-
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
fix: RabbitMQ 3.13 and ActiveMQ 5.18 Version Mismatch #39024
fix: RabbitMQ 3.13 and ActiveMQ 5.18 Version Mismatch #39024
Conversation
…3 and ActiveMQ 5.18 change to their corresponding patch version
…3 and ActiveMQ 5.18 change to their corresponding patch version
…3 and ActiveMQ 5.18 change to their corresponding patch version
Community NoteVoting for Prioritization
For Submitters
|
```console % make testacc PKG=mq TESTS=TestAccMQBroker_normalizedEngineVersion make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.22.6 test ./internal/service/mq/... -v -count 1 -parallel 20 -run='TestAccMQBroker_normalizedEngineVersion' -timeout 360m --- PASS: TestAccMQBroker_normalizedEngineVersion (973.99s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/mq 980.237s ``` ```console % go test -count=1 ./internal/service/mq/... -run=TestNormalizeEngineVersion ok github.com/hashicorp/terraform-provider-aws/internal/service/mq 6.269s ```
Thanks for your submission @architec! 👍 I'm working through some failures on the RabbitMQ acceptance tests which appear unrelated to this change (tags drift). Once those are resolved I'll proceed with merging this in. |
Thank you for your contribution! 🚀 Please note that typically Go dependency changes are handled in this repository by dependabot or the maintainers. This is to prevent pull request merge conflicts and further delay reviews of contributions. Remove any changes to the Additional details:
|
I've isolated the acceptance testing failures to a change in Terraform core Will merge this once the full test suite completes. % TF_ACC_TERRAFORM_VERSION=1.7.5 make testacc PKG=mq TESTS="TestAccMQBroker_normalizedEngineVersion|TestAccMQBroker_RabbitMQ_autoMinorVersionUpgrade|TestAccMQBroker_RabbitMQ_normalizedEngineVersion"
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.6 test ./internal/service/mq/... -v -count 1 -parallel 20 -run='TestAccMQBroker_normalizedEngineVersion|TestAccMQBroker_RabbitMQ_autoMinorVersionUpgrade|TestAccMQBroker_RabbitMQ_normalizedEngineVersion' -timeout 360m
=== RUN TestAccMQBroker_normalizedEngineVersion
=== PAUSE TestAccMQBroker_normalizedEngineVersion
=== RUN TestAccMQBroker_RabbitMQ_autoMinorVersionUpgrade
=== PAUSE TestAccMQBroker_RabbitMQ_autoMinorVersionUpgrade
=== RUN TestAccMQBroker_RabbitMQ_normalizedEngineVersion
=== PAUSE TestAccMQBroker_RabbitMQ_normalizedEngineVersion
=== CONT TestAccMQBroker_normalizedEngineVersion
=== CONT TestAccMQBroker_RabbitMQ_normalizedEngineVersion
=== CONT TestAccMQBroker_RabbitMQ_autoMinorVersionUpgrade
2024/09/12 11:43:45 [DEBUG] GET https://releases.hashicorp.com/terraform/1.7.5/index.json
2024/09/12 11:43:45 [DEBUG] GET https://releases.hashicorp.com/terraform/1.7.5/index.json
2024/09/12 11:43:45 [DEBUG] GET https://releases.hashicorp.com/terraform/1.7.5/index.json
2024/09/12 11:43:45 [DEBUG] GET https://releases.hashicorp.com/terraform/1.7.5/terraform_1.7.5_SHA256SUMS.72D7468F.sig
2024/09/12 11:43:45 [DEBUG] GET https://releases.hashicorp.com/terraform/1.7.5/terraform_1.7.5_SHA256SUMS.72D7468F.sig
2024/09/12 11:43:45 [DEBUG] GET https://releases.hashicorp.com/terraform/1.7.5/terraform_1.7.5_SHA256SUMS.72D7468F.sig
2024/09/12 11:43:45 [DEBUG] GET https://releases.hashicorp.com/terraform/1.7.5/terraform_1.7.5_SHA256SUMS
2024/09/12 11:43:45 [DEBUG] GET https://releases.hashicorp.com/terraform/1.7.5/terraform_1.7.5_SHA256SUMS
2024/09/12 11:43:45 [DEBUG] GET https://releases.hashicorp.com/terraform/1.7.5/terraform_1.7.5_SHA256SUMS
2024/09/12 11:43:45 [DEBUG] GET https://releases.hashicorp.com/terraform/1.7.5/terraform_1.7.5_darwin_arm64.zip
2024/09/12 11:43:45 [DEBUG] GET https://releases.hashicorp.com/terraform/1.7.5/terraform_1.7.5_darwin_arm64.zip
2024/09/12 11:43:45 [DEBUG] GET https://releases.hashicorp.com/terraform/1.7.5/terraform_1.7.5_darwin_arm64.zip
--- PASS: TestAccMQBroker_RabbitMQ_normalizedEngineVersion (681.96s)
--- PASS: TestAccMQBroker_RabbitMQ_autoMinorVersionUpgrade (686.64s)
--- PASS: TestAccMQBroker_normalizedEngineVersion (1182.01s)
PASS
ok github.com/hashicorp/terraform-provider-aws/internal/service/mq 1188.204s |
Previously the `engine_version` sent to the update API was the version read from the remote resource, rather than the configured value. This change passes the configured values for `engine_type`, `engine_version`, and `auto_minor_version_upgrade` to the `normalizeEngineVersion` function instead, allowing explicitly configured engine version updates to once again function properly. ```console % TF_ACC_TERRAFORM_VERSION=1.7.5 make testacc PKG=mq TESTS="TestAccMQBroker_" make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.22.6 test ./internal/service/mq/... -v -count 1 -parallel 20 -run='TestAccMQBroker_' -timeout 360m --- PASS: TestAccMQBroker_RabbitMQ_validationAuditLog (631.07s) === CONT TestAccMQBroker_normalizedEngineVersion --- PASS: TestAccMQBroker_RabbitMQ_normalizedEngineVersion (647.54s) === CONT TestAccMQBroker_RabbitMQ_basic --- PASS: TestAccMQBroker_RabbitMQ_autoMinorVersionUpgrade (659.43s) === CONT TestAccMQBroker_Update_hostInstanceType --- PASS: TestAccMQBroker_RabbitMQ_config (662.56s) --- PASS: TestAccMQBroker_RabbitMQ_cluster (669.10s) --- PASS: TestAccMQBroker_RabbitMQ_logs (672.09s) --- PASS: TestAccMQBroker_throughputOptimized (939.31s) --- PASS: TestAccMQBroker_ldap (953.94s) --- PASS: TestAccMQBroker_EncryptionOptions_kmsKeyID (989.45s) --- PASS: TestAccMQBroker_EncryptionOptions_managedKeyEnabled (1038.29s) --- PASS: TestAccMQBroker_EncryptionOptions_managedKeyDisabled (1043.15s) --- PASS: TestAccMQBroker_disappears (1060.67s) --- PASS: TestAccMQBroker_basic (1064.66s) --- PASS: TestAccMQBroker_tags (1078.43s) --- PASS: TestAccMQBroker_Update_engineVersion (1240.34s) --- PASS: TestAccMQBroker_Update_securityGroup (1262.55s) --- PASS: TestAccMQBroker_RabbitMQ_basic (660.77s) --- PASS: TestAccMQBroker_Update_users (1429.44s) --- PASS: TestAccMQBroker_normalizedEngineVersion (843.55s) --- PASS: TestAccMQBroker_AllFields_defaultVPC (1593.85s) --- PASS: TestAccMQBroker_AllFields_customVPC (1740.74s) --- PASS: TestAccMQBroker_Update_hostInstanceType (1353.62s) --- PASS: TestAccMQBroker_dataReplicationMode (2095.33s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/mq 2101.590s ```
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 🎉
% TF_ACC_TERRAFORM_VERSION=1.7.5 make testacc PKG=mq TESTS="TestAccMQBroker_"
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.6 test ./internal/service/mq/... -v -count 1 -parallel 20 -run='TestAccMQBroker_' -timeout 360m
--- PASS: TestAccMQBroker_RabbitMQ_validationAuditLog (631.07s)
=== CONT TestAccMQBroker_normalizedEngineVersion
--- PASS: TestAccMQBroker_RabbitMQ_normalizedEngineVersion (647.54s)
=== CONT TestAccMQBroker_RabbitMQ_basic
--- PASS: TestAccMQBroker_RabbitMQ_autoMinorVersionUpgrade (659.43s)
=== CONT TestAccMQBroker_Update_hostInstanceType
--- PASS: TestAccMQBroker_RabbitMQ_config (662.56s)
--- PASS: TestAccMQBroker_RabbitMQ_cluster (669.10s)
--- PASS: TestAccMQBroker_RabbitMQ_logs (672.09s)
--- PASS: TestAccMQBroker_throughputOptimized (939.31s)
--- PASS: TestAccMQBroker_ldap (953.94s)
--- PASS: TestAccMQBroker_EncryptionOptions_kmsKeyID (989.45s)
--- PASS: TestAccMQBroker_EncryptionOptions_managedKeyEnabled (1038.29s)
--- PASS: TestAccMQBroker_EncryptionOptions_managedKeyDisabled (1043.15s)
--- PASS: TestAccMQBroker_disappears (1060.67s)
--- PASS: TestAccMQBroker_basic (1064.66s)
--- PASS: TestAccMQBroker_tags (1078.43s)
--- PASS: TestAccMQBroker_Update_engineVersion (1240.34s)
--- PASS: TestAccMQBroker_Update_securityGroup (1262.55s)
--- PASS: TestAccMQBroker_RabbitMQ_basic (660.77s)
--- PASS: TestAccMQBroker_Update_users (1429.44s)
--- PASS: TestAccMQBroker_normalizedEngineVersion (843.55s)
--- PASS: TestAccMQBroker_AllFields_defaultVPC (1593.85s)
--- PASS: TestAccMQBroker_AllFields_customVPC (1740.74s)
--- PASS: TestAccMQBroker_Update_hostInstanceType (1353.62s)
--- PASS: TestAccMQBroker_dataReplicationMode (2095.33s)
PASS
ok github.com/hashicorp/terraform-provider-aws/internal/service/mq 2101.590s
Thanks for your contribution, @architec! 👍 Apologies for the long running review. |
This functionality has been released in v5.68.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. |
Description
Terraform encounters version mismatch with Amazon MQ RabbitMQ 3.13 and ActiveMQ 5.18, causing unnecessary reboots due to patch-level updates.
Relations
Closes #38930
Closes #38708
References
https://aws.amazon.com/about-aws/whats-new/2024/07/amazon-mq-rabbitmq-version-3-13/
Output from Acceptance Testing