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

provider: Add SERVICECreateTags generator to keyvaluetags, refactor EC2 resources to use keyvaluetags.CreateEc2Tags #12735

Merged
merged 5 commits into from
Apr 9, 2020
Merged

provider: Add SERVICECreateTags generator to keyvaluetags, refactor EC2 resources to use keyvaluetags.CreateEc2Tags #12735

merged 5 commits into from
Apr 9, 2020

Conversation

bflad
Copy link
Contributor

@bflad bflad commented Apr 8, 2020 •
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

Closes #11060
Closes #12427
Reference: https://github.com/terraform-providers/terraform-provider-aws/blob/0c56c9bea1291e77f28ae99c79748251a2e23517/aws/tags.go#L198

Release note for CHANGELOG:

* service/ec2: Prevent eventual consistency errors tagging resources on creation

Some services require special handling for newly created resources, such as retrying on "not found" errors for eventual consistency. This generator starts with just the EC2 service implementation, but is extensible for any service.

We can also consider generating this for all services to simplify {SERVICE}UpdateTags(conn, id, nil, tags) usage, but that is not a current refactoring goal.

Specifically, the EC2 service has special considerations during resource creation to retry for eventual consistency within the API itself on "NotFound" errors. This switches Terraform resources that cannot tag-on-create due to the lack of EC2 API support to the keyvaluetags implementation that handles this eventual consistency automatically for 5 minutes (or max retries if API is throttling).

This retry logic was present prior to the service refactoring to keyvaluetags (although errantly retrying on "NotFound" errors on every update, which may never succeed) and was still present in the aws_vpc and aws_subnet resources manually in the logic after the refactoring.

This refactor also catches cases where the resource Create function was depending on the Update logic to handle tagging on creation logic. We discourage the usage of Update after Create for new resources, but this refactor only guards against running the tag update logic rather than bundling more complex resource refactoring into this changeset.

Now all EC2 resources are consolidated to similar tagging on creation logic.

Output from acceptance testing:

--- PASS: TestAccAWSAMI_basic (49.73s)
--- PASS: TestAccAWSAMI_disappears (44.64s)
--- PASS: TestAccAWSAMI_snapshotSize (49.35s)
--- PASS: TestAccAWSAMI_tags (61.05s)

--- PASS: TestAccAWSAMICopy_basic (369.03s)
--- PASS: TestAccAWSAMICopy_Description (417.92s)
--- PASS: TestAccAWSAMICopy_EnaSupport (385.89s)
--- PASS: TestAccAWSAMICopy_tags (442.51s)

--- PASS: TestAccAWSAMIFromInstance_basic (368.39s)
--- PASS: TestAccAWSAMIFromInstance_tags (437.31s)

--- PASS: TestAccAWSAMILaunchPermission_Basic (340.48s)
--- PASS: TestAccAWSAMILaunchPermission_Disappears_AMI (380.19s)
--- PASS: TestAccAWSAMILaunchPermission_Disappears_LaunchPermission (329.65s)
--- PASS: TestAccAWSAMILaunchPermission_Disappears_LaunchPermission_Public (340.61s)

--- PASS: TestAccAWSCustomerGateway_basic (43.22s)
--- PASS: TestAccAWSCustomerGateway_disappears (24.61s)
--- PASS: TestAccAWSCustomerGateway_similarAlreadyExists (24.89s)

--- PASS: TestAccAWSCustomerGatewayDataSource_Filter (23.10s)
--- PASS: TestAccAWSCustomerGatewayDataSource_ID (22.40s)

--- PASS: TestAccAWSDefaultSecurityGroup_basic (10.70s)
--- PASS: TestAccAWSDefaultSecurityGroup_classic (12.95s)

--- PASS: TestAccAWSDHCPOptions_basic (9.62s)
--- PASS: TestAccAWSDHCPOptions_deleteOptions (6.63s)
--- PASS: TestAccAWSDHCPOptions_tags (18.81s)

--- PASS: TestAccAWSDHCPOptionsAssociation_basic (11.55s)

--- PASS: TestAccAWSEc2TransitGatewayVpcAttachmentAccepter_basic (330.89s)
--- PASS: TestAccAWSEc2TransitGatewayVpcAttachmentAccepter_Tags (332.27s)
--- PASS: TestAccAWSEc2TransitGatewayVpcAttachmentAccepter_TransitGatewayDefaultRouteTableAssociationAndPropagation (519.29s)

--- PASS: TestAccAWSEgressOnlyInternetGateway_basic (9.95s)
--- PASS: TestAccAWSEgressOnlyInternetGateway_Tags (22.54s)

--- PASS: TestAccAWSEIP_associated_user_private_ip (165.36s)
--- PASS: TestAccAWSEIP_basic (8.34s)
--- PASS: TestAccAWSEIP_disappears (6.20s)
--- PASS: TestAccAWSEIP_instance (255.73s)
--- PASS: TestAccAWSEIP_Instance_Reassociate (66.72s)
--- PASS: TestAccAWSEIP_networkInterface (24.97s)
--- PASS: TestAccAWSEIP_PublicIpv4Pool_default (8.16s)
--- PASS: TestAccAWSEIP_tags (13.69s)
--- PASS: TestAccAWSEIP_twoEIPsOneNetworkInterface (24.24s)

--- PASS: TestAccAWSEIPAssociate_notAssociated (152.52s)
--- PASS: TestAccAWSEIPAssociation_basic (191.52s)
--- PASS: TestAccAWSEIPAssociation_disappears (125.86s)
--- PASS: TestAccAWSEIPAssociation_instance (231.94s)
--- PASS: TestAccAWSEIPAssociation_networkInterface (21.50s)
--- PASS: TestAccAWSEIPAssociation_spotInstance (247.67s)

--- PASS: TestAccAWSENI_attached (358.17s)
--- PASS: TestAccAWSENI_basic (35.23s)
--- PASS: TestAccAWSENI_computedIPs (23.92s)
--- PASS: TestAccAWSENI_disappears (39.77s)
--- PASS: TestAccAWSENI_ignoreExternalAttachment (216.18s)
--- PASS: TestAccAWSENI_PrivateIpsCount (98.37s)
--- PASS: TestAccAWSENI_sourceDestCheck (39.03s)
--- PASS: TestAccAWSENI_updatedDescription (63.35s)

--- PASS: TestAccAWSInternetGateway_basic (37.49s)
--- PASS: TestAccAWSInternetGateway_delete (25.61s)
--- PASS: TestAccAWSInternetGateway_tags (27.00s)

--- PASS: TestAccAWSKeyPair_basic (7.80s)
--- PASS: TestAccAWSKeyPair_disappears (6.27s)
--- PASS: TestAccAWSKeyPair_generatedName (8.00s)
--- PASS: TestAccAWSKeyPair_namePrefix (8.25s)
--- PASS: TestAccAWSKeyPair_tags (19.52s)

--- PASS: TestAccAWSNetworkAcl_basic (20.38s)
--- PASS: TestAccAWSNetworkAcl_CaseSensitivityNoChanges (58.78s)
--- PASS: TestAccAWSNetworkAcl_disappears (17.26s)
--- PASS: TestAccAWSNetworkAcl_Egress_ConfigMode (34.63s)
--- PASS: TestAccAWSNetworkAcl_EgressAndIngressRules (34.01s)
--- PASS: TestAccAWSNetworkAcl_espProtocol (67.91s)
--- PASS: TestAccAWSNetworkAcl_Ingress_ConfigMode (42.44s)
--- PASS: TestAccAWSNetworkAcl_ipv6ICMPRules (26.46s)
--- PASS: TestAccAWSNetworkAcl_ipv6Rules (44.60s)
--- PASS: TestAccAWSNetworkAcl_ipv6VpcRules (36.42s)
--- PASS: TestAccAWSNetworkAcl_OnlyEgressRules (23.85s)
--- PASS: TestAccAWSNetworkAcl_OnlyIngressRules_basic (27.41s)
--- PASS: TestAccAWSNetworkAcl_OnlyIngressRules_update (64.73s)
--- PASS: TestAccAWSNetworkAcl_SubnetChange (70.52s)
--- PASS: TestAccAWSNetworkAcl_Subnets (97.21s)
--- PASS: TestAccAWSNetworkAcl_SubnetsDelete (56.27s)

--- PASS: TestAccAWSNetworkAclRule_allProtocol (19.48s)
--- PASS: TestAccAWSNetworkAclRule_basic (9.90s)
--- PASS: TestAccAWSNetworkAclRule_disappears (10.37s)
--- PASS: TestAccAWSNetworkAclRule_disappears_NetworkAcl (9.47s)
--- PASS: TestAccAWSNetworkAclRule_ingressEgressSameNumberDisappears (9.61s)
--- PASS: TestAccAWSNetworkAclRule_ipv6 (9.90s)
--- PASS: TestAccAWSNetworkAclRule_ipv6ICMP (9.88s)
--- PASS: TestAccAWSNetworkAclRule_ipv6VpcAssignGeneratedIpv6CidrBlockUpdate (25.81s)
--- PASS: TestAccAWSNetworkAclRule_missingParam (6.05s)
--- PASS: TestAccAWSNetworkAclRule_tcpProtocol (17.46s)

--- PASS: TestAccAWSPlacementGroup_basic (16.28s)
--- PASS: TestAccAWSPlacementGroup_disappears (8.39s)
--- PASS: TestAccAWSPlacementGroup_tags (42.20s)

--- PASS: TestAccAWSRouteTable_basic (86.65s)
--- PASS: TestAccAWSRouteTable_instance (107.66s)
--- PASS: TestAccAWSRouteTable_ipv6 (31.34s)
--- PASS: TestAccAWSRouteTable_panicEmptyRoute (20.29s)
--- PASS: TestAccAWSRouteTable_Route_ConfigMode (72.23s)
--- PASS: TestAccAWSRouteTable_Route_TransitGatewayID (341.06s)
--- PASS: TestAccAWSRouteTable_tags (49.35s)
--- PASS: TestAccAWSRouteTable_vgwRoutePropagation (100.78s)
--- PASS: TestAccAWSRouteTable_vpcPeering (53.31s)

--- PASS: TestAccAWSRouteTableAssociation_disappears (72.68s)
--- PASS: TestAccAWSRouteTableAssociation_Gateway_basic (119.29s)
--- PASS: TestAccAWSRouteTableAssociation_Gateway_ChangeGateway (83.03s)
--- PASS: TestAccAWSRouteTableAssociation_Gateway_ChangeRouteTable (67.27s)
--- PASS: TestAccAWSRouteTableAssociation_Subnet_basic (56.97s)
--- PASS: TestAccAWSRouteTableAssociation_Subnet_ChangeRouteTable (93.87s)
--- PASS: TestAccAWSRouteTableAssociation_Subnet_ChangeSubnet (99.34s)

--- PASS: TestAccAWSSecurityGroup_allowAll (82.97s)
--- PASS: TestAccAWSSecurityGroup_basic (38.41s)
--- PASS: TestAccAWSSecurityGroup_change (55.48s)
--- PASS: TestAccAWSSecurityGroup_CIDRandGroups (28.83s)
--- PASS: TestAccAWSSecurityGroup_defaultEgressClassic (15.48s)
--- PASS: TestAccAWSSecurityGroup_defaultEgressVPC (53.29s)
--- PASS: TestAccAWSSecurityGroup_drift (39.50s)
--- PASS: TestAccAWSSecurityGroup_driftComplex (42.19s)
--- PASS: TestAccAWSSecurityGroup_egressConfigMode (69.26s)
--- PASS: TestAccAWSSecurityGroup_egressWithPrefixList (38.66s)
--- PASS: TestAccAWSSecurityGroup_failWithDiffMismatch (50.12s)
--- PASS: TestAccAWSSecurityGroup_forceRevokeRulesFalse (654.36s)
--- PASS: TestAccAWSSecurityGroup_forceRevokeRulesTrue (663.74s)
--- PASS: TestAccAWSSecurityGroup_generatedName (23.98s)
--- PASS: TestAccAWSSecurityGroup_ingressConfigMode (114.85s)
--- PASS: TestAccAWSSecurityGroup_ingressWithCidrAndSGsClassic (21.80s)
--- PASS: TestAccAWSSecurityGroup_ingressWithCidrAndSGsVPC (53.78s)
--- PASS: TestAccAWSSecurityGroup_ingressWithPrefixList (57.53s)
--- PASS: TestAccAWSSecurityGroup_invalidCIDRBlock (1.76s)
--- PASS: TestAccAWSSecurityGroup_IPRangeAndSecurityGroupWithSameRules (40.19s)
--- PASS: TestAccAWSSecurityGroup_IPRangesWithSameRules (60.87s)
--- PASS: TestAccAWSSecurityGroup_ipv4andipv6Egress (42.57s)
--- PASS: TestAccAWSSecurityGroup_ipv6 (50.73s)
--- PASS: TestAccAWSSecurityGroup_multiIngress (44.80s)
--- PASS: TestAccAWSSecurityGroup_namePrefix (25.67s)
--- PASS: TestAccAWSSecurityGroup_ruleDescription (60.82s)
--- PASS: TestAccAWSSecurityGroup_ruleGathering (80.34s)
--- PASS: TestAccAWSSecurityGroup_ruleLimitCidrBlockExceededAppend (59.68s)
--- PASS: TestAccAWSSecurityGroup_ruleLimitExceededAllNew (55.11s)
--- PASS: TestAccAWSSecurityGroup_ruleLimitExceededAppend (61.34s)
--- PASS: TestAccAWSSecurityGroup_ruleLimitExceededPrepend (57.52s)
--- PASS: TestAccAWSSecurityGroup_rulesDropOnError (52.01s)
--- PASS: TestAccAWSSecurityGroup_self (48.38s)
--- PASS: TestAccAWSSecurityGroup_sourceSecurityGroup (32.90s)
--- PASS: TestAccAWSSecurityGroup_tags (55.07s)
--- PASS: TestAccAWSSecurityGroup_vpc (97.39s)
--- PASS: TestAccAWSSecurityGroup_vpcNegOneIngress (67.11s)
--- PASS: TestAccAWSSecurityGroup_vpcProtoNumIngress (35.74s)

--- PASS: TestAccAWSSecurityGroupRule_Description_AllPorts (25.54s)
--- PASS: TestAccAWSSecurityGroupRule_Description_AllPorts_NonZeroPorts (24.84s)
--- PASS: TestAccAWSSecurityGroupRule_Egress (23.71s)
--- PASS: TestAccAWSSecurityGroupRule_EgressDescription (16.18s)
--- PASS: TestAccAWSSecurityGroupRule_EgressDescription_updates (28.99s)
--- PASS: TestAccAWSSecurityGroupRule_ExpectInvalidCIDR (1.15s)
--- PASS: TestAccAWSSecurityGroupRule_ExpectInvalidTypeError (0.90s)
--- PASS: TestAccAWSSecurityGroupRule_Ingress_Classic (16.34s)
--- PASS: TestAccAWSSecurityGroupRule_Ingress_Ipv6 (22.19s)
--- PASS: TestAccAWSSecurityGroupRule_Ingress_Protocol (34.82s)
--- PASS: TestAccAWSSecurityGroupRule_Ingress_VPC (30.53s)
--- PASS: TestAccAWSSecurityGroupRule_IngressDescription (20.67s)
--- PASS: TestAccAWSSecurityGroupRule_IngressDescription_updates (28.05s)
--- PASS: TestAccAWSSecurityGroupRule_Issue5310 (18.17s)
--- PASS: TestAccAWSSecurityGroupRule_MultiDescription (103.23s)
--- PASS: TestAccAWSSecurityGroupRule_MultiIngress (17.33s)
--- PASS: TestAccAWSSecurityGroupRule_MultipleRuleSearching_AllProtocolCrash (20.56s)
--- PASS: TestAccAWSSecurityGroupRule_PartialMatching_basic (49.89s)
--- PASS: TestAccAWSSecurityGroupRule_PartialMatching_Source (31.72s)
--- PASS: TestAccAWSSecurityGroupRule_PrefixListEgress (49.08s)
--- PASS: TestAccAWSSecurityGroupRule_Race (229.63s)
--- PASS: TestAccAWSSecurityGroupRule_SelfReference (29.71s)
--- PASS: TestAccAWSSecurityGroupRule_SelfSource (48.10s)

--- PASS: TestAccAWSSpotInstanceRequest_basic (116.70s)
--- PASS: TestAccAWSSpotInstanceRequest_getPasswordData (241.71s)
--- PASS: TestAccAWSSpotInstanceRequest_NetworkInterfaceAttributes (98.86s)
--- PASS: TestAccAWSSpotInstanceRequest_SubnetAndSGAndPublicIpAddress (84.15s)
--- PASS: TestAccAWSSpotInstanceRequest_validUntil (94.99s)
--- PASS: TestAccAWSSpotInstanceRequest_vpc (117.78s)
--- PASS: TestAccAWSSpotInstanceRequest_withBlockDuration (115.45s)
--- PASS: TestAccAWSSpotInstanceRequest_withLaunchGroup (87.11s)
--- PASS: TestAccAWSSpotInstanceRequest_withoutSpotPrice (61.58s)
--- PASS: TestAccAWSSpotInstanceRequestInterruptHibernate (313.09s)
--- PASS: TestAccAWSSpotInstanceRequestInterruptStop (307.82s)

--- PASS: TestAccAWSSubnet_availabilityZoneId (13.11s)
--- PASS: TestAccAWSSubnet_basic (18.54s)
--- PASS: TestAccAWSSubnet_enableIpv6 (23.40s)
--- PASS: TestAccAWSSubnet_ignoreTags (26.41s)
--- PASS: TestAccAWSSubnet_ipv6 (34.22s)

--- PASS: TestAccAWSVpc_AssignGeneratedIpv6CidrBlock (31.90s)
--- PASS: TestAccAWSVpc_basic (12.76s)
--- PASS: TestAccAWSVpc_bothDnsOptionsSet (10.88s)
--- PASS: TestAccAWSVpc_classiclinkDnsSupportOptionSet (10.44s)
--- PASS: TestAccAWSVpc_classiclinkOptionSet (10.92s)
--- PASS: TestAccAWSVpc_coreMismatchedDiffs (11.85s)
--- PASS: TestAccAWSVpc_DisabledDnsSupport (11.08s)
--- PASS: TestAccAWSVpc_disappears (7.03s)
--- PASS: TestAccAWSVpc_ignoreTags (25.48s)
--- PASS: TestAccAWSVpc_tags (23.32s)
--- PASS: TestAccAWSVpc_Tenancy (32.11s)
--- PASS: TestAccAWSVpc_update (21.92s)

--- PASS: TestAccAWSVpcEndpoint_gatewayBasic (22.60s)
--- PASS: TestAccAWSVpcEndpoint_gatewayPolicy (33.38s)
--- PASS: TestAccAWSVpcEndpoint_gatewayWithRouteTableAndPolicyAndTags (39.60s)
--- PASS: TestAccAWSVpcEndpoint_interfaceBasic (91.92s)
--- PASS: TestAccAWSVpcEndpoint_interfaceNonAWSService (266.19s)
--- PASS: TestAccAWSVpcEndpoint_interfaceWithSubnetAndSecurityGroup (328.94s)
--- PASS: TestAccAWSVpcEndpoint_removed (16.03s)

--- PASS: TestAccAWSVpcEndpointConnectionNotification_basic (247.97s)

--- PASS: TestAccAWSVpcEndpointRouteTableAssociation_basic (22.26s)

--- PASS: TestAccAWSVpcEndpointService_AllowedPrincipalsAndTags (238.56s)
--- PASS: TestAccAWSVpcEndpointService_basic (224.78s)
--- PASS: TestAccAWSVpcEndpointService_removed (255.08s)
--- PASS: TestAccAWSVpcEndpointServiceAllowedPrincipal_basic (260.95s)

--- PASS: TestAccAWSVpcEndpointSubnetAssociation_basic (274.34s)
--- PASS: TestAccAWSVpcEndpointSubnetAssociation_multiple (567.69s)

--- PASS: TestAccAWSVPCPeeringConnection_accept (39.06s)
--- PASS: TestAccAWSVPCPeeringConnection_basic (11.38s)
--- PASS: TestAccAWSVPCPeeringConnection_failedState (6.25s)
--- PASS: TestAccAWSVPCPeeringConnection_options (17.69s)
--- PASS: TestAccAWSVPCPeeringConnection_optionsNoAutoAccept (7.54s)
--- PASS: TestAccAWSVPCPeeringConnection_peerRegionAutoAccept (14.30s)
--- PASS: TestAccAWSVPCPeeringConnection_plan (10.11s)
--- PASS: TestAccAWSVPCPeeringConnection_region (25.94s)
--- PASS: TestAccAWSVPCPeeringConnection_tags (11.28s)

--- PASS: TestAccAWSVPCPeeringConnectionAccepter_differentRegionDifferentAccount (34.46s)
--- PASS: TestAccAWSVPCPeeringConnectionAccepter_differentRegionSameAccount (32.21s)
--- PASS: TestAccAWSVPCPeeringConnectionAccepter_sameRegionDifferentAccount (13.09s)
--- PASS: TestAccAWSVPCPeeringConnectionAccepter_sameRegionSameAccount (35.70s)

--- PASS: TestAccAWSVpcPeeringConnectionOptions_basic (11.03s)
--- PASS: TestAccAWSVpcPeeringConnectionOptions_differentRegionSameAccount (37.70s)
--- PASS: TestAccAWSVpcPeeringConnectionOptions_sameRegionDifferentAccount (14.67s)

--- PASS: TestAccAWSVpnConnection_basic (761.44s)
--- PASS: TestAccAWSVpnConnection_disappears (411.85s)
--- PASS: TestAccAWSVpnConnection_TransitGatewayID (1054.04s)
--- PASS: TestAccAWSVpnConnection_tunnelOptions (313.38s)
--- PASS: TestAccAWSVpnConnection_withoutStaticRoutes (281.89s)

--- PASS: TestAccAWSVpnConnectionRoute_basic (368.73s)

--- PASS: TestAccAWSVpnGateway_basic (449.37s)
--- PASS: TestAccAWSVpnGateway_delete (742.54s)
--- PASS: TestAccAWSVpnGateway_disappears (746.37s)
--- PASS: TestAccAWSVpnGateway_reattach (487.48s)
--- PASS: TestAccAWSVpnGateway_tags (654.38s)
--- PASS: TestAccAWSVpnGateway_withAmazonSideAsnSetToState (655.34s)
--- PASS: TestAccAWSVpnGateway_withAvailabilityZoneSetToState (552.62s)

--- PASS: TestAccAWSVpnGatewayAttachment_basic (543.50s)
--- PASS: TestAccAWSVpnGatewayAttachment_deleted (231.08s)

--- PASS: TestAWSVpnConnection_xmlconfig (0.00s)

bflad added 3 commits April 8, 2020 13:01
@bflad
internal/keyvaluetags: Move all generator customization functions int…
fe71e7e 
…o shared service_generation_customizations.go
@bflad
internal/keyvaluetags: Initial tagging function generator for handlin…
10df491 
…g tagging of new resources

Some services require special handling for newly created resources, such as retrying on "not found" errors for eventual consistency. This generator starts with just the EC2 service implementation, but is extensible for any service.

We can also consider generating this for all services to simplify `{SERVICE}UpdateTags(conn, id, nil, tags)` usage, but that is not a current refactoring goal.
@bflad
service/ec2: Switch tagging during resource creation to keyvaluetags.…
7e1be5e 
…CreateEc2Tags implementation

Reference: #11060
Reference: #12427
Reference: https://github.com/terraform-providers/terraform-provider-aws/blob/0c56c9bea1291e77f28ae99c79748251a2e23517/aws/tags.go#L198

The EC2 service has special considerations during resource creation to retry for eventual consistency within the API itself on "NotFound" errors. This switches Terraform resources that cannot tag-on-create due to the lack of EC2 API support to the keyvaluetags implementation that handles this eventual consistency automatically for 5 minutes (or max retries if API is throttling).

This retry logic was present prior to the service refactoring to keyvaluetags (although errantly retrying on "NotFound" errors on every update, which may never succeed) and was still present in the `aws_vpc` and `aws_subnet` resources manually in the logic after the refactoring.

This refactor also catches cases where the resource `Create` function was depending on the `Update` logic to handle tagging on creation logic. We discourage the usage of `Update` after `Create` for new resources, but this refactor only guards against running the tag update logic rather than bundling more complex resource refactoring into this changeset.

Now all EC2 resources are consolidated to similar tagging on creation logic.

Output from acceptance testing:

```

```
@bflad bflad added bug Addresses a defect in current functionality. regression Pertains to a degraded workflow resulting from an upstream patch or internal enhancement. labels Apr 8, 2020
@bflad bflad requested a review from a team April 8, 2020 19:53
@ghost ghost added size/XXL Managed by automation to categorize the size of a PR. needs-triage Waiting for first response or review from a maintainer. service/ec2 Issues and PRs that pertain to the ec2 service. labels Apr 8, 2020
@bflad bflad changed the title provider: Add CreateSERVICETags generator to keyvaluetags, refactor EC2 resources to use keyvaluetags.CreateEc2Tags provider: Add SERVICECreateTags generator to keyvaluetags, refactor EC2 resources to use keyvaluetags.CreateEc2Tags Apr 8, 2020
@bflad bflad removed the needs-triage Waiting for first response or review from a maintainer. label Apr 8, 2020
bflad added 2 commits April 8, 2020 19:39
@bflad
resource/aws_vpc_peering_connection_accepter: Do not overwrite incomi…
5a79a7a 
…ng ResourceData on creation

Otherwise information like tagging can be dropped and not written on first apply.

Previously:

```
=== CONT  TestAccAWSVPCPeeringConnectionAccepter_sameRegionDifferentAccount
    TestAccAWSVPCPeeringConnectionAccepter_sameRegionDifferentAccount: testing.go:669: Step 0 error: After applying this step, the plan was not empty:

        DIFF:

        UPDATE: aws_vpc_peering_connection_accepter.peer
...
          tags.Name:                                   "" => "terraform-testacc-pcxaccpt-118309467362907493"
...
```
@bflad
resource/aws_network_acl: Ensure tags are handled on creation
23dcb94 
Previously:

```
--- FAIL: TestAccAWSNetworkAcl_basic (7.89s)
    testing.go:669: Step 0 error: After applying this step, the plan was not empty:

        DIFF:

        UPDATE: aws_network_acl.test
...
          tags.Name:                 "" => "tf-acc-acl-egress-and-ingress"
...
```

Output from acceptance testing:

```
--- PASS: TestAccAWSNetworkAcl_basic (44.83s)
--- PASS: TestAccAWSNetworkAcl_CaseSensitivityNoChanges (45.84s)
--- PASS: TestAccAWSNetworkAcl_disappears (41.71s)
--- PASS: TestAccAWSNetworkAcl_Egress_ConfigMode (80.98s)
--- PASS: TestAccAWSNetworkAcl_EgressAndIngressRules (40.63s)
--- PASS: TestAccAWSNetworkAcl_espProtocol (43.41s)
--- PASS: TestAccAWSNetworkAcl_Ingress_ConfigMode (74.98s)
--- PASS: TestAccAWSNetworkAcl_ipv6ICMPRules (31.16s)
--- PASS: TestAccAWSNetworkAcl_ipv6Rules (38.52s)
--- PASS: TestAccAWSNetworkAcl_ipv6VpcRules (37.93s)
--- PASS: TestAccAWSNetworkAcl_OnlyEgressRules (37.58s)
--- PASS: TestAccAWSNetworkAcl_OnlyIngressRules_basic (39.35s)
--- PASS: TestAccAWSNetworkAcl_OnlyIngressRules_update (63.18s)
--- PASS: TestAccAWSNetworkAcl_SubnetChange (60.24s)
--- PASS: TestAccAWSNetworkAcl_Subnets (69.00s)
--- PASS: TestAccAWSNetworkAcl_SubnetsDelete (67.02s)

--- PASS: TestAccAWSNetworkAclRule_allProtocol (57.73s)
--- PASS: TestAccAWSNetworkAclRule_basic (42.24s)
--- PASS: TestAccAWSNetworkAclRule_disappears (45.36s)
--- PASS: TestAccAWSNetworkAclRule_disappears_NetworkAcl (41.05s)
--- PASS: TestAccAWSNetworkAclRule_ingressEgressSameNumberDisappears (46.62s)
--- PASS: TestAccAWSNetworkAclRule_ipv6 (42.03s)
--- PASS: TestAccAWSNetworkAclRule_ipv6ICMP (36.46s)
--- PASS: TestAccAWSNetworkAclRule_ipv6VpcAssignGeneratedIpv6CidrBlockUpdate (58.86s)
--- PASS: TestAccAWSNetworkAclRule_missingParam (20.95s)
```
gdavison
gdavison approved these changes Apr 9, 2020
View reviewed changes
Copy link
Contributor

@gdavison gdavison left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

--- PASS: TestAccAWSVpc_coreMismatchedDiffs (12.68s)
--- PASS: TestAccAWSDefaultSecurityGroup_basic (12.92s)
--- PASS: TestAccAWSEgressOnlyInternetGateway_basic (16.65s)
--- PASS: TestAccAWSDefaultSecurityGroup_classic (21.20s)
--- PASS: TestAccAWSEIP_basic (9.07s)
--- PASS: TestAccAWSCustomerGateway_disappears (27.46s)
--- PASS: TestAccAWSCustomerGateway_similarAlreadyExists (38.38s)
--- PASS: TestAccAWSAMI_disappears (43.97s)
--- PASS: TestAccAWSCustomerGateway_basic (50.36s)
--- PASS: TestAccAWSAMI_snapshotSize (51.89s)
--- PASS: TestAccAWSEgressOnlyInternetGateway_Tags (39.31s)
--- PASS: TestAccAWSAMI_basic (61.75s)
--- PASS: TestAccAWSEIP_networkInterface (38.24s)
--- SKIP: TestAccAWSEIP_PublicIpv4Pool_custom (0.00s)
--- PASS: TestAccAWSEIP_twoEIPsOneNetworkInterface (36.71s)
--- PASS: TestAccAWSEIP_disappears (19.28s)
--- PASS: TestAccAWSEIP_PublicIpv4Pool_default (20.75s)
--- PASS: TestAccAWSEIP_tags (33.94s)
--- PASS: TestAccAWSAMI_tags (86.16s)
--- PASS: TestAccAWSInternetGateway_delete (26.01s)
--- PASS: TestAccAWSKeyPair_basic (7.89s)
--- PASS: TestAccAWSKeyPair_generatedName (7.41s)
--- PASS: TestAccAWSInternetGateway_tags (25.13s)
--- PASS: TestAccAWSKeyPair_disappears (5.65s)
--- PASS: TestAccAWSKeyPair_namePrefix (7.53s)
--- PASS: TestAccAWSKeyPair_tags (17.83s)
--- PASS: TestAccAWSNetworkAcl_basic (10.37s)
--- PASS: TestAccAWSNetworkAcl_disappears (9.93s)
--- PASS: TestAccAWSInternetGateway_basic (49.75s)
--- PASS: TestAccAWSNetworkAcl_EgressAndIngressRules (14.42s)
--- PASS: TestAccAWSNetworkAcl_OnlyIngressRules_basic (19.53s)
--- PASS: TestAccAWSNetworkAcl_CaseSensitivityNoChanges (14.13s)
--- PASS: TestAccAWSEIP_associated_user_private_ip (91.32s)
--- PASS: TestAccAWSEIP_instance (113.38s)
--- PASS: TestAccAWSNetworkAcl_OnlyEgressRules (21.84s)
--- PASS: TestAccAWSNetworkAcl_Egress_ConfigMode (46.46s)
--- PASS: TestAccAWSNetworkAcl_Ingress_ConfigMode (57.92s)
--- PASS: TestAccAWSNetworkAcl_Subnets (31.93s)
--- FAIL: TestAccAWSEIP_Ec2Classic (148.21s)
--- PASS: TestAccAWSNetworkAcl_SubnetsDelete (32.63s)
--- PASS: TestAccAWSNetworkAcl_OnlyIngressRules_update (58.26s)
--- PASS: TestAccAWSNetworkAcl_ipv6VpcRules (22.73s)
--- PASS: TestAccAWSEIPAssociate_notAssociated (119.78s)
--- PASS: TestAccAWSNetworkAcl_ipv6ICMPRules (32.61s)
--- PASS: TestAccAWSENI_basic (15.11s)
--- PASS: TestAccAWSNetworkAcl_SubnetChange (53.33s)
--- PASS: TestAccAWSNetworkAcl_ipv6Rules (45.02s)
--- PASS: TestAccAWSEIP_Instance_Reassociate (137.87s)
--- PASS: TestAccAWSENI_disappears (27.08s)
--- PASS: TestAccAWSPlacementGroup_disappears (7.78s)
--- PASS: TestAccAWSNetworkAcl_espProtocol (42.83s)
--- PASS: TestAccAWSPlacementGroup_basic (31.44s)
--- PASS: TestAccAWSENI_sourceDestCheck (37.95s)
--- PASS: TestAccAWSRouteTable_panicEmptyRoute (7.64s)
--- PASS: TestAccAWSENI_computedIPs (45.46s)
--- PASS: TestAccAWSRouteTable_ipv6 (32.22s)
--- PASS: TestAccAWSENI_updatedDescription (76.64s)
--- PASS: TestAccAWSRouteTable_tags (31.44s)
--- PASS: TestProtocolStateFunc (0.00s)
--- PASS: TestProtocolForValue (0.00s)
--- PASS: TestResourceAwsSecurityGroupExpandCollapseRules (0.00s)
--- PASS: TestResourceAwsSecurityGroupIPPermGather (0.00s)
--- PASS: TestAccAWSRouteTable_basic (70.25s)
--- PASS: TestAccAWSPlacementGroup_tags (78.85s)
--- FAIL: TestAccAWSRouteTable_vpcPeering (28.96s)
--- PASS: TestAccAWSSecurityGroup_allowAll (22.42s)
--- FAIL: TestAccAWSRouteTable_vgwRoutePropagation (30.40s)
--- PASS: TestAccAWSENI_PrivateIpsCount (95.03s)
--- PASS: TestAccAWSENI_ignoreExternalAttachment (108.45s)
--- PASS: TestAccAWSSecurityGroup_IPRangesWithSameRules (16.59s)
--- PASS: TestAccAWSSecurityGroup_basic (14.98s)
--- PASS: TestAccAWSRouteTable_instance (90.63s)
--- PASS: TestAccAWSSecurityGroup_sourceSecurityGroup (25.51s)
--- PASS: TestAccAWSRouteTable_Route_ConfigMode (72.09s)
--- PASS: TestAccAWSSecurityGroup_egressConfigMode (31.73s)
--- PASS: TestAccAWSSecurityGroup_ipv6 (21.19s)
--- PASS: TestAccAWSSecurityGroup_IPRangeAndSecurityGroupWithSameRules (44.45s)
--- PASS: TestAccAWSSecurityGroup_self (16.72s)
--- PASS: TestAccAWSSecurityGroup_namePrefix (29.22s)
--- PASS: TestAccAWSSecurityGroup_ingressConfigMode (47.96s)
--- PASS: TestAccAWSSecurityGroup_vpcNegOneIngress (17.75s)
--- PASS: TestAccAWSSecurityGroup_vpc (19.76s)
--- PASS: TestAccAWSSecurityGroup_ruleGathering (47.70s)
--- PASS: TestAccAWSSecurityGroup_vpcProtoNumIngress (26.00s)
--- PASS: TestAccAWSSecurityGroup_multiIngress (23.24s)
--- PASS: TestAccAWSSecurityGroup_defaultEgressVPC (12.75s)
--- PASS: TestAccAWSSecurityGroup_invalidCIDRBlock (1.63s)
--- PASS: TestAccAWSSecurityGroup_generatedName (16.51s)
--- PASS: TestAccAWSSecurityGroup_change (22.65s)
--- PASS: TestAccAWSSecurityGroup_drift (8.89s)
--- PASS: TestAccAWSSecurityGroup_defaultEgressClassic (18.96s)
--- PASS: TestAccAWSSecurityGroup_driftComplex (14.09s)
--- PASS: TestAccAWSSecurityGroup_ingressWithCidrAndSGsVPC (20.97s)
--- PASS: TestAccAWSEc2TransitGatewayVpcAttachmentAccepter_basic (360.85s)
--- PASS: TestAccAWSSecurityGroup_CIDRandGroups (25.45s)
--- PASS: TestAccAWSSecurityGroup_tags (26.02s)
--- PASS: TestAccAWSSecurityGroup_ingressWithCidrAndSGsClassic (24.00s)
--- PASS: TestAccAWSSecurityGroup_ruleDescription (45.12s)
--- PASS: TestAccAWSAMICopy_EnaSupport (368.89s)
--- PASS: TestAccAWSAMICopy_basic (370.36s)
--- PASS: TestAccAWSSecurityGroup_egressWithPrefixList (35.80s)
--- PASS: TestAccAWSAMICopy_Description (377.16s)
--- PASS: TestAccAWSSecurityGroup_failWithDiffMismatch (26.69s)
--- PASS: TestAccAWSSecurityGroup_ingressWithPrefixList (48.29s)
--- PASS: TestAccAWSSecurityGroup_ipv4andipv6Egress (35.22s)
--- PASS: TestAccAWSEc2TransitGatewayVpcAttachmentAccepter_Tags (396.65s)
--- PASS: TestAccAWSAMICopy_tags (401.85s)
--- PASS: TestAccAWSENI_attached (245.57s)
--- PASS: TestAccAWSAMIFromInstance_tags (410.87s)
--- PASS: TestAccAWSSecurityGroup_rulesDropOnError (45.62s)
--- PASS: TestAccAWSSecurityGroup_ruleLimitExceededAppend (54.77s)
--- PASS: TestAccAWSAMIFromInstance_basic (418.49s)
--- PASS: TestAccAWSSecurityGroup_ruleLimitCidrBlockExceededAppend (60.34s)
--- PASS: TestAccAWSSecurityGroup_ruleLimitExceededPrepend (60.88s)
--- PASS: TestAccAWSSpotInstanceRequest_basic (58.29s)
--- PASS: TestAccAWSSubnet_basic (23.08s)
--- PASS: TestAccAWSSecurityGroup_ruleLimitExceededAllNew (83.30s)
--- PASS: TestAccAWSDHCPOptions_deleteOptions (18.79s)
--- PASS: TestAccAWSSubnet_availabilityZoneId (43.77s)
--- PASS: TestAccAWSSubnet_enableIpv6 (52.67s)
--- PASS: TestAccAWSSubnet_ipv6 (57.82s)
--- PASS: TestAccAWSSubnet_ignoreTags (63.05s)
--- PASS: TestAccAWSDHCPOptions_basic (51.29s)
--- PASS: TestAccAWSSpotInstanceRequest_withBlockDuration (115.28s)
--- PASS: TestAccAWSSpotInstanceRequest_vpc (115.48s)
--- PASS: TestAccAWSVPCPeeringConnectionAccepter_sameRegionSameAccount (32.91s)
--- PASS: TestAccAWSVPCPeeringConnection_tags (11.00s)
--- PASS: TestAccAWSSpotInstanceRequestInterruptHibernate (103.46s)
--- PASS: TestAccAWSSpotInstanceRequest_SubnetAndSGAndPublicIpAddress (126.25s)
--- PASS: TestAccAWSVPCPeeringConnection_failedState (8.94s)
--- PASS: TestAccAWSVPCPeeringConnection_basic (33.22s)
--- PASS: TestAccAWSVPCPeeringConnection_options (19.22s)
--- PASS: TestAccAWSVPCPeeringConnection_plan (34.50s)
--- PASS: TestAccAWSVPCPeeringConnection_optionsNoAutoAccept (8.29s)
--- PASS: TestAccAWSDHCPOptions_tags (68.58s)
--- PASS: TestAccAWSVPCPeeringConnectionAccepter_sameRegionDifferentAccount (57.55s)
--- PASS: TestAccAWSVPCPeeringConnection_peerRegionAutoAccept (20.42s)
--- PASS: TestAccAWSVPCPeeringConnectionAccepter_differentRegionDifferentAccount (60.51s)
--- PASS: TestAccAWSVPCPeeringConnectionAccepter_differentRegionSameAccount (71.27s)
--- PASS: TestAccAWSVpc_basic (23.94s)
--- PASS: TestAccAWSVpc_disappears (22.23s)
--- PASS: TestAccAWSSpotInstanceRequest_withLaunchGroup (182.31s)
--- PASS: TestAccAWSVpc_bothDnsOptionsSet (15.06s)
--- PASS: TestAccAWSVPCPeeringConnection_region (40.24s)
--- PASS: TestAccAWSRouteTable_Route_TransitGatewayID (346.93s)
--- PASS: TestAccAWSSpotInstanceRequest_validUntil (173.31s)
--- PASS: TestAccAWSVpc_update (23.36s)
--- PASS: TestAccAWSVpc_ignoreTags (35.52s)
--- PASS: TestAWSVpnConnection_xmlconfig (0.00s)
--- PASS: TestAccAWSVpc_tags (30.14s)
--- PASS: TestAccAWSVPCPeeringConnection_accept (48.11s)
--- PASS: TestAccAWSVpc_DisabledDnsSupport (24.73s)
--- PASS: TestAccAWSVpc_classiclinkOptionSet (25.21s)
--- PASS: TestAccAWSVpc_Tenancy (49.40s)
--- PASS: TestAccAWSVpc_classiclinkDnsSupportOptionSet (30.87s)
--- PASS: TestAccAWSVpc_AssignGeneratedIpv6CidrBlock (57.99s)
--- PASS: TestAccAWSSpotInstanceRequest_NetworkInterfaceAttributes (191.54s)
--- PASS: TestAccAWSEc2TransitGatewayVpcAttachmentAccepter_TransitGatewayDefaultRouteTableAssociationAndPropagation (603.57s)
--- PASS: TestAccAWSVpnGateway_withAvailabilityZoneSetToState (37.08s)
--- PASS: TestAccAWSVpnGateway_disappears (54.97s)
--- PASS: TestAccAWSVpnGateway_basic (65.01s)
--- PASS: TestAccAWSVpnGateway_withAmazonSideAsnSetToState (62.22s)
--- PASS: TestAccAWSVpnGateway_tags (73.39s)
--- PASS: TestAccAWSVpnGateway_delete (84.43s)
--- PASS: TestAccAWSVpnGateway_reattach (102.56s)
--- PASS: TestAccAWSSpotInstanceRequest_withoutSpotPrice (312.78s)
--- PASS: TestAccAWSSpotInstanceRequestInterruptStop (313.03s)
--- PASS: TestAccAWSSpotInstanceRequest_getPasswordData (374.75s)
--- PASS: TestAccAWSVpnConnection_withoutStaticRoutes (287.26s)
--- PASS: TestAccAWSVpnConnection_tunnelOptions (288.44s)
--- PASS: TestAccAWSSecurityGroup_forceRevokeRulesTrue (673.21s)
--- PASS: TestAccAWSSecurityGroup_forceRevokeRulesFalse (688.91s)
--- PASS: TestAccAWSVpnConnection_disappears (465.20s)
--- PASS: TestAccAWSVpnConnection_TransitGatewayID (581.30s)
--- PASS: TestAccAWSVpnConnection_basic (957.23s)

The test failures are unrelated to this change:

  • TestAccAWSEIP_Ec2Classic
  • TestAccAWSRouteTable_vgwRoutePropagation
  • TestAccAWSRouteTable_vpcPeering

@gdavison gdavison added this to the v2.57.0 milestone Apr 9, 2020
gdavison
gdavison approved these changes Apr 9, 2020
View reviewed changes
Copy link
Contributor

@gdavison gdavison left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

--- PASS: TestAWSVpnConnection_xmlconfig (0.00s)

--- PASS: TestAccAWSAMICopy_Description (377.16s)
--- PASS: TestAccAWSAMICopy_EnaSupport (368.89s)
--- PASS: TestAccAWSAMICopy_basic (370.36s)
--- PASS: TestAccAWSAMICopy_tags (401.85s)

--- PASS: TestAccAWSAMIFromInstance_basic (418.49s)
--- PASS: TestAccAWSAMIFromInstance_tags (410.87s)

--- PASS: TestAccAWSAMI_basic (61.75s)
--- PASS: TestAccAWSAMI_disappears (43.97s)
--- PASS: TestAccAWSAMI_snapshotSize (51.89s)
--- PASS: TestAccAWSAMI_tags (86.16s)

--- PASS: TestAccAWSCustomerGateway_basic (50.36s)
--- PASS: TestAccAWSCustomerGateway_disappears (27.46s)
--- PASS: TestAccAWSCustomerGateway_similarAlreadyExists (38.38s)

--- PASS: TestAccAWSDHCPOptions_basic (51.29s)
--- PASS: TestAccAWSDHCPOptions_deleteOptions (18.79s)
--- PASS: TestAccAWSDHCPOptions_tags (68.58s)

--- PASS: TestAccAWSDefaultSecurityGroup_basic (12.92s)
--- PASS: TestAccAWSDefaultSecurityGroup_classic (21.20s)

--- PASS: TestAccAWSEIPAssociate_notAssociated (119.78s)

--- PASS: TestAccAWSEIP_Instance_Reassociate (137.87s)
--- PASS: TestAccAWSEIP_PublicIpv4Pool_default (20.75s)
--- PASS: TestAccAWSEIP_associated_user_private_ip (91.32s)
--- PASS: TestAccAWSEIP_basic (9.07s)
--- PASS: TestAccAWSEIP_disappears (19.28s)
--- PASS: TestAccAWSEIP_instance (113.38s)
--- PASS: TestAccAWSEIP_networkInterface (38.24s)
--- PASS: TestAccAWSEIP_tags (33.94s)
--- PASS: TestAccAWSEIP_twoEIPsOneNetworkInterface (36.71s)

--- PASS: TestAccAWSENI_PrivateIpsCount (95.03s)
--- PASS: TestAccAWSENI_attached (245.57s)
--- PASS: TestAccAWSENI_basic (15.11s)
--- PASS: TestAccAWSENI_computedIPs (45.46s)
--- PASS: TestAccAWSENI_disappears (27.08s)
--- PASS: TestAccAWSENI_ignoreExternalAttachment (108.45s)
--- PASS: TestAccAWSENI_sourceDestCheck (37.95s)
--- PASS: TestAccAWSENI_updatedDescription (76.64s)

--- PASS: TestAccAWSEc2TransitGatewayVpcAttachmentAccepter_Tags (396.65s)
--- PASS: TestAccAWSEc2TransitGatewayVpcAttachmentAccepter_TransitGatewayDefaultRouteTableAssociationAndPropagation (603.57s)
--- PASS: TestAccAWSEc2TransitGatewayVpcAttachmentAccepter_basic (360.85s)

--- PASS: TestAccAWSEgressOnlyInternetGateway_Tags (39.31s)
--- PASS: TestAccAWSEgressOnlyInternetGateway_basic (16.65s)

--- PASS: TestAccAWSInternetGateway_basic (49.75s)
--- PASS: TestAccAWSInternetGateway_delete (26.01s)
--- PASS: TestAccAWSInternetGateway_tags (25.13s)

--- PASS: TestAccAWSKeyPair_basic (7.89s)
--- PASS: TestAccAWSKeyPair_disappears (5.65s)
--- PASS: TestAccAWSKeyPair_generatedName (7.41s)
--- PASS: TestAccAWSKeyPair_namePrefix (7.53s)
--- PASS: TestAccAWSKeyPair_tags (17.83s)

--- PASS: TestAccAWSNetworkAcl_CaseSensitivityNoChanges (14.13s)
--- PASS: TestAccAWSNetworkAcl_EgressAndIngressRules (14.42s)
--- PASS: TestAccAWSNetworkAcl_Egress_ConfigMode (46.46s)
--- PASS: TestAccAWSNetworkAcl_Ingress_ConfigMode (57.92s)
--- PASS: TestAccAWSNetworkAcl_OnlyEgressRules (21.84s)
--- PASS: TestAccAWSNetworkAcl_OnlyIngressRules_basic (19.53s)
--- PASS: TestAccAWSNetworkAcl_OnlyIngressRules_update (58.26s)
--- PASS: TestAccAWSNetworkAcl_SubnetChange (53.33s)
--- PASS: TestAccAWSNetworkAcl_Subnets (31.93s)
--- PASS: TestAccAWSNetworkAcl_SubnetsDelete (32.63s)
--- PASS: TestAccAWSNetworkAcl_basic (10.37s)
--- PASS: TestAccAWSNetworkAcl_disappears (9.93s)
--- PASS: TestAccAWSNetworkAcl_espProtocol (42.83s)
--- PASS: TestAccAWSNetworkAcl_ipv6ICMPRules (32.61s)
--- PASS: TestAccAWSNetworkAcl_ipv6Rules (45.02s)
--- PASS: TestAccAWSNetworkAcl_ipv6VpcRules (22.73s)

--- PASS: TestAccAWSPlacementGroup_basic (31.44s)
--- PASS: TestAccAWSPlacementGroup_disappears (7.78s)
--- PASS: TestAccAWSPlacementGroup_tags (78.85s)

--- PASS: TestAccAWSRouteTable_Route_ConfigMode (72.09s)
--- PASS: TestAccAWSRouteTable_Route_TransitGatewayID (346.93s)
--- PASS: TestAccAWSRouteTable_basic (70.25s)
--- PASS: TestAccAWSRouteTable_instance (90.63s)
--- PASS: TestAccAWSRouteTable_ipv6 (32.22s)
--- PASS: TestAccAWSRouteTable_panicEmptyRoute (7.64s)
--- PASS: TestAccAWSRouteTable_tags (31.44s)

--- PASS: TestAccAWSSecurityGroup_CIDRandGroups (25.45s)
--- PASS: TestAccAWSSecurityGroup_IPRangeAndSecurityGroupWithSameRules (44.45s)
--- PASS: TestAccAWSSecurityGroup_IPRangesWithSameRules (16.59s)
--- PASS: TestAccAWSSecurityGroup_allowAll (22.42s)
--- PASS: TestAccAWSSecurityGroup_basic (14.98s)
--- PASS: TestAccAWSSecurityGroup_change (22.65s)
--- PASS: TestAccAWSSecurityGroup_defaultEgressClassic (18.96s)
--- PASS: TestAccAWSSecurityGroup_defaultEgressVPC (12.75s)
--- PASS: TestAccAWSSecurityGroup_drift (8.89s)
--- PASS: TestAccAWSSecurityGroup_driftComplex (14.09s)
--- PASS: TestAccAWSSecurityGroup_egressConfigMode (31.73s)
--- PASS: TestAccAWSSecurityGroup_egressWithPrefixList (35.80s)
--- PASS: TestAccAWSSecurityGroup_failWithDiffMismatch (26.69s)
--- PASS: TestAccAWSSecurityGroup_forceRevokeRulesFalse (688.91s)
--- PASS: TestAccAWSSecurityGroup_forceRevokeRulesTrue (673.21s)
--- PASS: TestAccAWSSecurityGroup_generatedName (16.51s)
--- PASS: TestAccAWSSecurityGroup_ingressConfigMode (47.96s)
--- PASS: TestAccAWSSecurityGroup_ingressWithCidrAndSGsClassic (24.00s)
--- PASS: TestAccAWSSecurityGroup_ingressWithCidrAndSGsVPC (20.97s)
--- PASS: TestAccAWSSecurityGroup_ingressWithPrefixList (48.29s)
--- PASS: TestAccAWSSecurityGroup_invalidCIDRBlock (1.63s)
--- PASS: TestAccAWSSecurityGroup_ipv4andipv6Egress (35.22s)
--- PASS: TestAccAWSSecurityGroup_ipv6 (21.19s)
--- PASS: TestAccAWSSecurityGroup_multiIngress (23.24s)
--- PASS: TestAccAWSSecurityGroup_namePrefix (29.22s)
--- PASS: TestAccAWSSecurityGroup_ruleDescription (45.12s)
--- PASS: TestAccAWSSecurityGroup_ruleGathering (47.70s)
--- PASS: TestAccAWSSecurityGroup_ruleLimitCidrBlockExceededAppend (60.34s)
--- PASS: TestAccAWSSecurityGroup_ruleLimitExceededAllNew (83.30s)
--- PASS: TestAccAWSSecurityGroup_ruleLimitExceededAppend (54.77s)
--- PASS: TestAccAWSSecurityGroup_ruleLimitExceededPrepend (60.88s)
--- PASS: TestAccAWSSecurityGroup_rulesDropOnError (45.62s)
--- PASS: TestAccAWSSecurityGroup_self (16.72s)
--- PASS: TestAccAWSSecurityGroup_sourceSecurityGroup (25.51s)
--- PASS: TestAccAWSSecurityGroup_tags (26.02s)
--- PASS: TestAccAWSSecurityGroup_vpc (19.76s)
--- PASS: TestAccAWSSecurityGroup_vpcNegOneIngress (17.75s)
--- PASS: TestAccAWSSecurityGroup_vpcProtoNumIngress (26.00s)

--- PASS: TestAccAWSSpotInstanceRequestInterruptHibernate (103.46s)
--- PASS: TestAccAWSSpotInstanceRequestInterruptStop (313.03s)
--- PASS: TestAccAWSSpotInstanceRequest_NetworkInterfaceAttributes (191.54s)
--- PASS: TestAccAWSSpotInstanceRequest_SubnetAndSGAndPublicIpAddress (126.25s)
--- PASS: TestAccAWSSpotInstanceRequest_basic (58.29s)
--- PASS: TestAccAWSSpotInstanceRequest_getPasswordData (374.75s)
--- PASS: TestAccAWSSpotInstanceRequest_validUntil (173.31s)
--- PASS: TestAccAWSSpotInstanceRequest_vpc (115.48s)
--- PASS: TestAccAWSSpotInstanceRequest_withBlockDuration (115.28s)
--- PASS: TestAccAWSSpotInstanceRequest_withLaunchGroup (182.31s)
--- PASS: TestAccAWSSpotInstanceRequest_withoutSpotPrice (312.78s)

--- PASS: TestAccAWSSubnet_availabilityZoneId (43.77s)
--- PASS: TestAccAWSSubnet_basic (23.08s)
--- PASS: TestAccAWSSubnet_enableIpv6 (52.67s)
--- PASS: TestAccAWSSubnet_ignoreTags (63.05s)
--- PASS: TestAccAWSSubnet_ipv6 (57.82s)

--- PASS: TestAccAWSVPCPeeringConnectionAccepter_differentRegionDifferentAccount (60.51s)
--- PASS: TestAccAWSVPCPeeringConnectionAccepter_differentRegionSameAccount (71.27s)
--- PASS: TestAccAWSVPCPeeringConnectionAccepter_sameRegionDifferentAccount (57.55s)
--- PASS: TestAccAWSVPCPeeringConnectionAccepter_sameRegionSameAccount (32.91s)

--- PASS: TestAccAWSVPCPeeringConnection_accept (48.11s)
--- PASS: TestAccAWSVPCPeeringConnection_basic (33.22s)
--- PASS: TestAccAWSVPCPeeringConnection_failedState (8.94s)
--- PASS: TestAccAWSVPCPeeringConnection_options (19.22s)
--- PASS: TestAccAWSVPCPeeringConnection_optionsNoAutoAccept (8.29s)
--- PASS: TestAccAWSVPCPeeringConnection_peerRegionAutoAccept (20.42s)
--- PASS: TestAccAWSVPCPeeringConnection_plan (34.50s)
--- PASS: TestAccAWSVPCPeeringConnection_region (40.24s)
--- PASS: TestAccAWSVPCPeeringConnection_tags (11.00s)

--- PASS: TestAccAWSVpc_AssignGeneratedIpv6CidrBlock (57.99s)
--- PASS: TestAccAWSVpc_DisabledDnsSupport (24.73s)
--- PASS: TestAccAWSVpc_Tenancy (49.40s)
--- PASS: TestAccAWSVpc_basic (23.94s)
--- PASS: TestAccAWSVpc_bothDnsOptionsSet (15.06s)
--- PASS: TestAccAWSVpc_classiclinkDnsSupportOptionSet (30.87s)
--- PASS: TestAccAWSVpc_classiclinkOptionSet (25.21s)
--- PASS: TestAccAWSVpc_coreMismatchedDiffs (12.68s)
--- PASS: TestAccAWSVpc_disappears (22.23s)
--- PASS: TestAccAWSVpc_ignoreTags (35.52s)
--- PASS: TestAccAWSVpc_tags (30.14s)
--- PASS: TestAccAWSVpc_update (23.36s)

--- PASS: TestAccAWSVpnConnection_TransitGatewayID (581.30s)
--- PASS: TestAccAWSVpnConnection_basic (957.23s)
--- PASS: TestAccAWSVpnConnection_disappears (465.20s)
--- PASS: TestAccAWSVpnConnection_tunnelOptions (288.44s)
--- PASS: TestAccAWSVpnConnection_withoutStaticRoutes (287.26s)

--- PASS: TestAccAWSVpnGateway_basic (65.01s)
--- PASS: TestAccAWSVpnGateway_delete (84.43s)
--- PASS: TestAccAWSVpnGateway_disappears (54.97s)
--- PASS: TestAccAWSVpnGateway_reattach (102.56s)
--- PASS: TestAccAWSVpnGateway_tags (73.39s)
--- PASS: TestAccAWSVpnGateway_withAmazonSideAsnSetToState (62.22s)
--- PASS: TestAccAWSVpnGateway_withAvailabilityZoneSetToState (37.08s)

@gdavison gdavison merged commit c774e0f into master Apr 9, 2020
@gdavison gdavison deleted the b-keyvaluetags-createtags branch April 9, 2020 23:08
gdavison added a commit that referenced this pull request Apr 9, 2020
@gdavison
Update CHANGELOG for #12735
5e74c54
@ghost
Copy link

ghost commented Apr 10, 2020

This has been released in version 2.57.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 for triage. Thanks!

@ghost
Copy link

ghost commented May 10, 2020

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

@ghost ghost locked and limited conversation to collaborators May 10, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@gdavison gdavison gdavison approved these changes

Assignees
No one assigned
Labels
bug Addresses a defect in current functionality. regression Pertains to a degraded workflow resulting from an upstream patch or internal enhancement. service/ec2 Issues and PRs that pertain to the ec2 service. size/XXL Managed by automation to categorize the size of a PR.
Projects
None yet
Milestone
v2.57.0
Development

Successfully merging this pull request may close these issues.

Error tagging resources Occasional InvalidElasticIpID.NotFound error when tagging EIPs
2 participants
@bflad @gdavison