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.

Sign up for GitHub

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

Jump to bottom

ec2: Remove remaining empty validation #22948

Merged
merged 7 commits into from
Feb 4, 2022
Merged

ec2: Remove remaining empty validation #22948

merged 7 commits into from
Feb 4, 2022

Conversation

YakDriver
Copy link
Member

@YakDriver YakDriver commented Feb 4, 2022 •
edited
Loading

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

Output from acceptance testing:

% make testacc TESTS='TestAccEC2VPC_|TestAccEC2VPCDataSource_' PKG=ec2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 20 -run=TestAccEC2VPCDataSource_  -timeout 180m
--- PASS: TestAccEC2VPCDataSource_basic (39.49s)
--- PASS: TestAccEC2VPCDataSource_CIDRBlockAssociations_multiple (53.49s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	54.810s
% make testacc TESTS='TestAccVPC_|TestAccVPCDataSource_' PKG=ec2 
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 20 -run='TestAccVPC_|TestAccVPCDataSource_'  -timeout 180m
--- SKIP: TestAccVPC_IpamIpv4BasicExplicitCidr (1.56s)
--- SKIP: TestAccVPC_IpamIpv4BasicNetmask (1.56s)
--- PASS: TestAccVPC_DefaultTagsProviderAndResource_duplicateTag (5.14s)
--- PASS: TestAccVPC_disappears (17.80s)
--- PASS: TestAccVPC_assignGeneratedIPv6CIDRBlockWithNetworkBorderGroup (89.71s)
--- PASS: TestAccVPC_basic (45.77s)
--- PASS: TestAccVPC_classicLinkDNSSupportOptionSet (48.60s)
--- PASS: TestAccVPC_classicLinkOptionSet (48.80s)
--- PASS: TestAccVPC_disabledDNSSupport (63.37s)
--- PASS: TestAccVPC_bothDNSOptionsSet (63.63s)
--- PASS: TestAccVPC_DefaultTags_updateToProviderOnly (62.20s)
--- PASS: TestAccVPC_DynamicResourceTagsMergedWithLocals_ignoreChanges (67.52s)
--- PASS: TestAccVPC_DefaultTags_updateToResourceOnly (69.11s)
--- PASS: TestAccVPC_DynamicResourceTags_ignoreChanges (70.33s)
--- PASS: TestAccVPC_DefaultTagsProviderAndResource_nonOverlappingTag (76.37s)
--- PASS: TestAccVPC_updateDNSHostnames (76.57s)
--- PASS: TestAccVPC_DefaultTagsProviderAndResource_overlappingTag (78.07s)
--- PASS: TestAccVPC_DefaultTags_providerOnly (79.25s)
--- PASS: TestAccVPC_ignoreTags (83.37s)
--- PASS: TestAccVPC_defaultAndIgnoreTags (83.38s)
--- PASS: TestAccVPC_tags (95.51s)
--- PASS: TestAccVPC_tenancy (100.31s)
--- PASS: TestAccVPC_assignGeneratedIPv6CIDRBlock (131.23s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	132.855s
% make testacc TESTS=TestAccEC2DefaultVPCAndSubnet_serial PKG=ec2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 20 -run='TestAccEC2DefaultVPCAndSubnet_serial'  -timeout 180m
--- PASS: TestAccEC2DefaultVPCAndSubnet_serial (1.37s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	2.894s
% make testacc TESTS='TestAccEC2Instance_|TestAccEC2InstanceDataSource_' PKG=ec2 
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 20 -run='TestAccEC2Instance_|TestAccEC2InstanceDataSource_'  -timeout 180m
--- PASS: TestAccEC2Instance_NewNetworkInterface_emptyPrivateIPAndSecondaryPrivateIPs (81.19s)
--- PASS: TestAccEC2Instance_NewNetworkInterface_emptyPrivateIPAndSecondaryPrivateIPsUpdate (154.49s)
--- PASS: TestAccEC2Instance_NewNetworkInterface_privateIPAndSecondaryPrivateIPs (107.95s)
--- PASS: TestAccEC2InstanceDataSource_basic (113.25s)
--- PASS: TestAccEC2Instance_LaunchTemplate_overrideTemplate (116.06s)
--- PASS: TestAccEC2Instance_LaunchTemplateModifyTemplate_defaultVersion (118.36s)
--- PASS: TestAccEC2Instance_primaryNetworkInterfaceSourceDestCheck (118.18s)
--- PASS: TestAccEC2Instance_LaunchTemplate_basic (127.18s)
--- PASS: TestAccEC2Instance_AssociatePublic_overridePublic (127.18s)
--- PASS: TestAccEC2Instance_LaunchTemplate_setSpecificVersion (127.96s)
--- PASS: TestAccEC2Instance_Empty_privateIP (119.57s)
--- PASS: TestAccEC2Instance_AssociatePublic_defaultPrivate (135.96s)
--- PASS: TestAccEC2Instance_AssociatePublic_explicitPrivate (137.71s)
--- PASS: TestAccEC2Instance_AssociatePublic_overridePrivate (139.36s)
--- PASS: TestAccEC2Instance_primaryNetworkInterface (135.89s)
--- PASS: TestAccEC2Instance_AssociatePublic_explicitPublic (146.97s)
--- PASS: TestAccEC2Instance_AssociatePublic_defaultPublic (158.14s)
--- PASS: TestAccEC2Instance_NewNetworkInterface_publicIPAndSecondaryPrivateIPs (207.99s)
--- PASS: TestAccEC2Instance_NewNetworkInterface_privateIPAndSecondaryPrivateIPsUpdate (208.00s)
--- PASS: TestAccEC2Instance_LaunchTemplate_updateTemplateVersion (211.34s)
--- PASS: TestAccEC2Instance_forceNewAndTagsDrift (224.39s)
--- PASS: TestAccEC2Instance_associatePublicIPAndPrivateIP (108.79s)
--- PASS: TestAccEC2Instance_privateIP (120.78s)
--- PASS: TestAccEC2Instance_EBSBlockDevice_RootBlockDevice_removed (159.35s)
--- PASS: TestAccEC2Instance_EBSRootDevice_modifyDeleteOnTermination (148.69s)
--- PASS: TestAccEC2Instance_withIAMInstanceProfilePath (122.53s)
--- PASS: TestAccEC2Instance_EBSRootDeviceMultipleBlockDevices_modifySize (157.11s)
--- PASS: TestAccEC2Instance_EBSRootDevice_modifyAll (157.36s)
--- PASS: TestAccEC2Instance_EBSRootDeviceMultipleBlockDevices_modifyDeleteOnTermination (167.94s)
--- PASS: TestAccEC2Instance_EBSRootDeviceModifyThroughput_gp3 (166.84s)
--- PASS: TestAccEC2Instance_EBSRootDeviceModifyIOPS_io2 (168.28s)
--- PASS: TestAccEC2Instance_EBSRootDeviceModifyIOPS_io1 (169.54s)
--- PASS: TestAccEC2Instance_EBSRootDevice_multipleDynamicEBSBlockDevices (203.31s)
--- PASS: TestAccEC2Instance_ipv6AddressCountAndSingleAddressCausesError (29.23s)
--- PASS: TestAccEC2Instance_withIAMInstanceProfile (117.69s)
--- PASS: TestAccEC2Instance_keyPairCheck (211.99s)
--- PASS: TestAccEC2Instance_rootBlockDeviceMismatch (229.39s)
--- SKIP: TestAccEC2Instance_outpost (0.64s)
--- PASS: TestAccEC2Instance_tags (121.96s)
--- PASS: TestAccEC2Instance_BlockDeviceTags_ebsAndRoot (185.08s)
--- PASS: TestAccEC2Instance_networkInstanceVPCSecurityGroupIDs (127.21s)
--- PASS: TestAccEC2Instance_addSecondaryInterface (401.01s)
--- PASS: TestAccEC2Instance_addSecurityGroupNetworkInterface (404.70s)
--- PASS: TestAccEC2Instance_networkInstanceSecurityGroups (128.71s)
--- PASS: TestAccEC2Instance_gp2WithIopsValue (10.88s)
--- PASS: TestAccEC2Instance_noAMIEphemeralDevices (102.49s)
--- PASS: TestAccEC2Instance_EBSBlockDevice_invalidThroughputForVolumeType (9.72s)
--- PASS: TestAccEC2Instance_placementPartitionNumber (108.63s)
--- PASS: TestAccEC2Instance_EBSBlockDevice_invalidIopsForVolumeType (9.94s)
--- PASS: TestAccEC2Instance_rootInstanceStore (107.43s)
--- PASS: TestAccEC2Instance_IPv6_supportAddressCount (142.82s)
--- PASS: TestAccEC2Instance_IPv6_supportAddressCountWithIPv4 (150.31s)
--- PASS: TestAccEC2Instance_placementGroup (107.71s)
--- SKIP: TestAccEC2Instance_inEC2Classic (0.44s)
--- PASS: TestAccEC2Instance_BlockDeviceTags_withAttachedVolume (215.73s)
--- PASS: TestAccEC2Instance_networkInstanceRemovingAllSecurityGroups (170.78s)
--- PASS: TestAccEC2Instance_instanceProfileChange (251.43s)
--- PASS: TestAccEC2Instance_EBSRootDevice_modifyType (160.14s)
--- PASS: TestAccEC2Instance_dedicatedInstance (118.98s)
--- PASS: TestAccEC2Instance_EBSRootDevice_modifySize (168.73s)
--- PASS: TestAccEC2Instance_EBSBlockDevice_kmsKeyARN (84.38s)
--- PASS: TestAccEC2Instance_blockDevices (112.37s)
--- PASS: TestAccEC2Instance_basic (78.88s)
--- PASS: TestAccEC2Instance_changeInstanceType (208.06s)
--- PASS: TestAccEC2Instance_EBSRootDevice_basic (96.40s)
--- PASS: TestAccEC2Instance_gp2IopsDevice (112.42s)
--- PASS: TestAccEC2Instance_disableAPITermination (144.37s)
--- PASS: TestAccEC2Instance_BlockDeviceTags_volumeTags (286.76s)
--- PASS: TestAccEC2InstanceDataSource_privateIP (111.71s)
--- PASS: TestAccEC2Instance_inDefaultVPCBySgName (104.07s)
--- PASS: TestAccEC2Instance_inDefaultVPCBySgID (115.89s)
--- PASS: TestAccEC2Instance_RootBlockDevice_kmsKeyARN (123.09s)
--- PASS: TestAccEC2InstanceDataSource_blockDeviceTags (105.33s)
--- PASS: TestAccEC2Instance_sourceDestCheck (191.03s)
--- PASS: TestAccEC2InstanceDataSource_vpcSecurityGroups (125.84s)
--- PASS: TestAccEC2InstanceDataSource_GetPasswordData_trueToFalse (203.65s)
--- PASS: TestAccEC2Instance_userDataBase64 (191.36s)
--- PASS: TestAccEC2Instance_atLeastOneOtherEBSVolume (182.49s)
--- PASS: TestAccEC2Instance_CreditSpecificationT3_updateCPUCredits (169.14s)
--- PASS: TestAccEC2InstanceDataSource_securityGroups (124.32s)
--- PASS: TestAccEC2Instance_gp3RootBlockDevice (164.50s)
--- PASS: TestAccEC2InstanceDataSource_placementGroup (120.95s)
--- PASS: TestAccEC2InstanceDataSource_vpc (124.36s)
--- PASS: TestAccEC2InstanceDataSource_secondaryPrivateIPs (123.77s)
--- PASS: TestAccEC2InstanceDataSource_enclaveOptions (101.78s)
--- PASS: TestAccEC2Instance_CapacityReservationPreference_none (121.97s)
--- PASS: TestAccEC2Instance_CapacityReservation_targetID (124.75s)
--- PASS: TestAccEC2Instance_CapacityReservationPreference_open (120.21s)
--- PASS: TestAccEC2InstanceDataSource_metadataOptions (124.14s)
--- PASS: TestAccEC2Instance_CapacityReservation_modifyTarget (186.96s)
--- PASS: TestAccEC2Instance_CreditSpecification_unlimitedCPUCredits (138.31s)
--- PASS: TestAccEC2Instance_CapacityReservation_modifyPreference (172.43s)
--- PASS: TestAccEC2Instance_CapacityReservation_unspecifiedDefaultsToOpen (131.45s)
--- PASS: TestAccEC2Instance_CreditSpecificationT3_unlimitedCPUCredits (155.47s)
--- PASS: TestAccEC2Instance_CreditSpecification_isNotAppliedToNonBurstable (108.22s)
--- PASS: TestAccEC2InstanceDataSource_creditSpecification (113.85s)
--- PASS: TestAccEC2Instance_CreditSpecificationT3_standardCPUCredits (130.12s)
--- PASS: TestAccEC2Instance_CreditSpecificationT3_unspecifiedDefaultsToUnlimited (130.28s)
--- PASS: TestAccEC2Instance_CreditSpecificationUnknownCPUCredits_t3 (109.72s)
--- PASS: TestAccEC2InstanceDataSource_keyPair (117.87s)
--- PASS: TestAccEC2InstanceDataSource_ipv6Addresses (136.34s)
--- PASS: TestAccEC2InstanceDataSource_blockDevices (85.24s)
--- PASS: TestAccEC2Instance_metadataOptions (159.38s)
--- PASS: TestAccEC2Instance_CreditSpecificationUnknownCPUCredits_t2 (141.71s)
--- PASS: TestAccEC2Instance_CreditSpecification_updateCPUCredits (188.37s)
--- PASS: TestAccEC2InstanceDataSource_gp2IopsDevice (106.61s)
--- PASS: TestAccEC2Instance_enclaveOptions (205.85s)
--- PASS: TestAccEC2InstanceDataSource_gp3ThroughputDevice (107.90s)
--- PASS: TestAccEC2Instance_UserData_unspecifiedToEmptyString (154.69s)
--- PASS: TestAccEC2InstanceDataSource_GetUserData_noUserData (220.32s)
--- PASS: TestAccEC2InstanceDataSource_rootInstanceStore (114.50s)
--- PASS: TestAccEC2InstanceDataSource_RootBlockDevice_kmsKeyID (107.39s)
--- PASS: TestAccEC2InstanceDataSource_getUserData (197.39s)
--- PASS: TestAccEC2Instance_UserData_emptyStringToUnspecified (132.46s)
--- PASS: TestAccEC2InstanceDataSource_GetPasswordData_falseToTrue (198.94s)
--- PASS: TestAccEC2Instance_CreditSpecificationUnspecifiedToEmpty_nonBurstable (143.43s)
--- PASS: TestAccEC2Instance_CreditSpecificationUnlimitedCPUCredits_t2Tot3Taint (184.16s)
--- PASS: TestAccEC2Instance_hibernation (219.39s)
--- PASS: TestAccEC2InstanceDataSource_EBSBlockDevice_kmsKeyID (139.19s)
--- PASS: TestAccEC2Instance_CreditSpecificationEmpty_nonBurstable (140.86s)
--- PASS: TestAccEC2InstanceDataSource_tags (128.49s)
--- PASS: TestAccEC2Instance_GetPasswordData_falseToTrue (159.61s)
--- PASS: TestAccEC2Instance_CreditSpecification_unspecifiedDefaultsToStandard (134.78s)
--- PASS: TestAccEC2Instance_CreditSpecificationStandardCPUCredits_t2Tot3Taint (232.38s)
--- PASS: TestAccEC2Instance_LaunchTemplate_swapIDAndName (127.08s)
--- PASS: TestAccEC2InstanceDataSource_azUserData (130.69s)
--- PASS: TestAccEC2Instance_CreditSpecification_standardCPUCredits (175.50s)
--- PASS: TestAccEC2Instance_disappears (318.85s)
--- PASS: TestAccEC2Instance_GetPasswordData_trueToFalse (202.91s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	1045.837s

@github-actions github-actions bot added service/ec2 Issues and PRs that pertain to the ec2 service. size/XS Managed by automation to categorize the size of a PR. labels Feb 4, 2022
@anGie44 anGie44 self-assigned this Feb 4, 2022
@YakDriver YakDriver marked this pull request as draft February 4, 2022 16:17
@YakDriver YakDriver added this to the v4.0.0 milestone Feb 4, 2022
@github-actions github-actions bot added documentation Introduces or discusses updates to documentation. size/XL Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. and removed size/XS Managed by automation to categorize the size of a PR. labels Feb 4, 2022
@YakDriver YakDriver marked this pull request as ready for review February 4, 2022 17:02
anGie44
anGie44 approved these changes Feb 4, 2022
View reviewed changes
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 👍

Output of VPC tests:

--- SKIP: TestAccVPC_IpamIpv4BasicNetmask (1.54s)
--- SKIP: TestAccVPC_IpamIpv4BasicExplicitCidr (1.55s)
--- PASS: TestAccVPC_DefaultTagsProviderAndResource_duplicateTag (5.08s)
--- PASS: TestAccVPC_disappears (847.23s)
--- PASS: TestAccVPC_DefaultTags_updateToResourceOnly (955.87s)
--- PASS: TestAccVPC_basic (955.96s)
--- PASS: TestAccVPC_disabledDNSSupport (956.12s)
--- PASS: TestAccVPC_classicLinkDNSSupportOptionSet (956.39s)
--- PASS: TestAccVPC_classicLinkOptionSet (1008.74s)
--- PASS: TestAccVPC_DefaultTags_updateToProviderOnly (1016.72s)
--- PASS: TestAccVPC_bothDNSOptionsSet (1060.85s)
--- PASS: TestAccVPC_updateDNSHostnames (1116.17s)
--- PASS: TestAccVPC_DynamicResourceTagsMergedWithLocals_ignoreChanges (1135.54s)
--- PASS: TestAccVPC_DefaultTagsProviderAndResource_nonOverlappingTag (1168.67s)
--- PASS: TestAccVPC_DynamicResourceTags_ignoreChanges (1186.18s)
--- PASS: TestAccVPC_assignGeneratedIPv6CIDRBlockWithNetworkBorderGroup (1187.93s)
--- PASS: TestAccVPC_DefaultTags_providerOnly (1196.53s)
--- PASS: TestAccVPC_ignoreTags (1198.07s)
--- PASS: TestAccVPC_DefaultTagsProviderAndResource_overlappingTag (1206.34s)
--- PASS: TestAccVPC_defaultAndIgnoreTags (1209.73s)
--- PASS: TestAccVPC_assignGeneratedIPv6CIDRBlock (1210.70s)
--- PASS: TestAccVPC_tenancy (1221.17s)
--- PASS: TestAccVPC_tags (1232.75s)

@YakDriver YakDriver merged commit 61c61be into main Feb 4, 2022
@YakDriver YakDriver deleted the td-empty-valid-ec2 branch February 4, 2022 19:28
github-actions bot pushed a commit that referenced this pull request Feb 4, 2022
Update CHANGELOG.md for #22948
9a5875f
@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!

@YakDriver YakDriver mentioned this pull request Feb 24, 2022
Closed
@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.
Reviewers

@anGie44 anGie44 anGie44 approved these changes

Assignees

@anGie44 anGie44

Labels
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
Milestone
v4.0.0
Development

Successfully merging this pull request may close these issues.
2 participants
@YakDriver @anGie44