fix: golangci-lint

Author: atulpatildbz

keymanager/go.mod

@@ -1,5 +1,10 @@
 module github.com/google/go-tpm-tools/keymanager
 
-go 1.22
+go 1.23
 
-require github.com/google/uuid v1.6.0
+toolchain go1.24.13
+
+require (
+	github.com/google/uuid v1.6.0
+	google.golang.org/protobuf v1.36.11
+)

keymanager/go.sum

@@ -1,2 +1,6 @@
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=

keymanager/key_protection_service/service_test.go

@@ -18,7 +18,7 @@ func TestServiceGenerateKEMKeypairSuccess(t *testing.T) {
 	}
 
 	svc := NewService(
-		func(algo *algorithms.HpkeAlgorithm, bindingPubKey []byte, lifespanSecs uint64) (uuid.UUID, []byte, error) {
+		func(_ *algorithms.HpkeAlgorithm, bindingPubKey []byte, lifespanSecs uint64) (uuid.UUID, []byte, error) {
 			if len(bindingPubKey) != 32 {
 				t.Fatalf("expected 32-byte binding public key, got %d", len(bindingPubKey))
 			}
@@ -27,7 +27,7 @@ func TestServiceGenerateKEMKeypairSuccess(t *testing.T) {
 			}
 			return expectedUUID, expectedPubKey, nil
 		},
-		func(limit, offset int) ([]kpskcc.KEMKeyInfo, bool, error) {
+		func(_, _ int) ([]kpskcc.KEMKeyInfo, bool, error) {
 			return nil, false, nil
 		},
 	)
@@ -46,10 +46,10 @@ func TestServiceGenerateKEMKeypairSuccess(t *testing.T) {
 
 func TestServiceGenerateKEMKeypairError(t *testing.T) {
 	svc := NewService(
-		func(algo *algorithms.HpkeAlgorithm, bindingPubKey []byte, lifespanSecs uint64) (uuid.UUID, []byte, error) {
+		func(_ *algorithms.HpkeAlgorithm, _ []byte, _ uint64) (uuid.UUID, []byte, error) {
 			return uuid.Nil, nil, fmt.Errorf("FFI error")
 		},
-		func(limit, offset int) ([]kpskcc.KEMKeyInfo, bool, error) {
+		func(_, _ int) ([]kpskcc.KEMKeyInfo, bool, error) {
 			return nil, false, nil
 		},
 	)
@@ -75,7 +75,7 @@ func TestServiceEnumerateKEMKeysSuccess(t *testing.T) {
 	}
 
 	svc := NewService(
-		func(algo *algorithms.HpkeAlgorithm, bindingPubKey []byte, lifespanSecs uint64) (uuid.UUID, []byte, error) {
+		func(_ *algorithms.HpkeAlgorithm, _ []byte, _ uint64) (uuid.UUID, []byte, error) {
 			return uuid.Nil, nil, nil
 		},
 		func(limit, offset int) ([]kpskcc.KEMKeyInfo, bool, error) {
@@ -100,10 +100,10 @@ func TestServiceEnumerateKEMKeysSuccess(t *testing.T) {
 
 func TestServiceEnumerateKEMKeysError(t *testing.T) {
 	svc := NewService(
-		func(algo *algorithms.HpkeAlgorithm, bindingPubKey []byte, lifespanSecs uint64) (uuid.UUID, []byte, error) {
+		func(_ *algorithms.HpkeAlgorithm, _ []byte, _ uint64) (uuid.UUID, []byte, error) {
 			return uuid.Nil, nil, nil
 		},
-		func(limit, offset int) ([]kpskcc.KEMKeyInfo, bool, error) {
+		func(_, _ int) ([]kpskcc.KEMKeyInfo, bool, error) {
 			return nil, false, fmt.Errorf("enumerate error")
 		},
 	)

keymanager/km_common/proto/algorithms.pb.go

@@ -8,9 +8,6 @@ import (
 	algorithms "github.com/google/go-tpm-tools/keymanager/km_common/proto"
 )
 
-// These enum values mirror the proto definitions in PROTOS.md and are used by
-// the WSD JSON API contract.
-
 // KemAlgorithm represents the requested KEM algorithm.
 type KemAlgorithm int32
 
@@ -102,8 +99,9 @@ func (k KemAlgorithm) ToHpkeAlgorithm() (*algorithms.HpkeAlgorithm, error) {
 type KdfAlgorithm int32
 
 const (
+	// KdfAlgorithmUnspecified indicates an unspecified KDF algorithm.
 	KdfAlgorithmUnspecified KdfAlgorithm = 0
-	// Corrected from HKDF_SHA384 to HKDF_SHA256 based on ToHpkeAlgorithm usage which maps to HKDF_SHA256 (val 1)
+	// KdfAlgorithmHKDFSHA256 specifies the HKDF-SHA256 KDF algorithm.
 	KdfAlgorithmHKDFSHA256 KdfAlgorithm = 1
 )
 
@@ -125,10 +123,12 @@ func (k KdfAlgorithm) String() string {
 	return fmt.Sprintf("KDF_ALGORITHM_UNKNOWN(%d)", k)
 }
 
+// MarshalJSON converts a KdfAlgorithm enum value to its JSON string representation.
 func (k KdfAlgorithm) MarshalJSON() ([]byte, error) {
 	return json.Marshal(k.String())
 }
 
+// UnmarshalJSON converts a JSON string back into a KdfAlgorithm enum value.
 func (k *KdfAlgorithm) UnmarshalJSON(data []byte) error {
 	var s string
 	if err := json.Unmarshal(data, &s); err != nil {
@@ -145,8 +145,10 @@ func (k *KdfAlgorithm) UnmarshalJSON(data []byte) error {
 type AeadAlgorithm int32
 
 const (
+	// AeadAlgorithmUnspecified indicates an unspecified AEAD algorithm.
 	AeadAlgorithmUnspecified AeadAlgorithm = 0
-	AeadAlgorithmAES256GCM   AeadAlgorithm = 1
+	// AeadAlgorithmAES256GCM specifies the AES-256-GCM AEAD algorithm.
+	AeadAlgorithmAES256GCM AeadAlgorithm = 1
 )
 
 var (
@@ -167,10 +169,12 @@ func (k AeadAlgorithm) String() string {
 	return fmt.Sprintf("AEAD_ALGORITHM_UNKNOWN(%d)", k)
 }
 
+// MarshalJSON converts an AeadAlgorithm enum value to its JSON string representation.
 func (k AeadAlgorithm) MarshalJSON() ([]byte, error) {
 	return json.Marshal(k.String())
 }
 
+// UnmarshalJSON converts a JSON string back into an AeadAlgorithm enum value.
 func (k *AeadAlgorithm) UnmarshalJSON(data []byte) error {
 	var s string
 	if err := json.Unmarshal(data, &s); err != nil {

keymanager/workload_service/proto_enums.go

@@ -330,7 +330,7 @@ func writeJSON(w http.ResponseWriter, v any, code int) {
 	w.Header().Set("Content-Type", "application/json")
 	w.Header().Set("X-Content-Type-Options", "nosniff")
 	w.WriteHeader(code)
-	json.NewEncoder(w).Encode(v)
+	_ = json.NewEncoder(w).Encode(v)
 }
 
 // writeError writes a JSON error response.

keymanager/workload_service/server.go

@@ -53,7 +53,7 @@ func (m *mockKeyProtectionService) GenerateKEMKeypair(_ *algorithms.HpkeAlgorith
 	return m.uuid, m.pubKey, m.err
 }
 
-func (m *mockKeyProtectionService) EnumerateKEMKeys(limit, offset int) ([]kpskcc.KEMKeyInfo, bool, error) {
+func (m *mockKeyProtectionService) EnumerateKEMKeys(_, _ int) ([]kpskcc.KEMKeyInfo, bool, error) {
 	return m.enumeratedKeys, false, m.enumerateErr
 }