Browse Source

use storespec directly in get ClusterProjectID

Atze de Vries 4 years ago
parent
commit
03fc0e9dc1

+ 2 - 3
pkg/provider/gcp/secretmanager/secretsmanager_workload_identity.go

@@ -115,7 +115,7 @@ func (w *workloadIdentity) TokenSource(ctx context.Context, store esv1beta1.Gene
 		saKey.Namespace = *wi.ServiceAccountRef.Namespace
 	}
 
-	clusterProjectID, err := clusterProjectID(store)
+	clusterProjectID, err := clusterProjectID(spec)
 	if err != nil {
 		return nil, err
 	}
@@ -263,8 +263,7 @@ func (g *gcpIDBindTokenGenerator) Generate(ctx context.Context, client *http.Cli
 	return idBindToken, nil
 }
 
-func clusterProjectID(store esv1beta1.GenericStore) (string, error) {
-	spec := store.GetSpec()
+func clusterProjectID(spec *esv1beta1.SecretStoreSpec) (string, error) {
 	if spec.Provider.GCPSM.Auth.WorkloadIdentity.ClusterProjectID != "" {
 		return spec.Provider.GCPSM.Auth.WorkloadIdentity.ClusterProjectID, nil
 	} else if spec.Provider.GCPSM.ProjectID != "" {

+ 2 - 2
pkg/provider/gcp/secretmanager/secretsmanager_workload_identity_test.go

@@ -160,10 +160,10 @@ func TestWorkloadIdentity(t *testing.T) {
 }
 
 func TestClusterProjectID(t *testing.T) {
-	clusterID, err := clusterProjectID(defaultStore())
+	clusterID, err := clusterProjectID(esv1beta1.GenericStore.GetSpec(defaultStore()))
 	assert.Nil(t, err)
 	assert.Equal(t, clusterID, "1234")
-	externalClusterID, err := clusterProjectID(defaultExternalStore())
+	externalClusterID, err := clusterProjectID(esv1beta1.GenericStore.GetSpec(defaultExternalStore()))
 	assert.Nil(t, err)
 	assert.Equal(t, externalClusterID, "5678")
 }