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_ami added tpm_support argument to aws_ami resource #25045

Merged
merged 9 commits into from
May 25, 2022
Merged

r/aws_ami added tpm_support argument to aws_ami resource #25045

merged 9 commits into from
May 25, 2022

Conversation

nialdaly
Copy link
Contributor

@nialdaly nialdaly commented May 25, 2022

Summary

This PR includes changes to the aws_ami resource, to include the tpm_support argument. The following AWS SDK resources were used to inform the logic and descriptions for the argument attributes:

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 #24860

Output from acceptance testing:

$ make testacc TESTS=TestAccEC2AMI_tpmSupport PKG=ec2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 20 -run='TestAccEC2AMI_tpmSupport'  -timeout 180m
=== RUN   TestAccEC2AMI_tpmSupport
=== PAUSE TestAccEC2AMI_tpmSupport
=== CONT  TestAccEC2AMI_tpmSupport
--- PASS: TestAccEC2AMI_tpmSupport (71.31s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/ec2        72.935s

@nialdaly nialdaly marked this pull request as ready for review May 25, 2022 18:42
@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 May 25, 2022
@justinretzolk justinretzolk 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 May 25, 2022
@github-actions github-actions bot added size/L Managed by automation to categorize the size of a PR. and removed size/M Managed by automation to categorize the size of a PR. labels May 25, 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=TestAccEC2AMI' PKG=ec2 ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 2  -run=TestAccEC2AMI -timeout 180m
=== RUN   TestAccEC2AMICopy_basic
=== PAUSE TestAccEC2AMICopy_basic
=== RUN   TestAccEC2AMICopy_description
=== PAUSE TestAccEC2AMICopy_description
=== RUN   TestAccEC2AMICopy_enaSupport
=== PAUSE TestAccEC2AMICopy_enaSupport
=== RUN   TestAccEC2AMICopy_destinationOutpost
=== PAUSE TestAccEC2AMICopy_destinationOutpost
=== RUN   TestAccEC2AMICopy_tags
=== PAUSE TestAccEC2AMICopy_tags
=== RUN   TestAccEC2AMIDataSource_natInstance
=== PAUSE TestAccEC2AMIDataSource_natInstance
=== RUN   TestAccEC2AMIDataSource_windowsInstance
=== PAUSE TestAccEC2AMIDataSource_windowsInstance
=== RUN   TestAccEC2AMIDataSource_instanceStore
=== PAUSE TestAccEC2AMIDataSource_instanceStore
=== RUN   TestAccEC2AMIDataSource_localNameFilter
=== PAUSE TestAccEC2AMIDataSource_localNameFilter
=== RUN   TestAccEC2AMIDataSource_gp3BlockDevice
=== PAUSE TestAccEC2AMIDataSource_gp3BlockDevice
=== RUN   TestAccEC2AMIFromInstance_basic
=== PAUSE TestAccEC2AMIFromInstance_basic
=== RUN   TestAccEC2AMIFromInstance_tags
=== PAUSE TestAccEC2AMIFromInstance_tags
=== RUN   TestAccEC2AMIFromInstance_disappears
=== PAUSE TestAccEC2AMIFromInstance_disappears
=== RUN   TestAccEC2AMIIDsDataSource_basic
=== PAUSE TestAccEC2AMIIDsDataSource_basic
=== RUN   TestAccEC2AMIIDsDataSource_sorted
=== PAUSE TestAccEC2AMIIDsDataSource_sorted
=== RUN   TestAccEC2AMILaunchPermission_basic
=== PAUSE TestAccEC2AMILaunchPermission_basic
=== RUN   TestAccEC2AMILaunchPermission_disappears
=== PAUSE TestAccEC2AMILaunchPermission_disappears
=== RUN   TestAccEC2AMILaunchPermission_Disappears_ami
=== PAUSE TestAccEC2AMILaunchPermission_Disappears_ami
=== RUN   TestAccEC2AMILaunchPermission_group
=== PAUSE TestAccEC2AMILaunchPermission_group
=== RUN   TestAccEC2AMILaunchPermission_organizationARN
=== PAUSE TestAccEC2AMILaunchPermission_organizationARN
=== RUN   TestAccEC2AMILaunchPermission_organizationalUnitARN
=== PAUSE TestAccEC2AMILaunchPermission_organizationalUnitARN
=== RUN   TestAccEC2AMI_basic
=== PAUSE TestAccEC2AMI_basic
=== RUN   TestAccEC2AMI_deprecateAt
=== PAUSE TestAccEC2AMI_deprecateAt
=== RUN   TestAccEC2AMI_description
=== PAUSE TestAccEC2AMI_description
=== RUN   TestAccEC2AMI_disappears
=== PAUSE TestAccEC2AMI_disappears
=== RUN   TestAccEC2AMI_ephemeralBlockDevices
=== PAUSE TestAccEC2AMI_ephemeralBlockDevices
=== RUN   TestAccEC2AMI_gp3BlockDevice
=== PAUSE TestAccEC2AMI_gp3BlockDevice
=== RUN   TestAccEC2AMI_tags
=== PAUSE TestAccEC2AMI_tags
=== RUN   TestAccEC2AMI_outpost
=== PAUSE TestAccEC2AMI_outpost
=== RUN   TestAccEC2AMI_boot
=== PAUSE TestAccEC2AMI_boot
=== RUN   TestAccEC2AMI_tpmSupport
=== PAUSE TestAccEC2AMI_tpmSupport
=== CONT  TestAccEC2AMICopy_basic
=== CONT  TestAccEC2AMILaunchPermission_disappears
--- PASS: TestAccEC2AMILaunchPermission_disappears (360.32s)
=== CONT  TestAccEC2AMI_tpmSupport
--- PASS: TestAccEC2AMICopy_basic (382.97s)
=== CONT  TestAccEC2AMI_boot
--- PASS: TestAccEC2AMI_tpmSupport (65.89s)
=== CONT  TestAccEC2AMI_outpost
    acctest.go:1308: skipping since no Outposts found
--- SKIP: TestAccEC2AMI_outpost (1.52s)
=== CONT  TestAccEC2AMI_tags
--- PASS: TestAccEC2AMI_boot (67.54s)
=== CONT  TestAccEC2AMI_gp3BlockDevice
--- PASS: TestAccEC2AMI_gp3BlockDevice (66.95s)
=== CONT  TestAccEC2AMI_ephemeralBlockDevices
--- PASS: TestAccEC2AMI_tags (94.91s)
=== CONT  TestAccEC2AMI_disappears
--- PASS: TestAccEC2AMI_ephemeralBlockDevices (66.04s)
=== CONT  TestAccEC2AMI_description
--- PASS: TestAccEC2AMI_disappears (63.57s)
=== CONT  TestAccEC2AMI_deprecateAt
--- PASS: TestAccEC2AMI_deprecateAt (79.77s)
=== CONT  TestAccEC2AMI_basic
--- PASS: TestAccEC2AMI_description (82.71s)
=== CONT  TestAccEC2AMILaunchPermission_organizationalUnitARN
    acctest.go:697: skipping tests; this AWS account must not be an existing member of an AWS Organization
--- SKIP: TestAccEC2AMILaunchPermission_organizationalUnitARN (0.17s)
=== CONT  TestAccEC2AMILaunchPermission_organizationARN
--- PASS: TestAccEC2AMI_basic (67.86s)
=== CONT  TestAccEC2AMILaunchPermission_group
--- PASS: TestAccEC2AMILaunchPermission_organizationARN (371.25s)
=== CONT  TestAccEC2AMILaunchPermission_Disappears_ami
--- PASS: TestAccEC2AMILaunchPermission_group (364.44s)
=== CONT  TestAccEC2AMIFromInstance_disappears
--- PASS: TestAccEC2AMILaunchPermission_Disappears_ami (360.01s)
=== CONT  TestAccEC2AMILaunchPermission_basic
--- PASS: TestAccEC2AMIFromInstance_disappears (334.58s)
=== CONT  TestAccEC2AMIIDsDataSource_sorted
--- PASS: TestAccEC2AMIIDsDataSource_sorted (97.24s)
=== CONT  TestAccEC2AMIIDsDataSource_basic
--- PASS: TestAccEC2AMIIDsDataSource_basic (17.68s)
=== CONT  TestAccEC2AMIFromInstance_basic
--- PASS: TestAccEC2AMILaunchPermission_basic (370.95s)
=== CONT  TestAccEC2AMIFromInstance_tags
--- PASS: TestAccEC2AMIFromInstance_basic (319.53s)
=== CONT  TestAccEC2AMICopy_tags
--- PASS: TestAccEC2AMIFromInstance_tags (369.39s)
=== CONT  TestAccEC2AMIDataSource_instanceStore
--- PASS: TestAccEC2AMIDataSource_instanceStore (38.00s)
=== CONT  TestAccEC2AMIDataSource_windowsInstance
--- PASS: TestAccEC2AMIDataSource_windowsInstance (38.79s)
=== CONT  TestAccEC2AMIDataSource_natInstance
--- PASS: TestAccEC2AMIDataSource_natInstance (38.77s)
=== CONT  TestAccEC2AMICopy_enaSupport
--- PASS: TestAccEC2AMICopy_tags (409.80s)
=== CONT  TestAccEC2AMICopy_destinationOutpost
    acctest.go:1308: skipping since no Outposts found
--- SKIP: TestAccEC2AMICopy_destinationOutpost (0.55s)
=== CONT  TestAccEC2AMIDataSource_gp3BlockDevice
--- PASS: TestAccEC2AMIDataSource_gp3BlockDevice (64.71s)
=== CONT  TestAccEC2AMICopy_description
--- PASS: TestAccEC2AMICopy_enaSupport (383.01s)
=== CONT  TestAccEC2AMIDataSource_localNameFilter
--- PASS: TestAccEC2AMIDataSource_localNameFilter (40.53s)
--- PASS: TestAccEC2AMICopy_description (397.34s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	2743.916s

@ewbankkit
Copy link
Contributor

@nialdaly Thanks for the contribution 🎉 👏.

@ewbankkit
Copy link
Contributor

% make providerlint && make golangci-lint
==> Checking source code with providerlint...
==> Checking source code with golangci-lint...

@ewbankkit ewbankkit merged commit f15c1b8 into hashicorp:main May 25, 2022
@github-actions github-actions bot added this to the v4.16.0 milestone May 25, 2022
@nialdaly
Copy link
Contributor Author

Thanks! @ewbankkit

@nialdaly nialdaly deleted the f-aws_ami-add-tpm-support branch May 25, 2022 22:10
@github-actions
Copy link

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

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 Jun 29, 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/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.

aws_ami support for TPM2.0
3 participants