Run gofmt with go 1.11
Signed-off-by: James Munnelly <james@munnelly.eu>
This commit is contained in:
parent
73090995da
commit
a48b60581b
@ -901,10 +901,10 @@ func TestGetGenericIssuer(t *testing.T) {
|
|||||||
Err: true,
|
Err: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Name: "name",
|
Name: "name",
|
||||||
Kind: "ClusterIssuer",
|
Kind: "ClusterIssuer",
|
||||||
NilClusterIssuerLister: true,
|
NilClusterIssuerLister: true,
|
||||||
Err: true,
|
Err: true,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -192,10 +192,10 @@ func (v *Vault) requestVaultCert(commonName string, altNames []string, csr []byt
|
|||||||
glog.V(4).Infof("Vault certificate request for commonName %s altNames: %q", commonName, altNames)
|
glog.V(4).Infof("Vault certificate request for commonName %s altNames: %q", commonName, altNames)
|
||||||
|
|
||||||
parameters := map[string]string{
|
parameters := map[string]string{
|
||||||
"common_name": commonName,
|
"common_name": commonName,
|
||||||
"alt_names": strings.Join(altNames, ","),
|
"alt_names": strings.Join(altNames, ","),
|
||||||
"ttl": defaultCertificateDuration.String(),
|
"ttl": defaultCertificateDuration.String(),
|
||||||
"csr": string(csr),
|
"csr": string(csr),
|
||||||
"exclude_cn_from_sans": "true",
|
"exclude_cn_from_sans": "true",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -221,8 +221,8 @@ func (v *VaultInitializer) mountPKI(mount, ttl string) error {
|
|||||||
|
|
||||||
func (v *VaultInitializer) generateRootCert() (string, error) {
|
func (v *VaultInitializer) generateRootCert() (string, error) {
|
||||||
params := map[string]string{
|
params := map[string]string{
|
||||||
"common_name": "Root CA",
|
"common_name": "Root CA",
|
||||||
"ttl": "87600h",
|
"ttl": "87600h",
|
||||||
"exclude_cn_from_sans": "true",
|
"exclude_cn_from_sans": "true",
|
||||||
}
|
}
|
||||||
url := path.Join("/v1", v.rootMount, "root", "generate", "internal")
|
url := path.Join("/v1", v.rootMount, "root", "generate", "internal")
|
||||||
@ -237,8 +237,8 @@ func (v *VaultInitializer) generateRootCert() (string, error) {
|
|||||||
|
|
||||||
func (v *VaultInitializer) generateIntermediateSigningReq() (string, error) {
|
func (v *VaultInitializer) generateIntermediateSigningReq() (string, error) {
|
||||||
params := map[string]string{
|
params := map[string]string{
|
||||||
"common_name": "Intermediate CA",
|
"common_name": "Intermediate CA",
|
||||||
"ttl": "43800h",
|
"ttl": "43800h",
|
||||||
"exclude_cn_from_sans": "true",
|
"exclude_cn_from_sans": "true",
|
||||||
}
|
}
|
||||||
url := path.Join("/v1", v.intermediateMount, "intermediate", "generate", "internal")
|
url := path.Join("/v1", v.intermediateMount, "intermediate", "generate", "internal")
|
||||||
@ -253,10 +253,10 @@ func (v *VaultInitializer) generateIntermediateSigningReq() (string, error) {
|
|||||||
|
|
||||||
func (v *VaultInitializer) signCertificate(csr string) (string, error) {
|
func (v *VaultInitializer) signCertificate(csr string) (string, error) {
|
||||||
params := map[string]string{
|
params := map[string]string{
|
||||||
"use_csr_values": "true",
|
"use_csr_values": "true",
|
||||||
"ttl": "43800h",
|
"ttl": "43800h",
|
||||||
"exclude_cn_from_sans": "true",
|
"exclude_cn_from_sans": "true",
|
||||||
"csr": csr,
|
"csr": csr,
|
||||||
}
|
}
|
||||||
url := path.Join("/v1", v.rootMount, "root", "sign-intermediate")
|
url := path.Join("/v1", v.rootMount, "root", "sign-intermediate")
|
||||||
|
|
||||||
|
|||||||
18
third_party/crypto/acme/acme.go
vendored
18
third_party/crypto/acme/acme.go
vendored
@ -134,15 +134,15 @@ func (c *Client) Discover(ctx context.Context) (Directory, error) {
|
|||||||
return Directory{}, err
|
return Directory{}, err
|
||||||
}
|
}
|
||||||
c.dir = &Directory{
|
c.dir = &Directory{
|
||||||
NewNonceURL: v.NewNonce,
|
NewNonceURL: v.NewNonce,
|
||||||
NewAccountURL: v.NewAccount,
|
NewAccountURL: v.NewAccount,
|
||||||
NewOrderURL: v.NewOrder,
|
NewOrderURL: v.NewOrder,
|
||||||
NewAuthzURL: v.NewAuthz,
|
NewAuthzURL: v.NewAuthz,
|
||||||
RevokeCertURL: v.RevokeCert,
|
RevokeCertURL: v.RevokeCert,
|
||||||
KeyChangeURL: v.KeyChange,
|
KeyChangeURL: v.KeyChange,
|
||||||
Terms: v.Meta.TermsOfService,
|
Terms: v.Meta.TermsOfService,
|
||||||
Website: v.Meta.Website,
|
Website: v.Meta.Website,
|
||||||
CAA: v.Meta.CAAIdentities,
|
CAA: v.Meta.CAAIdentities,
|
||||||
ExternalAccountRequired: v.Meta.ExternalAccountRequired,
|
ExternalAccountRequired: v.Meta.ExternalAccountRequired,
|
||||||
}
|
}
|
||||||
return *c.dir, nil
|
return *c.dir, nil
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user