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_ec2_client_vpn_network_association: Deprecate security_groups; r/aws_ec2_client_vpn_endpoint: Add security_group_ids and vpc_id #22911

Merged

Conversation

ewbankkit
Copy link
Contributor

@ewbankkit ewbankkit commented Feb 2, 2022

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 #19468.
Closes #21761.
Closes #16645.
Closes #18478.
Closes #19750.

Output from acceptance testing:

% make testacc TESTARGS='-run=TestAccEC2ClientVPNEndpoint_serial/Endpoint -short' PKG=ec2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 20  -run=TestAccEC2ClientVPNEndpoint_serial/Endpoint -short -timeout 180m
=== RUN   TestAccEC2ClientVPNEndpoint_serial
=== PAUSE TestAccEC2ClientVPNEndpoint_serial
=== CONT  TestAccEC2ClientVPNEndpoint_serial
=== RUN   TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_securityGroupsOnEndpoint
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_securityGroupsOnEndpoint
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Endpoint_disappears
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Endpoint_disappears
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Endpoint_withDNSServers
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Endpoint_withDNSServers
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Endpoint_msADAuth
    client_vpn_endpoint_test.go:219: skipping long-running test in short mode
2022/02/03 10:28:47 [WARN] Notifying semaphore without Wait
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Endpoint_federatedAuth
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Endpoint_federatedAuth
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Endpoint_federatedAuthWithSelfService
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Endpoint_federatedAuthWithSelfService
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Endpoint_withClientConnect
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Endpoint_withClientConnect
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Endpoint_withLogGroup
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Endpoint_withLogGroup
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Endpoint_basic
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Endpoint_basic
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Endpoint_msADAuthAndMutualAuth
    client_vpn_endpoint_test.go:255: skipping long-running test in short mode
2022/02/03 10:28:48 [WARN] Notifying semaphore without Wait
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Endpoint_vpcSecurityGroups
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Endpoint_vpcSecurityGroups
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Endpoint_basicDataSource
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Endpoint_basicDataSource
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Endpoint_withClientLoginBanner
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Endpoint_withClientLoginBanner
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Endpoint_tags
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Endpoint_tags
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Endpoint_simpleAttributesUpdate
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Endpoint_simpleAttributesUpdate
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Endpoint_selfServicePortal
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Endpoint_selfServicePortal
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Endpoint_vpcNoSecurityGroups
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Endpoint_vpcNoSecurityGroups
=== RUN   TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_disappearsEndpoint
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_disappearsEndpoint
=== CONT  TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_securityGroupsOnEndpoint
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Endpoint_vpcSecurityGroups
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Endpoint_withClientConnect
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Endpoint_selfServicePortal
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Endpoint_disappears
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Endpoint_simpleAttributesUpdate
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Endpoint_basic
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Endpoint_withLogGroup
=== CONT  TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_disappearsEndpoint
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Endpoint_vpcNoSecurityGroups
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Endpoint_federatedAuthWithSelfService
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Endpoint_tags
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Endpoint_withClientLoginBanner
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Endpoint_withDNSServers
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Endpoint_basicDataSource
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Endpoint_federatedAuth
--- PASS: TestAccEC2ClientVPNEndpoint_serial (3.76s)
    --- SKIP: TestAccEC2ClientVPNEndpoint_serial/Endpoint_msADAuth (0.00s)
    --- SKIP: TestAccEC2ClientVPNEndpoint_serial/Endpoint_msADAuthAndMutualAuth (0.00s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_disappears (29.57s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_selfServicePortal (42.68s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_simpleAttributesUpdate (45.62s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_basic (52.56s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_vpcSecurityGroups (64.85s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_vpcNoSecurityGroups (91.17s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_disappearsEndpoint (102.60s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_withLogGroup (120.59s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_withClientConnect (122.64s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_tags (122.82s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_basicDataSource (143.87s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_federatedAuthWithSelfService (147.90s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_withClientLoginBanner (149.79s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_withDNSServers (160.02s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_federatedAuth (166.80s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_securityGroupsOnEndpoint (856.80s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/ec2        863.959s
% make testacc TESTARGS='-run=TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation' PKG=ec2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 20  -run=TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation -timeout 180m
=== RUN   TestAccEC2ClientVPNEndpoint_serial
=== PAUSE TestAccEC2ClientVPNEndpoint_serial
=== CONT  TestAccEC2ClientVPNEndpoint_serial
=== RUN   TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_basic
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_basic
=== RUN   TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_multipleSubnets
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_multipleSubnets
=== RUN   TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_disappears
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_disappears
=== RUN   TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_securityGroups
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_securityGroups
=== RUN   TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_securityGroupsOnEndpoint
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_securityGroupsOnEndpoint
=== CONT  TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_basic
=== CONT  TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_securityGroups
=== CONT  TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_securityGroupsOnEndpoint
=== CONT  TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_multipleSubnets
=== CONT  TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_disappears
--- PASS: TestAccEC2ClientVPNEndpoint_serial (0.70s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_securityGroups (702.99s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_disappears (705.49s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_basic (720.11s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_securityGroupsOnEndpoint (769.07s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_multipleSubnets (789.25s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	793.268s

@ewbankkit ewbankkit added this to the v4.0.0 milestone Feb 2, 2022
@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. size/L Managed by automation to categorize the size of a PR. labels Feb 2, 2022
…curityGroups'."

This reverts commit 97950d89a58eb32b291c450b480e3b63ed70159f.
…ion."

This reverts commit 9c7fe9c92abb021694ed73873af57ebc3079e563.
This reverts commit baa1fcf682a94e761d07a60feb8d3a18c7d75204.
This reverts commit 5b005fb2f4ab6e9513282a94110bd9dae3343ed2.
…' argument of the 'aws_ec2_client_vpn_endpoint' resource to replace 'security_groups'.
@ewbankkit ewbankkit force-pushed the b-aws_ec2_client_vpn_network_association-security-group-mixup branch from 81326b3 to 8c8fa95 Compare February 3, 2022 13:04
@github-actions github-actions bot added size/XL Managed by automation to categorize the size of a PR. and removed size/L Managed by automation to categorize the size of a PR. labels Feb 3, 2022
@ewbankkit ewbankkit changed the title [WIP] r/aws_ec2_client_vpn_network_association: Deprecate security_groups; r/aws_ec2_client_vpn_endpoint: Add security_group_ids and vpc_id r/aws_ec2_client_vpn_network_association: Deprecate security_groups; r/aws_ec2_client_vpn_endpoint: Add security_group_ids and vpc_id Feb 3, 2022
Acceptance test output:

% make testacc TESTARGS='-run=TestAccEC2ClientVPNEndpoint_serial/Route' PKG=ec2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 20  -run=TestAccEC2ClientVPNEndpoint_serial/Route -timeout 180m
=== RUN   TestAccEC2ClientVPNEndpoint_serial
=== PAUSE TestAccEC2ClientVPNEndpoint_serial
=== CONT  TestAccEC2ClientVPNEndpoint_serial
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Route_basic
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Route_basic
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Route_description
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Route_description
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Route_disappears
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Route_disappears
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Route_basic
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Route_disappears
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Route_description
--- PASS: TestAccEC2ClientVPNEndpoint_serial (0.38s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Route_disappears (729.08s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Route_description (744.76s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Route_basic (795.42s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/ec2        799.404s
…oncurrentMutationLimitExceeded' is returned.
% make testacc TESTARGS='-run=TestAccEC2ClientVPNEndpoint_serial/Route' PKG=ec2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 20  -run=TestAccEC2ClientVPNEndpoint_serial/Route -timeout 180m
=== RUN   TestAccEC2ClientVPNEndpoint_serial
=== PAUSE TestAccEC2ClientVPNEndpoint_serial
=== CONT  TestAccEC2ClientVPNEndpoint_serial
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Route_basic
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Route_basic
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Route_description
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Route_description
=== RUN   TestAccEC2ClientVPNEndpoint_serial/Route_disappears
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/Route_disappears
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Route_basic
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Route_disappears
=== CONT  TestAccEC2ClientVPNEndpoint_serial/Route_description
--- PASS: TestAccEC2ClientVPNEndpoint_serial (0.41s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Route_basic (945.84s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Route_disappears (1137.36s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Route_description (1223.14s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/ec2        1227.110s
…roup_id'.

Acceptance test output:

% make testacc TESTARGS='-run=TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule' PKG=ec2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 20  -run=TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule -timeout 180m
=== RUN   TestAccEC2ClientVPNEndpoint_serial
=== PAUSE TestAccEC2ClientVPNEndpoint_serial
=== CONT  TestAccEC2ClientVPNEndpoint_serial
=== RUN   TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_basic
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_basic
=== RUN   TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_groups
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_groups
=== RUN   TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_subnets
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_subnets
=== RUN   TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_disappears
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_disappears
=== RUN   TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_disappearsEndpoint
=== PAUSE TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_disappearsEndpoint
=== CONT  TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_basic
=== CONT  TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_disappears
=== CONT  TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_subnets
=== CONT  TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_disappearsEndpoint
=== CONT  TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_groups
--- PASS: TestAccEC2ClientVPNEndpoint_serial (1.94s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_disappearsEndpoint (61.28s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_disappears (65.88s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_basic (68.49s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_subnets (100.60s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_groups (133.82s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/ec2        140.874s
@anGie44 anGie44 self-assigned this Feb 4, 2022
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.

LGTM 👍 (tests are taking their time...)

Output of acceptances tests:

--- PASS: TestAccEC2ClientVPNEndpoint_serial (0.52s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_basic (737.10s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_disappears (789.94s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_securityGroups (846.76s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/NetworkAssociation_multipleSubnets (973.44s)

--- PASS: TestAccEC2ClientVPNEndpoint_serial (4.85s)
    --- SKIP: TestAccEC2ClientVPNEndpoint_serial/Endpoint_msADAuth (0.00s)
    --- SKIP: TestAccEC2ClientVPNEndpoint_serial/Endpoint_msADAuthAndMutualAuth (0.00s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_basicDataSource (23.75s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_simpleAttributesUpdate (42.84s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_selfServicePortal (43.74s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_withDNSServers (58.09s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_disappears (77.12s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_withClientLoginBanner (77.96s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_tags (96.45s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_basic (99.33s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/AuthorizationRule_disappearsEndpoint (99.90s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_federatedAuth (118.25s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_withClientConnect (120.32s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_federatedAuthWithSelfService (122.08s)
    --- PASS: TestAccEC2ClientVPNEndpoint_serial/Endpoint_withLogGroup (152.85s)

@github-actions github-actions bot added the client-connections Pertains to the AWS Client and service connections. label Feb 4, 2022
@ewbankkit ewbankkit merged commit 220676a into main Feb 4, 2022
@ewbankkit ewbankkit deleted the b-aws_ec2_client_vpn_network_association-security-group-mixup branch February 4, 2022 17:34
github-actions bot pushed a commit that referenced this pull request Feb 4, 2022
@github-actions
Copy link

This functionality has been released in v4.0.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 22, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
client-connections Pertains to the AWS Client and service connections. documentation Introduces or discusses updates to documentation. 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
2 participants