Merge pull request #22178 from hashicorp/rds-replica-monitoring-and-ca

resource/aws_db_instance: Correctly handles update and reboot for replica instances
hashicorp · Feb 3, 2022 · 1290463 · 1290463
2 parents de950a3 + 2f03e81
commit 1290463
Show file tree

Hide file tree

Showing 8 changed files with 1,189 additions and 327 deletions.
diff --git a/.changelog/22178.txt b/.changelog/22178.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_db_instance: Fix error with reboot of replica
+```
diff --git a/docs/contributing/contribution-checklists.md b/docs/contributing/contribution-checklists.md
@@ -148,7 +148,7 @@ func TestAccServiceThing_nameGenerated(t *testing.T) {
         Check: resource.ComposeTestCheckFunc(
           testAccCheckThingExists(resourceName, &thing),
           create.TestCheckResourceAttrNameGenerated(resourceName, "name"),
-          resource.TestCheckResourceAttr(resourceName, "name_prefix", "terraform-"),
+          resource.TestCheckResourceAttr(resourceName, "name_prefix", resource.UniqueIdPrefix),
         ),
       },
       // If the resource supports import:

diff --git a/internal/generate/namevaluesfilters/generators/servicefilters/main.go b/internal/generate/namevaluesfilters/generators/servicefilters/main.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/hashicorp/terraform-provider-aws/internal/namevaluesfilters"
+	"github.com/hashicorp/terraform-provider-aws/internal/generate/namevaluesfilters"
 )
 
 const filename = `service_filters_gen.go`

diff --git a/internal/service/rds/enum.go b/internal/service/rds/enum.go
@@ -6,6 +6,20 @@ const (
 	ClusterRoleStatusPending = "PENDING"
 )
 
+const (
+	StorageTypeStandard = "standard"
+	StorageTypeGp2      = "gp2"
+	StorageTypeIo1      = "io1"
+)
+
+func StorageType_Values() []string {
+	return []string{
+		StorageTypeStandard,
+		StorageTypeGp2,
+		StorageTypeIo1,
+	}
+}
+
 // https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/accessing-monitoring.html#Overview.DBInstance.Status.
 const (
 	InstanceStatusAvailable                     = "available"
@@ -15,6 +29,7 @@ const (
 	InstanceStatusCreating                      = "creating"
 	InstanceStatusDeleting                      = "deleting"
 	InstanceStatusIncompatibleParameters        = "incompatible-parameters"
+	InstanceStatusIncompatibleRestore           = "incompatible-restore"
 	InstanceStatusModifying                     = "modifying"
 	InstanceStatusStarting                      = "starting"
 	InstanceStatusStopping                      = "stopping"