diff --git a/.ci/semgrep/acctest/checks/arn.yml b/.ci/semgrep/acctest/checks/arn.yml index e20fb4112d4..c7a60b1cd2a 100644 --- a/.ci/semgrep/acctest/checks/arn.yml +++ b/.ci/semgrep/acctest/checks/arn.yml @@ -5,12 +5,6 @@ rules: paths: exclude: - "internal/service/controltower" - - "internal/service/ec2" - - "internal/service/elasticache" - - "internal/service/elasticbeanstalk" - - "internal/service/elb" - - "internal/service/elbv2" - - "internal/service/events" - "internal/service/firehose" - "internal/service/globalaccelerator" - "internal/service/guardduty" diff --git a/internal/service/ec2/ec2_eip_test.go b/internal/service/ec2/ec2_eip_test.go index d0412bf1a10..9fe77d32ab3 100644 --- a/internal/service/ec2/ec2_eip_test.go +++ b/internal/service/ec2/ec2_eip_test.go @@ -36,7 +36,7 @@ func TestAccEC2EIP_basic(t *testing.T) { Config: testAccEIPConfig_basic, Check: resource.ComposeTestCheckFunc( testAccCheckEIPExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "elastic-ip/{id}"), resource.TestCheckResourceAttr(resourceName, names.AttrDomain, "vpc"), resource.TestCheckResourceAttr(resourceName, "ptr_record", ""), resource.TestCheckResourceAttrSet(resourceName, "public_ip"), diff --git a/internal/service/ec2/ipam_pool_test.go b/internal/service/ec2/ipam_pool_test.go index b1f2852cae5..c8b1abf515f 100644 --- a/internal/service/ec2/ipam_pool_test.go +++ b/internal/service/ec2/ipam_pool_test.go @@ -40,7 +40,7 @@ func TestAccIPAMPool_basic(t *testing.T) { resource.TestCheckNoResourceAttr(resourceName, "allocation_max_netmask_length"), resource.TestCheckNoResourceAttr(resourceName, "allocation_min_netmask_length"), resource.TestCheckResourceAttr(resourceName, "allocation_resource_tags.%", "0"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrGlobalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "ipam-pool/{id}"), resource.TestCheckResourceAttr(resourceName, "auto_import", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "aws_service", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -66,7 +66,7 @@ func TestAccIPAMPool_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "allocation_min_netmask_length", "32"), resource.TestCheckResourceAttr(resourceName, "allocation_resource_tags.%", "1"), resource.TestCheckResourceAttr(resourceName, "allocation_resource_tags.test", "1"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrGlobalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "ipam-pool/{id}"), resource.TestCheckResourceAttr(resourceName, "auto_import", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "aws_service", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test"), diff --git a/internal/service/ec2/ipam_test.go b/internal/service/ec2/ipam_test.go index b31e0a3f4e6..d919c48dcce 100644 --- a/internal/service/ec2/ipam_test.go +++ b/internal/service/ec2/ipam_test.go @@ -37,7 +37,7 @@ func TestAccIPAM_basic(t *testing.T) { Config: testAccIPAMConfig_basic, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckIPAMExists(ctx, resourceName, &ipam), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrGlobalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "ipam/{id}"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "enable_private_gua", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "operating_regions.#", "1"), diff --git a/internal/service/ec2/transitgateway_attachment_data_source_test.go b/internal/service/ec2/transitgateway_attachment_data_source_test.go index 3a429505563..8a6fcae3571 100644 --- a/internal/service/ec2/transitgateway_attachment_data_source_test.go +++ b/internal/service/ec2/transitgateway_attachment_data_source_test.go @@ -32,14 +32,15 @@ func testAccTransitGatewayAttachmentDataSource_Filter(t *testing.T, semaphore tf { Config: testAccTransitGatewayAttachmentDataSourceConfig_filter(rName), Check: resource.ComposeAggregateTestCheckFunc( - resource.TestCheckResourceAttrSet(dataSourceName, names.AttrARN), - resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, dataSourceName, names.AttrResourceID), + acctest.CheckResourceAttrRegionalARNFormat(ctx, dataSourceName, names.AttrARN, "ec2", "transit-gateway-attachment/{id}"), + resource.TestCheckResourceAttrPair(dataSourceName, names.AttrResourceID, resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(dataSourceName, names.AttrID, resourceName, names.AttrID), acctest.CheckResourceAttrAccountID(ctx, dataSourceName, "resource_owner_id"), resource.TestCheckResourceAttr(dataSourceName, names.AttrResourceType, "vpc"), resource.TestCheckResourceAttrSet(dataSourceName, names.AttrState), - resource.TestCheckResourceAttrPair(resourceName, acctest.CtTagsPercent, dataSourceName, acctest.CtTagsPercent), - resource.TestCheckResourceAttrPair(resourceName, names.AttrID, dataSourceName, names.AttrTransitGatewayAttachmentID), - resource.TestCheckResourceAttrPair(resourceName, names.AttrTransitGatewayID, dataSourceName, names.AttrTransitGatewayID), + resource.TestCheckResourceAttrPair(dataSourceName, acctest.CtTagsPercent, resourceName, acctest.CtTagsPercent), + resource.TestCheckResourceAttrPair(dataSourceName, names.AttrTransitGatewayAttachmentID, dataSourceName, names.AttrID), + resource.TestCheckResourceAttrPair(dataSourceName, names.AttrTransitGatewayID, resourceName, names.AttrTransitGatewayID), acctest.CheckResourceAttrAccountID(ctx, dataSourceName, "transit_gateway_owner_id"), resource.TestCheckResourceAttr(dataSourceName, "association_state", "associated"), resource.TestCheckResourceAttrSet(dataSourceName, "association_transit_gateway_route_table_id"), @@ -67,14 +68,15 @@ func testAccTransitGatewayAttachmentDataSource_ID(t *testing.T, semaphore tfsync { Config: testAccTransitGatewayAttachmentDataSourceConfig_id(rName), Check: resource.ComposeAggregateTestCheckFunc( - resource.TestCheckResourceAttrSet(dataSourceName, names.AttrARN), - resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, dataSourceName, names.AttrResourceID), + acctest.CheckResourceAttrRegionalARNFormat(ctx, dataSourceName, names.AttrARN, "ec2", "transit-gateway-attachment/{id}"), + resource.TestCheckResourceAttrPair(dataSourceName, names.AttrResourceID, resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(dataSourceName, names.AttrID, resourceName, names.AttrID), acctest.CheckResourceAttrAccountID(ctx, dataSourceName, "resource_owner_id"), resource.TestCheckResourceAttr(dataSourceName, names.AttrResourceType, "vpc"), resource.TestCheckResourceAttrSet(dataSourceName, names.AttrState), - resource.TestCheckResourceAttrPair(resourceName, acctest.CtTagsPercent, dataSourceName, acctest.CtTagsPercent), - resource.TestCheckResourceAttrPair(resourceName, names.AttrID, dataSourceName, names.AttrTransitGatewayAttachmentID), - resource.TestCheckResourceAttrPair(resourceName, names.AttrTransitGatewayID, dataSourceName, names.AttrTransitGatewayID), + resource.TestCheckResourceAttrPair(dataSourceName, acctest.CtTagsPercent, resourceName, acctest.CtTagsPercent), + resource.TestCheckResourceAttrPair(dataSourceName, names.AttrTransitGatewayAttachmentID, dataSourceName, names.AttrID), + resource.TestCheckResourceAttrPair(dataSourceName, names.AttrTransitGatewayID, resourceName, names.AttrTransitGatewayID), acctest.CheckResourceAttrAccountID(ctx, dataSourceName, "transit_gateway_owner_id"), resource.TestCheckResourceAttr(dataSourceName, "association_state", "associated"), resource.TestCheckResourceAttrSet(dataSourceName, "association_transit_gateway_route_table_id"), diff --git a/internal/service/ec2/vpc_default_subnet_test.go b/internal/service/ec2/vpc_default_subnet_test.go index c0b2b676952..a0b5ae33dbc 100644 --- a/internal/service/ec2/vpc_default_subnet_test.go +++ b/internal/service/ec2/vpc_default_subnet_test.go @@ -98,7 +98,7 @@ func testAccDefaultSubnet_Existing_basic(t *testing.T) { Config: testAccVPCDefaultSubnetConfig_basic(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSubnetExists(ctx, resourceName, &v), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "subnet/{id}"), resource.TestCheckResourceAttr(resourceName, "assign_ipv6_address_on_creation", acctest.CtFalse), resource.TestCheckResourceAttrSet(resourceName, names.AttrAvailabilityZone), resource.TestCheckResourceAttrSet(resourceName, "availability_zone_id"), @@ -171,7 +171,7 @@ func testAccDefaultSubnet_Existing_ipv6(t *testing.T) { Config: testAccVPCDefaultSubnetConfig_ipv6(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSubnetExists(ctx, resourceName, &v), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "subnet/{id}"), resource.TestCheckResourceAttr(resourceName, "assign_ipv6_address_on_creation", acctest.CtTrue), resource.TestCheckResourceAttrSet(resourceName, names.AttrAvailabilityZone), resource.TestCheckResourceAttrSet(resourceName, "availability_zone_id"), @@ -218,7 +218,7 @@ func testAccDefaultSubnet_Existing_privateDNSNameOptionsOnLaunch(t *testing.T) { Config: testAccVPCDefaultSubnetConfig_privateDNSNameOptionsOnLaunch(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSubnetExists(ctx, resourceName, &v), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "subnet/{id}"), resource.TestCheckResourceAttr(resourceName, "assign_ipv6_address_on_creation", acctest.CtFalse), resource.TestCheckResourceAttrSet(resourceName, names.AttrAvailabilityZone), resource.TestCheckResourceAttrSet(resourceName, "availability_zone_id"), @@ -265,7 +265,7 @@ func testAccDefaultSubnet_NotFound_basic(t *testing.T) { Config: testAccVPCDefaultSubnetConfig_notFound(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSubnetExists(ctx, resourceName, &v), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "subnet/{id}"), resource.TestCheckResourceAttr(resourceName, "assign_ipv6_address_on_creation", acctest.CtFalse), resource.TestCheckResourceAttrSet(resourceName, names.AttrAvailabilityZone), resource.TestCheckResourceAttrSet(resourceName, "availability_zone_id"), @@ -311,7 +311,7 @@ func testAccDefaultSubnet_NotFound_ipv6Native(t *testing.T) { Config: testAccVPCDefaultSubnetConfig_ipv6Native(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSubnetExists(ctx, resourceName, &v), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "subnet/{id}"), resource.TestCheckResourceAttr(resourceName, "assign_ipv6_address_on_creation", acctest.CtTrue), resource.TestCheckResourceAttrSet(resourceName, names.AttrAvailabilityZone), resource.TestCheckResourceAttrSet(resourceName, "availability_zone_id"), diff --git a/internal/service/ec2/vpc_default_vpc_test.go b/internal/service/ec2/vpc_default_vpc_test.go index 496d3686516..e8887fd52e2 100644 --- a/internal/service/ec2/vpc_default_vpc_test.go +++ b/internal/service/ec2/vpc_default_vpc_test.go @@ -96,7 +96,7 @@ func testAccDefaultVPC_Existing_basic(t *testing.T) { Config: testAccVPCDefaultVPCConfig_basic, Check: resource.ComposeAggregateTestCheckFunc( acctest.CheckVPCExists(ctx, resourceName, &v), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "vpc/{id}"), resource.TestCheckResourceAttr(resourceName, "assign_generated_ipv6_cidr_block", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrCIDRBlock, "172.31.0.0/16"), resource.TestCheckResourceAttrSet(resourceName, "default_network_acl_id"), @@ -143,7 +143,7 @@ func testAccDefaultVPC_Existing_assignGeneratedIPv6CIDRBlock(t *testing.T) { Config: testAccVPCDefaultVPCConfig_assignGeneratedIPv6CIDRBlock(rName), Check: resource.ComposeAggregateTestCheckFunc( acctest.CheckVPCExists(ctx, resourceName, &v), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "vpc/{id}"), resource.TestCheckResourceAttr(resourceName, "assign_generated_ipv6_cidr_block", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, names.AttrCIDRBlock, "172.31.0.0/16"), resource.TestCheckResourceAttrSet(resourceName, "default_network_acl_id"), @@ -218,7 +218,7 @@ func testAccDefaultVPC_NotFound_basic(t *testing.T) { Config: testAccVPCDefaultVPCConfig_basic, Check: resource.ComposeAggregateTestCheckFunc( acctest.CheckVPCExists(ctx, resourceName, &v), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "vpc/{id}"), resource.TestCheckResourceAttr(resourceName, "assign_generated_ipv6_cidr_block", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrCIDRBlock, "172.31.0.0/16"), resource.TestCheckResourceAttrSet(resourceName, "default_network_acl_id"), @@ -265,7 +265,7 @@ func testAccDefaultVPC_NotFound_assignGeneratedIPv6CIDRBlock(t *testing.T) { Config: testAccVPCDefaultVPCConfig_assignGeneratedIPv6CIDRBlock(rName), Check: resource.ComposeAggregateTestCheckFunc( acctest.CheckVPCExists(ctx, resourceName, &v), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "vpc/{id}"), resource.TestCheckResourceAttr(resourceName, "assign_generated_ipv6_cidr_block", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, names.AttrCIDRBlock, "172.31.0.0/16"), resource.TestCheckResourceAttrSet(resourceName, "default_network_acl_id"), @@ -341,7 +341,7 @@ func testAccDefaultVPC_NotFound_assignGeneratedIPv6CIDRBlockAdoption(t *testing. Config: testAccVPCDefaultVPCConfig_assignGeneratedIPv6CIDRBlockAdoptionStep1(rName), Check: resource.ComposeAggregateTestCheckFunc( acctest.CheckVPCExists(ctx, resourceName, &v), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "vpc/{id}"), resource.TestCheckResourceAttr(resourceName, "assign_generated_ipv6_cidr_block", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, names.AttrCIDRBlock, "172.31.0.0/16"), resource.TestCheckResourceAttrSet(resourceName, "default_network_acl_id"), @@ -383,7 +383,7 @@ func testAccDefaultVPC_NotFound_assignGeneratedIPv6CIDRBlockAdoption(t *testing. Config: testAccVPCDefaultVPCConfig_assignGeneratedIPv6CIDRBlockAdoptionStep3(rName), Check: resource.ComposeAggregateTestCheckFunc( acctest.CheckVPCExists(ctx, resourceName, &v), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "vpc/{id}"), resource.TestCheckResourceAttr(resourceName, "assign_generated_ipv6_cidr_block", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, names.AttrCIDRBlock, "172.31.0.0/16"), resource.TestCheckResourceAttrSet(resourceName, "default_network_acl_id"), diff --git a/internal/service/ec2/vpc_security_group_egress_rule_test.go b/internal/service/ec2/vpc_security_group_egress_rule_test.go index edd2179109e..b7b90cdc528 100644 --- a/internal/service/ec2/vpc_security_group_egress_rule_test.go +++ b/internal/service/ec2/vpc_security_group_egress_rule_test.go @@ -35,11 +35,12 @@ func TestAccVPCSecurityGroupEgressRule_basic(t *testing.T) { Config: testAccVPCSecurityGroupEgressRuleConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSecurityGroupEgressRuleExists(ctx, resourceName, &v), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "security-group-rule/{id}"), resource.TestCheckResourceAttr(resourceName, "cidr_ipv4", "10.0.0.0/8"), resource.TestCheckNoResourceAttr(resourceName, "cidr_ipv6"), resource.TestCheckNoResourceAttr(resourceName, names.AttrDescription), resource.TestCheckResourceAttr(resourceName, "from_port", "80"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, "security_group_rule_id"), resource.TestCheckResourceAttr(resourceName, "ip_protocol", "tcp"), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestCheckNoResourceAttr(resourceName, "referenced_security_group_id"), diff --git a/internal/service/ec2/vpc_security_group_ingress_rule_test.go b/internal/service/ec2/vpc_security_group_ingress_rule_test.go index 937d381ef17..c30c7eace33 100644 --- a/internal/service/ec2/vpc_security_group_ingress_rule_test.go +++ b/internal/service/ec2/vpc_security_group_ingress_rule_test.go @@ -78,11 +78,12 @@ func TestAccVPCSecurityGroupIngressRule_basic(t *testing.T) { Config: testAccVPCSecurityGroupIngressRuleConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "security-group-rule/{id}"), resource.TestCheckResourceAttr(resourceName, "cidr_ipv4", "10.0.0.0/8"), resource.TestCheckNoResourceAttr(resourceName, "cidr_ipv6"), resource.TestCheckNoResourceAttr(resourceName, names.AttrDescription), resource.TestCheckResourceAttr(resourceName, "from_port", "80"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, "security_group_rule_id"), resource.TestCheckResourceAttr(resourceName, "ip_protocol", "tcp"), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestCheckNoResourceAttr(resourceName, "referenced_security_group_id"), @@ -216,11 +217,12 @@ func TestAccVPCSecurityGroupIngressRule_cidrIPv4(t *testing.T) { Config: testAccVPCSecurityGroupIngressRuleConfig_cidrIPv4(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v1), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "security-group-rule/{id}"), resource.TestCheckResourceAttr(resourceName, "cidr_ipv4", "0.0.0.0/0"), resource.TestCheckNoResourceAttr(resourceName, "cidr_ipv6"), resource.TestCheckNoResourceAttr(resourceName, names.AttrDescription), resource.TestCheckResourceAttr(resourceName, "from_port", "53"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, "security_group_rule_id"), resource.TestCheckResourceAttr(resourceName, "ip_protocol", "udp"), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestCheckNoResourceAttr(resourceName, "referenced_security_group_id"), @@ -239,11 +241,12 @@ func TestAccVPCSecurityGroupIngressRule_cidrIPv4(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v2), testAccCheckSecurityGroupRuleNotRecreated(&v2, &v1), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "security-group-rule/{id}"), resource.TestCheckResourceAttr(resourceName, "cidr_ipv4", "10.0.0.0/16"), resource.TestCheckNoResourceAttr(resourceName, "cidr_ipv6"), resource.TestCheckNoResourceAttr(resourceName, names.AttrDescription), resource.TestCheckResourceAttr(resourceName, "from_port", "-1"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, "security_group_rule_id"), resource.TestCheckResourceAttr(resourceName, "ip_protocol", "1"), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestCheckNoResourceAttr(resourceName, "referenced_security_group_id"), @@ -272,11 +275,12 @@ func TestAccVPCSecurityGroupIngressRule_cidrIPv6(t *testing.T) { Config: testAccVPCSecurityGroupIngressRuleConfig_cidrIPv6(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v1), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "security-group-rule/{id}"), resource.TestCheckNoResourceAttr(resourceName, "cidr_ipv4"), resource.TestCheckResourceAttr(resourceName, "cidr_ipv6", "2001:db8:85a3::/64"), resource.TestCheckNoResourceAttr(resourceName, names.AttrDescription), resource.TestCheckResourceAttr(resourceName, "from_port", "80"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, "security_group_rule_id"), resource.TestCheckResourceAttr(resourceName, "ip_protocol", "tcp"), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestCheckNoResourceAttr(resourceName, "referenced_security_group_id"), @@ -295,11 +299,12 @@ func TestAccVPCSecurityGroupIngressRule_cidrIPv6(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v2), testAccCheckSecurityGroupRuleNotRecreated(&v2, &v1), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "security-group-rule/{id}"), resource.TestCheckNoResourceAttr(resourceName, "cidr_ipv4"), resource.TestCheckResourceAttr(resourceName, "cidr_ipv6", "2001:db8:85a3:2::/64"), resource.TestCheckNoResourceAttr(resourceName, names.AttrDescription), resource.TestCheckNoResourceAttr(resourceName, "from_port"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, "security_group_rule_id"), resource.TestCheckResourceAttr(resourceName, "ip_protocol", "icmpv6"), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestCheckNoResourceAttr(resourceName, "referenced_security_group_id"), @@ -366,11 +371,12 @@ func TestAccVPCSecurityGroupIngressRule_prefixListID(t *testing.T) { Config: testAccVPCSecurityGroupIngressRuleConfig_prefixListID(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v1), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "security-group-rule/{id}"), resource.TestCheckNoResourceAttr(resourceName, "cidr_ipv4"), resource.TestCheckNoResourceAttr(resourceName, "cidr_ipv6"), resource.TestCheckNoResourceAttr(resourceName, names.AttrDescription), resource.TestCheckResourceAttr(resourceName, "from_port", "80"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, "security_group_rule_id"), resource.TestCheckResourceAttr(resourceName, "ip_protocol", "tcp"), resource.TestCheckResourceAttrPair(resourceName, "prefix_list_id", vpcEndpoint1ResourceName, "prefix_list_id"), resource.TestCheckNoResourceAttr(resourceName, "referenced_security_group_id"), @@ -389,11 +395,12 @@ func TestAccVPCSecurityGroupIngressRule_prefixListID(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v2), testAccCheckSecurityGroupRuleNotRecreated(&v2, &v1), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "security-group-rule/{id}"), resource.TestCheckNoResourceAttr(resourceName, "cidr_ipv4"), resource.TestCheckNoResourceAttr(resourceName, "cidr_ipv6"), resource.TestCheckNoResourceAttr(resourceName, names.AttrDescription), resource.TestCheckResourceAttr(resourceName, "from_port", "80"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, "security_group_rule_id"), resource.TestCheckResourceAttr(resourceName, "ip_protocol", "tcp"), resource.TestCheckResourceAttrPair(resourceName, "prefix_list_id", vpcEndpoint2ResourceName, "prefix_list_id"), resource.TestCheckNoResourceAttr(resourceName, "referenced_security_group_id"), @@ -424,11 +431,12 @@ func TestAccVPCSecurityGroupIngressRule_referencedSecurityGroupID(t *testing.T) Config: testAccVPCSecurityGroupIngressRuleConfig_referencedSecurityGroupID(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v1), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "security-group-rule/{id}"), resource.TestCheckNoResourceAttr(resourceName, "cidr_ipv4"), resource.TestCheckNoResourceAttr(resourceName, "cidr_ipv6"), resource.TestCheckNoResourceAttr(resourceName, names.AttrDescription), resource.TestCheckResourceAttr(resourceName, "from_port", "80"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, "security_group_rule_id"), resource.TestCheckResourceAttr(resourceName, "ip_protocol", "tcp"), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestCheckResourceAttrPair(resourceName, "referenced_security_group_id", securityGroup1ResourceName, names.AttrID), @@ -447,11 +455,12 @@ func TestAccVPCSecurityGroupIngressRule_referencedSecurityGroupID(t *testing.T) Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v2), testAccCheckSecurityGroupRuleNotRecreated(&v2, &v1), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "security-group-rule/{id}"), resource.TestCheckNoResourceAttr(resourceName, "cidr_ipv4"), resource.TestCheckNoResourceAttr(resourceName, "cidr_ipv6"), resource.TestCheckNoResourceAttr(resourceName, names.AttrDescription), resource.TestCheckResourceAttr(resourceName, "from_port", "80"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, "security_group_rule_id"), resource.TestCheckResourceAttr(resourceName, "ip_protocol", "tcp"), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestCheckResourceAttrPair(resourceName, "referenced_security_group_id", securityGroup2ResourceName, names.AttrID), @@ -483,11 +492,12 @@ func TestAccVPCSecurityGroupIngressRule_ReferencedSecurityGroupID_peerVPC(t *tes Config: testAccVPCSecurityGroupIngressRuleConfig_referencedSecurityGroupIDPeerVPC(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "security-group-rule/{id}"), resource.TestCheckNoResourceAttr(resourceName, "cidr_ipv4"), resource.TestCheckNoResourceAttr(resourceName, "cidr_ipv6"), resource.TestCheckNoResourceAttr(resourceName, names.AttrDescription), resource.TestCheckResourceAttr(resourceName, "from_port", "80"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, "security_group_rule_id"), resource.TestCheckResourceAttr(resourceName, "ip_protocol", "tcp"), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestMatchResourceAttr(resourceName, "referenced_security_group_id", regexache.MustCompile("^[0-9]{12}/sg-[0-9a-z]{17}$")), @@ -521,11 +531,12 @@ func TestAccVPCSecurityGroupIngressRule_updateSourceType(t *testing.T) { Config: testAccVPCSecurityGroupIngressRuleConfig_cidrIPv4(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v1), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "security-group-rule/{id}"), resource.TestCheckResourceAttr(resourceName, "cidr_ipv4", "0.0.0.0/0"), resource.TestCheckNoResourceAttr(resourceName, "cidr_ipv6"), resource.TestCheckNoResourceAttr(resourceName, names.AttrDescription), resource.TestCheckResourceAttr(resourceName, "from_port", "53"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, "security_group_rule_id"), resource.TestCheckResourceAttr(resourceName, "ip_protocol", "udp"), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestCheckNoResourceAttr(resourceName, "referenced_security_group_id"), @@ -544,11 +555,12 @@ func TestAccVPCSecurityGroupIngressRule_updateSourceType(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v2), testAccCheckSecurityGroupRuleRecreated(&v2, &v1), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "security-group-rule/{id}"), resource.TestCheckNoResourceAttr(resourceName, "cidr_ipv4"), resource.TestCheckResourceAttr(resourceName, "cidr_ipv6", "2001:db8:85a3::/64"), resource.TestCheckNoResourceAttr(resourceName, names.AttrDescription), resource.TestCheckResourceAttr(resourceName, "from_port", "80"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, "security_group_rule_id"), resource.TestCheckResourceAttr(resourceName, "ip_protocol", "tcp"), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestCheckNoResourceAttr(resourceName, "referenced_security_group_id"), diff --git a/internal/service/elasticache/serverless_cache_test.go b/internal/service/elasticache/serverless_cache_test.go index fc4a61c2dfc..90770c03e1c 100644 --- a/internal/service/elasticache/serverless_cache_test.go +++ b/internal/service/elasticache/serverless_cache_test.go @@ -43,15 +43,16 @@ func TestAccElastiCacheServerlessCache_basicRedis(t *testing.T) { Config: testAccServerlessCacheConfig_basicRedis(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerlessCacheExists(ctx, resourceName, &serverlessElasticCache), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "elasticache", "serverlesscache:{name}"), resource.TestCheckResourceAttrSet(resourceName, "cache_usage_limits.#"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreateTime), resource.TestCheckResourceAttrSet(resourceName, "daily_snapshot_time"), resource.TestCheckResourceAttrSet(resourceName, "endpoint.#"), resource.TestCheckResourceAttrSet(resourceName, names.AttrEngine), resource.TestCheckResourceAttrSet(resourceName, "full_engine_version"), - resource.TestCheckResourceAttrSet(resourceName, "reader_endpoint.#"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), + resource.TestCheckResourceAttrSet(resourceName, "reader_endpoint.#"), resource.TestCheckResourceAttrSet(resourceName, names.AttrStatus), resource.TestCheckResourceAttrSet(resourceName, "subnet_ids.#"), ), @@ -87,7 +88,7 @@ func TestAccElastiCacheServerlessCache_basicValkey(t *testing.T) { Config: testAccServerlessCacheConfig_basicValkey(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerlessCacheExists(ctx, resourceName, &serverlessElasticCache), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "elasticache", "serverlesscache:{name}"), resource.TestCheckResourceAttrSet(resourceName, "cache_usage_limits.#"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreateTime), resource.TestCheckResourceAttrSet(resourceName, "daily_snapshot_time"), @@ -131,7 +132,7 @@ func TestAccElastiCacheServerlessCache_full(t *testing.T) { Config: testAccServerlessCacheConfig_full(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerlessCacheExists(ctx, resourceName, &serverlessElasticCache), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "elasticache", "serverlesscache:{name}"), resource.TestCheckResourceAttrSet(resourceName, "cache_usage_limits.#"), resource.TestCheckResourceAttr(resourceName, "cache_usage_limits.0.data_storage.0.maximum", "10"), resource.TestCheckResourceAttr(resourceName, "cache_usage_limits.0.data_storage.0.minimum", "1"), @@ -179,7 +180,7 @@ func TestAccElastiCacheServerlessCache_fullRedis(t *testing.T) { Config: testAccServerlessCacheConfig_fullRedis(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerlessCacheExists(ctx, resourceName, &serverlessElasticCache), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "elasticache", "serverlesscache:{name}"), resource.TestCheckResourceAttrSet(resourceName, "cache_usage_limits.#"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreateTime), resource.TestCheckResourceAttrSet(resourceName, "endpoint.#"), @@ -222,7 +223,7 @@ func TestAccElastiCacheServerlessCache_fullValkey(t *testing.T) { Config: testAccServerlessCacheConfig_fullValkey(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerlessCacheExists(ctx, resourceName, &serverlessElasticCache), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "elasticache", "serverlesscache:{name}"), resource.TestCheckResourceAttrSet(resourceName, "cache_usage_limits.#"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreateTime), resource.TestCheckResourceAttrSet(resourceName, "endpoint.#"), @@ -267,7 +268,7 @@ func TestAccElastiCacheServerlessCache_update(t *testing.T) { Config: testAccServerlessCacheConfig_update(rName, descriptionOld), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerlessCacheExists(ctx, resourceName, &serverlessElasticCache), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "elasticache", "serverlesscache:{name}"), resource.TestCheckResourceAttrSet(resourceName, "cache_usage_limits.#"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreateTime), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, descriptionOld), @@ -289,7 +290,7 @@ func TestAccElastiCacheServerlessCache_update(t *testing.T) { Config: testAccServerlessCacheConfig_update(rName, descriptionNew), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerlessCacheExists(ctx, resourceName, &serverlessElasticCache), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "elasticache", "serverlesscache:{name}"), resource.TestCheckResourceAttrSet(resourceName, "cache_usage_limits.#"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreateTime), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, descriptionNew), @@ -330,7 +331,7 @@ func TestAccElastiCacheServerlessCache_updatesc(t *testing.T) { Config: testAccServerlessCacheConfig_updatesc(rName, descriptionOld, 1, 1000), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerlessCacheExists(ctx, resourceName, &v1), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "elasticache", "serverlesscache:{name}"), resource.TestCheckResourceAttrSet(resourceName, "cache_usage_limits.#"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreateTime), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, descriptionOld), @@ -353,7 +354,7 @@ func TestAccElastiCacheServerlessCache_updatesc(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerlessCacheExists(ctx, resourceName, &v2), testAccCheckServerlessCacheNotRecreated(&v1, &v2), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "elasticache", "serverlesscache:{name}"), resource.TestCheckResourceAttrSet(resourceName, "cache_usage_limits.#"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreateTime), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, descriptionOld), @@ -371,7 +372,7 @@ func TestAccElastiCacheServerlessCache_updatesc(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerlessCacheExists(ctx, resourceName, &v3), testAccCheckServerlessCacheNotRecreated(&v2, &v3), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "elasticache", "serverlesscache:{name}"), resource.TestCheckResourceAttrSet(resourceName, "cache_usage_limits.#"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreateTime), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, descriptionNew), @@ -389,7 +390,7 @@ func TestAccElastiCacheServerlessCache_updatesc(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerlessCacheExists(ctx, resourceName, &v4), testAccCheckServerlessCacheNotRecreated(&v3, &v4), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "elasticache", "serverlesscache:{name}"), resource.TestCheckResourceAttrSet(resourceName, "cache_usage_limits.#"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreateTime), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, descriptionNew), diff --git a/internal/service/elasticache/subnet_group_test.go b/internal/service/elasticache/subnet_group_test.go index d1ec2e08abd..10dbe07145b 100644 --- a/internal/service/elasticache/subnet_group_test.go +++ b/internal/service/elasticache/subnet_group_test.go @@ -35,8 +35,9 @@ func TestAccElastiCacheSubnetGroup_basic(t *testing.T) { Config: testAccSubnetGroupConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSubnetGroupExists(ctx, resourceName, &csg), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "elasticache", "subnetgroup:{name}"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "subnet_ids.#", "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/elasticbeanstalk/application_data_source_test.go b/internal/service/elasticbeanstalk/application_data_source_test.go index 2b73bc35b24..82ef55f0e39 100644 --- a/internal/service/elasticbeanstalk/application_data_source_test.go +++ b/internal/service/elasticbeanstalk/application_data_source_test.go @@ -15,7 +15,7 @@ import ( func TestAccElasticBeanstalkApplicationDataSource_basic(t *testing.T) { ctx := acctest.Context(t) rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) - dataSourceResourceName := "data.aws_elastic_beanstalk_application.test" + dataSourceName := "data.aws_elastic_beanstalk_application.test" resourceName := "aws_elastic_beanstalk_application.test" resource.ParallelTest(t, resource.TestCase{ @@ -26,13 +26,13 @@ func TestAccElasticBeanstalkApplicationDataSource_basic(t *testing.T) { { Config: testAccApplicationDataSourceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrSet(dataSourceResourceName, names.AttrARN), - resource.TestCheckResourceAttr(dataSourceResourceName, "appversion_lifecycle.#", "1"), - resource.TestCheckResourceAttrPair(resourceName, "appversion_lifecycle.0.delete_source_from_s3", dataSourceResourceName, "appversion_lifecycle.0.delete_source_from_s3"), - resource.TestCheckResourceAttrPair(resourceName, "appversion_lifecycle.0.max_age_in_days", dataSourceResourceName, "appversion_lifecycle.0.max_age_in_days"), - resource.TestCheckResourceAttrPair(resourceName, "appversion_lifecycle.0.service_role", dataSourceResourceName, "appversion_lifecycle.0.service_role"), - resource.TestCheckResourceAttrPair(resourceName, names.AttrDescription, dataSourceResourceName, names.AttrDescription), - resource.TestCheckResourceAttrPair(resourceName, names.AttrName, dataSourceResourceName, names.AttrName), + resource.TestCheckResourceAttrPair(dataSourceName, names.AttrARN, resourceName, names.AttrARN), + resource.TestCheckResourceAttr(dataSourceName, "appversion_lifecycle.#", "1"), + resource.TestCheckResourceAttrPair(resourceName, "appversion_lifecycle.0.delete_source_from_s3", dataSourceName, "appversion_lifecycle.0.delete_source_from_s3"), + resource.TestCheckResourceAttrPair(resourceName, "appversion_lifecycle.0.max_age_in_days", dataSourceName, "appversion_lifecycle.0.max_age_in_days"), + resource.TestCheckResourceAttrPair(resourceName, "appversion_lifecycle.0.service_role", dataSourceName, "appversion_lifecycle.0.service_role"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrDescription, dataSourceName, names.AttrDescription), + resource.TestCheckResourceAttrPair(resourceName, names.AttrName, dataSourceName, names.AttrName), ), }, }, diff --git a/internal/service/elasticbeanstalk/application_test.go b/internal/service/elasticbeanstalk/application_test.go index dff0c801425..48a929fd6de 100644 --- a/internal/service/elasticbeanstalk/application_test.go +++ b/internal/service/elasticbeanstalk/application_test.go @@ -36,8 +36,9 @@ func TestAccElasticBeanstalkApplication_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &app), resource.TestCheckResourceAttr(resourceName, "appversion_lifecycle.#", "0"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "elasticbeanstalk", "application/{name}"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), @@ -138,7 +139,7 @@ func TestAccElasticBeanstalkApplication_description(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &app), resource.TestCheckResourceAttr(resourceName, "appversion_lifecycle.#", "0"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "elasticbeanstalk", "application/{name}"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "description 1"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), @@ -154,7 +155,7 @@ func TestAccElasticBeanstalkApplication_description(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &app), resource.TestCheckResourceAttr(resourceName, "appversion_lifecycle.#", "0"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "elasticbeanstalk", "application/{name}"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "description 2"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/elb/load_balancer_test.go b/internal/service/elb/load_balancer_test.go index b79afae8e41..48997486ded 100644 --- a/internal/service/elb/load_balancer_test.go +++ b/internal/service/elb/load_balancer_test.go @@ -75,7 +75,7 @@ func TestAccELBLoadBalancer_basic(t *testing.T) { testAccCheckLoadBalancerExists(ctx, resourceName, &conf), testAccCheckLoadBalancerAttributes(&conf), resource.TestCheckResourceAttr(resourceName, "access_logs.#", "0"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "elasticloadbalancing", "loadbalancer/{name}"), resource.TestCheckResourceAttr(resourceName, "availability_zones.#", "3"), resource.TestCheckResourceAttr(resourceName, "connection_draining", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "connection_draining_timeout", "300"), @@ -83,6 +83,7 @@ func TestAccELBLoadBalancer_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "desync_mitigation_mode", "defensive"), resource.TestCheckResourceAttrSet(resourceName, names.AttrDNSName), resource.TestCheckResourceAttr(resourceName, "health_check.#", "1"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrName), resource.TestCheckResourceAttr(resourceName, "idle_timeout", "60"), resource.TestCheckResourceAttr(resourceName, "instances.#", "0"), resource.TestCheckResourceAttr(resourceName, "internal", acctest.CtFalse), diff --git a/internal/service/elbv2/load_balancer_test.go b/internal/service/elbv2/load_balancer_test.go index fac3d5ec986..c6933423c18 100644 --- a/internal/service/elbv2/load_balancer_test.go +++ b/internal/service/elbv2/load_balancer_test.go @@ -88,7 +88,7 @@ func TestAccELBV2LoadBalancer_ALB_basic(t *testing.T) { testAccCheckLoadBalancerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "access_logs.#", "1"), resource.TestCheckResourceAttr(resourceName, "access_logs.0.enabled", acctest.CtFalse), - acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("loadbalancer/app/%s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("loadbalancer/app/%s/[a-z0-9]{16}$", rName))), resource.TestCheckResourceAttr(resourceName, "connection_logs.#", "1"), resource.TestCheckResourceAttr(resourceName, "connection_logs.0.enabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "desync_mitigation_mode", "defensive"), @@ -97,6 +97,7 @@ func TestAccELBV2LoadBalancer_ALB_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "enable_tls_version_and_cipher_suite_headers", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "enable_xff_client_port", acctest.CtFalse), resource.TestCheckNoResourceAttr(resourceName, "enable_zonal_shift"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "idle_timeout", "30"), resource.TestCheckResourceAttr(resourceName, "internal", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, names.AttrIPAddressType, "ipv4"), @@ -133,12 +134,13 @@ func TestAccELBV2LoadBalancer_NLB_basic(t *testing.T) { testAccCheckLoadBalancerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "access_logs.#", "1"), resource.TestCheckResourceAttr(resourceName, "access_logs.0.enabled", acctest.CtFalse), - acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("loadbalancer/net/%s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("loadbalancer/net/%s/[a-z0-9]{16}$", rName))), resource.TestCheckNoResourceAttr(resourceName, "connection_logs.#"), resource.TestCheckResourceAttrSet(resourceName, names.AttrDNSName), resource.TestCheckResourceAttr(resourceName, "dns_record_client_routing_policy", "any_availability_zone"), resource.TestCheckResourceAttr(resourceName, "enable_deletion_protection", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "enable_zonal_shift", acctest.CtFalse), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "internal", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, names.AttrIPAddressType, "ipv4"), resource.TestCheckResourceAttr(resourceName, "load_balancer_type", "network"), @@ -482,7 +484,7 @@ func TestAccELBV2LoadBalancer_networkLoadBalancerEIP(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrIPAddressType, "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "zone_id"), resource.TestCheckResourceAttrSet(resourceName, names.AttrDNSName), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("loadbalancer/net/%s/[a-z0-9]{16}$", rName))), resource.TestCheckResourceAttr(resourceName, "load_balancer_type", "network"), resource.TestCheckResourceAttr(resourceName, "enable_deletion_protection", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "subnet_mapping.#", "2"), @@ -558,7 +560,7 @@ func TestAccELBV2LoadBalancer_backwardsCompatibility(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), resource.TestCheckResourceAttrSet(resourceName, "zone_id"), resource.TestCheckResourceAttrSet(resourceName, names.AttrDNSName), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("loadbalancer/app/%s/[a-z0-9]{16}$", rName))), ), }, }, diff --git a/internal/service/elbv2/target_group_data_source_test.go b/internal/service/elbv2/target_group_data_source_test.go index 80f3d610314..f15db10c911 100644 --- a/internal/service/elbv2/target_group_data_source_test.go +++ b/internal/service/elbv2/target_group_data_source_test.go @@ -18,6 +18,7 @@ func TestAccELBV2TargetGroupDataSource_basic(t *testing.T) { rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) datasourceNameByARN := "data.aws_lb_target_group.alb_tg_test_with_arn" datasourceNameByName := "data.aws_lb_target_group.alb_tg_test_with_name" + resourceName := "aws_lb_target_group.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, @@ -28,8 +29,8 @@ func TestAccELBV2TargetGroupDataSource_basic(t *testing.T) { Config: testAccTargetGroupDataSourceConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr(datasourceNameByARN, names.AttrName, rName), - resource.TestCheckResourceAttrSet(datasourceNameByARN, names.AttrARN), - resource.TestCheckResourceAttrSet(datasourceNameByARN, "arn_suffix"), + resource.TestCheckResourceAttrPair(datasourceNameByARN, names.AttrARN, resourceName, names.AttrARN), + resource.TestCheckResourceAttrPair(datasourceNameByARN, "arn_suffix", resourceName, "arn_suffix"), resource.TestCheckResourceAttr(datasourceNameByARN, "load_balancer_arns.#", "0"), resource.TestCheckResourceAttr(datasourceNameByARN, names.AttrPort, "8080"), resource.TestCheckResourceAttr(datasourceNameByARN, names.AttrProtocol, "HTTP"), @@ -53,8 +54,8 @@ func TestAccELBV2TargetGroupDataSource_basic(t *testing.T) { resource.TestCheckResourceAttr(datasourceNameByARN, "health_check.0.matcher", "200-299"), resource.TestCheckResourceAttr(datasourceNameByName, names.AttrName, rName), - resource.TestCheckResourceAttrSet(datasourceNameByName, names.AttrARN), - resource.TestCheckResourceAttrSet(datasourceNameByName, "arn_suffix"), + resource.TestCheckResourceAttrPair(datasourceNameByName, names.AttrARN, resourceName, names.AttrARN), + resource.TestCheckResourceAttrPair(datasourceNameByName, "arn_suffix", resourceName, "arn_suffix"), resource.TestCheckResourceAttr(datasourceNameByName, "load_balancer_arns.#", "0"), resource.TestCheckResourceAttr(datasourceNameByName, names.AttrPort, "8080"), resource.TestCheckResourceAttr(datasourceNameByName, names.AttrProtocol, "HTTP"), @@ -84,7 +85,8 @@ func TestAccELBV2TargetGroupDataSource_basic(t *testing.T) { func TestAccELBV2TargetGroupDataSource_appCookie(t *testing.T) { ctx := acctest.Context(t) rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) - resourceNameArn := "data.aws_lb_target_group.alb_tg_test_with_arn" + dataSourceName := "data.aws_lb_target_group.alb_tg_test_with_arn" + resourceName := "aws_lb_target_group.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, @@ -94,31 +96,31 @@ func TestAccELBV2TargetGroupDataSource_appCookie(t *testing.T) { { Config: testAccTargetGroupDataSourceConfig_appCookie(rName), Check: resource.ComposeAggregateTestCheckFunc( - resource.TestCheckResourceAttr(resourceNameArn, names.AttrName, rName), - resource.TestCheckResourceAttrSet(resourceNameArn, names.AttrARN), - resource.TestCheckResourceAttrSet(resourceNameArn, "arn_suffix"), - resource.TestCheckResourceAttr(resourceNameArn, "load_balancer_arns.#", "0"), - resource.TestCheckResourceAttr(resourceNameArn, names.AttrPort, "8080"), - resource.TestCheckResourceAttr(resourceNameArn, names.AttrProtocol, "HTTP"), - resource.TestCheckResourceAttr(resourceNameArn, "protocol_version", "HTTP1"), - resource.TestCheckResourceAttrSet(resourceNameArn, names.AttrVPCID), - resource.TestCheckResourceAttrSet(resourceNameArn, "load_balancing_algorithm_type"), - resource.TestCheckResourceAttrSet(resourceNameArn, "load_balancing_cross_zone_enabled"), - resource.TestCheckResourceAttr(resourceNameArn, "deregistration_delay", "300"), - resource.TestCheckResourceAttr(resourceNameArn, "slow_start", "0"), - resource.TestCheckResourceAttr(resourceNameArn, acctest.CtTagsPercent, "1"), - resource.TestCheckResourceAttr(resourceNameArn, "tags.Name", rName), - resource.TestCheckResourceAttr(resourceNameArn, "stickiness.#", "1"), - resource.TestCheckResourceAttr(resourceNameArn, "stickiness.0.cookie_duration", "600"), - resource.TestCheckResourceAttr(resourceNameArn, "stickiness.0.cookie_name", "cookieName"), - resource.TestCheckResourceAttr(resourceNameArn, "health_check.#", "1"), - resource.TestCheckResourceAttr(resourceNameArn, "health_check.0.path", "/health"), - resource.TestCheckResourceAttr(resourceNameArn, "health_check.0.port", "8081"), - resource.TestCheckResourceAttr(resourceNameArn, "health_check.0.protocol", "HTTP"), - resource.TestCheckResourceAttr(resourceNameArn, "health_check.0.timeout", "3"), - resource.TestCheckResourceAttr(resourceNameArn, "health_check.0.healthy_threshold", "3"), - resource.TestCheckResourceAttr(resourceNameArn, "health_check.0.unhealthy_threshold", "3"), - resource.TestCheckResourceAttr(resourceNameArn, "health_check.0.matcher", "200-299"), + resource.TestCheckResourceAttr(dataSourceName, names.AttrName, rName), + resource.TestCheckResourceAttrPair(dataSourceName, names.AttrARN, resourceName, names.AttrARN), + resource.TestCheckResourceAttrPair(dataSourceName, "arn_suffix", resourceName, "arn_suffix"), + resource.TestCheckResourceAttr(dataSourceName, "load_balancer_arns.#", "0"), + resource.TestCheckResourceAttr(dataSourceName, names.AttrPort, "8080"), + resource.TestCheckResourceAttr(dataSourceName, names.AttrProtocol, "HTTP"), + resource.TestCheckResourceAttr(dataSourceName, "protocol_version", "HTTP1"), + resource.TestCheckResourceAttrSet(dataSourceName, names.AttrVPCID), + resource.TestCheckResourceAttrSet(dataSourceName, "load_balancing_algorithm_type"), + resource.TestCheckResourceAttrSet(dataSourceName, "load_balancing_cross_zone_enabled"), + resource.TestCheckResourceAttr(dataSourceName, "deregistration_delay", "300"), + resource.TestCheckResourceAttr(dataSourceName, "slow_start", "0"), + resource.TestCheckResourceAttr(dataSourceName, acctest.CtTagsPercent, "1"), + resource.TestCheckResourceAttr(dataSourceName, "tags.Name", rName), + resource.TestCheckResourceAttr(dataSourceName, "stickiness.#", "1"), + resource.TestCheckResourceAttr(dataSourceName, "stickiness.0.cookie_duration", "600"), + resource.TestCheckResourceAttr(dataSourceName, "stickiness.0.cookie_name", "cookieName"), + resource.TestCheckResourceAttr(dataSourceName, "health_check.#", "1"), + resource.TestCheckResourceAttr(dataSourceName, "health_check.0.path", "/health"), + resource.TestCheckResourceAttr(dataSourceName, "health_check.0.port", "8081"), + resource.TestCheckResourceAttr(dataSourceName, "health_check.0.protocol", "HTTP"), + resource.TestCheckResourceAttr(dataSourceName, "health_check.0.timeout", "3"), + resource.TestCheckResourceAttr(dataSourceName, "health_check.0.healthy_threshold", "3"), + resource.TestCheckResourceAttr(dataSourceName, "health_check.0.unhealthy_threshold", "3"), + resource.TestCheckResourceAttr(dataSourceName, "health_check.0.matcher", "200-299"), ), }, }, @@ -128,8 +130,9 @@ func TestAccELBV2TargetGroupDataSource_appCookie(t *testing.T) { func TestAccELBV2TargetGroupDataSource_backwardsCompatibility(t *testing.T) { ctx := acctest.Context(t) rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) - resourceNameArn := "data.aws_alb_target_group.alb_tg_test_with_arn" - resourceName := "data.aws_alb_target_group.alb_tg_test_with_name" + datasourceNameByARN := "data.aws_alb_target_group.alb_tg_test_with_arn" + datasourceNameByName := "data.aws_alb_target_group.alb_tg_test_with_name" + resourceName := "aws_alb_target_group.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, @@ -139,48 +142,48 @@ func TestAccELBV2TargetGroupDataSource_backwardsCompatibility(t *testing.T) { { Config: testAccTargetGroupDataSourceConfig_backwardsCompatibility(rName), Check: resource.ComposeAggregateTestCheckFunc( - resource.TestCheckResourceAttr(resourceNameArn, names.AttrName, rName), - resource.TestCheckResourceAttrSet(resourceNameArn, names.AttrARN), - resource.TestCheckResourceAttrSet(resourceNameArn, "arn_suffix"), - resource.TestCheckResourceAttr(resourceNameArn, "load_balancer_arns.#", "0"), - resource.TestCheckResourceAttr(resourceNameArn, names.AttrPort, "8080"), - resource.TestCheckResourceAttr(resourceNameArn, names.AttrProtocol, "HTTP"), - resource.TestCheckResourceAttr(resourceNameArn, names.AttrProtocol, "HTTP"), - resource.TestCheckResourceAttrSet(resourceNameArn, names.AttrVPCID), - resource.TestCheckResourceAttr(resourceNameArn, "deregistration_delay", "300"), - resource.TestCheckResourceAttr(resourceNameArn, "slow_start", "0"), - resource.TestCheckResourceAttr(resourceNameArn, acctest.CtTagsPercent, "1"), - resource.TestCheckResourceAttr(resourceNameArn, "tags.Name", rName), - resource.TestCheckResourceAttr(resourceNameArn, "stickiness.#", "1"), - resource.TestCheckResourceAttr(resourceNameArn, "health_check.#", "1"), - resource.TestCheckResourceAttr(resourceNameArn, "health_check.0.path", "/health"), - resource.TestCheckResourceAttr(resourceNameArn, "health_check.0.port", "8081"), - resource.TestCheckResourceAttr(resourceNameArn, "health_check.0.protocol", "HTTP"), - resource.TestCheckResourceAttr(resourceNameArn, "health_check.0.timeout", "3"), - resource.TestCheckResourceAttr(resourceNameArn, "health_check.0.healthy_threshold", "3"), - resource.TestCheckResourceAttr(resourceNameArn, "health_check.0.unhealthy_threshold", "3"), - resource.TestCheckResourceAttr(resourceNameArn, "health_check.0.matcher", "200-299"), - - resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), - resource.TestCheckResourceAttrSet(resourceName, "arn_suffix"), - resource.TestCheckResourceAttr(resourceName, "load_balancer_arns.#", "0"), - resource.TestCheckResourceAttr(resourceName, names.AttrPort, "8080"), - resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTP"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), - resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "300"), - resource.TestCheckResourceAttr(resourceName, "slow_start", "0"), - resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), - resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), - resource.TestCheckResourceAttr(resourceName, "stickiness.#", "1"), - resource.TestCheckResourceAttr(resourceName, "health_check.#", "1"), - resource.TestCheckResourceAttr(resourceName, "health_check.0.path", "/health"), - resource.TestCheckResourceAttr(resourceName, "health_check.0.port", "8081"), - resource.TestCheckResourceAttr(resourceName, "health_check.0.protocol", "HTTP"), - resource.TestCheckResourceAttr(resourceName, "health_check.0.timeout", "3"), - resource.TestCheckResourceAttr(resourceName, "health_check.0.healthy_threshold", "3"), - resource.TestCheckResourceAttr(resourceName, "health_check.0.unhealthy_threshold", "3"), - resource.TestCheckResourceAttr(resourceName, "health_check.0.matcher", "200-299"), + resource.TestCheckResourceAttr(datasourceNameByARN, names.AttrName, rName), + resource.TestCheckResourceAttrPair(datasourceNameByARN, names.AttrARN, resourceName, names.AttrARN), + resource.TestCheckResourceAttrPair(datasourceNameByARN, "arn_suffix", resourceName, "arn_suffix"), + resource.TestCheckResourceAttr(datasourceNameByARN, "load_balancer_arns.#", "0"), + resource.TestCheckResourceAttr(datasourceNameByARN, names.AttrPort, "8080"), + resource.TestCheckResourceAttr(datasourceNameByARN, names.AttrProtocol, "HTTP"), + resource.TestCheckResourceAttr(datasourceNameByARN, names.AttrProtocol, "HTTP"), + resource.TestCheckResourceAttrSet(datasourceNameByARN, names.AttrVPCID), + resource.TestCheckResourceAttr(datasourceNameByARN, "deregistration_delay", "300"), + resource.TestCheckResourceAttr(datasourceNameByARN, "slow_start", "0"), + resource.TestCheckResourceAttr(datasourceNameByARN, acctest.CtTagsPercent, "1"), + resource.TestCheckResourceAttr(datasourceNameByARN, "tags.Name", rName), + resource.TestCheckResourceAttr(datasourceNameByARN, "stickiness.#", "1"), + resource.TestCheckResourceAttr(datasourceNameByARN, "health_check.#", "1"), + resource.TestCheckResourceAttr(datasourceNameByARN, "health_check.0.path", "/health"), + resource.TestCheckResourceAttr(datasourceNameByARN, "health_check.0.port", "8081"), + resource.TestCheckResourceAttr(datasourceNameByARN, "health_check.0.protocol", "HTTP"), + resource.TestCheckResourceAttr(datasourceNameByARN, "health_check.0.timeout", "3"), + resource.TestCheckResourceAttr(datasourceNameByARN, "health_check.0.healthy_threshold", "3"), + resource.TestCheckResourceAttr(datasourceNameByARN, "health_check.0.unhealthy_threshold", "3"), + resource.TestCheckResourceAttr(datasourceNameByARN, "health_check.0.matcher", "200-299"), + + resource.TestCheckResourceAttr(datasourceNameByName, names.AttrName, rName), + resource.TestCheckResourceAttrPair(datasourceNameByName, names.AttrARN, resourceName, names.AttrARN), + resource.TestCheckResourceAttrPair(datasourceNameByName, "arn_suffix", resourceName, "arn_suffix"), + resource.TestCheckResourceAttr(datasourceNameByName, "load_balancer_arns.#", "0"), + resource.TestCheckResourceAttr(datasourceNameByName, names.AttrPort, "8080"), + resource.TestCheckResourceAttr(datasourceNameByName, names.AttrProtocol, "HTTP"), + resource.TestCheckResourceAttrSet(datasourceNameByName, names.AttrVPCID), + resource.TestCheckResourceAttr(datasourceNameByName, "deregistration_delay", "300"), + resource.TestCheckResourceAttr(datasourceNameByName, "slow_start", "0"), + resource.TestCheckResourceAttr(datasourceNameByName, acctest.CtTagsPercent, "1"), + resource.TestCheckResourceAttr(datasourceNameByName, "tags.Name", rName), + resource.TestCheckResourceAttr(datasourceNameByName, "stickiness.#", "1"), + resource.TestCheckResourceAttr(datasourceNameByName, "health_check.#", "1"), + resource.TestCheckResourceAttr(datasourceNameByName, "health_check.0.path", "/health"), + resource.TestCheckResourceAttr(datasourceNameByName, "health_check.0.port", "8081"), + resource.TestCheckResourceAttr(datasourceNameByName, "health_check.0.protocol", "HTTP"), + resource.TestCheckResourceAttr(datasourceNameByName, "health_check.0.timeout", "3"), + resource.TestCheckResourceAttr(datasourceNameByName, "health_check.0.healthy_threshold", "3"), + resource.TestCheckResourceAttr(datasourceNameByName, "health_check.0.unhealthy_threshold", "3"), + resource.TestCheckResourceAttr(datasourceNameByName, "health_check.0.matcher", "200-299"), ), }, }, diff --git a/internal/service/elbv2/target_group_test.go b/internal/service/elbv2/target_group_test.go index 34739875902..5b799312dc5 100644 --- a/internal/service/elbv2/target_group_test.go +++ b/internal/service/elbv2/target_group_test.go @@ -107,14 +107,15 @@ func TestAccELBV2TargetGroup_basic(t *testing.T) { Config: testAccTargetGroupConfig_basic(rName, 200), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, ""), resource.TestCheckResourceAttr(resourceName, "load_balancer_arns.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), resource.TestCheckResourceAttr(resourceName, "protocol_version", "HTTP1"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "slow_start", "0"), resource.TestCheckResourceAttr(resourceName, "stickiness.#", "1"), @@ -287,12 +288,13 @@ func TestAccELBV2TargetGroup_backwardsCompatibility(t *testing.T) { Config: testAccTargetGroupConfig_backwardsCompatibility(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "load_balancer_arns.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "slow_start", "0"), resource.TestCheckResourceAttr(resourceName, "stickiness.#", "1"), @@ -332,12 +334,13 @@ func TestAccELBV2TargetGroup_ProtocolVersion_basic(t *testing.T) { Config: testAccTargetGroupConfig_protocolVersion(rName, "HTTP2"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &before), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), resource.TestCheckResourceAttr(resourceName, "protocol_version", "HTTP2"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "slow_start", "0"), resource.TestCheckResourceAttr(resourceName, "stickiness.#", "1"), @@ -501,11 +504,12 @@ func TestAccELBV2TargetGroup_HealthCheck_tcpHTTPS(t *testing.T) { Config: testAccTargetGroupConfig_typeTCPHTTPHealthCheck(rName, "/healthz", 2), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &confBefore), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "8082"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "TCP"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "300"), resource.TestCheckResourceAttr(resourceName, "health_check.#", "1"), resource.TestCheckResourceAttr(resourceName, "health_check.0.interval", "30"), @@ -523,11 +527,12 @@ func TestAccELBV2TargetGroup_HealthCheck_tcpHTTPS(t *testing.T) { Config: testAccTargetGroupConfig_typeTCPHTTPHealthCheck(rName, "/healthz2", 4), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &confAfter), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "8082"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "TCP"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "300"), resource.TestCheckResourceAttr(resourceName, "health_check.#", "1"), resource.TestCheckResourceAttr(resourceName, "health_check.0.interval", "30"), @@ -561,7 +566,7 @@ func TestAccELBV2TargetGroup_attrsOnCreate(t *testing.T) { Config: testAccTargetGroupConfig_basic(rName, 0), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "0"), resource.TestCheckResourceAttr(resourceName, "slow_start", "0"), ), @@ -570,7 +575,7 @@ func TestAccELBV2TargetGroup_attrsOnCreate(t *testing.T) { Config: testAccTargetGroupConfig_basic(rName, 200), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "slow_start", "0"), ), @@ -595,11 +600,12 @@ func TestAccELBV2TargetGroup_udp(t *testing.T) { Config: testAccTargetGroupConfig_basicUdp(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "514"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "UDP"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "health_check.#", "1"), resource.TestCheckResourceAttr(resourceName, "health_check.0.port", "514"), resource.TestCheckResourceAttr(resourceName, "health_check.0.protocol", "TCP"), @@ -750,12 +756,13 @@ func TestAccELBV2TargetGroup_Defaults_application(t *testing.T) { Config: testAccTargetGroupConfig_albDefaults(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTP"), resource.TestCheckResourceAttr(resourceName, "protocol_version", "HTTP1"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "slow_start", "0"), resource.TestCheckResourceAttr(resourceName, "health_check.#", "1"), @@ -795,11 +802,12 @@ timeout = 4 Config: testAccTargetGroupConfig_nlbDefaults(rName, healthCheckValid), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "TCP"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "slow_start", "0"), resource.TestCheckResourceAttr(resourceName, "health_check.#", "1"), @@ -833,7 +841,7 @@ func TestAccELBV2TargetGroup_HealthCheck_enable(t *testing.T) { Config: testAccTargetGroupConfig_noHealthcheck(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "health_check.#", "1"), resource.TestCheckResourceAttr(resourceName, "health_check.0.enabled", acctest.CtFalse), @@ -843,7 +851,7 @@ func TestAccELBV2TargetGroup_HealthCheck_enable(t *testing.T) { Config: testAccTargetGroupConfig_enableHealthcheck(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "health_check.#", "1"), resource.TestCheckResourceAttr(resourceName, "health_check.0.enabled", acctest.CtTrue), @@ -869,11 +877,12 @@ func TestAccELBV2TargetGroup_NetworkLB_tcpHealthCheckUpdated(t *testing.T) { Config: testAccTargetGroupConfig_typeTCP(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &targetGroup1), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "8082"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "TCP"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "proxy_protocol_v2", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "connection_termination", acctest.CtFalse), @@ -894,11 +903,12 @@ func TestAccELBV2TargetGroup_NetworkLB_tcpHealthCheckUpdated(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &targetGroup2), testAccCheckTargetGroupNotRecreated(&targetGroup1, &targetGroup2), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "8082"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "TCP"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "health_check.#", "1"), resource.TestCheckResourceAttr(resourceName, "health_check.0.enabled", acctest.CtTrue), @@ -1420,11 +1430,12 @@ func TestAccELBV2TargetGroup_Stickiness_updateAppEnabled(t *testing.T) { Config: testAccTargetGroupConfig_appStickiness(rName, false, false), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "health_check.#", "1"), resource.TestCheckResourceAttr(resourceName, "health_check.0.path", "/health2"), @@ -1441,11 +1452,12 @@ func TestAccELBV2TargetGroup_Stickiness_updateAppEnabled(t *testing.T) { Config: testAccTargetGroupConfig_appStickiness(rName, true, true), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "stickiness.#", "1"), resource.TestCheckResourceAttr(resourceName, "stickiness.0.enabled", acctest.CtTrue), @@ -1467,11 +1479,12 @@ func TestAccELBV2TargetGroup_Stickiness_updateAppEnabled(t *testing.T) { Config: testAccTargetGroupConfig_appStickiness(rName, true, false), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "stickiness.#", "1"), resource.TestCheckResourceAttr(resourceName, "stickiness.0.enabled", acctest.CtFalse), @@ -1509,11 +1522,12 @@ func TestAccELBV2TargetGroup_Stickiness_updateStickinessType(t *testing.T) { Config: testAccTargetGroupConfig_stickiness(rName, true, true), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "stickiness.#", "1"), resource.TestCheckResourceAttr(resourceName, "stickiness.0.enabled", acctest.CtTrue), @@ -1535,11 +1549,12 @@ func TestAccELBV2TargetGroup_Stickiness_updateStickinessType(t *testing.T) { Config: testAccTargetGroupConfig_appStickiness(rName, true, true), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "stickiness.#", "1"), resource.TestCheckResourceAttr(resourceName, "stickiness.0.enabled", acctest.CtTrue), @@ -1561,11 +1576,12 @@ func TestAccELBV2TargetGroup_Stickiness_updateStickinessType(t *testing.T) { Config: testAccTargetGroupConfig_stickiness(rName, true, true), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "stickiness.#", "1"), resource.TestCheckResourceAttr(resourceName, "stickiness.0.enabled", acctest.CtTrue), @@ -1603,11 +1619,12 @@ func TestAccELBV2TargetGroup_HealthCheck_update(t *testing.T) { Config: testAccTargetGroupConfig_basic(rName, 200), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "stickiness.#", "1"), resource.TestCheckResourceAttr(resourceName, "stickiness.0.type", "lb_cookie"), @@ -1628,11 +1645,12 @@ func TestAccELBV2TargetGroup_HealthCheck_update(t *testing.T) { Config: testAccTargetGroupConfig_updateHealthCheck(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "stickiness.#", "1"), resource.TestCheckResourceAttr(resourceName, "stickiness.0.type", "lb_cookie"), @@ -1669,11 +1687,12 @@ func TestAccELBV2TargetGroup_Stickiness_updateEnabled(t *testing.T) { Config: testAccTargetGroupConfig_stickiness(rName, false, false), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "health_check.#", "1"), resource.TestCheckResourceAttr(resourceName, "health_check.0.path", "/health2"), @@ -1690,11 +1709,12 @@ func TestAccELBV2TargetGroup_Stickiness_updateEnabled(t *testing.T) { Config: testAccTargetGroupConfig_stickiness(rName, true, true), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "stickiness.#", "1"), resource.TestCheckResourceAttr(resourceName, "stickiness.0.enabled", acctest.CtTrue), @@ -1715,11 +1735,12 @@ func TestAccELBV2TargetGroup_Stickiness_updateEnabled(t *testing.T) { Config: testAccTargetGroupConfig_stickiness(rName, true, false), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "stickiness.#", "1"), resource.TestCheckResourceAttr(resourceName, "stickiness.0.enabled", acctest.CtFalse), @@ -1756,7 +1777,7 @@ func TestAccELBV2TargetGroup_HealthCheck_without(t *testing.T) { Config: testAccTargetGroupConfig_noHealthcheck(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "health_check.#", "1"), resource.TestCheckResourceAttr(resourceName, "health_check.0.enabled", acctest.CtFalse), @@ -1782,11 +1803,12 @@ func TestAccELBV2TargetGroup_ALBAlias_basic(t *testing.T) { Config: testAccTargetGroupConfig_albBasic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "slow_start", "0"), resource.TestCheckResourceAttr(resourceName, "target_type", "instance"), @@ -2202,11 +2224,12 @@ func TestAccELBV2TargetGroup_ALBAlias_updateHealthCheck(t *testing.T) { Config: testAccTargetGroupConfig_albBasic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "stickiness.#", "1"), resource.TestCheckResourceAttr(resourceName, "stickiness.0.type", "lb_cookie"), @@ -2226,11 +2249,12 @@ func TestAccELBV2TargetGroup_ALBAlias_updateHealthCheck(t *testing.T) { Config: testAccTargetGroupConfig_albUpdateHealthCheck(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "stickiness.#", "1"), resource.TestCheckResourceAttr(resourceName, "stickiness.0.type", "lb_cookie"), @@ -2266,7 +2290,7 @@ func TestAccELBV2TargetGroup_ALBAlias_updateLoadBalancingAlgorithmType(t *testin Config: testAccTargetGroupConfig_albLoadBalancingAlgorithm(rName, false, ""), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "load_balancing_algorithm_type", "round_robin"), ), @@ -2275,7 +2299,7 @@ func TestAccELBV2TargetGroup_ALBAlias_updateLoadBalancingAlgorithmType(t *testin Config: testAccTargetGroupConfig_albLoadBalancingAlgorithm(rName, true, "round_robin"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "load_balancing_algorithm_type", "round_robin"), ), @@ -2284,7 +2308,7 @@ func TestAccELBV2TargetGroup_ALBAlias_updateLoadBalancingAlgorithmType(t *testin Config: testAccTargetGroupConfig_albLoadBalancingAlgorithm(rName, true, "least_outstanding_requests"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "load_balancing_algorithm_type", "least_outstanding_requests"), ), @@ -2293,7 +2317,7 @@ func TestAccELBV2TargetGroup_ALBAlias_updateLoadBalancingAlgorithmType(t *testin Config: testAccTargetGroupConfig_albLoadBalancingAlgorithm(rName, true, "weighted_random"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "load_balancing_algorithm_type", "weighted_random"), ), @@ -2340,7 +2364,7 @@ func TestAccELBV2TargetGroup_ALBAlias_updateLoadBalancingAnomalyMitigation(t *te Config: testAccTargetGroupConfig_albLoadBalancingAnomalyMitigation(rName, false, "weighted_random", ""), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "load_balancing_anomaly_mitigation", "off"), ), @@ -2349,7 +2373,7 @@ func TestAccELBV2TargetGroup_ALBAlias_updateLoadBalancingAnomalyMitigation(t *te Config: testAccTargetGroupConfig_albLoadBalancingAnomalyMitigation(rName, true, "weighted_random", "off"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "load_balancing_anomaly_mitigation", "off"), ), @@ -2358,7 +2382,7 @@ func TestAccELBV2TargetGroup_ALBAlias_updateLoadBalancingAnomalyMitigation(t *te Config: testAccTargetGroupConfig_albLoadBalancingAnomalyMitigation(rName, true, "weighted_random", "on"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "load_balancing_anomaly_mitigation", "on"), ), @@ -2383,7 +2407,7 @@ func TestAccELBV2TargetGroup_ALBAlias_updateLoadBalancingCrossZoneEnabled(t *tes Config: testAccTargetGroupConfig_albLoadBalancingCrossZoneEnabled(rName, false, false), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "load_balancing_cross_zone_enabled", "use_load_balancer_configuration"), ), @@ -2392,7 +2416,7 @@ func TestAccELBV2TargetGroup_ALBAlias_updateLoadBalancingCrossZoneEnabled(t *tes Config: testAccTargetGroupConfig_albLoadBalancingCrossZoneEnabled(rName, true, true), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "load_balancing_cross_zone_enabled", acctest.CtTrue), ), @@ -2401,7 +2425,7 @@ func TestAccELBV2TargetGroup_ALBAlias_updateLoadBalancingCrossZoneEnabled(t *tes Config: testAccTargetGroupConfig_albLoadBalancingCrossZoneEnabled(rName, true, false), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "load_balancing_cross_zone_enabled", acctest.CtFalse), ), @@ -2426,11 +2450,12 @@ func TestAccELBV2TargetGroup_ALBAlias_updateStickinessEnabled(t *testing.T) { Config: testAccTargetGroupConfig_albStickiness(rName, false, false), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "health_check.#", "1"), resource.TestCheckResourceAttr(resourceName, "health_check.0.path", "/health2"), @@ -2447,11 +2472,12 @@ func TestAccELBV2TargetGroup_ALBAlias_updateStickinessEnabled(t *testing.T) { Config: testAccTargetGroupConfig_albStickiness(rName, true, true), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "stickiness.#", "1"), resource.TestCheckResourceAttr(resourceName, "stickiness.0.enabled", acctest.CtTrue), @@ -2472,11 +2498,12 @@ func TestAccELBV2TargetGroup_ALBAlias_updateStickinessEnabled(t *testing.T) { Config: testAccTargetGroupConfig_albStickiness(rName, true, false), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("targetgroup/%s/[a-z0-9]{16}$", rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), - resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "deregistration_delay", "200"), resource.TestCheckResourceAttr(resourceName, "stickiness.#", "1"), resource.TestCheckResourceAttr(resourceName, "stickiness.0.enabled", acctest.CtFalse), diff --git a/internal/service/elbv2/trust_store_data_source_test.go b/internal/service/elbv2/trust_store_data_source_test.go index a5bd42b82ed..de3dba7a864 100644 --- a/internal/service/elbv2/trust_store_data_source_test.go +++ b/internal/service/elbv2/trust_store_data_source_test.go @@ -18,6 +18,7 @@ func TestAccELBV2TrustStoreDataSource_basic(t *testing.T) { rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) datasourceNameByName := "data.aws_lb_trust_store.named" datasourceNameByArn := "data.aws_lb_trust_store.with_arn" + resourceName := "aws_lb_trust_store.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, @@ -29,14 +30,14 @@ func TestAccELBV2TrustStoreDataSource_basic(t *testing.T) { Config: testAccTrustStoreDataSourceConfig_withName(rName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(datasourceNameByName, names.AttrName, rName), - resource.TestCheckResourceAttrSet(datasourceNameByName, names.AttrARN), + resource.TestCheckResourceAttrPair(datasourceNameByName, names.AttrARN, resourceName, names.AttrARN), ), }, { Config: testAccTrustStoreDataSourceConfig_withARN(rName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(datasourceNameByArn, names.AttrName, rName), - resource.TestCheckResourceAttrSet(datasourceNameByArn, names.AttrARN), + resource.TestCheckResourceAttrPair(datasourceNameByArn, names.AttrARN, resourceName, names.AttrARN), ), }, }, diff --git a/internal/service/events/source_data_source_test.go b/internal/service/events/source_data_source_test.go index dc7b2136e6b..138f2283d6f 100644 --- a/internal/service/events/source_data_source_test.go +++ b/internal/service/events/source_data_source_test.go @@ -40,7 +40,7 @@ func TestAccEventsSourceDataSource_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(dataSourceName, names.AttrName, busName), resource.TestCheckResourceAttr(dataSourceName, "created_by", createdBy), - resource.TestCheckResourceAttrSet(dataSourceName, names.AttrARN), + resource.TestCheckResourceAttrSet(dataSourceName, names.AttrARN), // nosemgrep:ci.semgrep.acctest.checks.arn-resourceattrset // TODO: need event source for testing ), }, },