-
Notifications
You must be signed in to change notification settings - Fork 9.3k
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
Use engine_version and engine_version_actual for aws_rds_cluster and rds_cluster_instance #20211
Use engine_version and engine_version_actual for aws_rds_cluster and rds_cluster_instance #20211
Conversation
717331c
to
dc34460
Compare
07b8f72
to
2692792
Compare
These same commits are in #20207, correct? |
@ewbankkit #20207 covers db_instance, and this one covers rds_cluster and rds_cluster_instance, but the changes for each are very similar. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 🚀.
% ACCTEST_TIMEOUT=300m ACCTEST_PARALLELISM=5 make testacc TESTARGS='-run=TestAccAWSRDSCluster_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 5 -run=TestAccAWSRDSCluster_ -timeout 300m
=== RUN TestAccAWSRDSCluster_basic
=== PAUSE TestAccAWSRDSCluster_basic
=== RUN TestAccAWSRDSCluster_AllowMajorVersionUpgrade
=== PAUSE TestAccAWSRDSCluster_AllowMajorVersionUpgrade
=== RUN TestAccAWSRDSCluster_OnlyMajorVersion
=== PAUSE TestAccAWSRDSCluster_OnlyMajorVersion
=== RUN TestAccAWSRDSCluster_AvailabilityZones
=== PAUSE TestAccAWSRDSCluster_AvailabilityZones
=== RUN TestAccAWSRDSCluster_BacktrackWindow
=== PAUSE TestAccAWSRDSCluster_BacktrackWindow
=== RUN TestAccAWSRDSCluster_ClusterIdentifierPrefix
=== PAUSE TestAccAWSRDSCluster_ClusterIdentifierPrefix
=== RUN TestAccAWSRDSCluster_DbSubnetGroupName
=== PAUSE TestAccAWSRDSCluster_DbSubnetGroupName
=== RUN TestAccAWSRDSCluster_s3Restore
=== PAUSE TestAccAWSRDSCluster_s3Restore
=== RUN TestAccAWSRDSCluster_PointInTimeRestore
=== PAUSE TestAccAWSRDSCluster_PointInTimeRestore
=== RUN TestAccAWSRDSCluster_PointInTimeRestore_EnabledCloudwatchLogsExports
=== PAUSE TestAccAWSRDSCluster_PointInTimeRestore_EnabledCloudwatchLogsExports
=== RUN TestAccAWSRDSCluster_generatedName
=== PAUSE TestAccAWSRDSCluster_generatedName
=== RUN TestAccAWSRDSCluster_takeFinalSnapshot
=== PAUSE TestAccAWSRDSCluster_takeFinalSnapshot
=== RUN TestAccAWSRDSCluster_missingUserNameCausesError
=== PAUSE TestAccAWSRDSCluster_missingUserNameCausesError
=== RUN TestAccAWSRDSCluster_Tags
=== PAUSE TestAccAWSRDSCluster_Tags
=== RUN TestAccAWSRDSCluster_EnabledCloudwatchLogsExports_MySQL
=== PAUSE TestAccAWSRDSCluster_EnabledCloudwatchLogsExports_MySQL
=== RUN TestAccAWSRDSCluster_EnabledCloudwatchLogsExports_Postgresql
=== PAUSE TestAccAWSRDSCluster_EnabledCloudwatchLogsExports_Postgresql
=== RUN TestAccAWSRDSCluster_updateIamRoles
=== PAUSE TestAccAWSRDSCluster_updateIamRoles
=== RUN TestAccAWSRDSCluster_kmsKey
=== PAUSE TestAccAWSRDSCluster_kmsKey
=== RUN TestAccAWSRDSCluster_encrypted
=== PAUSE TestAccAWSRDSCluster_encrypted
=== RUN TestAccAWSRDSCluster_copyTagsToSnapshot
=== PAUSE TestAccAWSRDSCluster_copyTagsToSnapshot
=== RUN TestAccAWSRDSCluster_ReplicationSourceIdentifier_KmsKeyId
=== PAUSE TestAccAWSRDSCluster_ReplicationSourceIdentifier_KmsKeyId
=== RUN TestAccAWSRDSCluster_backupsUpdate
=== PAUSE TestAccAWSRDSCluster_backupsUpdate
=== RUN TestAccAWSRDSCluster_iamAuth
=== PAUSE TestAccAWSRDSCluster_iamAuth
=== RUN TestAccAWSRDSCluster_DeletionProtection
=== PAUSE TestAccAWSRDSCluster_DeletionProtection
=== RUN TestAccAWSRDSCluster_EngineMode
=== PAUSE TestAccAWSRDSCluster_EngineMode
=== RUN TestAccAWSRDSCluster_EngineMode_Global
=== PAUSE TestAccAWSRDSCluster_EngineMode_Global
=== RUN TestAccAWSRDSCluster_EngineMode_Multimaster
=== PAUSE TestAccAWSRDSCluster_EngineMode_Multimaster
=== RUN TestAccAWSRDSCluster_EngineMode_ParallelQuery
=== PAUSE TestAccAWSRDSCluster_EngineMode_ParallelQuery
=== RUN TestAccAWSRDSCluster_EngineVersion
=== PAUSE TestAccAWSRDSCluster_EngineVersion
=== RUN TestAccAWSRDSCluster_EngineVersionWithPrimaryInstance
=== PAUSE TestAccAWSRDSCluster_EngineVersionWithPrimaryInstance
=== RUN TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global
=== PAUSE TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global
=== RUN TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Add
=== PAUSE TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Add
=== RUN TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Remove
=== PAUSE TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Remove
=== RUN TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Update
=== PAUSE TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Update
=== RUN TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Provisioned
=== PAUSE TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Provisioned
=== RUN TestAccAWSRDSCluster_GlobalClusterIdentifier_PrimarySecondaryClusters
=== PAUSE TestAccAWSRDSCluster_GlobalClusterIdentifier_PrimarySecondaryClusters
=== RUN TestAccAWSRDSCluster_GlobalClusterIdentifier_ReplicationSourceIdentifier
=== PAUSE TestAccAWSRDSCluster_GlobalClusterIdentifier_ReplicationSourceIdentifier
=== RUN TestAccAWSRDSCluster_Port
=== PAUSE TestAccAWSRDSCluster_Port
=== RUN TestAccAWSRDSCluster_ScalingConfiguration
=== PAUSE TestAccAWSRDSCluster_ScalingConfiguration
=== RUN TestAccAWSRDSCluster_ScalingConfiguration_DefaultMinCapacity
=== PAUSE TestAccAWSRDSCluster_ScalingConfiguration_DefaultMinCapacity
=== RUN TestAccAWSRDSCluster_SnapshotIdentifier
=== PAUSE TestAccAWSRDSCluster_SnapshotIdentifier
=== RUN TestAccAWSRDSCluster_SnapshotIdentifier_DeletionProtection
=== PAUSE TestAccAWSRDSCluster_SnapshotIdentifier_DeletionProtection
=== RUN TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_ParallelQuery
=== PAUSE TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_ParallelQuery
=== RUN TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_Provisioned
=== PAUSE TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_Provisioned
=== RUN TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_Serverless
resource_aws_rds_cluster_test.go:1853: serverless does not support snapshot restore on an empty volume
--- SKIP: TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_Serverless (0.00s)
=== RUN TestAccAWSRDSCluster_SnapshotIdentifier_EngineVersion_Different
=== PAUSE TestAccAWSRDSCluster_SnapshotIdentifier_EngineVersion_Different
=== RUN TestAccAWSRDSCluster_SnapshotIdentifier_EngineVersion_Equal
=== PAUSE TestAccAWSRDSCluster_SnapshotIdentifier_EngineVersion_Equal
=== RUN TestAccAWSRDSCluster_SnapshotIdentifier_KmsKeyId
=== PAUSE TestAccAWSRDSCluster_SnapshotIdentifier_KmsKeyId
=== RUN TestAccAWSRDSCluster_SnapshotIdentifier_MasterPassword
=== PAUSE TestAccAWSRDSCluster_SnapshotIdentifier_MasterPassword
=== RUN TestAccAWSRDSCluster_SnapshotIdentifier_MasterUsername
=== PAUSE TestAccAWSRDSCluster_SnapshotIdentifier_MasterUsername
=== RUN TestAccAWSRDSCluster_SnapshotIdentifier_PreferredBackupWindow
=== PAUSE TestAccAWSRDSCluster_SnapshotIdentifier_PreferredBackupWindow
=== RUN TestAccAWSRDSCluster_SnapshotIdentifier_PreferredMaintenanceWindow
=== PAUSE TestAccAWSRDSCluster_SnapshotIdentifier_PreferredMaintenanceWindow
=== RUN TestAccAWSRDSCluster_SnapshotIdentifier_Tags
=== PAUSE TestAccAWSRDSCluster_SnapshotIdentifier_Tags
=== RUN TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds
=== PAUSE TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds
=== RUN TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds_Tags
=== PAUSE TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds_Tags
=== RUN TestAccAWSRDSCluster_SnapshotIdentifier_EncryptedRestore
=== PAUSE TestAccAWSRDSCluster_SnapshotIdentifier_EncryptedRestore
=== RUN TestAccAWSRDSCluster_EnableHttpEndpoint
=== PAUSE TestAccAWSRDSCluster_EnableHttpEndpoint
=== CONT TestAccAWSRDSCluster_basic
=== CONT TestAccAWSRDSCluster_EngineVersionWithPrimaryInstance
=== CONT TestAccAWSRDSCluster_EnabledCloudwatchLogsExports_Postgresql
=== CONT TestAccAWSRDSCluster_PointInTimeRestore
=== CONT TestAccAWSRDSCluster_missingUserNameCausesError
--- PASS: TestAccAWSRDSCluster_missingUserNameCausesError (20.38s)
=== CONT TestAccAWSRDSCluster_EnableHttpEndpoint
--- PASS: TestAccAWSRDSCluster_EnabledCloudwatchLogsExports_Postgresql (136.66s)
=== CONT TestAccAWSRDSCluster_SnapshotIdentifier_EncryptedRestore
--- PASS: TestAccAWSRDSCluster_basic (136.74s)
=== CONT TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds_Tags
--- PASS: TestAccAWSRDSCluster_EnableHttpEndpoint (354.25s)
=== CONT TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds
--- PASS: TestAccAWSRDSCluster_PointInTimeRestore (427.49s)
=== CONT TestAccAWSRDSCluster_SnapshotIdentifier_Tags
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds_Tags (448.25s)
=== CONT TestAccAWSRDSCluster_SnapshotIdentifier_PreferredMaintenanceWindow
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EncryptedRestore (492.03s)
=== CONT TestAccAWSRDSCluster_SnapshotIdentifier_PreferredBackupWindow
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds (405.37s)
=== CONT TestAccAWSRDSCluster_SnapshotIdentifier_MasterUsername
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_Tags (420.71s)
=== CONT TestAccAWSRDSCluster_SnapshotIdentifier_MasterPassword
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_PreferredMaintenanceWindow (428.27s)
=== CONT TestAccAWSRDSCluster_SnapshotIdentifier_KmsKeyId
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_PreferredBackupWindow (427.38s)
=== CONT TestAccAWSRDSCluster_SnapshotIdentifier_EngineVersion_Equal
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_MasterUsername (418.26s)
=== CONT TestAccAWSRDSCluster_SnapshotIdentifier_EngineVersion_Different
--- PASS: TestAccAWSRDSCluster_EngineVersionWithPrimaryInstance (1198.94s)
=== CONT TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_Provisioned
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_MasterPassword (450.46s)
=== CONT TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_ParallelQuery
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_KmsKeyId (368.09s)
=== CONT TestAccAWSRDSCluster_SnapshotIdentifier_DeletionProtection
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineVersion_Equal (459.86s)
=== CONT TestAccAWSRDSCluster_SnapshotIdentifier
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_Provisioned (431.92s)
=== CONT TestAccAWSRDSCluster_ScalingConfiguration_DefaultMinCapacity
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineVersion_Different (493.24s)
=== CONT TestAccAWSRDSCluster_ScalingConfiguration
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_ParallelQuery (518.56s)
=== CONT TestAccAWSRDSCluster_Port
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_DeletionProtection (497.74s)
=== CONT TestAccAWSRDSCluster_GlobalClusterIdentifier_ReplicationSourceIdentifier
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier (395.21s)
=== CONT TestAccAWSRDSCluster_GlobalClusterIdentifier_PrimarySecondaryClusters
--- PASS: TestAccAWSRDSCluster_ScalingConfiguration_DefaultMinCapacity (290.68s)
=== CONT TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Provisioned
--- PASS: TestAccAWSRDSCluster_Port (185.97s)
=== CONT TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Update
--- PASS: TestAccAWSRDSCluster_ScalingConfiguration (374.29s)
=== CONT TestAccAWSRDSCluster_EnabledCloudwatchLogsExports_MySQL
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Provisioned (183.34s)
=== CONT TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Remove
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Update (209.56s)
=== CONT TestAccAWSRDSCluster_Tags
--- PASS: TestAccAWSRDSCluster_EnabledCloudwatchLogsExports_MySQL (220.45s)
=== CONT TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Add
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Remove (200.34s)
=== CONT TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global
--- PASS: TestAccAWSRDSCluster_Tags (169.99s)
=== CONT TestAccAWSRDSCluster_generatedName
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Add (206.08s)
=== CONT TestAccAWSRDSCluster_PointInTimeRestore_EnabledCloudwatchLogsExports
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global (193.85s)
=== CONT TestAccAWSRDSCluster_takeFinalSnapshot
--- PASS: TestAccAWSRDSCluster_generatedName (164.12s)
=== CONT TestAccAWSRDSCluster_iamAuth
--- PASS: TestAccAWSRDSCluster_takeFinalSnapshot (195.34s)
=== CONT TestAccAWSRDSCluster_copyTagsToSnapshot
--- PASS: TestAccAWSRDSCluster_iamAuth (165.74s)
=== CONT TestAccAWSRDSCluster_EngineVersion
--- PASS: TestAccAWSRDSCluster_PointInTimeRestore_EnabledCloudwatchLogsExports (404.45s)
=== CONT TestAccAWSRDSCluster_backupsUpdate
--- PASS: TestAccAWSRDSCluster_copyTagsToSnapshot (241.13s)
=== CONT TestAccAWSRDSCluster_EngineMode_ParallelQuery
--- PASS: TestAccAWSRDSCluster_backupsUpdate (180.26s)
=== CONT TestAccAWSRDSCluster_ReplicationSourceIdentifier_KmsKeyId
--- PASS: TestAccAWSRDSCluster_EngineMode_ParallelQuery (182.35s)
=== CONT TestAccAWSRDSCluster_EngineMode_Multimaster
--- PASS: TestAccAWSRDSCluster_EngineVersion (472.12s)
=== CONT TestAccAWSRDSCluster_EngineMode_Global
--- PASS: TestAccAWSRDSCluster_EngineMode_Multimaster (171.45s)
=== CONT TestAccAWSRDSCluster_kmsKey
--- PASS: TestAccAWSRDSCluster_EngineMode_Global (178.02s)
=== CONT TestAccAWSRDSCluster_EngineMode
--- PASS: TestAccAWSRDSCluster_kmsKey (167.05s)
=== CONT TestAccAWSRDSCluster_encrypted
=== CONT TestAccAWSRDSCluster_ReplicationSourceIdentifier_KmsKeyId
resource_aws_rds_cluster_test.go:883: Step 1/2 error: Error running apply: exit status 1
Error: error creating RDS cluster: InvalidParameterValue: PreSignedUrl could not be authenticated
status code: 400, request id: 4d743958-80f6-446c-9947-0a0b38f6ad23
with aws_rds_cluster.alternate,
on terraform_plugin_test.tf line 100, in resource "aws_rds_cluster" "alternate":
100: resource "aws_rds_cluster" "alternate" {
--- PASS: TestAccAWSRDSCluster_encrypted (171.02s)
=== CONT TestAccAWSRDSCluster_DeletionProtection
--- PASS: TestAccAWSRDSCluster_DeletionProtection (188.45s)
=== CONT TestAccAWSRDSCluster_BacktrackWindow
--- PASS: TestAccAWSRDSCluster_EngineMode (471.33s)
=== CONT TestAccAWSRDSCluster_DbSubnetGroupName
--- FAIL: TestAccAWSRDSCluster_ReplicationSourceIdentifier_KmsKeyId (860.32s)
=== CONT TestAccAWSRDSCluster_ClusterIdentifierPrefix
--- PASS: TestAccAWSRDSCluster_DbSubnetGroupName (162.88s)
=== CONT TestAccAWSRDSCluster_s3Restore
--- PASS: TestAccAWSRDSCluster_BacktrackWindow (198.98s)
=== CONT TestAccAWSRDSCluster_updateIamRoles
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_PrimarySecondaryClusters (2145.53s)
=== CONT TestAccAWSRDSCluster_OnlyMajorVersion
--- PASS: TestAccAWSRDSCluster_ClusterIdentifierPrefix (143.43s)
=== CONT TestAccAWSRDSCluster_AvailabilityZones
--- PASS: TestAccAWSRDSCluster_updateIamRoles (182.86s)
=== CONT TestAccAWSRDSCluster_AllowMajorVersionUpgrade
--- PASS: TestAccAWSRDSCluster_AvailabilityZones (123.66s)
--- PASS: TestAccAWSRDSCluster_OnlyMajorVersion (714.76s)
=== CONT TestAccAWSRDSCluster_s3Restore
resource_aws_rds_cluster_test.go:397: Step 1/2 error: Error running apply: exit status 1
Error: Error waiting for RDS Cluster state to be "available": unexpected state 'migration-failed', wanted target 'available'. last error: %!s(<nil>)
with aws_rds_cluster.test,
on terraform_plugin_test.tf line 74, in resource "aws_rds_cluster" "test":
74: resource "aws_rds_cluster" "test" {
--- PASS: TestAccAWSRDSCluster_AllowMajorVersionUpgrade (1352.45s)
--- FAIL: TestAccAWSRDSCluster_s3Restore (1599.62s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_ReplicationSourceIdentifier (6700.92s)
Failures are not related to this change and are occurring in nightly CI.
This functionality has been released in v3.52.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. Thank you! |
I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues. |
Instead of suppressing diffs to allow for using less specific
engine_version
s, allowengine_version
to be less specific, and keep the actual engine version inengine_version_actual
.Relates #20207
Community Note
Output from acceptance testing: