Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resource/aws_db_instance: Correctly handles update and reboot for replica instances #22178

Merged
merged 15 commits into from
Feb 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/22178.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_db_instance: Fix error with reboot of replica
```
2 changes: 1 addition & 1 deletion docs/contributing/contribution-checklists.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
15 changes: 15 additions & 0 deletions internal/service/rds/enum.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -15,6 +29,7 @@ const (
InstanceStatusCreating = "creating"
InstanceStatusDeleting = "deleting"
InstanceStatusIncompatibleParameters = "incompatible-parameters"
InstanceStatusIncompatibleRestore = "incompatible-restore"
InstanceStatusModifying = "modifying"
InstanceStatusStarting = "starting"
InstanceStatusStopping = "stopping"
Expand Down
Loading