appease linter (#1544)

Author: lestrrat

jwk/set.go

@@ -155,7 +155,8 @@ func (s *set) MarshalJSON() ([]byte, error) {
 	defer pool.ReleaseBytesBuffer(buf)
 	enc := json.NewEncoder(buf)
 
-	fields := []string{keysKey}
+	fields := make([]string, 0, 1+len(s.privateParams))
+	fields = append(fields, keysKey)
 	for k := range s.privateParams {
 		fields = append(fields, k)
 	}

jwk/set_test.go

@@ -17,8 +17,7 @@ func TestSet(t *testing.T) {
 		jwxtest.GenerateSymmetricJwk,
 	}
 
-	//nolint:prealloc
-	var keys []jwk.Key
+	keys := make([]jwk.Key, 0, len(keygens))
 	for _, gen := range keygens {
 		k, err := gen()
 		if !assert.NoError(t, err, `key generation should succeed`) {

jws/jws_test.go

@@ -329,7 +329,8 @@ func TestSignMulti2(t *testing.T) {
 	hmacAlgorithms := []jwa.SignatureAlgorithm{jwa.HS256, jwa.HS384, jwa.HS512}
 	var signed []byte
 	t.Run("Sign", func(t *testing.T) {
-		var options = []jws.SignOption{jws.WithJSON()}
+		options := make([]jws.SignOption, 0, 1+len(hmacAlgorithms))
+		options = append(options, jws.WithJSON())
 		for _, alg := range hmacAlgorithms {
 			options = append(options, jws.WithKey(alg, sharedkey)) // (signer, sharedkey, nil, nil))
 		}
@@ -768,7 +769,7 @@ func TestEncode(t *testing.T) {
 			t.Run(tc.Name, func(t *testing.T) {
 				t.Parallel()
 				// Create payload with X.Y.Z
-				var payload []byte
+				payload := make([]byte, 0, size+1+size+1+size)
 				for range size {
 					payload = append(payload, 'X')
 				}
@@ -1294,7 +1295,7 @@ func TestJKU(t *testing.T) {
 				Fetcher: func() jwk.Fetcher {
 					c := jwk.NewCache(context.TODO())
 					return jwk.FetchFunc(func(ctx context.Context, u string, options ...jwk.FetchOption) (jwk.Set, error) {
-						var cacheopts []jwk.RegisterOption
+						cacheopts := make([]jwk.RegisterOption, 0, len(options)+2)
 						for _, option := range options {
 							cacheopts = append(cacheopts, option)
 						}
@@ -1343,15 +1344,15 @@ func TestJKU(t *testing.T) {
 		// 1st and 3rd signatures are valid, but signed using keys that are not
 		// present in the JWKS.
 		// Only the second signature uses a key found in the JWKS
-		var keys []jwk.Key
+		keys := make([]jwk.Key, 0, 3)
 		for i := range 3 {
 			key, err := jwxtest.GenerateRsaJwk()
 			require.NoError(t, err, `jwxtest.GenerateRsaJwk should succeed`)
 			key.Set(jwk.KeyIDKey, fmt.Sprintf(`used-%d`, i))
 			keys = append(keys, key)
 		}
 
-		var unusedKeys []jwk.Key
+		unusedKeys := make([]jwk.Key, 0, 2)
 		for i := range 2 {
 			key, err := jwxtest.GenerateRsaJwk()
 			require.NoError(t, err, `jwxtest.GenerateRsaJwk should succeed`)
@@ -1375,7 +1376,8 @@ func TestJKU(t *testing.T) {
 		defer srv.Close()
 
 		// Sign the payload using the three keys
-		var signOptions = []jws.SignOption{jws.WithJSON()}
+		signOptions := make([]jws.SignOption, 0, 1+len(keys))
+		signOptions = append(signOptions, jws.WithJSON())
 		for _, key := range keys {
 			hdr := jws.NewHeaders()
 			hdr.Set(jws.JWKSetURLKey, srv.URL)

jwt/internal/types/string_test.go

@@ -11,7 +11,7 @@ func TestStringList_Accept(t *testing.T) {
 	t.Parallel()
 
 	var x types.StringList
-	interfaceList := make([]interface{}, 0)
+	interfaceList := make([]interface{}, 0, 2)
 	interfaceList = append(interfaceList, "first")
 	interfaceList = append(interfaceList, "second")
 	if !assert.NoError(t, x.Accept(interfaceList), "failed to convert []interface{} into StringList") {