Change externalname conf for Instance.rds

crossplane-contrib · Oct 5, 2023 · d6c919a · d6c919a
1 parent d12f733
commit d6c919a
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 7 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_generated_terraformed.go b/apis/rds/v1beta1/zz_generated_terraformed.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
@@ -570,7 +570,7 @@ var ExternalNameConfigs = 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/config/rds/config.go b/config/rds/config.go
@@ -104,7 +104,7 @@ func Configure(p *config.Provider) {
 		}
 		r.UseAsync = true
 		r.LateInitializer = config.LateInitializer{
-			IgnoredFields: []string{"name", "db_name"},
+			IgnoredFields: []string{"name", "db_name", "identifier_prefix"},
 		}
 		r.Sensitive.AdditionalConnectionDetailsFn = func(attr map[string]any) (map[string][]byte, error) {
 			conn := map[string][]byte{}

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
@@ -297,6 +297,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
@@ -1068,6 +1075,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
@@ -1596,6 +1610,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