Fix Instance.rds external-name configuration

Signed-off-by: Fatih Türken <[email protected]>
crossplane-contrib · Jan 12, 2024 · 413c2a3 · 413c2a3
1 parent 515489b
commit 413c2a3
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 10 deletions.
diff --git a/apis/rds/v1beta1/zz_generated.deepcopy.go b/apis/rds/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/rds/v1beta1/zz_generated.resolvers.go b/apis/rds/v1beta1/zz_generated.resolvers.go
diff --git a/apis/rds/v1beta1/zz_instance_types.go b/apis/rds/v1beta1/zz_instance_types.go
diff --git a/apis/rds/v1beta1/zz_instanceroleassociation_types.go b/apis/rds/v1beta1/zz_instanceroleassociation_types.go
diff --git a/apis/rds/v1beta1/zz_proxytarget_types.go b/apis/rds/v1beta1/zz_proxytarget_types.go
diff --git a/apis/rds/v1beta1/zz_snapshot_types.go b/apis/rds/v1beta1/zz_snapshot_types.go
diff --git a/config/externalname.go b/config/externalname.go
@@ -567,7 +567,7 @@ var NoForkExternalNameConfigs = map[string]config.ExternalName{
 	// rds
 	//
 	"aws_rds_cluster":        config.ParameterAsIdentifier("cluster_identifier"),
-	"aws_db_instance":        config.ParameterAsIdentifier("identifier"),
+	"aws_db_instance":        config.IdentifierFromProvider,
 	"aws_db_parameter_group": config.NameAsIdentifier,
 	"aws_db_subnet_group":    config.NameAsIdentifier,
 	// aws_db_instance_role_association can be imported using the DB Instance Identifier and IAM Role ARN separated by a comma

diff --git a/internal/controller/rds/instance/zz_controller.go b/internal/controller/rds/instance/zz_controller.go
diff --git a/package/crds/rds.aws.upbound.io_instances.yaml b/package/crds/rds.aws.upbound.io_instances.yaml
@@ -298,6 +298,13 @@ spec:
                     description: Specifies whether mappings of AWS Identity and Access
                       Management (IAM) accounts to database accounts is enabled.
                     type: boolean
+                  identifier:
+                    description: Required if restore_to_point_in_time is specified.
+                    type: string
+                  identifierPrefix:
+                    description: Creates a unique identifier beginning with the specified
+                      prefix. Conflicts with identifier.
+                    type: string
                   instanceClass:
                     description: The instance type of the RDS instance.
                     type: string
@@ -1229,6 +1236,13 @@ spec:
                     description: Specifies whether mappings of AWS Identity and Access
                       Management (IAM) accounts to database accounts is enabled.
                     type: boolean
+                  identifier:
+                    description: Required if restore_to_point_in_time is specified.
+                    type: string
+                  identifierPrefix:
+                    description: Creates a unique identifier beginning with the specified
+                      prefix. Conflicts with identifier.
+                    type: string
                   instanceClass:
                     description: The instance type of the RDS instance.
                     type: string
@@ -2237,6 +2251,13 @@ spec:
                   id:
                     description: RDS DBI resource ID.
                     type: string
+                  identifier:
+                    description: Required if restore_to_point_in_time is specified.
+                    type: string
+                  identifierPrefix:
+                    description: Creates a unique identifier beginning with the specified
+                      prefix. Conflicts with identifier.
+                    type: string
                   instanceClass:
                     description: The instance type of the RDS instance.
                     type: string