Add validation to the global_cluster_identifier property on a global cluster

.changelog/30996.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_rds_global_cluster: Add plan-time validation of `global_cluster_identifier`
+```

internal/service/rds/cluster.go

@@ -1601,7 +1601,7 @@ func FindDBClusterByID(ctx context.Context, conn *rds.RDS, id string) (*rds.DBCl
  input := &rds.DescribeDBClustersInput{
  DBClusterIdentifier: aws.String(id),
  }
- output, err := findDBCluster(ctx, conn, input)
+ output, err := findDBCluster(ctx, conn, input, tfslices.PredicateTrue[*rds.DBCluster]())
 
  if err != nil {
  return nil, err
@@ -1623,8 +1623,8 @@ func FindDBClusterByID(ctx context.Context, conn *rds.RDS, id string) (*rds.DBCl
  return output, nil
 }
 
-func findDBCluster(ctx context.Context, conn *rds.RDS, input *rds.DescribeDBClustersInput) (*rds.DBCluster, error) {
- output, err := findDBClusters(ctx, conn, input, tfslices.PredicateTrue[*rds.DBCluster]())
+func findDBCluster(ctx context.Context, conn *rds.RDS, input *rds.DescribeDBClustersInput, filter tfslices.Predicate[*rds.DBCluster]) (*rds.DBCluster, error) {
+ output, err := findDBClusters(ctx, conn, input, filter)
 
  if err != nil {
  return nil, err

internal/service/rds/cluster_snapshot.go

@@ -220,7 +220,7 @@ func FindDBClusterSnapshotByID(ctx context.Context, conn *rds.RDS, id string) (*
  input := &rds.DescribeDBClusterSnapshotsInput{
  DBClusterSnapshotIdentifier: aws.String(id),
  }
- output, err := findDBClusterSnapshot(ctx, conn, input)
+ output, err := findDBClusterSnapshot(ctx, conn, input, tfslices.PredicateTrue[*rds.DBClusterSnapshot]())
 
  if err != nil {
  return nil, err
@@ -236,8 +236,8 @@ func FindDBClusterSnapshotByID(ctx context.Context, conn *rds.RDS, id string) (*
  return output, nil
 }
 
-func findDBClusterSnapshot(ctx context.Context, conn *rds.RDS, input *rds.DescribeDBClusterSnapshotsInput) (*rds.DBClusterSnapshot, error) {
- output, err := findDBClusterSnapshots(ctx, conn, input, tfslices.PredicateTrue[*rds.DBClusterSnapshot]())
+func findDBClusterSnapshot(ctx context.Context, conn *rds.RDS, input *rds.DescribeDBClusterSnapshotsInput, filter tfslices.Predicate[*rds.DBClusterSnapshot]) (*rds.DBClusterSnapshot, error) {
+ output, err := findDBClusterSnapshots(ctx, conn, input, filter)
 
  if err != nil {
  return nil, err

internal/service/rds/consts.go

@@ -102,6 +102,14 @@ const (
  InstanceStatusUpgrading = "upgrading"
 )
 
+const (
+ GlobalClusterStatusAvailable = "available"
+ GlobalClusterStatusCreating = "creating"
+ GlobalClusterStatusDeleting = "deleting"
+ GlobalClusterStatusModifying = "modifying"
+ GlobalClusterStatusUpgrading = "upgrading"
+)
+
 const (
  EventSubscriptionStatusActive = "active"
  EventSubscriptionStatusCreating = "creating"
@@ -131,6 +139,20 @@ func ClusterEngine_Values() []string {
  }
 }
 
+const (
+ GlobalClusterEngineAurora = "aurora"
+ GlobalClusterEngineAuroraMySQL = "aurora-mysql"
+ GlobalClusterEngineAuroraPostgreSQL = "aurora-postgresql"
+)
+
+func GlobalClusterEngine_Values() []string {
+ return []string{
+ GlobalClusterEngineAurora,
+ GlobalClusterEngineAuroraMySQL,
+ GlobalClusterEngineAuroraPostgreSQL,
+ }
+}
+
 const (
  EngineModeGlobal = "global"
  EngineModeMultiMaster = "multimaster"

internal/service/rds/errors.go

@@ -4,7 +4,7 @@
 package rds
 
 const (
+ errCodeInvalidParameterCombination = "InvalidParameterCombination"
  errCodeInvalidParameterValue = "InvalidParameterValue"
  errCodeValidationError = "ValidationError"
- errCodeInvalidParameterCombination = "InvalidParameterCombination"
 )

internal/service/rds/find.go

@@ -195,92 +195,6 @@ func FindEventSubscriptionByID(ctx context.Context, conn *rds.RDS, id string) (*
  return output.EventSubscriptionsList[0], nil
 }
 
-func FindGlobalClusterByDBClusterARN(ctx context.Context, conn *rds.RDS, dbClusterARN string) (*rds.GlobalCluster, error) {
- input := &rds.DescribeGlobalClustersInput{}
- globalClusters, err := findGlobalClusters(ctx, conn, input)
- if err != nil {
- return nil, err
- }
-
- for _, globalCluster := range globalClusters {
- for _, v := range globalCluster.GlobalClusterMembers {
- if aws.StringValue(v.DBClusterArn) == dbClusterARN {
- return globalCluster, nil
- }
- }
- }
-
- return nil, &retry.NotFoundError{LastRequest: dbClusterARN}
-}
-
-func FindGlobalClusterByID(ctx context.Context, conn *rds.RDS, id string) (*rds.GlobalCluster, error) {
- input := &rds.DescribeGlobalClustersInput{
- GlobalClusterIdentifier: aws.String(id),
- }
-
- output, err := findGlobalCluster(ctx, conn, input)
- if err != nil {
- return nil, err
- }
-
- // Eventual consistency check.
- if aws.StringValue(output.GlobalClusterIdentifier) != id {
- return nil, &retry.NotFoundError{
- LastRequest: input,
- }
- }
-
- return output, nil
-}
-
-func findGlobalCluster(ctx context.Context, conn *rds.RDS, input *rds.DescribeGlobalClustersInput) (*rds.GlobalCluster, error) {
- output, err := findGlobalClusters(ctx, conn, input)
- if err != nil {
- return nil, err
- }
-
- if len(output) == 0 || output[0] == nil {
- return nil, tfresource.NewEmptyResultError(input)
- }
-
- if count := len(output); count > 1 {
- return nil, tfresource.NewTooManyResultsError(count, input)
- }
-
- return output[0], nil
-}
-
-func findGlobalClusters(ctx context.Context, conn *rds.RDS, input *rds.DescribeGlobalClustersInput) ([]*rds.GlobalCluster, error) {
- var output []*rds.GlobalCluster
-
- err := conn.DescribeGlobalClustersPagesWithContext(ctx, input, func(page *rds.DescribeGlobalClustersOutput, lastPage bool) bool {
- if page == nil {
- return !lastPage
- }
-
- for _, v := range page.GlobalClusters {
- if v != nil {
- output = append(output, v)
- }
- }
-
- return !lastPage
- })
-
- if tfawserr.ErrCodeEquals(err, rds.ErrCodeGlobalClusterNotFoundFault) {
- return nil, &retry.NotFoundError{
- LastError: err,
- LastRequest: input,
- }
- }
-
- if err != nil {
- return nil, err
- }
-
- return output, nil
-}
-
 func FindReservedDBInstanceByID(ctx context.Context, conn *rds.RDS, id string) (*rds.ReservedDBInstance, error) {
  input := &rds.DescribeReservedDBInstancesInput{
  ReservedDBInstanceId: aws.String(id),