Allow adding member Replication Group to ElastiCache Global Replication Group

.changelog/17725.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_elasticache_replication_group: Allows creating a Replication Group as part of a Global Replication Group
+```

.semgrep.yml

@@ -212,6 +212,12 @@ rules:
               var $CAST *resource.NotFoundError
               ...
               errors.As($ERR, &$CAST)
+          - pattern-not-inside: |
+              var $CAST *resource.NotFoundError
+              ...
+              errors.As($ERR, &$CAST)
+              ...
+              $CAST.$FIELD
         - patterns:
           - pattern: |
               $X, $Y := $ERR.(*resource.NotFoundError)

GNUmakefile

@@ -3,7 +3,7 @@ TEST?=./...
 SWEEP_DIR?=./aws
 PKG_NAME=aws
 TEST_COUNT?=1
-ACCTEST_TIMEOUT?=120m
+ACCTEST_TIMEOUT?=180m
 ACCTEST_PARALLELISM?=20
 
 default: build

aws/data_source_aws_elasticache_replication_group.go

@@ -16,8 +16,9 @@ func dataSourceAwsElasticacheReplicationGroup() *schema.Resource {
 		Read: dataSourceAwsElasticacheReplicationGroupRead,
 		Schema: map[string]*schema.Schema{
 			"replication_group_id": {
-				Type:     schema.TypeString,
-				Required: true,
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validateReplicationGroupID,
 			},
 			"replication_group_description": {
 				Type:     schema.TypeString,

aws/internal/service/elasticache/finder/finder.go

@@ -27,7 +27,7 @@ func ReplicationGroupByID(conn *elasticache.ElastiCache, id string) (*elasticach
 
 	if output == nil || len(output.ReplicationGroups) == 0 || output.ReplicationGroups[0] == nil {
 		return nil, &resource.NotFoundError{
-			Message:     "Empty result",
+			Message:     "empty result",
 			LastRequest: input,
 		}
 	}
@@ -48,7 +48,7 @@ func ReplicationGroupMemberClustersByID(conn *elasticache.ElastiCache, id string
 	}
 	if len(clusters) == 0 {
 		return clusters, &resource.NotFoundError{
-			Message: "No Member Clusters found",
+			Message: fmt.Sprintf("No Member Clusters found in Replication Group (%s)", id),
 		}
 	}
 
@@ -87,7 +87,7 @@ func CacheCluster(conn *elasticache.ElastiCache, input *elasticache.DescribeCach
 
 	if result == nil || len(result.CacheClusters) == 0 || result.CacheClusters[0] == nil {
 		return nil, &resource.NotFoundError{
-			Message:     "Empty result",
+			Message:     "empty result",
 			LastRequest: input,
 		}
 	}
@@ -176,6 +176,6 @@ func GlobalReplicationGroupMemberByID(conn *elasticache.ElastiCache, globalRepli
 	}
 
 	return nil, &resource.NotFoundError{
-		Message: fmt.Sprintf("Replication Group %q not found in Global Replication Group %q", id, globalReplicationGroupID),
+		Message: fmt.Sprintf("Replication Group (%s) not found in Global Replication Group (%s)", id, globalReplicationGroupID),
 	}
 }

aws/internal/service/elasticache/waiter/status.go

@@ -106,3 +106,22 @@ func GlobalReplicationGroupStatus(conn *elasticache.ElastiCache, globalReplicati
 		return grg, aws.StringValue(grg.Status), nil
 	}
 }
+
+const (
+	GlobalReplicationGroupMemberStatusAssociated = "associated"
+)
+
+// GlobalReplicationGroupStatus fetches the Global Replication Group and its Status
+func GlobalReplicationGroupMemberStatus(conn *elasticache.ElastiCache, globalReplicationGroupID, id string) resource.StateRefreshFunc {
+	return func() (interface{}, string, error) {
+		member, err := finder.GlobalReplicationGroupMemberByID(conn, globalReplicationGroupID, id)
+		if tfresource.NotFound(err) {
+			return nil, "", nil
+		}
+		if err != nil {
+			return nil, "", err
+		}
+
+		return member, aws.StringValue(member.Status), nil
+	}
+}

aws/internal/service/elasticache/waiter/waiter.go

@@ -199,3 +199,31 @@ func GlobalReplicationGroupDeleted(conn *elasticache.ElastiCache, globalReplicat
 	}
 	return nil, err
 }
+
+const (
+	GlobalReplicationGroupDisassociationRetryTimeout = 45 * time.Minute
+
+	globalReplicationGroupDisassociationTimeout = 20 * time.Minute
+
+	globalReplicationGroupDisassociationMinTimeout = 10 * time.Second
+	globalReplicationGroupDisassociationDelay      = 30 * time.Second
+)
+
+func GlobalReplicationGroupMemberDetached(conn *elasticache.ElastiCache, globalReplicationGroupID, id string) (*elasticache.GlobalReplicationGroupMember, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{
+			GlobalReplicationGroupMemberStatusAssociated,
+		},
+		Target:     []string{},
+		Refresh:    GlobalReplicationGroupMemberStatus(conn, globalReplicationGroupID, id),
+		Timeout:    globalReplicationGroupDisassociationTimeout,
+		MinTimeout: globalReplicationGroupDisassociationMinTimeout,
+		Delay:      globalReplicationGroupDisassociationDelay,
+	}
+
+	outputRaw, err := stateConf.WaitForState()
+	if v, ok := outputRaw.(*elasticache.GlobalReplicationGroupMember); ok {
+		return v, err
+	}
+	return nil, err
+}

aws/resource_aws_elasticache_cluster.go

@@ -174,9 +174,10 @@ func resourceAwsElasticacheCluster() *schema.Resource {
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
 			"replication_group_id": {
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
+				Type:         schema.TypeString,
+				Optional:     true,
+				ForceNew:     true,
+				ValidateFunc: validateReplicationGroupID,
 				ConflictsWith: []string{
 					"az_mode",
 					"engine_version",

aws/resource_aws_elasticache_global_replication_group.go

@@ -115,9 +115,10 @@ func resourceAwsElasticacheGlobalReplicationGroup() *schema.Resource {
 			// 	},
 			// },
 			"primary_replication_group_id": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validateReplicationGroupID,
 			},
 			"transit_encryption_enabled": {
 				Type:     schema.TypeBool,