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

New resource/aws_vpc_ipam_organization_admin_account #22394

Merged
merged 7 commits into from
Jan 4, 2022

Conversation

drewmullen
Copy link
Collaborator

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

Relates OR Closes #22092

Output from acceptance testing:

$ make testacc TESTARGS='-run=TestAccVPCIpamOrganizationAdminAccount_basic' PKG_NAME='./internal/service/ec2'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ././internal/service/ec2/... -v -count 1 -parallel 20 -run=TestAccVPCIpamOrganizationAdminAccount_basic -timeout 180m
=== RUN   TestAccVPCIpamOrganizationAdminAccount_basic
--- PASS: TestAccVPCIpamOrganizationAdminAccount_basic (15.31s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/ec2        18.537s

Also included note in docs for aws_vpc_ipam_pool_cidr to explain if the resource is unable to be deleted, users should have some context as to why and how to resolve

@github-actions github-actions bot added documentation Introduces or discusses updates to documentation. provider Pertains to the provider itself, rather than any interaction with AWS. 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/XL Managed by automation to categorize the size of a PR. and removed needs-triage Waiting for first response or review from a maintainer. labels Jan 3, 2022
@drewmullen
Copy link
Collaborator Author

what am i missing here? passing CLI tests but failing in CI

$ make lint
==> Checking source code with golangci-lint...
==> Checking source code with providerlint...
==> Checking source code with importlint...

$ make fmt
==> Fixing source code with gofmt...
gofmt -s -w ./internal ./providerlint/helper ./providerlint/main.go ./providerlint/passes

$ git status
On branch f-ipam-organization-enable
nothing to commit, working tree clean

@drewmullen drewmullen force-pushed the f-ipam-organization-enable branch from 3535900 to 098edf1 Compare January 3, 2022 18:16
@ewbankkit
Copy link
Contributor

@drewmullen No, terrafmt is not currently included in make lint.
#22287 addresses this I think - Could you take a look? Thanks.

@drewmullen drewmullen force-pushed the f-ipam-organization-enable branch from 098edf1 to 2b920c5 Compare January 3, 2022 18:42
@drewmullen drewmullen force-pushed the f-ipam-organization-enable branch from 2b920c5 to 51d7270 Compare January 3, 2022 18:45
@drewmullen
Copy link
Collaborator Author

@ewbankkit thanks for that PR. reviewing that now

regarding semgrep theres a error reported that is unavoidable because ec2 has no Describe action for enabling the service in organizations. is there an ignore option?

    8│   	"github.com/aws/aws-sdk-go/service/ec2"
    9│   	"github.com/aws/aws-sdk-go/service/organizations"
     ╵
     = Resources should not implement multiple AWS service functionality

@ewbankkit
Copy link
Contributor

Adding // nosemgrep: aws-sdk-go-multiple-service-imports will fix the semgrep complaint.
See e.g. internal/service/elbv2/load_balancer.go.

@drewmullen drewmullen force-pushed the f-ipam-organization-enable branch from f538ccc to 674abb9 Compare January 4, 2022 02:30
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 TESTS=TestAccVPCIpamOrganizationAdminAccount_ PKG=ec2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 20 -run='TestAccVPCIpamOrganizationAdminAccount_' -timeout 180m
=== RUN   TestAccVPCIpamOrganizationAdminAccount_basic
--- PASS: TestAccVPCIpamOrganizationAdminAccount_basic (25.32s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	31.046s

@ewbankkit
Copy link
Contributor

@drewmullen Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit de596bb into hashicorp:main Jan 4, 2022
@github-actions github-actions bot added this to the v3.71.0 milestone Jan 4, 2022
@github-actions
Copy link

github-actions bot commented Jan 6, 2022

This functionality has been released in v3.71.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 May 31, 2022
@justinretzolk justinretzolk added the partner Contribution from a partner. label May 16, 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. partner Contribution from a partner. provider Pertains to the provider itself, rather than any interaction with AWS. service/ec2 Issues and PRs that pertain to the ec2 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.

resource/aws_vpc_ipam_organization_admin_account
3 participants