fix: RabbitMQ 3.13 and ActiveMQ 5.18 Version Mismatch #39024

architec · 2024-08-23T21:47:53Z

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

Starting from RabbitMQ 3.13, Amazon MQ will manage patch version upgrades for your brokers. All brokers on version 3.13 will be automatically upgraded to the latest compatible and secure patch version in your scheduled maintenance window.

https://aws.amazon.com/about-aws/whats-new/2024/07/amazon-mq-rabbitmq-version-3-13/

Output from Acceptance Testing

% PKG=mq make testacc TESTS=TestAccMQBroker_basic

% PKG=mq make testacc TESTS=TestAccMQBroker_RabbitMQ_basic

% PKG=mq make test
...

…3 and ActiveMQ 5.18 change to their corresponding patch version

github-actions · 2024-08-23T21:48:05Z

Community Note

Voting for Prioritization

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

For Submitters

Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

mprince · 2024-08-25T16:59:04Z

internal/service/mq/broker.go

+		return *engineVersion
+	}
+	majorMinorEngineVersion := semver.MajorMinor("v" + *engineVersion)
+	rabbitSimplifiedVersion := "v3.13"


Thanks for picking this up @architec as I was looking at this issue as well. With this setup don't we have to update the code when AWS releases a new version? Also I was looking at how the RDS service had it working and setting up an actual_engine_version attribute?

Indeed, this PR will necessitate code updates when Amazon MQ releases new versions. However, I can submit a subsequent pull request to modify the change, making it applicable to all versions >= 3.13 for RabbitMQ and versions >= 5.18 for ActiveMQ.

With the subsequent PR, adding an attribute such as actual_engine_version is unnecessary.

…pgrade

```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 ```

jar-b · 2024-09-11T20:55:10Z

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.

…pgrade

github-actions · 2024-09-12T17:29:40Z

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 go.mod or go.sum files and commit them into this pull request.

Additional details:

Check open pull requests with the dependencies label to view other dependency updates.
If this pull request includes an update the AWS Go SDK (or any other dependency) version, only updates submitted via dependabot will be merged. This pull request will need to remove these changes and will need to be rebased after the existing dependency update via dependabot has been merged for this pull request to be reviewed.
If this pull request is for supporting a new AWS service:
- Ensure the new AWS service changes are following the Contributing Guide section on new services, in particular that the dependency addition and initial provider support are in a separate pull request from other changes (e.g. new resources). Contributions not following this item will not be reviewed until the changes are split.
- If this pull request is already a separate pull request from the above item, you can ignore this message.

jar-b · 2024-09-12T17:32:55Z

I've isolated the acceptance testing failures to a change in Terraform core 1.8.0. Running with 1.7.5 yields passing tests, so I'm going to run the full suite broker suite with that version now and file a separate issue to continue this research.

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 ```

jar-b

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

jar-b · 2024-09-12T20:46:45Z

Thanks for your contribution, @architec! 👍

Apologies for the long running review.

github-actions · 2024-09-20T12:44:15Z

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!

github-actions · 2024-10-22T02:20:30Z

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.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

architec added 3 commits August 22, 2024 22:58

fix: fixed bug for aws_mq_broker that simplified version RabbitMQ 3.1…

73fcefe

…3 and ActiveMQ 5.18 change to their corresponding patch version

fix: fixed bug for aws_mq_broker that simplified version RabbitMQ 3.1…

635d825

…3 and ActiveMQ 5.18 change to their corresponding patch version

fix: fixed bug for aws_mq_broker that simplified version RabbitMQ 3.1…

3e775e7

…3 and ActiveMQ 5.18 change to their corresponding patch version

architec requested a review from a team as a code owner August 23, 2024 21:47

github-actions bot added tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/mq Issues and PRs that pertain to the mq service. needs-triage Waiting for first response or review from a maintainer. labels Aug 23, 2024

mprince reviewed Aug 25, 2024

View reviewed changes

justinretzolk added bug Addresses a defect in current functionality. and removed needs-triage Waiting for first response or review from a maintainer. labels Aug 26, 2024

architec requested a review from mprince August 26, 2024 23:08

jar-b self-assigned this Sep 11, 2024

github-actions bot added the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Sep 11, 2024

jar-b added 6 commits September 11, 2024 10:32

Merge branch 'main' into b-mq-simplified-version-auto-minor-version-u…

4038f6c

…pgrade

chore: make testacc-lint-fix

8331fda

r/aws_mq_broker: fix import lints

9501238

r/aws_mq_broker(test): tidy normalized engine version tests

73df9e2

r/aws_mq_broker(test): fix test config name

16b4fb5

jar-b added 6 commits September 12, 2024 10:09

r/aws_mq_broker(test): parallel unit test lint

391e82f

r/aws_mq_broker: compare engine versions with greater or equal

567daf6

chore: changelog

ca45ed9

r/aws_mq_broker: tidy normalizeEngineVersion

01ab5f8

Merge branch 'main' into b-mq-simplified-version-auto-minor-version-u…

d9c4feb

…pgrade

chore: make clean-tidy

b189df9

jar-b approved these changes Sep 12, 2024

View reviewed changes

chore: make fix-constants

cda3a9f

jar-b merged commit 07e6480 into hashicorp:main Sep 13, 2024
39 checks passed

github-actions bot added this to the v5.68.0 milestone Sep 13, 2024

jar-b mentioned this pull request Sep 13, 2024

[TechDebt]: r/aws_mq_broker: RabbitMQ tests failing running with Terraform 1.8.0+ #39317

Open

github-actions bot removed the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Sep 20, 2024

github-actions bot locked as resolved and limited conversation to collaborators Oct 22, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: RabbitMQ 3.13 and ActiveMQ 5.18 Version Mismatch #39024

fix: RabbitMQ 3.13 and ActiveMQ 5.18 Version Mismatch #39024

architec commented Aug 23, 2024 •

edited by jar-b

Loading

github-actions bot commented Aug 23, 2024

mprince Aug 25, 2024

architec Aug 26, 2024

jar-b commented Sep 11, 2024

github-actions bot commented Sep 12, 2024

jar-b commented Sep 12, 2024

jar-b left a comment

jar-b commented Sep 12, 2024

github-actions bot commented Sep 20, 2024

github-actions bot commented Oct 22, 2024

fix: RabbitMQ 3.13 and ActiveMQ 5.18 Version Mismatch #39024

fix: RabbitMQ 3.13 and ActiveMQ 5.18 Version Mismatch #39024

Conversation

architec commented Aug 23, 2024 • edited by jar-b Loading

Description

Relations

References

Output from Acceptance Testing

github-actions bot commented Aug 23, 2024

Community Note

mprince Aug 25, 2024

Choose a reason for hiding this comment

architec Aug 26, 2024

Choose a reason for hiding this comment

jar-b commented Sep 11, 2024

github-actions bot commented Sep 12, 2024

jar-b commented Sep 12, 2024

jar-b left a comment

Choose a reason for hiding this comment

jar-b commented Sep 12, 2024

github-actions bot commented Sep 20, 2024

github-actions bot commented Oct 22, 2024

architec commented Aug 23, 2024 •

edited by jar-b

Loading