Merge pull request #7 from muvaf/externalnamefix

external name: use identifierfromprovider as provider-wide default
crossplane-contrib · Nov 19, 2021 · 7ec7f23 · 7ec7f23
2 parents 267a966 + 91cf982
commit 7ec7f23
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 2 deletions.
diff --git a/config/compute/config.go b/config/compute/config.go
@@ -18,6 +18,7 @@ func Configure(p *config.Provider) { //nolint: gocyclo
 
 	p.AddResourceConfigurator("google_compute_managed_ssl_certificate", func(r *config.Resource) {
 		r.Kind = "ManagedSSLCertificate"
+		r.ExternalName = config.NameAsIdentifier
 		r.ExternalName.GetExternalNameFn = common.GetNameFromFullyQualifiedID
 		r.ExternalName.GetIDFn = func(_ context.Context, externalName string, parameters map[string]interface{}, providerConfig map[string]interface{}) (string, error) {
 			project, err := common.GetField(providerConfig, common.KeyProject)
@@ -30,6 +31,7 @@ func Configure(p *config.Provider) { //nolint: gocyclo
 	})
 
 	p.AddResourceConfigurator("google_compute_subnetwork", func(r *config.Resource) {
+		r.ExternalName = config.NameAsIdentifier
 		r.ExternalName.GetExternalNameFn = common.GetNameFromFullyQualifiedID
 		r.ExternalName.GetIDFn = func(_ context.Context, externalName string, parameters map[string]interface{}, providerConfig map[string]interface{}) (string, error) {
 			project, err := common.GetField(providerConfig, common.KeyProject)
@@ -49,6 +51,7 @@ func Configure(p *config.Provider) { //nolint: gocyclo
 	})
 
 	p.AddResourceConfigurator("google_compute_address", func(r *config.Resource) {
+		r.ExternalName = config.NameAsIdentifier
 		r.ExternalName.GetExternalNameFn = common.GetNameFromFullyQualifiedID
 		r.ExternalName.GetIDFn = func(_ context.Context, externalName string, parameters map[string]interface{}, providerConfig map[string]interface{}) (string, error) {
 			project, err := common.GetField(providerConfig, common.KeyProject)
@@ -70,6 +73,7 @@ func Configure(p *config.Provider) { //nolint: gocyclo
 	})
 
 	p.AddResourceConfigurator("google_compute_firewall", func(r *config.Resource) {
+		r.ExternalName = config.NameAsIdentifier
 		r.ExternalName.GetExternalNameFn = common.GetNameFromFullyQualifiedID
 		r.ExternalName.GetIDFn = func(_ context.Context, externalName string, parameters map[string]interface{}, providerConfig map[string]interface{}) (string, error) {
 			project, err := common.GetField(providerConfig, common.KeyProject)
@@ -85,6 +89,7 @@ func Configure(p *config.Provider) { //nolint: gocyclo
 	})
 
 	p.AddResourceConfigurator("google_compute_router", func(r *config.Resource) {
+		r.ExternalName = config.NameAsIdentifier
 		r.ExternalName.GetExternalNameFn = common.GetNameFromFullyQualifiedID
 		r.ExternalName.GetIDFn = func(_ context.Context, externalName string, parameters map[string]interface{}, providerConfig map[string]interface{}) (string, error) {
 			project, err := common.GetField(providerConfig, common.KeyProject)
@@ -104,6 +109,7 @@ func Configure(p *config.Provider) { //nolint: gocyclo
 	})
 
 	p.AddResourceConfigurator("google_compute_router_nat", func(r *config.Resource) {
+		r.ExternalName = config.NameAsIdentifier
 		r.ExternalName.GetExternalNameFn = common.GetNameFromFullyQualifiedID
 		r.ExternalName.GetIDFn = func(_ context.Context, externalName string, parameters map[string]interface{}, providerConfig map[string]interface{}) (string, error) {
 			project, err := common.GetField(providerConfig, common.KeyProject)
@@ -135,6 +141,7 @@ func Configure(p *config.Provider) { //nolint: gocyclo
 		// elements configured as nil, defaulting to map[string]string:
 		r.TerraformResource.Schema["metadata"].Elem = schema.TypeString
 
+		r.ExternalName = config.NameAsIdentifier
 		r.ExternalName.GetExternalNameFn = common.GetNameFromFullyQualifiedID
 		r.ExternalName.GetIDFn = func(_ context.Context, externalName string, parameters map[string]interface{}, providerConfig map[string]interface{}) (string, error) {
 			project, err := common.GetField(providerConfig, common.KeyProject)
@@ -155,6 +162,7 @@ func Configure(p *config.Provider) { //nolint: gocyclo
 			Schema["initialize_params"].Elem.(*schema.Resource).
 			Schema["labels"].Elem = schema.TypeString
 
+		r.ExternalName = config.NameAsIdentifier
 		r.ExternalName.GetExternalNameFn = common.GetNameFromFullyQualifiedID
 		r.ExternalName.GetIDFn = func(_ context.Context, externalName string, parameters map[string]interface{}, providerConfig map[string]interface{}) (string, error) {
 			project, err := common.GetField(providerConfig, common.KeyProject)
@@ -189,6 +197,7 @@ func Configure(p *config.Provider) { //nolint: gocyclo
 			Schema["labels"].Elem = schema.TypeString
 		r.TerraformResource.Schema["metadata"].Elem = schema.TypeString
 
+		r.ExternalName = config.NameAsIdentifier
 		r.ExternalName.GetExternalNameFn = common.GetNameFromFullyQualifiedID
 		r.ExternalName.GetIDFn = func(_ context.Context, externalName string, parameters map[string]interface{}, providerConfig map[string]interface{}) (string, error) {
 			project, err := common.GetField(providerConfig, common.KeyProject)
@@ -211,4 +220,14 @@ func Configure(p *config.Provider) { //nolint: gocyclo
 
 		r.UseAsync = true
 	})
+
+	p.AddResourceConfigurator("google_compute_network", func(r *config.Resource) {
+		r.ExternalName = config.NameAsIdentifier
+		r.ExternalName.GetExternalNameFn = common.GetNameFromFullyQualifiedID
+		// projects/{{project}}/global/networks/{{name}}
+		r.ExternalName.GetIDFn = func(_ context.Context, externalName string, parameters map[string]interface{}, providerConfig map[string]interface{}) (string, error) {
+			project, err := common.GetField(providerConfig, common.KeyProject)
+			return fmt.Sprintf("projects/%s/global/networks/%s", project, externalName), err
+		}
+	})
 }
diff --git a/config/overrides.go b/config/overrides.go
@@ -3,9 +3,10 @@ package config
 import (
 	"strings"
 
-	tjconfig "github.com/crossplane-contrib/terrajet/pkg/config"
 	"github.com/iancoleman/strcase"
 
+	tjconfig "github.com/crossplane-contrib/terrajet/pkg/config"
+
 	"github.com/crossplane-contrib/provider-jet-gcp/config/accessapproval"
 	"github.com/crossplane-contrib/provider-jet-gcp/config/cloudplatform"
 )
@@ -52,3 +53,9 @@ func groupOverrides() tjconfig.ResourceOption { //nolint: gocyclo
 		}
 	}
 }
+
+func externalNameConfig() tjconfig.ResourceOption {
+	return func(r *tjconfig.Resource) {
+		r.ExternalName = tjconfig.IdentifierFromProvider
+	}
+}
diff --git a/config/provider.go b/config/provider.go
@@ -48,7 +48,10 @@ var includeList = []string{
 func GetProvider() *tjconfig.Provider {
 	resourceMap := tf.Provider().ResourcesMap
 	pc := tjconfig.NewProvider(resourceMap, resourcePrefix, modulePath,
-		tjconfig.WithDefaultResourceFn(DefaultResource(groupOverrides())),
+		tjconfig.WithDefaultResourceFn(DefaultResource(
+			groupOverrides(),
+			externalNameConfig(),
+		)),
 		tjconfig.WithRootGroup("gcp.jet.crossplane.io"),
 		tjconfig.WithShortName("gcpjet"),
 		// Comment out the following line to generate all resources.

diff --git a/config/storage/config.go b/config/storage/config.go
@@ -1,7 +1,12 @@
 package storage
 
 import (
+	"context"
+	"path/filepath"
+
 	"github.com/crossplane-contrib/terrajet/pkg/config"
+
+	"github.com/crossplane-contrib/provider-jet-gcp/config/common"
 )
 
 // Configure configures individual resources by adding custom
@@ -16,5 +21,10 @@ func Configure(p *config.Provider) {
 
 	p.AddResourceConfigurator("google_storage_bucket", func(r *config.Resource) {
 		r.ExternalName = config.NameAsIdentifier
+		r.ExternalName.GetExternalNameFn = common.GetNameFromFullyQualifiedID
+		r.ExternalName.GetIDFn = func(_ context.Context, externalName string, parameters map[string]interface{}, providerConfig map[string]interface{}) (string, error) {
+			project, err := common.GetField(providerConfig, common.KeyProject)
+			return filepath.Join(project, externalName), err
+		}
 	})
 }