[APP] Refactor secret name

Author: Sytten

app/pkg/config/config.go

@@ -29,7 +29,7 @@ func NewConfiguration(logger *zap.Logger) (*Configuration, error) {
 	}
 
 	// Load from secret
-	secretName := os.Getenv("APP_SECRET")
+	secretName := os.Getenv("APP_SECRET_NAME")
 	if secretName != "" {
 		config, err := loadFromSecret(secretName)
 		if err != nil {

app/pkg/config/secretManager.go

@@ -3,13 +3,10 @@ package config
 import (
 	"bytes"
 	"context"
-	"errors"
 	"fmt"
-	"os"
 
 	secretmanager "cloud.google.com/go/secretmanager/apiv1"
 	"github.com/spf13/viper"
-	"golang.org/x/oauth2/google"
 	secretmanagerpb "google.golang.org/genproto/googleapis/cloud/secretmanager/v1"
 )
 
@@ -22,12 +19,8 @@ func loadFromSecret(secretName string) (*Configuration, error) {
 	}
 
 	// Download secret
-	projectId, err := getProjectId(ctx)
-	if err != nil {
-		return nil, err
-	}
 	secret, err := client.AccessSecretVersion(ctx, &secretmanagerpb.AccessSecretVersionRequest{
-		Name: fmt.Sprintf("projects/%s/secrets/%s/versions/latest", projectId, secretName),
+		Name: fmt.Sprintf("%s/versions/latest", secretName),
 	})
 	if err != nil {
 		return nil, err
@@ -47,22 +40,3 @@ func loadFromSecret(secretName string) (*Configuration, error) {
 
 	return &config, nil
 }
-
-func getProjectId(ctx context.Context) (string, error) {
-	// Fetch from the credentials
-	credentials, err := google.FindDefaultCredentials(ctx)
-	if err != nil {
-		return "", err
-	}
-	if credentials.ProjectID != "" {
-		return credentials.ProjectID, nil
-	}
-
-	// Fetch from the environment variable
-	projectId := os.Getenv("APP_PROJECT_ID")
-	if projectId != "" {
-		return projectId, nil
-	}
-
-	return "", errors.New("unable to retrieve project id")
-}