r/elasticache_replication_group: Modify validation, make replication_group_id to lowercase

aws/resource_aws_elasticache_replication_group.go

@@ -23,6 +23,9 @@ func resourceAwsElasticacheReplicationGroup() *schema.Resource {
 		Required:     true,
 		ForceNew:     true,
 		ValidateFunc: validateAwsElastiCacheReplicationGroupId,
+		StateFunc: func(val interface{}) string {
+			return strings.ToLower(val.(string))
+		},
 	}
 
 	resourceSchema["automatic_failover_enabled"] = &schema.Schema{
@@ -518,7 +521,7 @@ func validateAwsElastiCacheReplicationGroupId(v interface{}, k string) (ws []str
 		errors = append(errors, fmt.Errorf(
 			"only alphanumeric characters and hyphens allowed in %q", k))
 	}
-	if !regexp.MustCompile(`^[a-z]`).MatchString(value) {
+	if !regexp.MustCompile(`^[a-zA-Z]`).MatchString(value) {
 		errors = append(errors, fmt.Errorf(
 			"first character of %q must be a letter", k))
 	}

aws/resource_aws_elasticache_replication_group_test.go

@@ -35,6 +35,27 @@ func TestAccAWSElasticacheReplicationGroup_basic(t *testing.T) {
 	})
 }
 
+func TestAccAWSElasticacheReplicationGroup_Uppercase(t *testing.T) {
+	var rg elasticache.ReplicationGroup
+	rStr := acctest.RandString(5)
+	rgName := fmt.Sprintf("TF-ELASTIRG-%s", rStr)
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAWSElasticacheReplicationDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAWSElasticacheReplicationGroupConfig_Uppercase(rgName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAWSElasticacheReplicationGroupExists("aws_elasticache_replication_group.bar", &rg),
+					resource.TestCheckResourceAttr(
+						"aws_elasticache_replication_group.bar", "replication_group_id", fmt.Sprintf("tf-elastirg-%s", rStr)),
+				),
+			},
+		},
+	})
+}
+
 func TestAccAWSElasticacheReplicationGroup_updateDescription(t *testing.T) {
 	var rg elasticache.ReplicationGroup
 	rName := acctest.RandString(10)
@@ -476,6 +497,17 @@ resource "aws_elasticache_replication_group" "bar" {
 }`, rName, rName, rName)
 }
 
+func testAccAWSElasticacheReplicationGroupConfig_Uppercase(rgName string) string {
+	return fmt.Sprintf(`
+resource "aws_elasticache_replication_group" "bar" {
+  replication_group_id = "%s"
+  replication_group_description = "test description"
+  node_type = "cache.t2.micro"
+  number_cache_clusters = 1
+  port = 6379
+}`, rgName)
+}
+
 func testAccAWSElasticacheReplicationGroupConfigEnableSnapshotting(rName string) string {
 	return fmt.Sprintf(`
 provider "aws" {