addressed comments in tests

Author: XuechunHou

confmap/provider/googlesecretmanagerprovider/provider_test.go

@@ -5,28 +5,32 @@ package googlesecretmanagerprovider
 
 import (
 	"context"
-	"errors"
+	"fmt"
 	"testing"
 
 	"cloud.google.com/go/secretmanager/apiv1/secretmanagerpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/confmap"
+	"google.golang.org/grpc/codes"
 )
 
-// Define a mock secretsManagerClient for testing
-type mockSecretsManagerClient struct {
-	err          error
-	secretString string
+var validSecrets = map[string]string{
+	"projects/my-project/secrets/secret-1/versions/1": "secret-1",
+	"projects/my-project/secrets/secret-2/versions/1": "secret-2",
 }
 
+// Define a mock secretsManagerClient for testing
+type mockSecretsManagerClient struct{}
+
 func (m *mockSecretsManagerClient) AccessSecretVersion(ctx context.Context, req *secretmanagerpb.AccessSecretVersionRequest, opts ...gax.CallOption) (*secretmanagerpb.AccessSecretVersionResponse, error) {
-	if m.err != nil {
-		return nil, m.err
+	secretString, ok := validSecrets[req.Name]
+	if !ok {
+		return nil, fmt.Errorf("secrets entry does not exist, error code: %v", codes.NotFound)
 	}
 	return &secretmanagerpb.AccessSecretVersionResponse{
 		Payload: &secretmanagerpb.SecretPayload{
-			Data: []byte(m.secretString),
+			Data: []byte(secretString),
 		},
 	}, nil
 }
@@ -43,13 +47,10 @@ func TestProvider_Retrieve_Success(t *testing.T) {
 		wantSecret        string
 	}{
 		{
-			name: "Happy path: valid uri, secret entry exists and is accessible",
-			uri:  schemeName + ":projects/my-project/secrets/test-secret-id/versions/1",
-			testSecretManager: &mockSecretsManagerClient{
-				err:          nil,
-				secretString: "test-secret-value",
-			},
-			wantSecret: "test-secret-value",
+			name:              "Happy path: valid uri, secret entry exists and is accessible",
+			uri:               schemeName + ":projects/my-project/secrets/secret-1/versions/1",
+			testSecretManager: &mockSecretsManagerClient{},
+			wantSecret:        "secret-1",
 		},
 	}
 
@@ -58,18 +59,13 @@ func TestProvider_Retrieve_Success(t *testing.T) {
 			testProvider := &provider{
 				client: tc.testSecretManager,
 			}
-			defer testProvider.client.Close()
 			gotSecret, err := testProvider.Retrieve(context.Background(), tc.uri, nil)
-			if err != nil {
-				t.Errorf("%v: Retrieve() gotError = %v, want nil error", tc.name, err)
-			}
+			require.NoError(t, err)
+
 			gotSecretString, err := gotSecret.AsString()
-			if err != nil {
-				t.Errorf("%v: failed to retrieve the string value of the secret, error: %v", tc.name, err)
-			}
-			if gotSecretString != tc.wantSecret {
-				t.Errorf("%v: Retrieve() gotSecret = %v, want %v", tc.name, gotSecret, tc.wantSecret)
-			}
+			require.NoError(t, err)
+			require.Equal(t, tc.wantSecret, gotSecretString)
+
 		})
 	}
 }
@@ -81,28 +77,19 @@ func TestProvider_Retrieve_Failure(t *testing.T) {
 		testSecretManager *mockSecretsManagerClient
 	}{
 		{
-			name: "Invalid scheme",
-			uri:  "invalidscheme" + ":projects/my-project/secrets/test-secret-id/versions/1",
-			testSecretManager: &mockSecretsManagerClient{
-				err:          errors.New("invalid scheme"),
-				secretString: "test-secret-value",
-			},
+			name:              "Invalid scheme",
+			uri:               "invalidscheme" + ":projects/my-project/secrets/test-secret-id/versions/1",
+			testSecretManager: &mockSecretsManagerClient{},
 		},
 		{
-			name: "secret entry does not exist in the secret manager",
-			uri:  schemeName + ":projects/my-project/secrets/non-existent/versions/1",
-			testSecretManager: &mockSecretsManagerClient{
-				err:          errors.New("secret entry does not exist"),
-				secretString: "test-secret-value",
-			},
+			name:              "secret entry does not exist in the secret manager",
+			uri:               schemeName + ":projects/my-project/secrets/non-existent/versions/1",
+			testSecretManager: &mockSecretsManagerClient{},
 		},
 		{
-			name: "invalid secret name",
-			uri:  schemeName + ":projects/my-project/invalid-secret/test-secret-id/versions/1",
-			testSecretManager: &mockSecretsManagerClient{
-				err:          errors.New("secret name is invalid"),
-				secretString: "test-secret-value",
-			},
+			name:              "invalid secret name",
+			uri:               schemeName + ":projects/my-project/versions/1",
+			testSecretManager: &mockSecretsManagerClient{},
 		},
 	}
 
@@ -111,11 +98,8 @@ func TestProvider_Retrieve_Failure(t *testing.T) {
 			testProvider := &provider{
 				client: tc.testSecretManager,
 			}
-			defer testProvider.client.Close()
 			_, err := testProvider.Retrieve(context.Background(), tc.uri, nil)
-			if err == nil {
-				t.Errorf("%v: Retrieve() got nil error, want non-nil error", tc.name)
-			}
+			require.Error(t, err)
 		})
 	}
 }