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

resource/aws_ses_configuration_set: Add delivery options to allow a TlsPolicy of Require to be specified #11600

Merged

Conversation

marcjay
Copy link
Contributor

@marcjay marcjay commented Jan 15, 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 #11197

Release note for CHANGELOG:

resource/aws_ses_configuration_set: Add `tls_policy` attribute to support requiring TLS as a `delivery_option`

Output from acceptance testing:

$ make testacc TEST=./aws TESTARGS='-run=TestAccAWSSESConfigurationSet'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSSESConfigurationSet -timeout 120m
=== RUN   TestAccAWSSESConfigurationSet_basic
=== PAUSE TestAccAWSSESConfigurationSet_basic
=== RUN   TestAccAWSSESConfigurationSet_deliveryOptions
=== PAUSE TestAccAWSSESConfigurationSet_deliveryOptions
=== RUN   TestAccAWSSESConfigurationSet_deliveryOptionsUpdate
=== PAUSE TestAccAWSSESConfigurationSet_deliveryOptionsUpdate
=== CONT  TestAccAWSSESConfigurationSet_basic
=== CONT  TestAccAWSSESConfigurationSet_deliveryOptionsUpdate
=== CONT  TestAccAWSSESConfigurationSet_deliveryOptions
--- PASS: TestAccAWSSESConfigurationSet_deliveryOptions (19.28s)
--- PASS: TestAccAWSSESConfigurationSet_basic (19.53s)
--- PASS: TestAccAWSSESConfigurationSet_deliveryOptionsUpdate (32.71s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	32.772s

@ghost ghost added size/L Managed by automation to categorize the size of a PR. needs-triage Waiting for first response or review from a maintainer. service/ses Issues and PRs that pertain to the ses service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. documentation Introduces or discusses updates to documentation. labels Jan 15, 2020
@marcjay marcjay changed the title Add delivery options to aws_ses_configuration_set resource to allow a TlsPolicy to be specified resource/aws_ses_configuration_set: Add delivery options to allow a TlsPolicy of Require to be specified Jan 15, 2020
@marcjay marcjay marked this pull request as ready for review January 15, 2020 03:03
@marcjay marcjay requested a review from a team January 15, 2020 03:03
@marcjay
Copy link
Contributor Author

marcjay commented Jan 15, 2020

This is based on the potential syntax on #11197 - if there is a preference for a different syntax, I'm happy to update this PR

@marcjay
Copy link
Contributor Author

marcjay commented Mar 20, 2020

Many thanks @richmidwinter for the approval. What's the next step for getting this merged? Cheers

@marcjay
Copy link
Contributor Author

marcjay commented Apr 7, 2020

Any chance of an update on this please? Appreciate that some PRs are more important than others but this is fairly small all things considered. Would really appreciate this being merged. Many thanks

@bmoylan
Copy link

bmoylan commented May 27, 2020

We would love to see this get in as well. @bflad are you the right reviewer here? Thanks in advance!

@marcjay
Copy link
Contributor Author

marcjay commented Jun 25, 2020

Re-ran the acceptance tests after resolving the merge conflicts:

$ make testacc TEST=./aws TESTARGS='-run=TestAccAWSSESConfigurationSet'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSSESConfigurationSet -timeout 120m
=== RUN   TestAccAWSSESConfigurationSet_basic
=== PAUSE TestAccAWSSESConfigurationSet_basic
=== RUN   TestAccAWSSESConfigurationSet_deliveryOptions
=== PAUSE TestAccAWSSESConfigurationSet_deliveryOptions
=== RUN   TestAccAWSSESConfigurationSet_deliveryOptionsUpdate
=== PAUSE TestAccAWSSESConfigurationSet_deliveryOptionsUpdate
=== CONT  TestAccAWSSESConfigurationSet_basic
=== CONT  TestAccAWSSESConfigurationSet_deliveryOptionsUpdate
=== CONT  TestAccAWSSESConfigurationSet_deliveryOptions
--- PASS: TestAccAWSSESConfigurationSet_deliveryOptions (16.81s)
--- PASS: TestAccAWSSESConfigurationSet_basic (16.92s)
--- PASS: TestAccAWSSESConfigurationSet_deliveryOptionsUpdate (27.18s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	28.632s

@nyetsche
Copy link

nyetsche commented Jul 7, 2020

@richmidwinter are you able to review and merge? We're very interested in seeing this reach mainline. Thanks.

@marcjay
Copy link
Contributor Author

marcjay commented Jul 23, 2020

Re-ran the acceptance tests after merging master and adopting TestCheckTypeSetElemNestedAttrs:

$ make testacc TESTARGS='-run=TestAccAWSSESConfigurationSet'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSSESConfigurationSet -timeout 120m
=== RUN   TestAccAWSSESConfigurationSet_basic
=== PAUSE TestAccAWSSESConfigurationSet_basic
=== RUN   TestAccAWSSESConfigurationSet_deliveryOptions
=== PAUSE TestAccAWSSESConfigurationSet_deliveryOptions
=== RUN   TestAccAWSSESConfigurationSet_deliveryOptionsUpdate
=== PAUSE TestAccAWSSESConfigurationSet_deliveryOptionsUpdate
=== CONT  TestAccAWSSESConfigurationSet_basic
=== CONT  TestAccAWSSESConfigurationSet_deliveryOptionsUpdate
=== CONT  TestAccAWSSESConfigurationSet_deliveryOptions
--- PASS: TestAccAWSSESConfigurationSet_basic (9.93s)
--- PASS: TestAccAWSSESConfigurationSet_deliveryOptions (9.98s)
--- PASS: TestAccAWSSESConfigurationSet_deliveryOptionsUpdate (15.92s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	17.482s

@marcjay marcjay force-pushed the ses-configuration-set-delivery-options branch from 2673158 to 994f6d2 Compare August 17, 2020 21:52
@marcjay
Copy link
Contributor Author

marcjay commented Sep 29, 2020

Hi @richmidwinter / @bflad - is there any chance this could be looked at/merged? It's not much fun dealing with merge conflicts when they pop up and it's been open for 9 months now. Many thanks

@voycey
Copy link

voycey commented Oct 27, 2020

Any update on this? We have a pretty heavy requirement for this configuration set to be enabled

Base automatically changed from master to main January 23, 2021 00:56
@breathingdust breathingdust requested a review from a team as a code owner January 23, 2021 00:56
@anGie44 anGie44 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 Feb 10, 2021
@anGie44
Copy link
Contributor

anGie44 commented Feb 11, 2021

Hi @marcjay 👋 Thank you for your work on this PR! In order to expedite the process and get this into our upcoming release, I'm going to rebase and likely make some minor adjustments. Make sure that you have checked the box "Allow edits from maintainers." Also, please coordinate with us before making any commits to this branch. Again, thank you for your help and we look forward to this popular addition to the AWS provider!

@anGie44 anGie44 force-pushed the ses-configuration-set-delivery-options branch from 40659b0 to 994f6d2 Compare February 11, 2021 08:24
Update r/aws_ses_configuration_set documentation for delivery_options/tls_policy
References hashicorp#11197
@anGie44 anGie44 force-pushed the ses-configuration-set-delivery-options branch 2 times, most recently from 941b238 to 063c6ce Compare February 11, 2021 09:56
@anGie44 anGie44 added this to the v3.28.0 milestone Feb 11, 2021
Copy link
Contributor

@anGie44 anGie44 left a comment

Choose a reason for hiding this comment

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

Output of acceptance tests (commercial):

--- PASS: TestAccAWSSESConfigurationSet_basic (14.28s)
--- PASS: TestAccAWSSESConfigurationSet_emptyDeliveryOptions (14.66s)
--- PASS: TestAccAWSSESConfigurationSet_deliveryOptions (15.44s)
--- PASS: TestAccAWSSESConfigurationSet_update_emptyDeliveryOptions (31.54s)
--- PASS: TestAccAWSSESConfigurationSet_update_deliveryOptions (39.64s)

@anGie44 anGie44 force-pushed the ses-configuration-set-delivery-options branch from 063c6ce to b906144 Compare February 11, 2021 14:51
Copy link
Contributor

@anGie44 anGie44 left a comment

Choose a reason for hiding this comment

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

Thanks again @marcjay! 🚀

@anGie44 anGie44 merged commit 00b3db8 into hashicorp:main Feb 11, 2021
anGie44 added a commit that referenced this pull request Feb 11, 2021
@marcjay marcjay deleted the ses-configuration-set-delivery-options branch February 12, 2021 00:00
@marcjay
Copy link
Contributor Author

marcjay commented Feb 12, 2021

Thanks again @marcjay! 🚀

@anGie44 thanks for getting it merged! Great to have it in at last

@ghost
Copy link

ghost commented Feb 12, 2021

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

@ghost
Copy link

ghost commented Mar 13, 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 Mar 13, 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/ses Issues and PRs that pertain to the ses service. size/L 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.

Feature request: SES configuration set delivery options
7 participants