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

Amazon MQ throughput-optimized message brokers #11459

Merged
merged 8 commits into from
Mar 9, 2021
Merged

Amazon MQ throughput-optimized message brokers #11459

merged 8 commits into from
Mar 9, 2021

Conversation

gdepuille
Copy link
Contributor

@gdepuille gdepuille commented Jan 2, 2020

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

Closes #11325

Release note for CHANGELOG:

ENHANCEMENTS:

* resource/aws_mq_broker: Add possibility to create an AmazonMQ broker with EBS (throughput optimized)

Output from acceptance testing:

$ make testacc TEST=./aws TESTARGS='-run=TestAccAWSMqBroker'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSMqBroker -timeout 120m
=== RUN   TestAccAWSMqBroker_basic
=== PAUSE TestAccAWSMqBroker_basic
=== RUN   TestAccAWSMqBroker_throughputOptimized
=== PAUSE TestAccAWSMqBroker_throughputOptimized
=== RUN   TestAccAWSMqBroker_allFieldsDefaultVpc
=== PAUSE TestAccAWSMqBroker_allFieldsDefaultVpc
=== RUN   TestAccAWSMqBroker_allFieldsCustomVpc
=== PAUSE TestAccAWSMqBroker_allFieldsCustomVpc
=== RUN   TestAccAWSMqBroker_EncryptionOptions_KmsKeyId
=== PAUSE TestAccAWSMqBroker_EncryptionOptions_KmsKeyId
=== RUN   TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Disabled
=== PAUSE TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Disabled
=== RUN   TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Enabled
=== PAUSE TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Enabled
=== RUN   TestAccAWSMqBroker_updateUsers
=== PAUSE TestAccAWSMqBroker_updateUsers
=== RUN   TestAccAWSMqBroker_updateTags
=== PAUSE TestAccAWSMqBroker_updateTags
=== RUN   TestAccAWSMqBroker_updateSecurityGroup
=== PAUSE TestAccAWSMqBroker_updateSecurityGroup
=== CONT  TestAccAWSMqBroker_basic
=== CONT  TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Enabled
=== CONT  TestAccAWSMqBroker_updateTags
=== CONT  TestAccAWSMqBroker_updateUsers
=== CONT  TestAccAWSMqBroker_updateSecurityGroup
=== CONT  TestAccAWSMqBroker_allFieldsCustomVpc
=== CONT  TestAccAWSMqBroker_allFieldsDefaultVpc
=== CONT  TestAccAWSMqBroker_EncryptionOptions_KmsKeyId
=== CONT  TestAccAWSMqBroker_throughputOptimized
=== CONT  TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Disabled
--- PASS: TestAccAWSMqBroker_throughputOptimized (795.27s)
--- PASS: TestAccAWSMqBroker_EncryptionOptions_KmsKeyId (1126.72s)
--- PASS: TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Disabled (1145.42s)
--- PASS: TestAccAWSMqBroker_updateTags (1186.27s)
--- PASS: TestAccAWSMqBroker_basic (1201.82s)
--- PASS: TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Enabled (1227.87s)
--- PASS: TestAccAWSMqBroker_updateUsers (1567.22s)
--- PASS: TestAccAWSMqBroker_updateSecurityGroup (1573.84s)
--- PASS: TestAccAWSMqBroker_allFieldsCustomVpc (1810.47s)
--- PASS: TestAccAWSMqBroker_allFieldsDefaultVpc (2039.51s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	2039.562s

@gdepuille gdepuille requested a review from a team January 2, 2020 18:02
@ghost ghost added needs-triage Waiting for first response or review from a maintainer. size/S Managed by automation to categorize the size of a PR. documentation Introduces or discusses updates to documentation. service/mq Issues and PRs that pertain to the mq service. size/M Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. and removed size/S Managed by automation to categorize the size of a PR. labels Jan 2, 2020
@gdepuille gdepuille changed the title WIP: Amazon MQ throughput-optimized message brokers Amazon MQ throughput-optimized message brokers Jan 2, 2020
@bflad bflad added enhancement Requests to existing resources that expand the functionality or scope. and removed needs-triage Waiting for first response or review from a maintainer. labels Jan 4, 2020
@gdepuille
Copy link
Contributor Author

Hi @bflad,
Can you communicate an ETA to validate this PR ?

@gdepuille
Copy link
Contributor Author

Hi,

I've rebased this development over the last release.

I've relaunched all acceptance tests and all are passed on the MQ features.

$ make testacc TEST=./aws TESTARGS='-run=TestAccAWSMq'

==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSMq -timeout 120m
=== RUN   TestAccAWSMqBroker_basic
=== PAUSE TestAccAWSMqBroker_basic
=== RUN   TestAccAWSMqBroker_throughputOptimized
=== PAUSE TestAccAWSMqBroker_throughputOptimized
=== RUN   TestAccAWSMqBroker_allFieldsDefaultVpc
=== PAUSE TestAccAWSMqBroker_allFieldsDefaultVpc
=== RUN   TestAccAWSMqBroker_allFieldsCustomVpc
=== PAUSE TestAccAWSMqBroker_allFieldsCustomVpc
=== RUN   TestAccAWSMqBroker_EncryptionOptions_KmsKeyId
=== PAUSE TestAccAWSMqBroker_EncryptionOptions_KmsKeyId
=== RUN   TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Disabled
=== PAUSE TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Disabled
=== RUN   TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Enabled
=== PAUSE TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Enabled
=== RUN   TestAccAWSMqBroker_updateUsers
=== PAUSE TestAccAWSMqBroker_updateUsers
=== RUN   TestAccAWSMqBroker_updateTags
=== PAUSE TestAccAWSMqBroker_updateTags
=== RUN   TestAccAWSMqBroker_updateSecurityGroup
=== PAUSE TestAccAWSMqBroker_updateSecurityGroup
=== RUN   TestAccAWSMqBroker_disappears
=== PAUSE TestAccAWSMqBroker_disappears
=== RUN   TestAccAWSMqConfiguration_basic
=== PAUSE TestAccAWSMqConfiguration_basic
=== RUN   TestAccAWSMqConfiguration_withData
=== PAUSE TestAccAWSMqConfiguration_withData
=== RUN   TestAccAWSMqConfiguration_updateTags
=== PAUSE TestAccAWSMqConfiguration_updateTags
=== CONT  TestAccAWSMqBroker_basic
=== CONT  TestAccAWSMqBroker_updateTags
=== CONT  TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Enabled
=== CONT  TestAccAWSMqBroker_updateUsers
=== CONT  TestAccAWSMqConfiguration_withData
=== CONT  TestAccAWSMqConfiguration_updateTags
=== CONT  TestAccAWSMqBroker_EncryptionOptions_KmsKeyId
=== CONT  TestAccAWSMqBroker_allFieldsDefaultVpc
=== CONT  TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Disabled
=== CONT  TestAccAWSMqBroker_disappears
=== CONT  TestAccAWSMqBroker_allFieldsCustomVpc
=== CONT  TestAccAWSMqConfiguration_basic
=== CONT  TestAccAWSMqBroker_throughputOptimized
=== CONT  TestAccAWSMqBroker_updateSecurityGroup
--- PASS: TestAccAWSMqConfiguration_withData (36.82s)
--- PASS: TestAccAWSMqConfiguration_basic (61.86s)
--- PASS: TestAccAWSMqConfiguration_updateTags (89.84s)
--- PASS: TestAccAWSMqBroker_throughputOptimized (852.44s)
--- PASS: TestAccAWSMqBroker_basic (1140.31s)
--- PASS: TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Enabled (1141.84s)
--- PASS: TestAccAWSMqBroker_EncryptionOptions_KmsKeyId (1161.45s)
--- PASS: TestAccAWSMqBroker_disappears (1170.60s)
--- PASS: TestAccAWSMqBroker_updateTags (1234.79s)
--- PASS: TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Disabled (1261.30s)
--- PASS: TestAccAWSMqBroker_updateSecurityGroup (1484.36s)
--- PASS: TestAccAWSMqBroker_updateUsers (1584.28s)
--- PASS: TestAccAWSMqBroker_allFieldsDefaultVpc (2005.72s)
--- PASS: TestAccAWSMqBroker_allFieldsCustomVpc (2012.93s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	2013.016s

@gdepuille
Copy link
Contributor Author

I've realized a rebase from 3.7.0

@matosf
Copy link

matosf commented Oct 28, 2020

Any ETA for this to be merged?

@ziek-za
Copy link

ziek-za commented Nov 12, 2020

@gdepuille are there any updates? Would love to be able to make use of this!

@gdepuille
Copy link
Contributor Author

@ziek-za I'm sorry that this PR is not included in the basic version. I use this in production since it's submitted. If you want to use it, it's possible to make a custom version of the provider with the commits you need. It's just you need some piece of time when new features are added in the core version.

@gdepuille gdepuille requested a review from a team as a code owner December 15, 2020 16:43
Base automatically changed from master to main January 23, 2021 00:56
@YakDriver
Copy link
Member

@gdepuille Thank you for this PR! We performed significant MQ reorganization in #16108. It looks like your PR may have some helpful tests beyond that. Please rebase when you have a chance.

@YakDriver YakDriver self-assigned this Mar 5, 2021
@YakDriver YakDriver added the waiting-response Maintainers are waiting on response from community or contributor. label Mar 5, 2021
@gdepuille
Copy link
Contributor Author

@YakDriver I've just been rebase this one. I've relaunch acceptance tests

PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	1772.201s
$> make testacc TEST=./aws TESTARGS='-run=TestAccAWSMq'==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSMq -timeout 120m
=== RUN   TestAccAWSMqBroker_basic
=== PAUSE TestAccAWSMqBroker_basic
=== RUN   TestAccAWSMqBroker_throughputOptimized
=== PAUSE TestAccAWSMqBroker_throughputOptimized
=== RUN   TestAccAWSMqBroker_allFieldsDefaultVpc
=== PAUSE TestAccAWSMqBroker_allFieldsDefaultVpc
=== RUN   TestAccAWSMqBroker_allFieldsCustomVpc
=== PAUSE TestAccAWSMqBroker_allFieldsCustomVpc
=== RUN   TestAccAWSMqBroker_EncryptionOptions_KmsKeyId
=== PAUSE TestAccAWSMqBroker_EncryptionOptions_KmsKeyId
=== RUN   TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Disabled
=== PAUSE TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Disabled
=== RUN   TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Enabled
=== PAUSE TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Enabled
=== RUN   TestAccAWSMqBroker_updateUsers
=== PAUSE TestAccAWSMqBroker_updateUsers
=== RUN   TestAccAWSMqBroker_updateTags
=== PAUSE TestAccAWSMqBroker_updateTags
=== RUN   TestAccAWSMqBroker_updateSecurityGroup
=== PAUSE TestAccAWSMqBroker_updateSecurityGroup
=== RUN   TestAccAWSMqBroker_disappears
=== PAUSE TestAccAWSMqBroker_disappears
=== RUN   TestAccAWSMqBroker_rabbitmq
=== PAUSE TestAccAWSMqBroker_rabbitmq
=== RUN   TestAccAWSMqConfiguration_basic
=== PAUSE TestAccAWSMqConfiguration_basic
=== RUN   TestAccAWSMqConfiguration_withData
=== PAUSE TestAccAWSMqConfiguration_withData
=== RUN   TestAccAWSMqConfiguration_updateTags
=== PAUSE TestAccAWSMqConfiguration_updateTags
=== CONT  TestAccAWSMqBroker_basic
=== CONT  TestAccAWSMqBroker_rabbitmq
=== CONT  TestAccAWSMqBroker_allFieldsDefaultVpc
=== CONT  TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Enabled
=== CONT  TestAccAWSMqBroker_updateSecurityGroup
=== CONT  TestAccAWSMqBroker_updateTags
=== CONT  TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Disabled
=== CONT  TestAccAWSMqBroker_EncryptionOptions_KmsKeyId
=== CONT  TestAccAWSMqConfiguration_updateTags
=== CONT  TestAccAWSMqConfiguration_withData
=== CONT  TestAccAWSMqConfiguration_basic
=== CONT  TestAccAWSMqBroker_updateUsers
=== CONT  TestAccAWSMqBroker_throughputOptimized
=== CONT  TestAccAWSMqBroker_disappears
=== CONT  TestAccAWSMqBroker_allFieldsCustomVpc
--- PASS: TestAccAWSMqConfiguration_withData (34.41s)
--- PASS: TestAccAWSMqConfiguration_basic (52.58s)
--- PASS: TestAccAWSMqConfiguration_updateTags (68.85s)
--- PASS: TestAccAWSMqBroker_rabbitmq (571.55s)
--- PASS: TestAccAWSMqBroker_throughputOptimized (861.68s)
--- PASS: TestAccAWSMqBroker_EncryptionOptions_KmsKeyId (1085.95s)
--- PASS: TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Disabled (1165.41s)
--- PASS: TestAccAWSMqBroker_disappears (1197.57s)
--- PASS: TestAccAWSMqBroker_basic (1214.57s)
--- PASS: TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Enabled (1223.27s)
--- PASS: TestAccAWSMqBroker_updateTags (1239.36s)
--- PASS: TestAccAWSMqBroker_updateSecurityGroup (1357.05s)
--- PASS: TestAccAWSMqBroker_updateUsers (1604.82s)
--- PASS: TestAccAWSMqBroker_allFieldsDefaultVpc (1710.93s)
--- PASS: TestAccAWSMqBroker_allFieldsCustomVpc (1772.14s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	1772.201s

@ghost ghost removed the waiting-response Maintainers are waiting on response from community or contributor. label Mar 6, 2021
Copy link
Member

@YakDriver YakDriver left a comment

Choose a reason for hiding this comment

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

Thanks for your changes! There are just a few minor fixes and we should be good to go!

website/docs/r/mq_broker.html.markdown Outdated Show resolved Hide resolved
website/docs/r/mq_broker.html.markdown Outdated Show resolved Hide resolved
website/docs/r/mq_broker.html.markdown Outdated Show resolved Hide resolved
aws/resource_aws_mq_broker_test.go Outdated Show resolved Hide resolved
@YakDriver YakDriver added the waiting-response Maintainers are waiting on response from community or contributor. label Mar 8, 2021
@gdepuille
Copy link
Contributor Author

@YakDriver I trust you for the documentation because it's not my native language ;-)

I've validated all your suggestion. I'm very happy this PR is near to be validated.

@ghost ghost removed waiting-response Maintainers are waiting on response from community or contributor. labels Mar 9, 2021
Copy link
Member

@YakDriver YakDriver left a comment

Choose a reason for hiding this comment

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

Looks good! Thanks!

Acceptance tests:

--- PASS: TestAccAWSMqBroker_rabbitmq (549.56s)
--- PASS: TestAccAWSMqBroker_throughputOptimized (791.92s)
--- PASS: TestAccAWSMqBroker_disappears (1138.54s)
--- PASS: TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Disabled (1182.12s)
--- PASS: TestAccAWSMqBroker_basic (1191.68s)
--- PASS: TestAccAWSMqBroker_updateTags (1199.67s)
--- PASS: TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Enabled (1225.50s)
--- PASS: TestAccAWSMqBroker_EncryptionOptions_KmsKeyId (1286.37s)
--- PASS: TestAccAWSMqBroker_updateSecurityGroup (1346.46s)
--- PASS: TestAccAWSMqBroker_updateUsers (1590.61s)
--- PASS: TestAccAWSMqBroker_allFieldsDefaultVpc (1696.42s)
--- PASS: TestAccAWSMqBroker_allFieldsCustomVpc (1748.95s)

@YakDriver YakDriver added this to the v3.32.0 milestone Mar 9, 2021
@YakDriver YakDriver merged commit 6877875 into hashicorp:main Mar 9, 2021
@ghost
Copy link

ghost commented Mar 12, 2021

This has been released in version 3.32.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!

@gdepuille gdepuille deleted the f-add-mq-throuphput-optimized branch April 9, 2021 15:35
@ghost
Copy link

ghost commented Apr 9, 2021

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 Apr 9, 2021
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. enhancement Requests to existing resources that expand the functionality or scope. service/mq Issues and PRs that pertain to the mq service. size/M 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.

Amazon MQ throughput-optimized message brokers
5 participants