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

aws_ami: Support setting the imds_support attribute at creation time #27084

Merged
merged 3 commits into from
Oct 4, 2022

Conversation

christophetd
Copy link
Contributor

@christophetd christophetd commented Oct 4, 2022

Description

This pull request adds support for setting the imds_support attribute when creating aws_ami resources. It also adds support for this attribute in the aws_ami data source.

Note: Setting this attribute is currently only supported in the AWS API at registration time (i.e. ec2:RegisterImage). It is not available in ec2:ModifyImageAttributes.

Relations

closes #27083

References

https://aws.amazon.com/about-aws/whats-new/2022/10/amazon-machine-images-support-instance-metadata-service-version-2-default/

Output from Acceptance Testing

$ make testacc TESTS=TestAccEC2AMI_imdsSupport PKG=ec2

==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 20 -run='TestAccEC2AMI_imdsSupport'  -timeout 180m
=== RUN   TestAccEC2AMI_imdsSupport
=== PAUSE TestAccEC2AMI_imdsSupport
=== CONT  TestAccEC2AMI_imdsSupport
--- PASS: TestAccEC2AMI_imdsSupport (76.29s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	79.165s

Note: Due to #27049, I had to use Terraform v1.2.9 to run acceptance tests (did not work with v1.3.1)

@github-actions
Copy link

github-actions bot commented Oct 4, 2022

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 documentation Introduces or discusses updates to documentation. service/ec2 Issues and PRs that pertain to the ec2 service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. needs-triage Waiting for first response or review from a maintainer. size/M Managed by automation to categorize the size of a PR. labels Oct 4, 2022
@github-actions
Copy link

github-actions bot commented Oct 4, 2022

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.

@christophetd christophetd force-pushed the ami-imds-support branch 2 times, most recently from 425bca3 to 9de0537 Compare October 4, 2022 10:15
@christophetd
Copy link
Contributor Author

Now rebased on #27080 that handles bumping the go-aws-sdk version.

@github-actions github-actions bot added the service/wafv2 Issues and PRs that pertain to the wafv2 service. label Oct 4, 2022
@christophetd
Copy link
Contributor Author

Cherry-picked 1a40797 from #27088 to fix the broken link and have the CI job pass.

@christophetd
Copy link
Contributor Author

One CI check is failing due to #27089 but the rest looks good to me, I'll switch the PR to 'ready for review'.

@christophetd christophetd marked this pull request as ready for review October 4, 2022 13:11
@christophetd
Copy link
Contributor Author

Now rebased on latest main

@github-actions github-actions bot removed the service/wafv2 Issues and PRs that pertain to the wafv2 service. label Oct 4, 2022
@ewbankkit ewbankkit 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 Oct 4, 2022
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 🚀.

% make testacc TESTARGS='-run=TestAccEC2AMIDataSource_natInstance\|TestAccEC2AMI_imdsSupport\|TestAccEC2AMI_basic' PKG=ec2 ACCTEST_PARALLELISM=3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 3  -run=TestAccEC2AMIDataSource_natInstance\|TestAccEC2AMI_imdsSupport\|TestAccEC2AMI_basic -timeout 180m
=== RUN   TestAccEC2AMIDataSource_natInstance
=== PAUSE TestAccEC2AMIDataSource_natInstance
=== RUN   TestAccEC2AMI_basic
=== PAUSE TestAccEC2AMI_basic
=== RUN   TestAccEC2AMI_imdsSupport
=== PAUSE TestAccEC2AMI_imdsSupport
=== CONT  TestAccEC2AMIDataSource_natInstance
=== CONT  TestAccEC2AMI_imdsSupport
=== CONT  TestAccEC2AMI_basic
--- PASS: TestAccEC2AMIDataSource_natInstance (34.96s)
--- PASS: TestAccEC2AMI_imdsSupport (75.04s)
--- PASS: TestAccEC2AMI_basic (75.60s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	82.310s

@ewbankkit
Copy link
Contributor

@christophetd Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit 4e61ef8 into hashicorp:main Oct 4, 2022
@github-actions github-actions bot added this to the v4.34.0 milestone Oct 4, 2022
@christophetd christophetd deleted the ami-imds-support branch October 5, 2022 08:47
@christophetd
Copy link
Contributor Author

Appreciate the quick turnaround! When's the next release planned for?

@ewbankkit
Copy link
Contributor

@christophetd: https://hashicorp.github.io/terraform-provider-aws/faq/#how-often-do-you-release.

@github-actions
Copy link

github-actions bot commented Oct 6, 2022

This functionality has been released in v4.34.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
Copy link

github-actions bot commented Nov 7, 2022

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 Nov 7, 2022
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/ec2 Issues and PRs that pertain to the ec2 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.

[Enhancement]: Support enabling IMDSv2 by default for AMIs
2 participants