Change externalname conf for EndpointAccess.redshiftserverless

crossplane-contrib · Sep 21, 2023 · ef45a3b · ef45a3b
1 parent 7aad4e9
commit ef45a3b
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 46 deletions.
diff --git a/apis/redshiftserverless/v1beta1/zz_endpointaccess_types.go b/apis/redshiftserverless/v1beta1/zz_endpointaccess_types.go
diff --git a/apis/redshiftserverless/v1beta1/zz_generated.deepcopy.go b/apis/redshiftserverless/v1beta1/zz_generated.deepcopy.go
diff --git a/config/externalname.go b/config/externalname.go
@@ -1162,10 +1162,13 @@ var ExternalNameConfigs = map[string]config.ExternalName{
 	"aws_redshift_hsm_configuration": config.ParameterAsIdentifier("hsm_configuration_identifier"),
 	// Redshift usage limits can be imported using the id
 	"aws_redshift_usage_limit": config.IdentifierFromProvider,
+
+	// redshiftserverless
+	//
 	// Redshift Serverless Namespaces can be imported using the namespace_name
 	"aws_redshiftserverless_namespace": config.ParameterAsIdentifier("namespace_name"),
 	// Redshift Serverless Endpoint Access can be imported using the endpoint_name
-	"aws_redshiftserverless_endpoint_access": config.IdentifierFromProvider,
+	"aws_redshiftserverless_endpoint_access": config.ParameterAsIdentifier("endpoint_name"),
 	// Redshift Serverless Resource Policies can be imported using the resource_arn
 	"aws_redshiftserverless_resource_policy": config.IdentifierFromProvider,
 	// Redshift Serverless Snapshots can be imported using the snapshot_name

diff --git a/examples-generated/redshiftserverless/endpointaccess.yaml b/examples-generated/redshiftserverless/endpointaccess.yaml
@@ -8,6 +8,5 @@ metadata:
   name: example
 spec:
   forProvider:
-    endpointName: example
     region: us-west-1
     workgroupName: example
diff --git a/examples/redshiftserverless/endpointaccess.yaml b/examples/redshiftserverless/endpointaccess.yaml
@@ -8,7 +8,6 @@ metadata:
   name: example
 spec:
   forProvider:
-    endpointName: example
     region: us-west-1
     workgroupName: example
     subnetIdRefs:
@@ -65,4 +64,4 @@ metadata:
 spec:
   forProvider:
     cidrBlock: 10.0.0.0/16
-    region: us-west-1
+    region: us-west-1
diff --git a/examples/redshiftserverless/resourcepolicy.yaml b/examples/redshiftserverless/resourcepolicy.yaml
@@ -34,7 +34,7 @@ metadata:
     meta.upbound.io/example-id: redshiftserverless/v1beta1/resourcepolicy
   labels:
     testing.upbound.io/example-name: example
-  name: example-resourcepolicy
+  name: example
 spec:
   forProvider:
     namespaceName: example
@@ -47,7 +47,7 @@ metadata:
     meta.upbound.io/example-id: redshiftserverless/v1beta1/resourcepolicy
   labels:
     testing.upbound.io/example-name: example
-  name: example-resourcepolicy
+  name: example
 spec:
   forProvider:
     region: us-west-1
@@ -59,7 +59,7 @@ metadata:
     meta.upbound.io/example-id: redshiftserverless/v1beta1/resourcepolicy
   labels:
     testing.upbound.io/example-name: example
-  name: example-resourcepolicy
+  name: example
 spec:
   forProvider:
     namespaceName: example

diff --git a/internal/controller/redshiftserverless/endpointaccess/zz_controller.go b/internal/controller/redshiftserverless/endpointaccess/zz_controller.go
diff --git a/package/crds/redshiftserverless.aws.upbound.io_endpointaccesses.yaml b/package/crds/redshiftserverless.aws.upbound.io_endpointaccesses.yaml
@@ -67,9 +67,6 @@ spec:
                 type: string
               forProvider:
                 properties:
-                  endpointName:
-                    description: The name of the endpoint.
-                    type: string
                   region:
                     description: Region is the region you'd like your resource to
                       be created in.
@@ -259,9 +256,6 @@ spec:
                   creation, for example because of an external controller is managing
                   them, like an autoscaler.
                 properties:
-                  endpointName:
-                    description: The name of the endpoint.
-                    type: string
                   workgroupName:
                     description: The name of the workgroup.
                     type: string
@@ -464,10 +458,6 @@ spec:
             - forProvider
             type: object
             x-kubernetes-validations:
-            - message: endpointName is a required parameter
-              rule: '!(''*'' in self.managementPolicies || ''Create'' in self.managementPolicies
-                || ''Update'' in self.managementPolicies) || has(self.forProvider.endpointName)
-                || has(self.initProvider.endpointName)'
             - message: workgroupName is a required parameter
               rule: '!(''*'' in self.managementPolicies || ''Create'' in self.managementPolicies
                 || ''Update'' in self.managementPolicies) || has(self.forProvider.workgroupName)
@@ -484,9 +474,6 @@ spec:
                     description: Amazon Resource Name (ARN) of the Redshift Serverless
                       Endpoint Access.
                     type: string
-                  endpointName:
-                    description: The name of the endpoint.
-                    type: string
                   id:
                     description: The Redshift Endpoint Access Name.
                     type: string