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

tests/provider: Fix hardcoded (rds cluster instance) #15022

Merged
merged 1 commit into from
Sep 16, 2020
Merged

tests/provider: Fix hardcoded (rds cluster instance) #15022

merged 1 commit into from
Sep 16, 2020

Conversation

YakDriver
Copy link
Member

@YakDriver YakDriver commented Sep 3, 2020 •
edited
Loading

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

Relates #12995, #14188

Release note for CHANGELOG:

NONE

Output from acceptance testing (GovCloud):

--- PASS: TestAccAWSRDSClusterInstance_basic (1385.39s)

Output from acceptance testing (commercial):

--- PASS: TestAccAWSRDSClusterInstance_kmsKey (568.23s)
--- PASS: TestAccAWSRDSClusterInstance_generatedName (570.13s)
--- PASS: TestAccAWSRDSClusterInstance_PubliclyAccessible (611.42s)
--- PASS: TestAccAWSRDSClusterInstance_namePrefix (663.63s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraPostgresql (689.00s)
--- PASS: TestAccAWSRDSClusterInstance_isAlreadyBeingDeleted (711.95s)
--- PASS: TestAccAWSRDSClusterInstance_CopyTagsToSnapshot (712.53s)
--- PASS: TestAccAWSRDSClusterInstance_az (714.00s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql2 (753.35s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1 (783.43s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToRemoved (783.79s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1_DefaultKeyToCustomKey (799.15s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2 (802.36s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql1 (802.83s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2_DefaultKeyToCustomKey (826.01s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_RemovedToEnabled (860.74s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToDisabled (1024.74s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql_DefaultKeyToCustomKey (577.20s)
--- PASS: TestAccAWSRDSClusterInstance_CACertificateIdentifier (612.95s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql (725.28s)
--- PASS: TestAccAWSRDSClusterInstance_disappears (1351.19s)
--- PASS: TestAccAWSRDSClusterInstance_basic (1401.42s)
--- FAIL: TestAccAWSRDSClusterInstance_MonitoringInterval (1627.27s)

The fail on commercial:

Error modifying DB Instance tf-acc-test-854893840051788754: InvalidDBInstanceState: Database
instance is not in available state.

@YakDriver YakDriver requested a review from a team September 3, 2020 21:17
@ghost ghost added size/XL 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 Sep 3, 2020
@YakDriver YakDriver added the partition/aws-us-gov Pertains to the aws-us-gov partition. label Sep 3, 2020
@YakDriver YakDriver mentioned this pull request Sep 3, 2020
Merged
@YakDriver YakDriver force-pushed the t-gov-rds-cluster-inst branch from d54781f to b683de4 Compare September 4, 2020 07:03
@bflad bflad self-assigned this Sep 4, 2020
bflad
bflad previously requested changes Sep 4, 2020
View reviewed changes
Copy link
Contributor

@bflad bflad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The configuration changes here all look and test good, but the PreCheck logic needs some updates so it is appropriately handling the differing engines and versions between tests. 👍

aws/resource_aws_rds_cluster_instance_test.go Outdated Show resolved Hide resolved
aws/resource_aws_rds_cluster_instance_test.go Outdated Show resolved Hide resolved
@YakDriver YakDriver mentioned this pull request Sep 8, 2020
Closed
@YakDriver YakDriver force-pushed the t-gov-rds-cluster-inst branch from b683de4 to be429ca Compare September 8, 2020 18:52
@YakDriver YakDriver mentioned this pull request Sep 8, 2020
Closed
@YakDriver YakDriver requested a review from bflad September 8, 2020 19:17
@YakDriver
Copy link
Member Author

See hashicorp/terraform-plugin-sdk#568 for a better long-term approach.

@YakDriver
Copy link
Member Author

#14778 is waiting on the precheck in this PR.

@YakDriver YakDriver force-pushed the t-gov-rds-cluster-inst branch 2 times, most recently from 3d5f755 to 6c3b0a3 Compare September 15, 2020 21:16
@YakDriver YakDriver force-pushed the t-gov-rds-cluster-inst branch from 6c3b0a3 to cced994 Compare September 15, 2020 22:15
@YakDriver
Copy link
Member Author

Performance insights tests on GovCloud:

    resource_aws_rds_cluster_instance_test.go:931: RDS Performance Insights not supported, skipping acceptance test
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql1 (2.76s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql2 (1.78s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraPostgresql (2.35s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1 (2.30s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1_DefaultKeyToCustomKey (2.37s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2 (2.06s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2_DefaultKeyToCustomKey (1.78s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql (2.29s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql_DefaultKeyToCustomKey (2.29s)

@YakDriver YakDriver dismissed bflad’s stale review September 15, 2020 22:21

Both fixes now complete

@YakDriver
Copy link
Member Author

The output from acceptance testing (GovCloud) (Sep 15):

--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql2 (0.00s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql1 (0.00s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraPostgresql (0.00s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1 (0.00s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1_DefaultKeyToCustomKey (0.00s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2 (0.00s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql (0.00s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2_DefaultKeyToCustomKey (0.00s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql_DefaultKeyToCustomKey (0.00s)
--- FAIL: TestAccAWSRDSClusterInstance_CACertificateIdentifier (518.21s) (Error: error modifying DB Instance (tf-acc-test-5221094997559595721): CertificateNotFound: Certificate not found: rds-ca-2019)
--- PASS: TestAccAWSRDSClusterInstance_namePrefix (600.79s)
--- PASS: TestAccAWSRDSClusterInstance_generatedName (621.63s)
--- PASS: TestAccAWSRDSClusterInstance_CopyTagsToSnapshot (664.86s)
--- PASS: TestAccAWSRDSClusterInstance_kmsKey (668.62s)
--- PASS: TestAccAWSRDSClusterInstance_az (669.23s)
--- PASS: TestAccAWSRDSClusterInstance_isAlreadyBeingDeleted (683.13s)
--- PASS: TestAccAWSRDSClusterInstance_disappears (683.42s)
--- PASS: TestAccAWSRDSClusterInstance_PubliclyAccessible (745.69s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_RemovedToEnabled (786.08s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToRemoved (988.55s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToDisabled (1008.75s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringInterval (1245.45s)
--- PASS: TestAccAWSRDSClusterInstance_basic (1374.40s)

The output from acceptance testing (commercial) (Sep 15):

--- PASS: TestAccAWSRDSClusterInstance_namePrefix (508.42s)
--- PASS: TestAccAWSRDSClusterInstance_az (608.44s)
--- PASS: TestAccAWSRDSClusterInstance_generatedName (683.98s)
--- PASS: TestAccAWSRDSClusterInstance_kmsKey (720.11s)
--- PASS: TestAccAWSRDSClusterInstance_CopyTagsToSnapshot (738.01s)
--- PASS: TestAccAWSRDSClusterInstance_isAlreadyBeingDeleted (759.45s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql2 (780.09s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1 (788.63s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraPostgresql (789.48s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2_DefaultKeyToCustomKey (804.30s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1_DefaultKeyToCustomKey (805.17s)
--- PASS: TestAccAWSRDSClusterInstance_disappears (825.04s)
--- PASS: TestAccAWSRDSClusterInstance_PubliclyAccessible (841.89s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_RemovedToEnabled (869.34s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2 (890.19s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql1 (910.84s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToDisabled (944.11s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToRemoved (968.83s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql (703.50s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql_DefaultKeyToCustomKey (667.49s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringInterval (1291.97s)
--- PASS: TestAccAWSRDSClusterInstance_basic (1313.86s)
--- PASS: TestAccAWSRDSClusterInstance_CACertificateIdentifier (693.30s)

bflad
bflad approved these changes Sep 16, 2020
View reviewed changes
Copy link
Contributor

@bflad bflad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good 🚀

Output from acceptance testing in AWS Commercial:

--- PASS: TestAccAWSRDSClusterInstance_CopyTagsToSnapshot (623.75s)
--- PASS: TestAccAWSRDSClusterInstance_namePrefix (637.15s)
--- PASS: TestAccAWSRDSClusterInstance_generatedName (687.08s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1_DefaultKeyToCustomKey (717.52s)
--- PASS: TestAccAWSRDSClusterInstance_disappears (724.35s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_RemovedToEnabled (750.30s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraPostgresql (751.25s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1 (780.24s)
--- PASS: TestAccAWSRDSClusterInstance_isAlreadyBeingDeleted (785.08s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql2 (789.59s)
--- PASS: TestAccAWSRDSClusterInstance_PubliclyAccessible (793.74s)
--- PASS: TestAccAWSRDSClusterInstance_kmsKey (795.35s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql1 (811.69s)
--- PASS: TestAccAWSRDSClusterInstance_az (821.72s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2_DefaultKeyToCustomKey (838.52s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2 (853.51s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToDisabled (916.04s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToRemoved (975.79s)
--- PASS: TestAccAWSRDSClusterInstance_CACertificateIdentifier (645.25s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql_DefaultKeyToCustomKey (698.04s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql (712.91s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringInterval (1384.19s)
--- PASS: TestAccAWSRDSClusterInstance_basic (1441.41s)

Output from acceptance testing in AWS GovCloud (US) (failures unrelated to these changes):

--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql2 (0.43s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql1 (0.99s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraPostgresql (0.81s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1 (0.60s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1_DefaultKeyToCustomKey (0.89s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2 (0.41s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2_DefaultKeyToCustomKey (0.66s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql (0.75s)
--- SKIP: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql_DefaultKeyToCustomKey (0.68s)
--- PASS: TestAccAWSRDSClusterInstance_kmsKey (558.46s)
--- PASS: TestAccAWSRDSClusterInstance_generatedName (559.78s)
--- PASS: TestAccAWSRDSClusterInstance_PubliclyAccessible (565.39s)
--- PASS: TestAccAWSRDSClusterInstance_namePrefix (600.42s)
--- FAIL: TestAccAWSRDSClusterInstance_CACertificateIdentifier (599.10s)
--- PASS: TestAccAWSRDSClusterInstance_disappears (623.24s)
--- PASS: TestAccAWSRDSClusterInstance_CopyTagsToSnapshot (655.88s)
--- PASS: TestAccAWSRDSClusterInstance_az (679.06s)
--- PASS: TestAccAWSRDSClusterInstance_isAlreadyBeingDeleted (743.57s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_RemovedToEnabled (745.59s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToRemoved (987.42s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToDisabled (1028.71s)
--- PASS: TestAccAWSRDSClusterInstance_basic (1211.67s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringInterval (1468.00s)

@YakDriver YakDriver merged commit e1516b7 into master Sep 16, 2020
@YakDriver YakDriver deleted the t-gov-rds-cluster-inst branch September 16, 2020 18:33
@YakDriver YakDriver added this to the v3.7.0 milestone Sep 16, 2020
@YakDriver YakDriver mentioned this pull request Sep 17, 2020
Closed
@ghost
Copy link

ghost commented Sep 17, 2020

This has been released in version 3.7.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
Copy link

ghost commented Oct 17, 2020

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 ghost locked as resolved and limited conversation to collaborators Oct 17, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@bflad bflad bflad approved these changes

Assignees

@bflad bflad

Labels
partition/aws-us-gov Pertains to the aws-us-gov partition. service/rds Issues and PRs that pertain to the rds service. size/XL Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v3.7.0
Development

Successfully merging this pull request may close these issues.
2 participants
@YakDriver @bflad