resource/rds_cluster: update delete timeout and add additional retry condition #14420

anGie44 · 2020-07-30T22:35:26Z

Community Note

Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

Release note for CHANGELOG:

resource/rds_cluster: update delete timeout and add additional retry condition

Output from acceptance testing:

--- PASS: TestAccAWSRDSCluster_MultipleClustersInGlobalCluster (1828.70s) 😨

aws/resource_aws_rds_cluster_test.go

bflad · 2020-07-31T04:36:15Z

(If you see awsproviderlint failures, I just fixed it on master)

bflad

Nice! Curious about your thoughts on the two things below, then happy to run the acceptance testing and approve. 👍

aws/resource_aws_rds_cluster_test.go

bflad · 2020-07-31T14:35:34Z

aws/resource_aws_rds_cluster_test.go

+  lifecycle {
+    ignore_changes = [
+      replication_source_identifier,
+    ]
+  }


I'm curious about this, is the API automatically adding it? 😄 If so, we may want to mark it as Computed: true in a separate change.

it is in this case -- the rds_cluster that get's the Secondary role get's this field populated with the identifier/ARN of the Primary cluster. similarly, if you have 1 global cluster , 1 primary cluster , and 1 regional cluster (reading from the primary cluster e.g. the "secondary" cluster here would be configured without global_cluster_identifier but with replication_source_identifier of the "primary" rds_cluster), the API will send back the global_cluster_identifier also creating the non-empty plan

in the original issue's description, i didn't see a workaround to this behavior so i thought maybe the test configuration is a little off or it was just omitted for brevity? took me a bit of experimenting to get the right combination of primary/secondary rds_clusters 😅

Interesting! For what its worth, I think we're going to mark global_cluster_identifier as Computed: true anyways for #10965

nice, that issue def looks similar to what i ran into here

ah looks like there's already an issue related to this param: #10150 .. not sure about the timeout though

anGie44 · 2020-07-31T18:04:55Z

ready for re-review/test run 👍

bflad

Looks great, nice work! 🚀

Output from acceptance testing (failure being tracked in #14275):

--- FAIL: TestAccAWSRDSCluster_s3Restore (1522.51s)

--- PASS: TestAccAWSRDSCluster_AvailabilityZones (130.74s)
--- PASS: TestAccAWSRDSCluster_BacktrackWindow (165.54s)
--- PASS: TestAccAWSRDSCluster_backupsUpdate (145.40s)
--- PASS: TestAccAWSRDSCluster_basic (129.96s)
--- PASS: TestAccAWSRDSCluster_ClusterIdentifierPrefix (120.02s)
--- PASS: TestAccAWSRDSCluster_copyTagsToSnapshot (181.63s)
--- PASS: TestAccAWSRDSCluster_DbSubnetGroupName (125.27s)
--- PASS: TestAccAWSRDSCluster_DeletionProtection (145.35s)
--- PASS: TestAccAWSRDSCluster_EnabledCloudwatchLogsExports (318.13s)
--- PASS: TestAccAWSRDSCluster_EnableHttpEndpoint (327.94s)
--- PASS: TestAccAWSRDSCluster_encrypted (120.43s)
--- PASS: TestAccAWSRDSCluster_EncryptedCrossRegionReplication (1596.81s)
--- PASS: TestAccAWSRDSCluster_EngineMode (420.61s)
--- PASS: TestAccAWSRDSCluster_EngineMode_Global (140.10s)
--- PASS: TestAccAWSRDSCluster_EngineMode_Multimaster (134.68s)
--- PASS: TestAccAWSRDSCluster_EngineMode_ParallelQuery (149.66s)
--- PASS: TestAccAWSRDSCluster_EngineVersion (432.87s)
--- PASS: TestAccAWSRDSCluster_EngineVersionWithPrimaryInstance (1145.51s)
--- PASS: TestAccAWSRDSCluster_generatedName (129.80s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global (155.43s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Add (154.83s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Remove (149.93s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Update (157.58s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Provisioned (123.83s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_PrimarySecondaryClusters (1765.07s)
--- PASS: TestAccAWSRDSCluster_iamAuth (120.11s)
--- PASS: TestAccAWSRDSCluster_kmsKey (151.47s)
--- PASS: TestAccAWSRDSCluster_missingUserNameCausesError (3.43s)
--- PASS: TestAccAWSRDSCluster_Port (257.16s)
--- PASS: TestAccAWSRDSCluster_ScalingConfiguration (318.10s)
--- PASS: TestAccAWSRDSCluster_ScalingConfiguration_DefaultMinCapacity (323.07s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier (348.50s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_DeletionProtection (383.97s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EncryptedRestore (368.65s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_ParallelQuery (407.96s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_Provisioned (368.22s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineVersion_Different (337.84s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineVersion_Equal (368.32s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_MasterPassword (419.37s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_MasterUsername (378.60s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_PreferredBackupWindow (338.21s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_PreferredMaintenanceWindow (368.34s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_Tags (368.44s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds (349.86s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds_Tags (389.94s)
--- PASS: TestAccAWSRDSCluster_Tags (121.05s)
--- PASS: TestAccAWSRDSCluster_takeFinalSnapshot (170.36s)
--- PASS: TestAccAWSRDSCluster_updateIamRoles (145.89s)

--- PASS: TestAccAWSRDSClusterInstance_az (742.90s)
--- PASS: TestAccAWSRDSClusterInstance_basic (1526.64s)
--- PASS: TestAccAWSRDSClusterInstance_CACertificateIdentifier (656.31s)
--- PASS: TestAccAWSRDSClusterInstance_CopyTagsToSnapshot (658.03s)
--- PASS: TestAccAWSRDSClusterInstance_disappears (700.46s)
--- PASS: TestAccAWSRDSClusterInstance_generatedName (617.35s)
--- PASS: TestAccAWSRDSClusterInstance_isAlreadyBeingDeleted (771.91s)
--- PASS: TestAccAWSRDSClusterInstance_kmsKey (1319.22s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringInterval (1320.21s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToDisabled (1024.03s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToRemoved (921.71s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_RemovedToEnabled (870.44s)
--- PASS: TestAccAWSRDSClusterInstance_namePrefix (657.49s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql1 (773.28s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql2 (793.02s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraPostgresql (742.47s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1 (854.00s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1_DefaultKeyToCustomKey (896.24s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2 (737.93s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2_DefaultKeyToCustomKey (842.37s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql (821.95s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql_DefaultKeyToCustomKey (811.40s)
--- PASS: TestAccAWSRDSClusterInstance_PubliclyAccessible (727.84s)

ghost · 2020-08-07T23:28:30Z

This has been released in version 3.1.0 of the Terraform AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template for triage. Thanks!

ghost · 2020-08-31T17:10:55Z

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

ghost added size/M Managed by automation to categorize the size of a PR. service/rds Issues and PRs that pertain to the rds service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Jul 30, 2020

anGie44 commented Jul 30, 2020

View reviewed changes

aws/resource_aws_rds_cluster_test.go Outdated Show resolved Hide resolved

anGie44 force-pushed the b-rds-cluster-destroy branch from ce8d9ba to 0b44ac4 Compare July 31, 2020 05:36

ghost added size/XXL Managed by automation to categorize the size of a PR. and removed size/M Managed by automation to categorize the size of a PR. labels Jul 31, 2020

anGie44 force-pushed the b-rds-cluster-destroy branch 2 times, most recently from 1902680 to 313efd3 Compare July 31, 2020 05:53

ghost added size/M Managed by automation to categorize the size of a PR. and removed size/XXL Managed by automation to categorize the size of a PR. labels Jul 31, 2020

anGie44 force-pushed the b-rds-cluster-destroy branch 8 times, most recently from 70e0247 to 4ec4276 Compare July 31, 2020 08:11

use new provider incantation

5cb638d

anGie44 force-pushed the b-rds-cluster-destroy branch from 4ec4276 to 5cb638d Compare July 31, 2020 09:16

anGie44 marked this pull request as ready for review July 31, 2020 14:24

anGie44 requested a review from a team July 31, 2020 14:24

bflad reviewed Jul 31, 2020

View reviewed changes

bflad added the bug Addresses a defect in current functionality. label Jul 31, 2020

bflad added this to the v3.1.0 milestone Jul 31, 2020

bflad self-assigned this Jul 31, 2020

update test configs with resource refs

54497cc

bflad approved these changes Jul 31, 2020

View reviewed changes

anGie44 merged commit cc040d1 into master Jul 31, 2020

anGie44 deleted the b-rds-cluster-destroy branch July 31, 2020 21:25

anGie44 added a commit that referenced this pull request Jul 31, 2020

Update CHANGELOG for #14420

f213ed9

ghost locked and limited conversation to collaborators Aug 31, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

resource/rds_cluster: update delete timeout and add additional retry condition #14420

resource/rds_cluster: update delete timeout and add additional retry condition #14420

anGie44 commented Jul 30, 2020 •

edited

Loading

bflad commented Jul 31, 2020

bflad left a comment

bflad Jul 31, 2020

anGie44 Jul 31, 2020 •

edited

Loading

anGie44 Jul 31, 2020 •

edited

Loading

bflad Jul 31, 2020

anGie44 Jul 31, 2020

anGie44 Jul 31, 2020 •

edited

Loading

anGie44 commented Jul 31, 2020

bflad left a comment

ghost commented Aug 7, 2020

ghost commented Aug 31, 2020

resource/rds_cluster: update delete timeout and add additional retry condition #14420

resource/rds_cluster: update delete timeout and add additional retry condition #14420

Conversation

anGie44 commented Jul 30, 2020 • edited Loading

Community Note

bflad commented Jul 31, 2020

bflad left a comment

Choose a reason for hiding this comment

bflad Jul 31, 2020

Choose a reason for hiding this comment

anGie44 Jul 31, 2020 • edited Loading

Choose a reason for hiding this comment

anGie44 Jul 31, 2020 • edited Loading

Choose a reason for hiding this comment

bflad Jul 31, 2020

Choose a reason for hiding this comment

anGie44 Jul 31, 2020

Choose a reason for hiding this comment

anGie44 Jul 31, 2020 • edited Loading

Choose a reason for hiding this comment

anGie44 commented Jul 31, 2020

bflad left a comment

Choose a reason for hiding this comment

ghost commented Aug 7, 2020

ghost commented Aug 31, 2020

anGie44 commented Jul 30, 2020 •

edited

Loading

anGie44 Jul 31, 2020 •

edited

Loading

anGie44 Jul 31, 2020 •

edited

Loading

anGie44 Jul 31, 2020 •

edited

Loading