Correct node pool external names

config/externalname.go

@@ -316,8 +316,8 @@ var noForkExternalNameConfigs = map[string]config.ExternalName{
 	//
 	// Imported by using the following format: projects/my-gcp-project/locations/us-east1-a/clusters/my-cluster
 	"google_container_cluster": config.TemplatedStringAsIdentifier("name", "projects/{{ .setup.configuration.project }}/locations/{{ .parameters.location }}/clusters/{{ .external_name }}"),
-	// Imported by using the following format: my-gcp-project/us-east1-a/my-cluster/main-pool
-	"google_container_node_pool": config.TemplatedStringAsIdentifier("name", "{{ .setup.configuration.project }}/{{ .parameters.location }}/{{ .parameters.cluster }}/{{ .external_name }}"),
+	// Imported by using the following format: projects/my-gcp-project/locations/us-east1-a/clusters/my-cluster/nodePools/main-pool
+	"google_container_node_pool": config.TemplatedStringAsIdentifier("name", "{{ .parameters.cluster }}/nodePools/{{ .external_name }}"),
 
 	// containeranalysis
 	//
@@ -332,15 +332,15 @@ var noForkExternalNameConfigs = map[string]config.ExternalName{
 	//
 	// Imported by using the following format: projects/my-gcp-project/locations/us-east1-a/clusters/my-cluster
 	"google_container_aws_cluster": config.TemplatedStringAsIdentifier("name", "projects/{{ .setup.configuration.project }}/locations/{{ .parameters.location }}/clusters/{{ .external_name }}"),
-	// Imported by using the following format: my-gcp-project/us-east1-a/my-cluster/main-pool
-	"google_container_aws_node_pool": config.TemplatedStringAsIdentifier("name", "{{ .setup.configuration.project }}/{{ .parameters.location }}/{{ .parameters.cluster }}/{{ .external_name }}"),
+	// Imported by using the following format: projects/my-gcp-project/locations/us-east1-a/clusters/my-cluster/nodePools/main-pool
+	"google_container_aws_node_pool": config.TemplatedStringAsIdentifier("name", "{{ .parameters.cluster }}/nodePools/{{ .external_name }}"),
 
 	// containerazure
 	//
 	// Imported by using the following format: projects/my-gcp-project/locations/us-east1-a/clusters/my-cluster
 	"google_container_azure_cluster": config.TemplatedStringAsIdentifier("name", "projects/{{ .setup.configuration.project }}/locations/{{ .parameters.location }}/clusters/{{ .external_name }}"),
-	// Imported by using the following format: my-gcp-project/us-east1-a/my-cluster/main-pool
-	"google_container_azure_node_pool": config.TemplatedStringAsIdentifier("name", "{{ .setup.configuration.project }}/{{ .parameters.location }}/{{ .parameters.cluster }}/{{ .external_name }}"),
+	// Imported by using the following format: projects/my-gcp-project/locations/us-east1-a/clusters/my-cluster/nodePools/main-pool
+	"google_container_azure_node_pool": config.TemplatedStringAsIdentifier("name", "{{ .parameters.cluster }}/nodePools/{{ .external_name }}"),
 	// Imported by using the following format: projects/my-gcp-project/locations/us-east1-a/azureClients/my-client
 	"google_container_azure_client": config.TemplatedStringAsIdentifier("name", "projects/{{ .setup.configuration.project }}/locations/{{ .parameters.location }}/azureClients/{{ .external_name }}"),
 

package/crds/container.gcp.upbound.io_nodepools.yaml

@@ -712,6 +712,9 @@ spec:
                       need this value, don't set it.  If you do need it, you can use a lifecycle block to
                       ignore subsequent changes to this field.
                     type: number
+                  location:
+                    description: The location (region or zone) of the cluster.
+                    type: string
                   management:
                     description: |-
                       Node management configuration, wherein auto-repair and

package/crds/containeraws.gcp.upbound.io_nodepools.yaml

@@ -354,8 +354,6 @@ spec:
                       1.19.10-gke.1000). You can list all supported versions on a
                       given Google Cloud region by calling GetAwsServerConfig.
                     type: string
-                required:
-                - location
                 type: object
               initProvider:
                 description: |-
@@ -549,6 +547,9 @@ spec:
                           type: array
                       type: object
                     type: array
+                  location:
+                    description: The location for the resource
+                    type: string
                   maxPodsConstraint:
                     description: The constraint on the maximum number of pods that
                       can be run simultaneously on a node in the node pool.
@@ -748,6 +749,10 @@ spec:
               rule: '!(''*'' in self.managementPolicies || ''Create'' in self.managementPolicies
                 || ''Update'' in self.managementPolicies) || has(self.forProvider.config)
                 || (has(self.initProvider) && has(self.initProvider.config))'
+            - message: spec.forProvider.location is a required parameter
+              rule: '!(''*'' in self.managementPolicies || ''Create'' in self.managementPolicies
+                || ''Update'' in self.managementPolicies) || has(self.forProvider.location)
+                || (has(self.initProvider) && has(self.initProvider.location))'
             - message: spec.forProvider.maxPodsConstraint is a required parameter
               rule: '!(''*'' in self.managementPolicies || ''Create'' in self.managementPolicies
                 || ''Update'' in self.managementPolicies) || has(self.forProvider.maxPodsConstraint)

package/crds/containerazure.gcp.upbound.io_nodepools.yaml

@@ -269,8 +269,6 @@ spec:
                     description: The Kubernetes version (e.g. 1.19.10-gke.1000) running
                       on this node pool.
                     type: string
-                required:
-                - location
                 type: object
               initProvider:
                 description: |-
@@ -378,6 +376,9 @@ spec:
                           type: string
                       type: object
                     type: array
+                  location:
+                    description: The location for the resource
+                    type: string
                   maxPodsConstraint:
                     description: The constraint on the maximum number of pods that
                       can be run simultaneously on a node in the node pool.
@@ -578,6 +579,10 @@ spec:
               rule: '!(''*'' in self.managementPolicies || ''Create'' in self.managementPolicies
                 || ''Update'' in self.managementPolicies) || has(self.forProvider.config)
                 || (has(self.initProvider) && has(self.initProvider.config))'
+            - message: spec.forProvider.location is a required parameter
+              rule: '!(''*'' in self.managementPolicies || ''Create'' in self.managementPolicies
+                || ''Update'' in self.managementPolicies) || has(self.forProvider.location)
+                || (has(self.initProvider) && has(self.initProvider.location))'
             - message: spec.forProvider.maxPodsConstraint is a required parameter
               rule: '!(''*'' in self.managementPolicies || ''Create'' in self.managementPolicies
                 || ''Update'' in self.managementPolicies) || has(self.forProvider.maxPodsConstraint)