Run gofumports on source

johanbrandhorst · Dec 26, 2019 · 5d940d8 · 5d940d8
1 parent 60e3475
commit 5d940d8
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 22 deletions.
diff --git a/cache.go b/cache.go
@@ -270,9 +270,11 @@ type noopCache struct{}
 func (*noopCache) Get(context.Context, string) (*tls.Certificate, error) {
 	return nil, ErrCacheMiss
 }
+
 func (*noopCache) Put(context.Context, string, *tls.Certificate) error {
 	return nil
 }
+
 func (*noopCache) Delete(context.Context, string) error {
 	return nil
 }
diff --git a/issuers/vault/types.go b/issuers/vault/types.go
@@ -47,7 +47,7 @@ type RenewingToken struct {
 	token   string
 	tokenMu sync.Mutex
 	errC    chan error
-	cancel func()
+	cancel  func()
 }
 
 // SetToken implements AuthMethod for RenewingToken.
@@ -71,7 +71,7 @@ func (r *RenewingToken) SetToken(ctx context.Context, cli *api.Client) error {
 			return
 		}
 		defer resp.Body.Close()
-	
+
 		tok, tErr := api.ParseSecret(resp.Body)
 		if tErr != nil {
 			err = tErr
@@ -118,7 +118,7 @@ func (r *RenewingToken) SetToken(ctx context.Context, cli *api.Client) error {
 
 				// Needs renewal
 				req := cli.NewRequest("PUT", "/v1/auth/token/renew-self")
-			
+
 				body := map[string]interface{}{"increment": r.TimeToLive.Seconds()}
 				if err := req.SetJSONBody(body); err != nil {
 					r.errC <- err
@@ -130,7 +130,7 @@ func (r *RenewingToken) SetToken(ctx context.Context, cli *api.Client) error {
 					return
 				}
 				defer resp.Body.Close()
-			
+
 				tok, tErr := api.ParseSecret(resp.Body)
 				if tErr != nil {
 					r.errC <- err

diff --git a/issuers/vault/vault.go b/issuers/vault/vault.go
@@ -75,9 +75,9 @@ type Issuer struct {
 // the token already defined in the client for authentication.
 func FromClient(v *api.Client, role string) *Issuer {
 	return &Issuer{
-		Role: role,
+		Role:       role,
 		AuthMethod: ConstantToken(v.Token()),
-		cli:  v,
+		cli:        v,
 	}
 }
 

diff --git a/issuers/vault/vault_test.go b/issuers/vault/vault_test.go
@@ -65,9 +65,9 @@ var _ = Describe("Vault Issuer", func() {
 
 	BeforeEach(func() {
 		iss = &vault.Issuer{
-			URL:   vaultTLSConf.URL,
+			URL:        vaultTLSConf.URL,
 			AuthMethod: vault.ConstantToken(vaultTLSConf.Token),
-			Role:  vaultTLSConf.Role,
+			Role:       vaultTLSConf.Role,
 			TLSConfig: &tls.Config{
 				RootCAs: vaultTLSConf.CertPool,
 			},
@@ -109,19 +109,19 @@ var _ = Describe("Vault Issuer", func() {
 	Context("with no explicit AuthMethod set", func() {
 		It("still works", func() {
 			cn := "somename.com"
-	
+
 			tlsCert, err := iss.Issue(context.Background(), cn, conf)
 			Expect(err).NotTo(HaveOccurred())
-	
+
 			Expect(tlsCert.Leaf).NotTo(BeNil(), "tlsCert.Leaf should be populated by Issue to track expiry")
 			Expect(tlsCert.Leaf.Subject.CommonName).To(Equal(cn))
-	
+
 			// Check that chain is included
 			Expect(tlsCert.Certificate).To(HaveLen(2))
 			caCert, err := x509.ParseCertificate(tlsCert.Certificate[1])
 			Expect(err).NotTo(HaveOccurred())
 			Expect(caCert.Subject.SerialNumber).To(Equal(tlsCert.Leaf.Issuer.SerialNumber))
-	
+
 			Expect(tlsCert.Leaf.NotBefore).To(BeTemporally("<", time.Now()))
 			Expect(tlsCert.Leaf.NotAfter).To(BeTemporally("~", time.Now().Add(iss.(*vault.Issuer).TimeToLive), 5*time.Second))
 			Expect(getOtherNames(tlsCert.Leaf)).To(ConsistOf(otherName{
@@ -134,9 +134,9 @@ var _ = Describe("Vault Issuer", func() {
 	Context("with URI SANs", func() {
 		BeforeEach(func() {
 			iss = &vault.Issuer{
-				URL:   vaultTLSConf.URL,
+				URL:        vaultTLSConf.URL,
 				AuthMethod: vault.ConstantToken(vaultTLSConf.Token),
-				Role:  vaultTLSConf.RoleURISANs,
+				Role:       vaultTLSConf.RoleURISANs,
 				TLSConfig: &tls.Config{
 					RootCAs: vaultTLSConf.CertPool,
 				},
@@ -172,10 +172,10 @@ var _ = Describe("Vault Issuer", func() {
 	Context("with a non-standard mount point", func() {
 		BeforeEach(func() {
 			iss = &vault.Issuer{
-				URL:   vaultTLSConf.URL,
+				URL:        vaultTLSConf.URL,
 				AuthMethod: vault.ConstantToken(vaultTLSConf.Token),
-				Mount: altMount,
-				Role:  vaultTLSConf.Role,
+				Mount:      altMount,
+				Role:       vaultTLSConf.Role,
 				TLSConfig: &tls.Config{
 					RootCAs: vaultTLSConf.CertPool,
 				},
@@ -485,9 +485,9 @@ var _ = Describe("When using RenewingToken", func() {
 		}()
 
 		iss := &vault.Issuer{
-			URL: vaultTLSConf.URL,
+			URL:        vaultTLSConf.URL,
 			AuthMethod: rt,
-			Role: vaultTLSConf.Role,
+			Role:       vaultTLSConf.Role,
 			TLSConfig: &tls.Config{
 				RootCAs: vaultTLSConf.CertPool,
 			},
@@ -503,7 +503,7 @@ var _ = Describe("When using RenewingToken", func() {
 		_, err = iss.Issue(context.Background(), cn, conf)
 		Expect(err).To(Succeed())
 
-		time.Sleep(2*time.Second) // Should cause token to be renewed in the background.
+		time.Sleep(2 * time.Second) // Should cause token to be renewed in the background.
 
 		_, err = iss.Issue(context.Background(), cn, conf)
 		Expect(err).To(Succeed())
@@ -554,9 +554,9 @@ var _ = Describe("gRPC Test", func() {
 				cb = &certify.Certify{
 					CommonName: "Certify",
 					Issuer: &vault.Issuer{
-						URL:   vaultTLSConf.URL,
+						URL:        vaultTLSConf.URL,
 						AuthMethod: vault.ConstantToken(vaultTLSConf.Token),
-						Role:  vaultTLSConf.Role,
+						Role:       vaultTLSConf.Role,
 						TLSConfig: &tls.Config{
 							RootCAs: vaultTLSConf.CertPool,
 						},