Address reviews

Signed-off-by: Sergen Yalçın <yalcinsergen97@gmail.com>

config/cloudplatform/config.go

@@ -3,8 +3,6 @@ package cloudplatform
 import (
 	"github.com/crossplane/terrajet/pkg/config"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-
-	"github.com/crossplane-contrib/provider-jet-gcp/config/common"
 )
 
 // Configure configures individual resources by adding custom
@@ -53,8 +51,14 @@ func Configure(p *config.Provider) {
 	})
 	p.AddResourceConfigurator("google_service_account", func(r *config.Resource) {
 		r.Kind = "ServiceAccount"
-		r.ExternalName.GetExternalNameFn = common.GetNameFromFullyQualifiedID
-		r.UseAsync = true
+		r.ExternalName = config.ExternalName{
+			SetIdentifierArgumentFn: func(base map[string]interface{}, name string) {
+				base["account_id"] = name
+			},
+			OmittedFields:     []string{"account_id"},
+			GetExternalNameFn: config.IDAsExternalName,
+			GetIDFn:           config.ExternalNameAsID,
+		}
 	})
 	p.AddResourceConfigurator("google_service_account_iam", func(r *config.Resource) {
 		r.Kind = "ServiceAccountIAM"

config/common/config.go

@@ -3,6 +3,7 @@ package common
 import (
 	"strings"
 
+	jresource "github.com/crossplane/terrajet/pkg/resource"
 	"github.com/pkg/errors"
 
 	"github.com/crossplane/crossplane-runtime/pkg/fieldpath"
@@ -17,6 +18,9 @@ const (
 	SelfPackagePath = "github.com/crossplane-contrib/provider-jet-gcp/config/common"
 
 	errFmtCannotGetFieldAsString = "cannot get the %q field as string"
+
+	// ExtractResourceIDFuncPath holds the GCP resource ID extractor func name
+	ExtractResourceIDFuncPath = "github.com/crossplane-contrib/provider-jet-gcp/config/common.ExtractResourceID()"
 )
 
 var (
@@ -61,3 +65,16 @@ func GetField(mapping map[string]interface{}, field string) (string, error) {
 	}
 	return f, nil
 }
+
+// ExtractResourceID extracts the value of `spec.atProvider.id`
+// from a Terraformed resource. If mr is not a Terraformed
+// resource, returns an empty string.
+func ExtractResourceID() reference.ExtractValueFn {
+	return func(mr resource.Managed) string {
+		tr, ok := mr.(jresource.Terraformed)
+		if !ok {
+			return ""
+		}
+		return tr.GetID()
+	}
+}

config/kubernetes/config.go → config/container/config.go

@@ -1,13 +1,12 @@
-package kubernetes
+package container
 
 import (
 	"context"
 	"fmt"
 	"strings"
 
-	"github.com/crossplane-contrib/terrajet/pkg/config"
+	"github.com/crossplane/terrajet/pkg/config"
 
-	"github.com/crossplane-contrib/provider-jet-gcp/apis/rconfig"
 	"github.com/crossplane-contrib/provider-jet-gcp/config/common"
 )
 
@@ -36,7 +35,6 @@ func Configure(p *config.Provider) {
 	})
 
 	p.AddResourceConfigurator("google_container_node_pool", func(r *config.Resource) {
-		locationIndex, clusterNameIndex := 3, 5
 		r.Kind = "NodePool"
 		r.ExternalName = config.NameAsIdentifier
 		r.ExternalName.GetExternalNameFn = common.GetNameFromFullyQualifiedID
@@ -49,13 +47,13 @@ func Configure(p *config.Provider) {
 			if err != nil {
 				return "", err
 			}
-			location := strings.Split(clusterID, "/")[locationIndex]
-			cluster := strings.Split(clusterID, "/")[clusterNameIndex]
+			location := strings.Split(clusterID, "/")[3]
+			cluster := strings.Split(clusterID, "/")[5]
 			return fmt.Sprintf("%s/%s/%s/%s", project, location, cluster, externalName), nil
 		}
 		r.References["cluster"] = config.Reference{
 			Type:      "Cluster",
-			Extractor: rconfig.ExtractResourceIDFuncPath,
+			Extractor: common.ExtractResourceIDFuncPath,
 		}
 		r.UseAsync = true
 	})

config/provider.go

@@ -10,9 +10,9 @@ import (
 	"github.com/crossplane-contrib/provider-jet-gcp/config/cloudiot"
 	"github.com/crossplane-contrib/provider-jet-gcp/config/cloudplatform"
 	"github.com/crossplane-contrib/provider-jet-gcp/config/compute"
+	"github.com/crossplane-contrib/provider-jet-gcp/config/container"
 	"github.com/crossplane-contrib/provider-jet-gcp/config/dataflow"
 	"github.com/crossplane-contrib/provider-jet-gcp/config/dataproc"
-	"github.com/crossplane-contrib/provider-jet-gcp/config/kubernetes"
 	"github.com/crossplane-contrib/provider-jet-gcp/config/project"
 	"github.com/crossplane-contrib/provider-jet-gcp/config/storage"
 )
@@ -81,7 +81,7 @@ func GetProvider() *tjconfig.Provider {
 		dataproc.Configure,
 		project.Configure,
 		storage.Configure,
-		kubernetes.Configure,
+		container.Configure,
 	} {
 		configure(pc)
 	}

examples/cloudplatform/serviceaccount.yaml

@@ -1,8 +1,7 @@
 apiVersion: cloudplatform.gcp.jet.crossplane.io/v1alpha1
 kind: ServiceAccount
 metadata:
-  name: example
+  name: example-service-account
 spec:
   forProvider:
-    accountId: service-account-id
     displayName: Service Account

examples/providerconfig/providerconfig.yaml

@@ -7,6 +7,6 @@ spec:
   credentials:
     source: Secret
     secretRef:
-      name: gcp-creds
+      name: example-creds
       namespace: crossplane-system
-      key: creds
+      key: credentials