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.

Sign up for GitHub

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

Add support for Aurora MySQL 5.7 #3278

Merged
merged 1 commit into from
Feb 7, 2018
Merged

Add support for Aurora MySQL 5.7 #3278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions aws/resource_aws_rds_cluster_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ func TestAccAWSRDSClusterInstance_disappears(t *testing.T) {
func testAccCheckAWSDBClusterInstanceAttributes(v *rds.DBInstance) resource.TestCheckFunc {
return func(s *terraform.State) error {

if *v.Engine != "aurora" && *v.Engine != "aurora-postgresql" {
return fmt.Errorf("bad engine, expected \"aurora\" or \"aurora-postgresql\": %#v", *v.Engine)
if *v.Engine != "aurora" && *v.Engine != "aurora-postgresql" && *v.Engine != "aurora-mysql" {
return fmt.Errorf("bad engine, expected \"aurora\", \"aurora-mysql\" or \"aurora-postgresql\": %#v", *v.Engine)
}

if !strings.HasPrefix(*v.DBClusterIdentifier, "tf-aurora-cluster") {
Expand Down
1 change: 1 addition & 0 deletions aws/validators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ func validateRdsEngine(v interface{}, k string) (ws []string, errors []error) {

validTypes := map[string]bool{
"aurora": true,
"aurora-mysql": true,
"aurora-postgresql": true,
}

Expand Down
17 changes: 16 additions & 1 deletion website/docs/r/rds_cluster.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,22 @@ for more information.

## Example Usage

### Aurora with Default engine (MySQL)
### Aurora MySQL 2.x (MySQL 5.7)

```hcl
resource "aws_rds_cluster" "default" {
cluster_identifier = "aurora-cluster-demo"
engine = "aurora-mysql"
availability_zones = ["us-west-2a", "us-west-2b", "us-west-2c"]
database_name = "mydb"
master_username = "foo"
master_password = "bar"
backup_retention_period = 5
preferred_backup_window = "07:00-09:00"
}
```

### Aurora MySQL 1.x (MySQL 5.6)

```hcl
resource "aws_rds_cluster" "default" {
Expand Down