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

add support for aws shield subscription resource fixes hashicorp#21430 #37637

Merged
merged 14 commits into from
Jul 24, 2024

Conversation

iwarapter
Copy link
Contributor

Description

Add resource for Shield Subscription:

Relations

Closes #21430

Output from Acceptance Testing

% make testacc TESTS=TestAccShieldSubscription_basic PKG=shield
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.2 test ./internal/service/shield/... -v -count 1 -parallel 20 -run='TestAccShieldSubscription_basic'  -timeout 360m
=== RUN   TestAccShieldSubscription_basic
=== PAUSE TestAccShieldSubscription_basic
=== CONT  TestAccShieldSubscription_basic
    subscription_test.go:34: Error running post-test destroy, there may be dangling resources: exit status 1
        
        Error: deleting AWS Shield Subscription ("hidden"): operation error Shield: DeleteSubscription, https response error StatusCode: 400, RequestID: 13177d54-c466-46f8-9446-346d6abeeb7c, LockedSubscriptionException: The subscription could not be deactivated before time commitment expires.
        
        operation error Shield: DeleteSubscription, https response error StatusCode:
        400, RequestID: 13177d54-c466-46f8-9446-346d6abeeb7c,
        LockedSubscriptionException: The subscription could not be deactivated before
        time commitment expires.
--- FAIL: TestAccShieldSubscription_basic (14.72s)
FAIL
FAIL    github.com/hashicorp/terraform-provider-aws/internal/service/shield     18.885s
FAIL
make: *** [testacc] Error 1
...

I ran out of accounts to subscribe in my organisation to finish the tests but added the destroy = false to both create/import steps.

All the accounts I tested with are correctly subscribed.

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/shield Issues and PRs that pertain to the shield service. generators Relates to code generators. labels May 22, 2024
@terraform-aws-provider terraform-aws-provider bot added the needs-triage Waiting for first response or review from a maintainer. label May 22, 2024
@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 24, 2024
@barryib
Copy link

barryib commented Jun 24, 2024

@iwarapter are you still working on this great improvement ?

@iwarapter
Copy link
Contributor Author

Oh I didn't notice the linter failed, will take a look

@jar-b jar-b self-assigned this Jul 23, 2024
@jar-b jar-b requested a review from a team as a code owner July 23, 2024 20:28
Copy link
Member

@jar-b jar-b 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 PKG=shield TESTS=TestAccShieldSubscription_basic
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.5 test ./internal/service/shield/... -v -count 1 -parallel 20 -run='TestAccShieldSubscription_basic'  -timeout 360m
=== RUN   TestAccShieldSubscription_basic
    subscription_test.go:32: running this test requires a yearly commitment to AWS Shield Advanced with a $3000 monthly fee in the associated account
--- SKIP: TestAccShieldSubscription_basic (0.00s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/shield     5.888s

@jar-b
Copy link
Member

jar-b commented Jul 24, 2024

Thanks for your contribution, @iwarapter! 👍

@jar-b jar-b merged commit fe0ab1d into hashicorp:main Jul 24, 2024
41 checks passed
@github-actions github-actions bot added this to the v5.60.0 milestone Jul 24, 2024
Copy link

This functionality has been released in v5.60.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!

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 Aug 26, 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. enhancement Requests to existing resources that expand the functionality or scope. generators Relates to code generators. service/shield Issues and PRs that pertain to the shield 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.

Support for AWS Shield Advance Subscriptions
4 participants