Updates based on PR feedback

Author: wwsean08

cmd/webhook/main.go

@@ -61,7 +61,7 @@ func main() {
 
 	// Fetch webhook secrets from secret manager
 	// or allow webhook secret to be defined by env var.
-	// Not everyone is using Google kmsProvider, so we need to support other methods
+	// Not everyone is using Google KMS, so we need to support other methods
 	webhookSecrets := [][]byte{}
 	if baseCfg.KMSKey != "" {
 		secretmanager, err := secretmanager.NewClient(ctx)

pkg/ghtransport/ghtransport_test.go

@@ -19,7 +19,7 @@ import (
 	gcpKMS "cloud.google.com/go/kms/apiv1"
 	"github.com/bradleyfalzon/ghinstallation/v2"
 	"github.com/octo-sts/app/pkg/envconfig"
-	kmsGCP "github.com/octo-sts/app/pkg/gcpkms"
+	"github.com/octo-sts/app/pkg/kms/gcp"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/api/option"
 	"google.golang.org/grpc"
@@ -181,5 +181,5 @@ type testKMSSigner struct {
 
 func (k *testKMSSigner) NewSigner() (ghinstallation.Signer, error) {
 	client := generateKMSClient(k.ctx, k.t)
-	return kmsGCP.New(k.ctx, client, k.key)
+	return gcp.New(k.ctx, client, k.key)
 }

pkg/awskms/awskms.go renamed to pkg/kms/aws/aws.go

@@ -1,7 +1,7 @@
-// Copyright 2024 Chainguard, Inc.
+// Copyright 2025 Chainguard, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-package awskms
+package aws
 
 import (
 	"context"

pkg/awskms/awskms_test.go renamed to pkg/kms/aws/aws_test.go

@@ -1,7 +1,7 @@
-// Copyright 2024 Chainguard, Inc.
+// Copyright 2025 Chainguard, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-package awskms
+package aws
 
 import (
 	"context"

pkg/gcpkms/gcpkms.go renamed to pkg/kms/gcp/gcp.go

@@ -1,7 +1,7 @@
 // Copyright 2024 Chainguard, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-package gcpkms
+package gcp
 
 import (
 	"context"

pkg/gcpkms/gcpkms_test.go renamed to pkg/kms/gcp/gcp_test.go

@@ -1,7 +1,7 @@
 // Copyright 2024 Chainguard, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-package gcpkms
+package gcp
 
 import (
 	"context"

pkg/kms/kms.go

@@ -1,4 +1,4 @@
-// Copyright 2024 Chainguard, Inc.
+// Copyright 2025 Chainguard, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
 package kms
@@ -12,8 +12,8 @@ import (
 	"github.com/aws/aws-sdk-go-v2/config"
 	kmsAWS "github.com/aws/aws-sdk-go-v2/service/kms"
 	"github.com/bradleyfalzon/ghinstallation/v2"
-	"github.com/octo-sts/app/pkg/awskms"
-	"github.com/octo-sts/app/pkg/gcpkms"
+	"github.com/octo-sts/app/pkg/kms/aws"
+	"github.com/octo-sts/app/pkg/kms/gcp"
 )
 
 const (
@@ -64,9 +64,9 @@ func NewKMS(ctx context.Context, provider, kmsKey string) (KMS, error) {
 func (k *kmsProvider) NewSigner() (ghinstallation.Signer, error) {
 	switch k.provider {
 	case GCP:
-		return gcpkms.New(k.ctx, k.gcpClient, k.kmsKey)
+		return gcp.New(k.ctx, k.gcpClient, k.kmsKey)
 	case AWS:
-		return awskms.New(k.ctx, k.awsClient, k.kmsKey)
+		return aws.New(k.ctx, k.awsClient, k.kmsKey)
 	default:
 		return nil, errors.New("unsupported kms provider")
 	}

pkg/kms/kms_test.go

@@ -1,4 +1,4 @@
-// Copyright 2024 Chainguard, Inc.
+// Copyright 2025 Chainguard, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
 package kms