fix linting issues

Signed-off-by: Noah Kreiger <noahkreiger@gmail.com>
sigstore · Feb 5, 2024 · 10d5c9b · 10d5c9b
1 parent 8853141
commit 10d5c9b
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 26 deletions.
diff --git a/pkg/oauthflow/client_credentials.go b/pkg/oauthflow/client_credentials.go
@@ -19,13 +19,14 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/coreos/go-oidc/v3/oidc"
-	"golang.org/x/oauth2"
 	"io"
 	"net/http"
 	"net/url"
 	"strings"
 	"time"
+
+	"github.com/coreos/go-oidc/v3/oidc"
+	"golang.org/x/oauth2"
 )
 
 // CodeURL fetches the client credentials token authorization endpoint URL from the provider's well-known configuration endpoint

diff --git a/pkg/oauthflow/client_credentials_test.go b/pkg/oauthflow/client_credentials_test.go
@@ -19,23 +19,19 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/coreos/go-oidc/v3/oidc"
 	"net/http"
 	"net/http/httptest"
 	"strings"
 	"testing"
+
+	"github.com/coreos/go-oidc/v3/oidc"
 )
 
 type testccDriver struct {
-	msgs   []string
 	respCh chan interface{}
 	t      *testing.T
 }
 
-func (td *testccDriver) writeMsg(s string) {
-	td.msgs = append(td.msgs, s)
-}
-
 func (td *testccDriver) handler(w http.ResponseWriter, r *http.Request) {
 	td.t.Log("got request:", r.URL.Path)
 	if r.URL.Path == "/.well-known/openid-configuration" {

diff --git a/pkg/signature/kms/azure/client_test.go b/pkg/signature/kms/azure/client_test.go
@@ -71,17 +71,17 @@ func (c *testKVClient) Verify(_ context.Context, _, _ string, _ azkeys.VerifyPar
 
 type keyNotFoundClient struct {
 	testKVClient
-	key azkeys.JSONWebKey
-	getKeyReturnsErr bool
+	key                 azkeys.JSONWebKey
+	getKeyReturnsErr    bool
 	getKeyCallThreshold int
-	getKeyCallCount int
+	getKeyCallCount     int
 }
 
 func (c *keyNotFoundClient) GetKey(_ context.Context, _, _ string, _ *azkeys.GetKeyOptions) (azkeys.GetKeyResponse, error) {
 	if c.getKeyReturnsErr && c.getKeyCallCount < c.getKeyCallThreshold {
 		c.getKeyCallCount++
 		return azkeys.GetKeyResponse{}, &azcore.ResponseError{
-			StatusCode: http.StatusNotFound,
+			StatusCode:  http.StatusNotFound,
 			RawResponse: &http.Response{},
 		}
 	}
@@ -95,7 +95,7 @@ func (c *keyNotFoundClient) GetKey(_ context.Context, _, _ string, _ *azkeys.Get
 
 type nonResponseErrClient struct {
 	testKVClient
-	keyCache   *ttlcache.Cache[string, crypto.PublicKey]
+	keyCache *ttlcache.Cache[string, crypto.PublicKey]
 }
 
 func (c *nonResponseErrClient) GetKey(_ context.Context, _, _ string, _ *azkeys.GetKeyOptions) (result azkeys.GetKeyResponse, err error) {
@@ -105,7 +105,7 @@ func (c *nonResponseErrClient) GetKey(_ context.Context, _, _ string, _ *azkeys.
 
 type non404RespClient struct {
 	testKVClient
-	keyCache   *ttlcache.Cache[string, crypto.PublicKey]
+	keyCache *ttlcache.Cache[string, crypto.PublicKey]
 }
 
 func (c *non404RespClient) GetKey(_ context.Context, _, _ string, _ *azkeys.GetKeyOptions) (result azkeys.GetKeyResponse, err error) {
@@ -212,8 +212,8 @@ func TestAzureVaultClientFetchPublicKey(t *testing.T) {
 
 func TestAzureVaultClientCreateKey(t *testing.T) {
 	type test struct {
-		name string
-		client  kvClient
+		name          string
+		client        kvClient
 		expectSuccess bool
 	}
 
@@ -226,27 +226,27 @@ func TestAzureVaultClientCreateKey(t *testing.T) {
 		{
 			name: "Successfully create key if it doesn't exist",
 			client: &keyNotFoundClient{
-				key: key,
-				getKeyReturnsErr: true,
+				key:                 key,
+				getKeyReturnsErr:    true,
 				getKeyCallThreshold: 1,
 			},
 			expectSuccess: true,
 		},
 		{
 			name: "Return public key if it already exists",
-			client:  &testKVClient{
+			client: &testKVClient{
 				key: key,
 			},
 			expectSuccess: true,
 		},
 		{
-			name: "Fail to create key due to unknown error",
-			client:  &nonResponseErrClient{},
+			name:          "Fail to create key due to unknown error",
+			client:        &nonResponseErrClient{},
 			expectSuccess: false,
 		},
 		{
-			name: "Fail to create key due to non-404 status code error",
-			client:  &non404RespClient{},
+			name:          "Fail to create key due to non-404 status code error",
+			client:        &non404RespClient{},
 			expectSuccess: false,
 		},
 	}

diff --git a/pkg/signature/kms/azure/integration_test.go b/pkg/signature/kms/azure/integration_test.go
@@ -117,7 +117,7 @@ func TestCreateKey(t *testing.T) {
 	if azureVaultURL == "" {
 		t.Fatalf("VAULT_URL must be set")
 	}
-	
+
 	newKeyRef := fmt.Sprintf("azurekms://%s.vault.azure.net/%s", azureVaultURL, "new-test-key")
 
 	sv, err := LoadSignerVerifier(context.Background(), newKeyRef)

diff --git a/test/fuzz/pem/fuzzcert_test.go b/test/fuzz/pem/fuzzcert_test.go
@@ -18,8 +18,9 @@ package pem
 import (
 	"bytes"
 	"encoding/pem"
-	"github.com/sigstore/sigstore/pkg/cryptoutils"
 	"testing"
+
+	"github.com/sigstore/sigstore/pkg/cryptoutils"
 )
 
 func FuzzLoadCertificates(f *testing.F) {

diff --git a/test/fuzz/signature/fuzz_signature_test.go b/test/fuzz/signature/fuzz_signature_test.go
@@ -33,7 +33,6 @@ import (
 
 func FuzzECDSASigner(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-
 		x := ecdsa.PrivateKey{}
 		z := new(big.Int)
 		z.SetBytes(data)
@@ -63,6 +62,7 @@ func FuzzECDSASigner(f *testing.F) {
 		}
 	})
 }
+
 func FuzzComputeDigest(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
 		hashFuncs := []crypto.Hash{

diff --git a/test/fuzz/tools.go b/test/fuzz/tools.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 // Copyright 2021 The Sigstore Authors.