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

Jump to bottom

service/rds: Additional error handling for Global Clusters, test fixes for engine versions #15938

Merged
merged 1 commit into from
Nov 4, 2020
Merged

service/rds: Additional error handling for Global Clusters, test fixes for engine versions #15938

merged 1 commit into from
Nov 4, 2020

Commits on Oct 30, 2020

  1. service/rds: Additional error handling for Global Clusters, test fixe… 

    …s for engine versions

Reference: #8186

At a certain point new RDS Clusters wishing to specify `engine_mode = "global"`, which is now legacy, began automatically creating `provisioned` mode clusters instead. Specifying a compatible `engine_version` allows the legacy `global` mode usage still. Separately, the `engine_version` being used for testing updates to that attribute are now updated to recent versions supported in both AWS Commercial and GovCloud (US). Finally, while testing the test updates, ran into a similar error recently reported in #8186 as well, so added logic to ignore the error in the deletion function because it did not need to be returned.

Previously in AWS Commercial:

```
--- FAIL: TestAccAWSRDSCluster_EngineMode_Global (129.27s)

TestAccAWSRDSCluster_EngineMode_Global: resource_aws_rds_cluster_test.go:977: Step 1/2 error: Check failed: Check 2/2 error: aws_rds_cluster.test: Attribute 'engine_mode' expected "global", got "provisioned"

--- FAIL: TestAccAWSRDSCluster_EngineVersionWithPrimaryInstance (1132.14s)

TestAccAWSRDSCluster_EngineVersionWithPrimaryInstance: resource_aws_rds_cluster_test.go:1116: Step 3/3 error: Check failed: Check 3/3 error: aws_rds_cluster.test: Attribute 'engine_version' expected "9.6.6", got "9.6.8"

--- FAIL: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global (133.32s)

TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global: resource_aws_rds_cluster_test.go:1160: Step 1/2 error: After applying this test step, the plan was not empty.
...
~ engine_mode                         = "provisioned" -> "global"
~ engine_version                      = "5.6.mysql_aurora.1.22.2" -> (known after apply)

--- FAIL: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Add (142.29s)

TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Add: resource_aws_rds_cluster_test.go:1194: Step 1/3 error: After applying this test step, the plan was not empty.
...
~ engine_mode                         = "provisioned" -> "global"
~ engine_version                      = "5.6.mysql_aurora.1.22.2" -> (known after apply)

--- FAIL: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Remove (124.34s)

TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Remove: resource_aws_rds_cluster_test.go:1233: Step 1/3 error: After applying this test step, the plan was not empty.
...
~ engine_mode                         = "provisioned" -> "global"
~ engine_version                      = "5.6.mysql_aurora.1.22.2" -> (known after apply)

--- FAIL: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Update (164.15s)

TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Update: resource_aws_rds_cluster_test.go:1276: Step 1/3 error: After applying this test step, the plan was not empty.
...
~ engine_mode                         = "provisioned" -> "global"
~ engine_version                      = "5.6.mysql_aurora.1.22.2" -> (known after apply)
```

Previously in AWS GovCloud (US):

```
--- FAIL: TestAccAWSRDSCluster_EngineVersionWithPrimaryInstance (4.74s)

TestAccAWSRDSCluster_EngineVersionWithPrimaryInstance: resource_aws_rds_cluster_test.go:1116: Step 1/3 error: Error running apply: 2020/10/29 15:18:58 [DEBUG] Using modified User-Agent: Terraform/0.12.29 HashiCorp-terraform-exec/0.10.0
Error: error creating RDS cluster: InvalidParameterCombination: Cannot find version 9.6.3 for aurora-postgresql
  status code: 400, request id: 49b61f8c-3a33-4390-8fa8-cda26650b82b
```

Output from acceptance testing in AWS Commerical:

```
--- FAIL: TestAccAWSRDSCluster_s3Restore (26.99s) # #13391
--- PASS: TestAccAWSRDSCluster_AllowMajorVersionUpgrade (1163.37s)
--- PASS: TestAccAWSRDSCluster_AvailabilityZones (121.24s)
--- PASS: TestAccAWSRDSCluster_BacktrackWindow (161.38s)
--- PASS: TestAccAWSRDSCluster_backupsUpdate (217.31s)
--- PASS: TestAccAWSRDSCluster_basic (184.11s)
--- PASS: TestAccAWSRDSCluster_ClusterIdentifierPrefix (140.55s)
--- PASS: TestAccAWSRDSCluster_copyTagsToSnapshot (251.25s)
--- PASS: TestAccAWSRDSCluster_DbSubnetGroupName (188.87s)
--- PASS: TestAccAWSRDSCluster_DeletionProtection (161.77s)
--- PASS: TestAccAWSRDSCluster_EnabledCloudwatchLogsExports_MySQL (227.56s)
--- PASS: TestAccAWSRDSCluster_EnabledCloudwatchLogsExports_Postgresql (146.68s)
--- PASS: TestAccAWSRDSCluster_EnableHttpEndpoint (369.29s)
--- PASS: TestAccAWSRDSCluster_encrypted (191.28s)
--- PASS: TestAccAWSRDSCluster_EngineMode (467.55s)
--- PASS: TestAccAWSRDSCluster_EngineMode_Global (153.36s)
--- PASS: TestAccAWSRDSCluster_EngineMode_Multimaster (143.75s)
--- PASS: TestAccAWSRDSCluster_EngineMode_ParallelQuery (172.28s)
--- PASS: TestAccAWSRDSCluster_EngineVersion (445.21s)
--- PASS: TestAccAWSRDSCluster_EngineVersionWithPrimaryInstance (1087.08s)
--- PASS: TestAccAWSRDSCluster_generatedName (120.93s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global (170.73s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Add (170.70s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Remove (160.68s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Update (173.82s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Provisioned (178.17s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_PrimarySecondaryClusters (1805.19s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_ReplicationSourceIdentifier (1864.34s)
--- PASS: TestAccAWSRDSCluster_iamAuth (129.14s)
--- PASS: TestAccAWSRDSCluster_kmsKey (188.31s)
--- PASS: TestAccAWSRDSCluster_missingUserNameCausesError (9.80s)
--- PASS: TestAccAWSRDSCluster_Port (339.07s)
--- PASS: TestAccAWSRDSCluster_ReplicationSourceIdentifier_KmsKeyId (1537.43s)
--- PASS: TestAccAWSRDSCluster_ScalingConfiguration (368.52s)
--- PASS: TestAccAWSRDSCluster_ScalingConfiguration_DefaultMinCapacity (340.43s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier (370.94s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_DeletionProtection (418.15s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EncryptedRestore (363.14s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_ParallelQuery (419.92s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_Provisioned (358.63s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineVersion_Different (403.08s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineVersion_Equal (421.50s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_MasterPassword (372.04s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_MasterUsername (361.12s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_PreferredBackupWindow (379.74s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_PreferredMaintenanceWindow (360.90s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_Tags (464.57s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds (420.15s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds_Tags (440.36s)
--- PASS: TestAccAWSRDSCluster_Tags (163.24s)
--- PASS: TestAccAWSRDSCluster_takeFinalSnapshot (180.83s)
--- PASS: TestAccAWSRDSCluster_updateIamRoles (223.14s)
--- SKIP: TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_Serverless (0.00s)

--- PASS: TestAccAWSRdsGlobalCluster_basic (17.74s)
--- PASS: TestAccAWSRdsGlobalCluster_DatabaseName (30.67s)
--- PASS: TestAccAWSRdsGlobalCluster_DeletionProtection (28.82s)
--- PASS: TestAccAWSRdsGlobalCluster_disappears (14.06s)
--- PASS: TestAccAWSRdsGlobalCluster_Engine_Aurora (16.50s)
--- PASS: TestAccAWSRdsGlobalCluster_EngineVersion_Aurora (22.12s)
--- PASS: TestAccAWSRdsGlobalCluster_EngineVersion_AuroraMySQL (21.94s)
--- PASS: TestAccAWSRdsGlobalCluster_EngineVersion_AuroraPostgresql (22.01s)
--- PASS: TestAccAWSRdsGlobalCluster_SourceDbClusterIdentifier (180.95s)
--- PASS: TestAccAWSRdsGlobalCluster_SourceDbClusterIdentifier_StorageEncrypted (209.32s)
--- PASS: TestAccAWSRdsGlobalCluster_StorageEncrypted (34.92s)
```

Output from acceptance testing in AWS GovCloud (US):

```
--- SKIP: TestAccAWSRDSCluster_EngineMode_Global (1.71s)
--- PASS: TestAccAWSRDSCluster_EngineVersionWithPrimaryInstance (1073.20s)
--- SKIP: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global (1.66s)
--- SKIP: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Add (1.67s)
--- SKIP: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Remove (1.65s)
--- SKIP: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Update (1.65s)
```
    @bflad
    bflad committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    fcb42cd View commit details
    Browse the repository at this point in the history