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.

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

r/aws_mq_broker: enable cross-region data replication #35990

Merged
merged 1 commit into from
Feb 29, 2024

Conversation

jar-b
Copy link
Member

@jar-b jar-b commented Feb 27, 2024

Description

This change adds the data_replication_mode and data_replication_primary_broker_arn arguments, enabling support for cross-region data replication. See the AWS MQ documentation for configuration details.

Relations

Closes #32566

References

Output from Acceptance Testing

% make testacc PKG=mq TESTS=TestAccMQBroker_dataReplicationMode
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/mq/... -v -count 1 -parallel 20 -run='TestAccMQBroker_dataReplicationMode'  -timeout 360m

--- PASS: TestAccMQBroker_dataReplicationMode (511.53s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/mq 518.736s
% make testacc PKG=mq TESTS=TestAccMQBroker_
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/mq/... -v -count 1 -parallel 20 -run='TestAccMQBroker_'  -timeout 360m

--- PASS: TestAccMQBroker_RabbitMQ_basic (526.84s)
--- PASS: TestAccMQBroker_RabbitMQ_validationAuditLog (662.77s)
--- PASS: TestAccMQBroker_RabbitMQ_logs (681.95s)
--- PASS: TestAccMQBroker_RabbitMQ_config (754.07s)
--- PASS: TestAccMQBroker_RabbitMQ_cluster (796.26s)
--- PASS: TestAccMQBroker_throughputOptimized (833.05s)
--- PASS: TestAccMQBroker_tags (860.41s)
--- PASS: TestAccMQBroker_ldap (862.65s)
--- PASS: TestAccMQBroker_EncryptionOptions_managedKeyEnabled (864.26s)
--- PASS: TestAccMQBroker_basic (866.91s)
--- PASS: TestAccMQBroker_EncryptionOptions_kmsKeyID (877.54s)
--- PASS: TestAccMQBroker_disappears (885.05s)
--- PASS: TestAccMQBroker_EncryptionOptions_managedKeyDisabled (894.47s)
--- PASS: TestAccMQBroker_Update_securityGroup (1063.63s)
--- PASS: TestAccMQBroker_Update_engineVersion (1070.81s)
--- PASS: TestAccMQBroker_Update_users (1370.02s)
--- PASS: TestAccMQBroker_Update_hostInstanceType (1377.49s)
--- PASS: TestAccMQBroker_AllFields_defaultVPC (1483.88s)
--- PASS: TestAccMQBroker_AllFields_customVPC (1606.21s)
--- PASS: TestAccMQBroker_dataReplicationMode (3081.61s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/mq 3089.017s

Copy link

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.

@github-actions github-actions bot added size/XL Managed by automation to categorize the size of a PR. documentation Introduces or discusses updates to documentation. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/mq Issues and PRs that pertain to the mq service. labels Feb 27, 2024
@terraform-aws-provider terraform-aws-provider bot added the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Feb 27, 2024
@jar-b jar-b force-pushed the f-mq_broker-replication branch 3 times, most recently from be9e370 to 3e888f9 Compare February 28, 2024 18:54
This change adds the `data_replication_mode` and `data_replication_primary_broker_arn` arguments, enabling support for cross-region data replication. See the AWS MQ documentation for configuration details.

https://docs.aws.amazon.com/amazon-mq/latest/developer-guide/crdr-for-active-mq.html

```console
% make testacc PKG=mq TESTS=TestAccMQBroker_dataReplicationMode
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/mq/... -v -count 1 -parallel 20 -run='TestAccMQBroker_dataReplicationMode'  -timeout 360m

--- PASS: TestAccMQBroker_dataReplicationMode (511.53s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/mq 518.736s
```
@jar-b jar-b marked this pull request as ready for review February 28, 2024 19:29
@ewbankkit ewbankkit self-assigned this Feb 29, 2024
Copy link
Contributor

@ewbankkit ewbankkit left a comment

Choose a reason for hiding this comment

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

LGTM 🚀.

% ACCTEST_TIMEOUT=720m make testacc TESTARGS='-run=TestAccMQBroker_' PKG=mq ACCTEST_PARALLELISM=3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/mq/... -v -count 1 -parallel 3  -run=TestAccMQBroker_ -timeout 720m
=== RUN   TestAccMQBroker_basic
=== PAUSE TestAccMQBroker_basic
=== RUN   TestAccMQBroker_disappears
=== PAUSE TestAccMQBroker_disappears
=== RUN   TestAccMQBroker_tags
=== PAUSE TestAccMQBroker_tags
=== RUN   TestAccMQBroker_throughputOptimized
=== PAUSE TestAccMQBroker_throughputOptimized
=== RUN   TestAccMQBroker_AllFields_defaultVPC
=== PAUSE TestAccMQBroker_AllFields_defaultVPC
=== RUN   TestAccMQBroker_AllFields_customVPC
=== PAUSE TestAccMQBroker_AllFields_customVPC
=== RUN   TestAccMQBroker_EncryptionOptions_kmsKeyID
=== PAUSE TestAccMQBroker_EncryptionOptions_kmsKeyID
=== RUN   TestAccMQBroker_EncryptionOptions_managedKeyDisabled
=== PAUSE TestAccMQBroker_EncryptionOptions_managedKeyDisabled
=== RUN   TestAccMQBroker_EncryptionOptions_managedKeyEnabled
=== PAUSE TestAccMQBroker_EncryptionOptions_managedKeyEnabled
=== RUN   TestAccMQBroker_Update_users
=== PAUSE TestAccMQBroker_Update_users
=== RUN   TestAccMQBroker_Update_securityGroup
=== PAUSE TestAccMQBroker_Update_securityGroup
=== RUN   TestAccMQBroker_Update_engineVersion
=== PAUSE TestAccMQBroker_Update_engineVersion
=== RUN   TestAccMQBroker_Update_hostInstanceType
=== PAUSE TestAccMQBroker_Update_hostInstanceType
=== RUN   TestAccMQBroker_RabbitMQ_basic
=== PAUSE TestAccMQBroker_RabbitMQ_basic
=== RUN   TestAccMQBroker_RabbitMQ_config
=== PAUSE TestAccMQBroker_RabbitMQ_config
=== RUN   TestAccMQBroker_RabbitMQ_logs
=== PAUSE TestAccMQBroker_RabbitMQ_logs
=== RUN   TestAccMQBroker_RabbitMQ_validationAuditLog
=== PAUSE TestAccMQBroker_RabbitMQ_validationAuditLog
=== RUN   TestAccMQBroker_RabbitMQ_cluster
=== PAUSE TestAccMQBroker_RabbitMQ_cluster
=== RUN   TestAccMQBroker_ldap
=== PAUSE TestAccMQBroker_ldap
=== RUN   TestAccMQBroker_dataReplicationMode
=== PAUSE TestAccMQBroker_dataReplicationMode
=== CONT  TestAccMQBroker_basic
=== CONT  TestAccMQBroker_Update_securityGroup
=== CONT  TestAccMQBroker_EncryptionOptions_managedKeyEnabled
--- PASS: TestAccMQBroker_EncryptionOptions_managedKeyEnabled (850.17s)
=== CONT  TestAccMQBroker_AllFields_customVPC
--- PASS: TestAccMQBroker_basic (867.56s)
=== CONT  TestAccMQBroker_EncryptionOptions_managedKeyDisabled
--- PASS: TestAccMQBroker_Update_securityGroup (1124.50s)
=== CONT  TestAccMQBroker_EncryptionOptions_kmsKeyID
--- PASS: TestAccMQBroker_EncryptionOptions_managedKeyDisabled (855.07s)
=== CONT  TestAccMQBroker_RabbitMQ_logs
--- PASS: TestAccMQBroker_EncryptionOptions_kmsKeyID (877.40s)
=== CONT  TestAccMQBroker_dataReplicationMode
--- PASS: TestAccMQBroker_RabbitMQ_logs (681.52s)
=== CONT  TestAccMQBroker_ldap
--- PASS: TestAccMQBroker_AllFields_customVPC (1598.69s)
=== CONT  TestAccMQBroker_RabbitMQ_cluster
--- PASS: TestAccMQBroker_ldap (853.30s)
=== CONT  TestAccMQBroker_RabbitMQ_validationAuditLog
--- PASS: TestAccMQBroker_RabbitMQ_cluster (875.12s)
=== CONT  TestAccMQBroker_Update_users
--- PASS: TestAccMQBroker_RabbitMQ_validationAuditLog (560.48s)
=== CONT  TestAccMQBroker_throughputOptimized
--- PASS: TestAccMQBroker_dataReplicationMode (2016.61s)
=== CONT  TestAccMQBroker_AllFields_defaultVPC
--- PASS: TestAccMQBroker_Update_users (1295.59s)
=== CONT  TestAccMQBroker_RabbitMQ_basic
--- PASS: TestAccMQBroker_throughputOptimized (872.63s)
=== CONT  TestAccMQBroker_RabbitMQ_config
--- PASS: TestAccMQBroker_RabbitMQ_basic (589.47s)
=== CONT  TestAccMQBroker_Update_hostInstanceType
--- PASS: TestAccMQBroker_RabbitMQ_config (522.26s)
=== CONT  TestAccMQBroker_tags
--- PASS: TestAccMQBroker_AllFields_defaultVPC (1462.93s)
=== CONT  TestAccMQBroker_disappears
--- PASS: TestAccMQBroker_tags (878.76s)
=== CONT  TestAccMQBroker_Update_engineVersion
--- PASS: TestAccMQBroker_disappears (864.20s)
--- PASS: TestAccMQBroker_Update_hostInstanceType (1331.13s)
--- PASS: TestAccMQBroker_Update_engineVersion (1061.05s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/mq	7159.558s

@jar-b jar-b merged commit ef6ffcc into main Feb 29, 2024
62 checks passed
@jar-b jar-b deleted the f-mq_broker-replication branch February 29, 2024 20:22
@github-actions github-actions bot added this to the v5.39.0 milestone Feb 29, 2024
github-actions bot pushed a commit that referenced this pull request Feb 29, 2024
Copy link

github-actions bot commented Mar 1, 2024

This functionality has been released in v5.39.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 github-actions bot removed the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Mar 1, 2024
Copy link

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.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 31, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
documentation Introduces or discusses updates to documentation. service/mq Issues and PRs that pertain to the mq 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
Development

Successfully merging this pull request may close these issues.

[Enhancement]: aws_mq_broker allow creation of cross-region replicated brokers
2 participants