From 3eae2511881046d76fb980f8f50a1c6475ddaa0d Mon Sep 17 00:00:00 2001 From: ezgidemirel Date: Thu, 10 Nov 2022 17:15:44 +0300 Subject: [PATCH] Fix secret selector of google_secret_manager_secret_version Signed-off-by: ezgidemirel --- apis/secretmanager/v1beta1/zz_generated.resolvers.go | 2 +- apis/secretmanager/v1beta1/zz_secretversion_types.go | 1 + config/secretmanager/config.go | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apis/secretmanager/v1beta1/zz_generated.resolvers.go b/apis/secretmanager/v1beta1/zz_generated.resolvers.go index d4b358b5e..c4bd55238 100644 --- a/apis/secretmanager/v1beta1/zz_generated.resolvers.go +++ b/apis/secretmanager/v1beta1/zz_generated.resolvers.go @@ -60,7 +60,7 @@ func (mg *SecretVersion) ResolveReferences(ctx context.Context, c client.Reader) rsp, err = r.Resolve(ctx, reference.ResolutionRequest{ CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.Secret), - Extract: reference.ExternalName(), + Extract: common.ExtractResourceID(), Reference: mg.Spec.ForProvider.SecretRef, Selector: mg.Spec.ForProvider.SecretSelector, To: reference.To{ diff --git a/apis/secretmanager/v1beta1/zz_secretversion_types.go b/apis/secretmanager/v1beta1/zz_secretversion_types.go index 0c148b547..5c9670e26 100755 --- a/apis/secretmanager/v1beta1/zz_secretversion_types.go +++ b/apis/secretmanager/v1beta1/zz_secretversion_types.go @@ -49,6 +49,7 @@ type SecretVersionParameters struct { // Secret Manager secret resource // +crossplane:generate:reference:type=Secret + // +crossplane:generate:reference:extractor=github.com/upbound/provider-gcp/config/common.ExtractResourceID() // +kubebuilder:validation:Optional Secret *string `json:"secret,omitempty" tf:"secret,omitempty"` diff --git a/config/secretmanager/config.go b/config/secretmanager/config.go index 745d643f8..552c9f3ae 100644 --- a/config/secretmanager/config.go +++ b/config/secretmanager/config.go @@ -21,7 +21,8 @@ func Configure(p *config.Provider) { p.AddResourceConfigurator("google_secret_manager_secret_version", func(r *config.Resource) { r.References["secret"] = config.Reference{ - Type: "Secret", + Type: "Secret", + Extractor: common.ExtractResourceIDFuncPath, } }) }