Skip to content

Commit

Permalink
Run gofmt with go 1.11
Browse files Browse the repository at this point in the history
Signed-off-by: James Munnelly <james@munnelly.eu>
  • Loading branch information
munnerz committed Sep 8, 2018
1 parent 7309099 commit a48b605
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions pkg/controller/ingress-shim/sync_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
}

Expand Down
8 changes: 4 additions & 4 deletions pkg/issuer/vault/issue.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}

Expand Down
14 changes: 7 additions & 7 deletions test/util/vault/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand All @@ -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")

Expand Down
18 changes: 9 additions & 9 deletions third_party/crypto/acme/acme.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a48b605

Please sign in to comment.