From aa5bfe04d57ae0697839036e76b6f7a046606ece Mon Sep 17 00:00:00 2001
From: Aleksandr Nogikh <nogikh@google.com>
Date: Mon, 11 Aug 2025 17:10:16 +0200
Subject: pkg: move gcpsecret to a separate package

It simplifies the dependency tree and fixes a build error for the
send-test-email container.
---
 pkg/gce/gcp_secret.go   | 61 -------------------------------------------------
 pkg/gcpsecret/secret.go | 61 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 61 deletions(-)
 delete mode 100644 pkg/gce/gcp_secret.go
 create mode 100644 pkg/gcpsecret/secret.go

(limited to 'pkg')

diff --git a/pkg/gce/gcp_secret.go b/pkg/gce/gcp_secret.go
deleted file mode 100644
index ef4eb2341..000000000
--- a/pkg/gce/gcp_secret.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2021 syzkaller project authors. All rights reserved.
-// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-
-package gce
-
-import (
-	"context"
-	"fmt"
-
-	"cloud.google.com/go/compute/metadata"
-	secretmanager "cloud.google.com/go/secretmanager/apiv1"
-	"cloud.google.com/go/secretmanager/apiv1/secretmanagerpb"
-)
-
-// GcpSecret returns the GCP Secret Manager blob as a []byte data.
-func GcpSecret(name string) ([]byte, error) {
-	return GcpSecretWithContext(context.Background(), name)
-}
-
-func GcpSecretWithContext(ctx context.Context, name string) ([]byte, error) {
-	// name := "projects/my-project/secrets/my-secret/versions/5"
-	// name := "projects/my-project/secrets/my-secret/versions/latest"
-
-	// Create the client.
-	client, err := secretmanager.NewClient(ctx)
-	if err != nil {
-		return nil, err
-	}
-	defer client.Close()
-
-	// Build the request.
-	req := &secretmanagerpb.AccessSecretVersionRequest{
-		Name: name,
-	}
-
-	// Call the API.
-	result, err := client.AccessSecretVersion(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return result.Payload.Data, nil
-}
-
-// LatestGcpSecret returns the latest secret value.
-func LatestGcpSecret(ctx context.Context, projectName, key string) ([]byte, error) {
-	return GcpSecretWithContext(ctx,
-		fmt.Sprintf("projects/%s/secrets/%s/versions/latest", projectName, key))
-}
-
-// ProjectName returns the name of the GCP project the code is running on.
-func ProjectName(ctx context.Context) (string, error) {
-	if !metadata.OnGCE() {
-		return "", fmt.Errorf("not running on GKE/GCE")
-	}
-	projectID, err := metadata.ProjectIDWithContext(ctx)
-	if err != nil {
-		return "", err
-	}
-	return projectID, nil
-}
diff --git a/pkg/gcpsecret/secret.go b/pkg/gcpsecret/secret.go
new file mode 100644
index 000000000..a801615f2
--- /dev/null
+++ b/pkg/gcpsecret/secret.go
@@ -0,0 +1,61 @@
+// Copyright 2021 syzkaller project authors. All rights reserved.
+// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
+
+package gcpsecret
+
+import (
+	"context"
+	"fmt"
+
+	"cloud.google.com/go/compute/metadata"
+	secretmanager "cloud.google.com/go/secretmanager/apiv1"
+	"cloud.google.com/go/secretmanager/apiv1/secretmanagerpb"
+)
+
+// GcpSecret returns the GCP Secret Manager blob as a []byte data.
+func GcpSecret(name string) ([]byte, error) {
+	return GcpSecretWithContext(context.Background(), name)
+}
+
+func GcpSecretWithContext(ctx context.Context, name string) ([]byte, error) {
+	// name := "projects/my-project/secrets/my-secret/versions/5"
+	// name := "projects/my-project/secrets/my-secret/versions/latest"
+
+	// Create the client.
+	client, err := secretmanager.NewClient(ctx)
+	if err != nil {
+		return nil, err
+	}
+	defer client.Close()
+
+	// Build the request.
+	req := &secretmanagerpb.AccessSecretVersionRequest{
+		Name: name,
+	}
+
+	// Call the API.
+	result, err := client.AccessSecretVersion(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return result.Payload.Data, nil
+}
+
+// LatestGcpSecret returns the latest secret value.
+func LatestGcpSecret(ctx context.Context, projectName, key string) ([]byte, error) {
+	return GcpSecretWithContext(ctx,
+		fmt.Sprintf("projects/%s/secrets/%s/versions/latest", projectName, key))
+}
+
+// ProjectName returns the name of the GCP project the code is running on.
+func ProjectName(ctx context.Context) (string, error) {
+	if !metadata.OnGCE() {
+		return "", fmt.Errorf("not running on GKE/GCE")
+	}
+	projectID, err := metadata.ProjectIDWithContext(ctx)
+	if err != nil {
+		return "", err
+	}
+	return projectID, nil
+}
-- 
cgit mrf-deployment