From a48b60581b4b1026a08ede8d897af57fdbea67b4 Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Sat, 8 Sep 2018 03:18:51 +0100 Subject: [PATCH] Run gofmt with go 1.11 Signed-off-by: James Munnelly --- pkg/controller/ingress-shim/sync_test.go | 6 +++--- pkg/issuer/vault/issue.go | 8 ++++---- test/util/vault/util.go | 14 +++++++------- third_party/crypto/acme/acme.go | 18 +++++++++--------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pkg/controller/ingress-shim/sync_test.go b/pkg/controller/ingress-shim/sync_test.go index f9d8130c6..6a7f62500 100644 --- a/pkg/controller/ingress-shim/sync_test.go +++ b/pkg/controller/ingress-shim/sync_test.go @@ -901,10 +901,10 @@ func TestGetGenericIssuer(t *testing.T) { Err: true, }, { - Name: "name", - Kind: "ClusterIssuer", + Name: "name", + Kind: "ClusterIssuer", NilClusterIssuerLister: true, - Err: true, + Err: true, }, } diff --git a/pkg/issuer/vault/issue.go b/pkg/issuer/vault/issue.go index 06fc67ea8..64207187b 100644 --- a/pkg/issuer/vault/issue.go +++ b/pkg/issuer/vault/issue.go @@ -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) parameters := map[string]string{ - "common_name": commonName, - "alt_names": strings.Join(altNames, ","), - "ttl": defaultCertificateDuration.String(), - "csr": string(csr), + "common_name": commonName, + "alt_names": strings.Join(altNames, ","), + "ttl": defaultCertificateDuration.String(), + "csr": string(csr), "exclude_cn_from_sans": "true", } diff --git a/test/util/vault/util.go b/test/util/vault/util.go index 4ad00fd2e..c55af24d1 100644 --- a/test/util/vault/util.go +++ b/test/util/vault/util.go @@ -221,8 +221,8 @@ func (v *VaultInitializer) mountPKI(mount, ttl string) error { func (v *VaultInitializer) generateRootCert() (string, error) { params := map[string]string{ - "common_name": "Root CA", - "ttl": "87600h", + "common_name": "Root CA", + "ttl": "87600h", "exclude_cn_from_sans": "true", } 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) { params := map[string]string{ - "common_name": "Intermediate CA", - "ttl": "43800h", + "common_name": "Intermediate CA", + "ttl": "43800h", "exclude_cn_from_sans": "true", } 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) { params := map[string]string{ - "use_csr_values": "true", - "ttl": "43800h", + "use_csr_values": "true", + "ttl": "43800h", "exclude_cn_from_sans": "true", - "csr": csr, + "csr": csr, } url := path.Join("/v1", v.rootMount, "root", "sign-intermediate") diff --git a/third_party/crypto/acme/acme.go b/third_party/crypto/acme/acme.go index 944c60143..86f1009c0 100644 --- a/third_party/crypto/acme/acme.go +++ b/third_party/crypto/acme/acme.go @@ -134,15 +134,15 @@ func (c *Client) Discover(ctx context.Context) (Directory, error) { return Directory{}, err } c.dir = &Directory{ - NewNonceURL: v.NewNonce, - NewAccountURL: v.NewAccount, - NewOrderURL: v.NewOrder, - NewAuthzURL: v.NewAuthz, - RevokeCertURL: v.RevokeCert, - KeyChangeURL: v.KeyChange, - Terms: v.Meta.TermsOfService, - Website: v.Meta.Website, - CAA: v.Meta.CAAIdentities, + NewNonceURL: v.NewNonce, + NewAccountURL: v.NewAccount, + NewOrderURL: v.NewOrder, + NewAuthzURL: v.NewAuthz, + RevokeCertURL: v.RevokeCert, + KeyChangeURL: v.KeyChange, + Terms: v.Meta.TermsOfService, + Website: v.Meta.Website, + CAA: v.Meta.CAAIdentities, ExternalAccountRequired: v.Meta.ExternalAccountRequired, } return *c.dir, nil