From fad26ec59e6ca15cf54bc72f788992e1fe96404f Mon Sep 17 00:00:00 2001 From: clint shryock Date: Fri, 10 Jun 2016 10:07:02 -0500 Subject: [PATCH 1/2] provider tests: Update to match new tags map in state --- builtin/providers/aws/data_source_aws_ami_test.go | 6 +++--- .../providers/aws/resource_aws_cloudformation_stack_test.go | 4 ++-- builtin/providers/aws/resource_aws_cloudtrail_test.go | 6 +++--- .../providers/aws/resource_aws_db_parameter_group_test.go | 4 ++-- .../providers/aws/resource_aws_db_security_group_test.go | 2 +- .../aws/resource_aws_rds_cluster_parameter_group_test.go | 4 ++-- builtin/providers/aws/resource_aws_redshift_cluster_test.go | 4 ++-- .../providers/azurerm/resource_arm_availability_set_test.go | 4 ++-- builtin/providers/azurerm/resource_arm_cdn_endpoint_test.go | 4 ++-- builtin/providers/azurerm/resource_arm_cdn_profile_test.go | 4 ++-- builtin/providers/azurerm/resource_arm_dns_a_record_test.go | 4 ++-- .../providers/azurerm/resource_arm_dns_aaaa_record_test.go | 4 ++-- .../providers/azurerm/resource_arm_dns_cname_record_test.go | 4 ++-- .../providers/azurerm/resource_arm_dns_mx_record_test.go | 4 ++-- .../providers/azurerm/resource_arm_dns_ns_record_test.go | 4 ++-- .../providers/azurerm/resource_arm_dns_srv_record_test.go | 4 ++-- .../providers/azurerm/resource_arm_dns_txt_record_test.go | 4 ++-- .../azurerm/resource_arm_network_interface_card_test.go | 4 ++-- .../azurerm/resource_arm_network_security_group_test.go | 4 ++-- builtin/providers/azurerm/resource_arm_public_ip_test.go | 4 ++-- .../providers/azurerm/resource_arm_resource_group_test.go | 4 ++-- builtin/providers/azurerm/resource_arm_route_table_test.go | 4 ++-- .../providers/azurerm/resource_arm_search_service_test.go | 6 +++--- builtin/providers/azurerm/resource_arm_sql_database_test.go | 4 ++-- builtin/providers/azurerm/resource_arm_sql_server_test.go | 4 ++-- .../providers/azurerm/resource_arm_storage_account_test.go | 4 ++-- .../providers/azurerm/resource_arm_virtual_machine_test.go | 4 ++-- .../providers/azurerm/resource_arm_virtual_network_test.go | 4 ++-- 28 files changed, 58 insertions(+), 58 deletions(-) diff --git a/builtin/providers/aws/data_source_aws_ami_test.go b/builtin/providers/aws/data_source_aws_ami_test.go index 2f8eba3eb..d1a2657aa 100644 --- a/builtin/providers/aws/data_source_aws_ami_test.go +++ b/builtin/providers/aws/data_source_aws_ami_test.go @@ -45,7 +45,7 @@ func TestAccAWSAmiDataSource_natInstance(t *testing.T) { resource.TestCheckResourceAttr("data.aws_ami.nat_ami", "state", "available"), resource.TestCheckResourceAttr("data.aws_ami.nat_ami", "state_reason.code", "UNSET"), resource.TestCheckResourceAttr("data.aws_ami.nat_ami", "state_reason.message", "UNSET"), - resource.TestCheckResourceAttr("data.aws_ami.nat_ami", "tags.#", "0"), + resource.TestCheckResourceAttr("data.aws_ami.nat_ami", "tags.%", "0"), resource.TestCheckResourceAttr("data.aws_ami.nat_ami", "virtualization_type", "hvm"), ), }, @@ -82,7 +82,7 @@ func TestAccAWSAmiDataSource_windowsInstance(t *testing.T) { resource.TestCheckResourceAttr("data.aws_ami.windows_ami", "state", "available"), resource.TestCheckResourceAttr("data.aws_ami.windows_ami", "state_reason.code", "UNSET"), resource.TestCheckResourceAttr("data.aws_ami.windows_ami", "state_reason.message", "UNSET"), - resource.TestCheckResourceAttr("data.aws_ami.windows_ami", "tags.#", "0"), + resource.TestCheckResourceAttr("data.aws_ami.windows_ami", "tags.%", "0"), resource.TestCheckResourceAttr("data.aws_ami.windows_ami", "virtualization_type", "hvm"), ), }, @@ -116,7 +116,7 @@ func TestAccAWSAmiDataSource_instanceStore(t *testing.T) { resource.TestCheckResourceAttr("data.aws_ami.instance_store_ami", "state", "available"), resource.TestCheckResourceAttr("data.aws_ami.instance_store_ami", "state_reason.code", "UNSET"), resource.TestCheckResourceAttr("data.aws_ami.instance_store_ami", "state_reason.message", "UNSET"), - resource.TestCheckResourceAttr("data.aws_ami.instance_store_ami", "tags.#", "0"), + resource.TestCheckResourceAttr("data.aws_ami.instance_store_ami", "tags.%", "0"), resource.TestCheckResourceAttr("data.aws_ami.instance_store_ami", "virtualization_type", "hvm"), ), }, diff --git a/builtin/providers/aws/resource_aws_cloudformation_stack_test.go b/builtin/providers/aws/resource_aws_cloudformation_stack_test.go index 33da17db2..0b26b6682 100644 --- a/builtin/providers/aws/resource_aws_cloudformation_stack_test.go +++ b/builtin/providers/aws/resource_aws_cloudformation_stack_test.go @@ -69,7 +69,7 @@ func TestAccAWSCloudFormation_allAttributes(t *testing.T) { resource.TestCheckResourceAttr("aws_cloudformation_stack.full", "parameters.#", "1"), resource.TestCheckResourceAttr("aws_cloudformation_stack.full", "parameters.VpcCIDR", "10.0.0.0/16"), resource.TestCheckResourceAttr("aws_cloudformation_stack.full", "policy_body", expectedPolicyBody), - resource.TestCheckResourceAttr("aws_cloudformation_stack.full", "tags.#", "2"), + resource.TestCheckResourceAttr("aws_cloudformation_stack.full", "tags.%", "2"), resource.TestCheckResourceAttr("aws_cloudformation_stack.full", "tags.First", "Mickey"), resource.TestCheckResourceAttr("aws_cloudformation_stack.full", "tags.Second", "Mouse"), resource.TestCheckResourceAttr("aws_cloudformation_stack.full", "timeout_in_minutes", "10"), @@ -87,7 +87,7 @@ func TestAccAWSCloudFormation_allAttributes(t *testing.T) { resource.TestCheckResourceAttr("aws_cloudformation_stack.full", "parameters.#", "1"), resource.TestCheckResourceAttr("aws_cloudformation_stack.full", "parameters.VpcCIDR", "10.0.0.0/16"), resource.TestCheckResourceAttr("aws_cloudformation_stack.full", "policy_body", expectedPolicyBody), - resource.TestCheckResourceAttr("aws_cloudformation_stack.full", "tags.#", "2"), + resource.TestCheckResourceAttr("aws_cloudformation_stack.full", "tags.%", "2"), resource.TestCheckResourceAttr("aws_cloudformation_stack.full", "tags.First", "Mickey"), resource.TestCheckResourceAttr("aws_cloudformation_stack.full", "tags.Second", "Mouse"), resource.TestCheckResourceAttr("aws_cloudformation_stack.full", "timeout_in_minutes", "10"), diff --git a/builtin/providers/aws/resource_aws_cloudtrail_test.go b/builtin/providers/aws/resource_aws_cloudtrail_test.go index 8f6ae7223..79a89cb2d 100644 --- a/builtin/providers/aws/resource_aws_cloudtrail_test.go +++ b/builtin/providers/aws/resource_aws_cloudtrail_test.go @@ -176,7 +176,7 @@ func TestAccAWSCloudTrail_tags(t *testing.T) { Config: testAccAWSCloudTrailConfig_tags(cloudTrailRandInt), Check: resource.ComposeTestCheckFunc( testAccCheckCloudTrailExists("aws_cloudtrail.foobar", &trail), - resource.TestCheckResourceAttr("aws_cloudtrail.foobar", "tags.#", "2"), + resource.TestCheckResourceAttr("aws_cloudtrail.foobar", "tags.%", "2"), testAccCheckCloudTrailLoadTags(&trail, &trailTags), testAccCheckCloudTrailCheckTags(&trailTags, map[string]string{"Foo": "moo", "Pooh": "hi"}), testAccCheckCloudTrailLogValidationEnabled("aws_cloudtrail.foobar", false, &trail), @@ -187,7 +187,7 @@ func TestAccAWSCloudTrail_tags(t *testing.T) { Config: testAccAWSCloudTrailConfig_tagsModified(cloudTrailRandInt), Check: resource.ComposeTestCheckFunc( testAccCheckCloudTrailExists("aws_cloudtrail.foobar", &trail), - resource.TestCheckResourceAttr("aws_cloudtrail.foobar", "tags.#", "3"), + resource.TestCheckResourceAttr("aws_cloudtrail.foobar", "tags.%", "3"), testAccCheckCloudTrailLoadTags(&trail, &trailTagsModified), testAccCheckCloudTrailCheckTags(&trailTagsModified, map[string]string{"Foo": "moo", "Moo": "boom", "Pooh": "hi"}), testAccCheckCloudTrailLogValidationEnabled("aws_cloudtrail.foobar", false, &trail), @@ -198,7 +198,7 @@ func TestAccAWSCloudTrail_tags(t *testing.T) { Config: testAccAWSCloudTrailConfig_tagsModifiedAgain(cloudTrailRandInt), Check: resource.ComposeTestCheckFunc( testAccCheckCloudTrailExists("aws_cloudtrail.foobar", &trail), - resource.TestCheckResourceAttr("aws_cloudtrail.foobar", "tags.#", "0"), + resource.TestCheckResourceAttr("aws_cloudtrail.foobar", "tags.%", "0"), testAccCheckCloudTrailLoadTags(&trail, &trailTagsModified), testAccCheckCloudTrailCheckTags(&trailTagsModified, map[string]string{}), testAccCheckCloudTrailLogValidationEnabled("aws_cloudtrail.foobar", false, &trail), diff --git a/builtin/providers/aws/resource_aws_db_parameter_group_test.go b/builtin/providers/aws/resource_aws_db_parameter_group_test.go index f620152cd..26c0e574d 100644 --- a/builtin/providers/aws/resource_aws_db_parameter_group_test.go +++ b/builtin/providers/aws/resource_aws_db_parameter_group_test.go @@ -48,7 +48,7 @@ func TestAccAWSDBParameterGroup_basic(t *testing.T) { resource.TestCheckResourceAttr( "aws_db_parameter_group.bar", "parameter.2478663599.value", "utf8"), resource.TestCheckResourceAttr( - "aws_db_parameter_group.bar", "tags.#", "1"), + "aws_db_parameter_group.bar", "tags.%", "1"), ), }, resource.TestStep{ @@ -83,7 +83,7 @@ func TestAccAWSDBParameterGroup_basic(t *testing.T) { resource.TestCheckResourceAttr( "aws_db_parameter_group.bar", "parameter.2478663599.value", "utf8"), resource.TestCheckResourceAttr( - "aws_db_parameter_group.bar", "tags.#", "2"), + "aws_db_parameter_group.bar", "tags.%", "2"), ), }, }, diff --git a/builtin/providers/aws/resource_aws_db_security_group_test.go b/builtin/providers/aws/resource_aws_db_security_group_test.go index e3dcd716e..cfafad50c 100644 --- a/builtin/providers/aws/resource_aws_db_security_group_test.go +++ b/builtin/providers/aws/resource_aws_db_security_group_test.go @@ -33,7 +33,7 @@ func TestAccAWSDBSecurityGroup_basic(t *testing.T) { resource.TestCheckResourceAttr( "aws_db_security_group.bar", "ingress.#", "1"), resource.TestCheckResourceAttr( - "aws_db_security_group.bar", "tags.#", "1"), + "aws_db_security_group.bar", "tags.%", "1"), ), }, }, diff --git a/builtin/providers/aws/resource_aws_rds_cluster_parameter_group_test.go b/builtin/providers/aws/resource_aws_rds_cluster_parameter_group_test.go index 46f7378c1..f2a3b2137 100644 --- a/builtin/providers/aws/resource_aws_rds_cluster_parameter_group_test.go +++ b/builtin/providers/aws/resource_aws_rds_cluster_parameter_group_test.go @@ -44,7 +44,7 @@ func TestAccAWSDBClusterParameterGroup_basic(t *testing.T) { resource.TestCheckResourceAttr( "aws_rds_cluster_parameter_group.bar", "parameter.2478663599.value", "utf8"), resource.TestCheckResourceAttr( - "aws_rds_cluster_parameter_group.bar", "tags.#", "1"), + "aws_rds_cluster_parameter_group.bar", "tags.%", "1"), ), }, resource.TestStep{ @@ -79,7 +79,7 @@ func TestAccAWSDBClusterParameterGroup_basic(t *testing.T) { resource.TestCheckResourceAttr( "aws_rds_cluster_parameter_group.bar", "parameter.2478663599.value", "utf8"), resource.TestCheckResourceAttr( - "aws_rds_cluster_parameter_group.bar", "tags.#", "2"), + "aws_rds_cluster_parameter_group.bar", "tags.%", "2"), ), }, }, diff --git a/builtin/providers/aws/resource_aws_redshift_cluster_test.go b/builtin/providers/aws/resource_aws_redshift_cluster_test.go index 307f19a0b..2a94b9123 100644 --- a/builtin/providers/aws/resource_aws_redshift_cluster_test.go +++ b/builtin/providers/aws/resource_aws_redshift_cluster_test.go @@ -154,7 +154,7 @@ func TestAccAWSRedshiftCluster_tags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSRedshiftClusterExists("aws_redshift_cluster.default", &v), resource.TestCheckResourceAttr( - "aws_redshift_cluster.default", "tags.#", "3"), + "aws_redshift_cluster.default", "tags.%", "3"), resource.TestCheckResourceAttr("aws_redshift_cluster.default", "tags.environment", "Production"), ), }, @@ -164,7 +164,7 @@ func TestAccAWSRedshiftCluster_tags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAWSRedshiftClusterExists("aws_redshift_cluster.default", &v), resource.TestCheckResourceAttr( - "aws_redshift_cluster.default", "tags.#", "1"), + "aws_redshift_cluster.default", "tags.%", "1"), resource.TestCheckResourceAttr("aws_redshift_cluster.default", "tags.environment", "Production"), ), }, diff --git a/builtin/providers/azurerm/resource_arm_availability_set_test.go b/builtin/providers/azurerm/resource_arm_availability_set_test.go index d846a45bf..471c48c95 100644 --- a/builtin/providers/azurerm/resource_arm_availability_set_test.go +++ b/builtin/providers/azurerm/resource_arm_availability_set_test.go @@ -50,7 +50,7 @@ func TestAccAzureRMAvailabilitySet_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMAvailabilitySetExists("azurerm_availability_set.test"), resource.TestCheckResourceAttr( - "azurerm_availability_set.test", "tags.#", "2"), + "azurerm_availability_set.test", "tags.%", "2"), resource.TestCheckResourceAttr( "azurerm_availability_set.test", "tags.environment", "Production"), resource.TestCheckResourceAttr( @@ -63,7 +63,7 @@ func TestAccAzureRMAvailabilitySet_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMAvailabilitySetExists("azurerm_availability_set.test"), resource.TestCheckResourceAttr( - "azurerm_availability_set.test", "tags.#", "1"), + "azurerm_availability_set.test", "tags.%", "1"), resource.TestCheckResourceAttr( "azurerm_availability_set.test", "tags.environment", "staging"), ), diff --git a/builtin/providers/azurerm/resource_arm_cdn_endpoint_test.go b/builtin/providers/azurerm/resource_arm_cdn_endpoint_test.go index 705564ebc..3065bd9c4 100644 --- a/builtin/providers/azurerm/resource_arm_cdn_endpoint_test.go +++ b/builtin/providers/azurerm/resource_arm_cdn_endpoint_test.go @@ -44,7 +44,7 @@ func TestAccAzureRMCdnEndpoint_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMCdnEndpointExists("azurerm_cdn_endpoint.test"), resource.TestCheckResourceAttr( - "azurerm_cdn_endpoint.test", "tags.#", "2"), + "azurerm_cdn_endpoint.test", "tags.%", "2"), resource.TestCheckResourceAttr( "azurerm_cdn_endpoint.test", "tags.environment", "Production"), resource.TestCheckResourceAttr( @@ -57,7 +57,7 @@ func TestAccAzureRMCdnEndpoint_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMCdnEndpointExists("azurerm_cdn_endpoint.test"), resource.TestCheckResourceAttr( - "azurerm_cdn_endpoint.test", "tags.#", "1"), + "azurerm_cdn_endpoint.test", "tags.%", "1"), resource.TestCheckResourceAttr( "azurerm_cdn_endpoint.test", "tags.environment", "staging"), ), diff --git a/builtin/providers/azurerm/resource_arm_cdn_profile_test.go b/builtin/providers/azurerm/resource_arm_cdn_profile_test.go index aa16dbe21..0d1b8628e 100644 --- a/builtin/providers/azurerm/resource_arm_cdn_profile_test.go +++ b/builtin/providers/azurerm/resource_arm_cdn_profile_test.go @@ -82,7 +82,7 @@ func TestAccAzureRMCdnProfile_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMCdnProfileExists("azurerm_cdn_profile.test"), resource.TestCheckResourceAttr( - "azurerm_cdn_profile.test", "tags.#", "2"), + "azurerm_cdn_profile.test", "tags.%", "2"), resource.TestCheckResourceAttr( "azurerm_cdn_profile.test", "tags.environment", "Production"), resource.TestCheckResourceAttr( @@ -95,7 +95,7 @@ func TestAccAzureRMCdnProfile_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMCdnProfileExists("azurerm_cdn_profile.test"), resource.TestCheckResourceAttr( - "azurerm_cdn_profile.test", "tags.#", "1"), + "azurerm_cdn_profile.test", "tags.%", "1"), resource.TestCheckResourceAttr( "azurerm_cdn_profile.test", "tags.environment", "staging"), ), diff --git a/builtin/providers/azurerm/resource_arm_dns_a_record_test.go b/builtin/providers/azurerm/resource_arm_dns_a_record_test.go index d89e6ba1b..0db25e2e9 100644 --- a/builtin/providers/azurerm/resource_arm_dns_a_record_test.go +++ b/builtin/providers/azurerm/resource_arm_dns_a_record_test.go @@ -75,7 +75,7 @@ func TestAccAzureRMDnsARecord_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsARecordExists("azurerm_dns_a_record.test"), resource.TestCheckResourceAttr( - "azurerm_dns_a_record.test", "tags.#", "2"), + "azurerm_dns_a_record.test", "tags.%", "2"), ), }, @@ -84,7 +84,7 @@ func TestAccAzureRMDnsARecord_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsARecordExists("azurerm_dns_a_record.test"), resource.TestCheckResourceAttr( - "azurerm_dns_a_record.test", "tags.#", "1"), + "azurerm_dns_a_record.test", "tags.%", "1"), ), }, }, diff --git a/builtin/providers/azurerm/resource_arm_dns_aaaa_record_test.go b/builtin/providers/azurerm/resource_arm_dns_aaaa_record_test.go index df11fc18e..489048617 100644 --- a/builtin/providers/azurerm/resource_arm_dns_aaaa_record_test.go +++ b/builtin/providers/azurerm/resource_arm_dns_aaaa_record_test.go @@ -75,7 +75,7 @@ func TestAccAzureRMDnsAAAARecord_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsAAAARecordExists("azurerm_dns_aaaa_record.test"), resource.TestCheckResourceAttr( - "azurerm_dns_aaaa_record.test", "tags.#", "2"), + "azurerm_dns_aaaa_record.test", "tags.%", "2"), ), }, @@ -84,7 +84,7 @@ func TestAccAzureRMDnsAAAARecord_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsAAAARecordExists("azurerm_dns_aaaa_record.test"), resource.TestCheckResourceAttr( - "azurerm_dns_aaaa_record.test", "tags.#", "1"), + "azurerm_dns_aaaa_record.test", "tags.%", "1"), ), }, }, diff --git a/builtin/providers/azurerm/resource_arm_dns_cname_record_test.go b/builtin/providers/azurerm/resource_arm_dns_cname_record_test.go index aa4a87f5f..05a686a8d 100644 --- a/builtin/providers/azurerm/resource_arm_dns_cname_record_test.go +++ b/builtin/providers/azurerm/resource_arm_dns_cname_record_test.go @@ -71,7 +71,7 @@ func TestAccAzureRMDnsCNameRecord_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsCNameRecordExists("azurerm_dns_cname_record.test"), resource.TestCheckResourceAttr( - "azurerm_dns_cname_record.test", "tags.#", "2"), + "azurerm_dns_cname_record.test", "tags.%", "2"), ), }, @@ -80,7 +80,7 @@ func TestAccAzureRMDnsCNameRecord_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsCNameRecordExists("azurerm_dns_cname_record.test"), resource.TestCheckResourceAttr( - "azurerm_dns_cname_record.test", "tags.#", "1"), + "azurerm_dns_cname_record.test", "tags.%", "1"), ), }, }, diff --git a/builtin/providers/azurerm/resource_arm_dns_mx_record_test.go b/builtin/providers/azurerm/resource_arm_dns_mx_record_test.go index 73256ec1c..b7b4cc403 100644 --- a/builtin/providers/azurerm/resource_arm_dns_mx_record_test.go +++ b/builtin/providers/azurerm/resource_arm_dns_mx_record_test.go @@ -75,7 +75,7 @@ func TestAccAzureRMDnsMxRecord_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsMxRecordExists("azurerm_dns_mx_record.test"), resource.TestCheckResourceAttr( - "azurerm_dns_mx_record.test", "tags.#", "2"), + "azurerm_dns_mx_record.test", "tags.%", "2"), ), }, @@ -84,7 +84,7 @@ func TestAccAzureRMDnsMxRecord_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsMxRecordExists("azurerm_dns_mx_record.test"), resource.TestCheckResourceAttr( - "azurerm_dns_mx_record.test", "tags.#", "1"), + "azurerm_dns_mx_record.test", "tags.%", "1"), ), }, }, diff --git a/builtin/providers/azurerm/resource_arm_dns_ns_record_test.go b/builtin/providers/azurerm/resource_arm_dns_ns_record_test.go index 47994e927..4fb2cd903 100644 --- a/builtin/providers/azurerm/resource_arm_dns_ns_record_test.go +++ b/builtin/providers/azurerm/resource_arm_dns_ns_record_test.go @@ -75,7 +75,7 @@ func TestAccAzureRMDnsNsRecord_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsNsRecordExists("azurerm_dns_ns_record.test"), resource.TestCheckResourceAttr( - "azurerm_dns_ns_record.test", "tags.#", "2"), + "azurerm_dns_ns_record.test", "tags.%", "2"), ), }, @@ -84,7 +84,7 @@ func TestAccAzureRMDnsNsRecord_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsNsRecordExists("azurerm_dns_ns_record.test"), resource.TestCheckResourceAttr( - "azurerm_dns_ns_record.test", "tags.#", "1"), + "azurerm_dns_ns_record.test", "tags.%", "1"), ), }, }, diff --git a/builtin/providers/azurerm/resource_arm_dns_srv_record_test.go b/builtin/providers/azurerm/resource_arm_dns_srv_record_test.go index d74830a68..35d860191 100644 --- a/builtin/providers/azurerm/resource_arm_dns_srv_record_test.go +++ b/builtin/providers/azurerm/resource_arm_dns_srv_record_test.go @@ -75,7 +75,7 @@ func TestAccAzureRMDnsSrvRecord_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsSrvRecordExists("azurerm_dns_srv_record.test"), resource.TestCheckResourceAttr( - "azurerm_dns_srv_record.test", "tags.#", "2"), + "azurerm_dns_srv_record.test", "tags.%", "2"), ), }, @@ -84,7 +84,7 @@ func TestAccAzureRMDnsSrvRecord_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsSrvRecordExists("azurerm_dns_srv_record.test"), resource.TestCheckResourceAttr( - "azurerm_dns_srv_record.test", "tags.#", "1"), + "azurerm_dns_srv_record.test", "tags.%", "1"), ), }, }, diff --git a/builtin/providers/azurerm/resource_arm_dns_txt_record_test.go b/builtin/providers/azurerm/resource_arm_dns_txt_record_test.go index 3d08878e3..99fbfaedf 100644 --- a/builtin/providers/azurerm/resource_arm_dns_txt_record_test.go +++ b/builtin/providers/azurerm/resource_arm_dns_txt_record_test.go @@ -75,7 +75,7 @@ func TestAccAzureRMDnsTxtRecord_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsTxtRecordExists("azurerm_dns_txt_record.test"), resource.TestCheckResourceAttr( - "azurerm_dns_txt_record.test", "tags.#", "2"), + "azurerm_dns_txt_record.test", "tags.%", "2"), ), }, @@ -84,7 +84,7 @@ func TestAccAzureRMDnsTxtRecord_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsTxtRecordExists("azurerm_dns_txt_record.test"), resource.TestCheckResourceAttr( - "azurerm_dns_txt_record.test", "tags.#", "1"), + "azurerm_dns_txt_record.test", "tags.%", "1"), ), }, }, diff --git a/builtin/providers/azurerm/resource_arm_network_interface_card_test.go b/builtin/providers/azurerm/resource_arm_network_interface_card_test.go index 43df3a73e..5683333f0 100644 --- a/builtin/providers/azurerm/resource_arm_network_interface_card_test.go +++ b/builtin/providers/azurerm/resource_arm_network_interface_card_test.go @@ -54,7 +54,7 @@ func TestAccAzureRMNetworkInterface_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkInterfaceExists("azurerm_network_interface.test"), resource.TestCheckResourceAttr( - "azurerm_network_interface.test", "tags.#", "2"), + "azurerm_network_interface.test", "tags.%", "2"), resource.TestCheckResourceAttr( "azurerm_network_interface.test", "tags.environment", "Production"), resource.TestCheckResourceAttr( @@ -66,7 +66,7 @@ func TestAccAzureRMNetworkInterface_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkInterfaceExists("azurerm_network_interface.test"), resource.TestCheckResourceAttr( - "azurerm_network_interface.test", "tags.#", "1"), + "azurerm_network_interface.test", "tags.%", "1"), resource.TestCheckResourceAttr( "azurerm_network_interface.test", "tags.environment", "staging"), ), diff --git a/builtin/providers/azurerm/resource_arm_network_security_group_test.go b/builtin/providers/azurerm/resource_arm_network_security_group_test.go index 44e8eeb2c..f397f12f7 100644 --- a/builtin/providers/azurerm/resource_arm_network_security_group_test.go +++ b/builtin/providers/azurerm/resource_arm_network_security_group_test.go @@ -36,7 +36,7 @@ func TestAccAzureRMNetworkSecurityGroup_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkSecurityGroupExists("azurerm_network_security_group.test"), resource.TestCheckResourceAttr( - "azurerm_network_security_group.test", "tags.#", "2"), + "azurerm_network_security_group.test", "tags.%", "2"), resource.TestCheckResourceAttr( "azurerm_network_security_group.test", "tags.environment", "Production"), resource.TestCheckResourceAttr( @@ -49,7 +49,7 @@ func TestAccAzureRMNetworkSecurityGroup_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkSecurityGroupExists("azurerm_network_security_group.test"), resource.TestCheckResourceAttr( - "azurerm_network_security_group.test", "tags.#", "1"), + "azurerm_network_security_group.test", "tags.%", "1"), resource.TestCheckResourceAttr( "azurerm_network_security_group.test", "tags.environment", "staging"), ), diff --git a/builtin/providers/azurerm/resource_arm_public_ip_test.go b/builtin/providers/azurerm/resource_arm_public_ip_test.go index eaf4a3646..41f1f9dbf 100644 --- a/builtin/providers/azurerm/resource_arm_public_ip_test.go +++ b/builtin/providers/azurerm/resource_arm_public_ip_test.go @@ -114,7 +114,7 @@ func TestAccAzureRMPublicIpStatic_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMPublicIpExists("azurerm_public_ip.test"), resource.TestCheckResourceAttr( - "azurerm_public_ip.test", "tags.#", "2"), + "azurerm_public_ip.test", "tags.%", "2"), resource.TestCheckResourceAttr( "azurerm_public_ip.test", "tags.environment", "Production"), resource.TestCheckResourceAttr( @@ -127,7 +127,7 @@ func TestAccAzureRMPublicIpStatic_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMPublicIpExists("azurerm_public_ip.test"), resource.TestCheckResourceAttr( - "azurerm_public_ip.test", "tags.#", "1"), + "azurerm_public_ip.test", "tags.%", "1"), resource.TestCheckResourceAttr( "azurerm_public_ip.test", "tags.environment", "staging"), ), diff --git a/builtin/providers/azurerm/resource_arm_resource_group_test.go b/builtin/providers/azurerm/resource_arm_resource_group_test.go index ed7e6a0a8..e4f4d6578 100644 --- a/builtin/providers/azurerm/resource_arm_resource_group_test.go +++ b/builtin/providers/azurerm/resource_arm_resource_group_test.go @@ -44,7 +44,7 @@ func TestAccAzureRMResourceGroup_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMResourceGroupExists("azurerm_resource_group.test"), resource.TestCheckResourceAttr( - "azurerm_resource_group.test", "tags.#", "2"), + "azurerm_resource_group.test", "tags.%", "2"), resource.TestCheckResourceAttr( "azurerm_resource_group.test", "tags.environment", "Production"), resource.TestCheckResourceAttr( @@ -57,7 +57,7 @@ func TestAccAzureRMResourceGroup_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMResourceGroupExists("azurerm_resource_group.test"), resource.TestCheckResourceAttr( - "azurerm_resource_group.test", "tags.#", "1"), + "azurerm_resource_group.test", "tags.%", "1"), resource.TestCheckResourceAttr( "azurerm_resource_group.test", "tags.environment", "staging"), ), diff --git a/builtin/providers/azurerm/resource_arm_route_table_test.go b/builtin/providers/azurerm/resource_arm_route_table_test.go index e6d978246..200d0651f 100644 --- a/builtin/providers/azurerm/resource_arm_route_table_test.go +++ b/builtin/providers/azurerm/resource_arm_route_table_test.go @@ -94,7 +94,7 @@ func TestAccAzureRMRouteTable_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMRouteTableExists("azurerm_route_table.test"), resource.TestCheckResourceAttr( - "azurerm_route_table.test", "tags.#", "2"), + "azurerm_route_table.test", "tags.%", "2"), resource.TestCheckResourceAttr( "azurerm_route_table.test", "tags.environment", "Production"), resource.TestCheckResourceAttr( @@ -107,7 +107,7 @@ func TestAccAzureRMRouteTable_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMRouteTableExists("azurerm_route_table.test"), resource.TestCheckResourceAttr( - "azurerm_route_table.test", "tags.#", "1"), + "azurerm_route_table.test", "tags.%", "1"), resource.TestCheckResourceAttr( "azurerm_route_table.test", "tags.environment", "staging"), ), diff --git a/builtin/providers/azurerm/resource_arm_search_service_test.go b/builtin/providers/azurerm/resource_arm_search_service_test.go index 9350053d9..51f9c4bf7 100644 --- a/builtin/providers/azurerm/resource_arm_search_service_test.go +++ b/builtin/providers/azurerm/resource_arm_search_service_test.go @@ -24,7 +24,7 @@ func TestAccAzureRMSearchService_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMSearchServiceExists("azurerm_search_service.test"), resource.TestCheckResourceAttr( - "azurerm_search_service.test", "tags.#", "2"), + "azurerm_search_service.test", "tags.%", "2"), ), }, }, @@ -46,7 +46,7 @@ func TestAccAzureRMSearchService_updateReplicaCountAndTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMSearchServiceExists("azurerm_search_service.test"), resource.TestCheckResourceAttr( - "azurerm_search_service.test", "tags.#", "2"), + "azurerm_search_service.test", "tags.%", "2"), resource.TestCheckResourceAttr( "azurerm_search_service.test", "replica_count", "1"), ), @@ -57,7 +57,7 @@ func TestAccAzureRMSearchService_updateReplicaCountAndTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMSearchServiceExists("azurerm_search_service.test"), resource.TestCheckResourceAttr( - "azurerm_search_service.test", "tags.#", "1"), + "azurerm_search_service.test", "tags.%", "1"), resource.TestCheckResourceAttr( "azurerm_search_service.test", "replica_count", "2"), ), diff --git a/builtin/providers/azurerm/resource_arm_sql_database_test.go b/builtin/providers/azurerm/resource_arm_sql_database_test.go index 58e212063..b7fb27588 100644 --- a/builtin/providers/azurerm/resource_arm_sql_database_test.go +++ b/builtin/providers/azurerm/resource_arm_sql_database_test.go @@ -76,7 +76,7 @@ func TestAccAzureRMSqlDatabase_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMSqlDatabaseExists("azurerm_sql_database.test"), resource.TestCheckResourceAttr( - "azurerm_sql_database.test", "tags.#", "2"), + "azurerm_sql_database.test", "tags.%", "2"), ), }, @@ -85,7 +85,7 @@ func TestAccAzureRMSqlDatabase_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMSqlDatabaseExists("azurerm_sql_database.test"), resource.TestCheckResourceAttr( - "azurerm_sql_database.test", "tags.#", "1"), + "azurerm_sql_database.test", "tags.%", "1"), ), }, }, diff --git a/builtin/providers/azurerm/resource_arm_sql_server_test.go b/builtin/providers/azurerm/resource_arm_sql_server_test.go index eae4c59df..1236c154c 100644 --- a/builtin/providers/azurerm/resource_arm_sql_server_test.go +++ b/builtin/providers/azurerm/resource_arm_sql_server_test.go @@ -44,7 +44,7 @@ func TestAccAzureRMSqlServer_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMSqlServerExists("azurerm_sql_server.test"), resource.TestCheckResourceAttr( - "azurerm_sql_server.test", "tags.#", "2"), + "azurerm_sql_server.test", "tags.%", "2"), ), }, @@ -53,7 +53,7 @@ func TestAccAzureRMSqlServer_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMSqlServerExists("azurerm_sql_server.test"), resource.TestCheckResourceAttr( - "azurerm_sql_server.test", "tags.#", "1"), + "azurerm_sql_server.test", "tags.%", "1"), ), }, }, diff --git a/builtin/providers/azurerm/resource_arm_storage_account_test.go b/builtin/providers/azurerm/resource_arm_storage_account_test.go index 6cad5a1f5..5bd91da27 100644 --- a/builtin/providers/azurerm/resource_arm_storage_account_test.go +++ b/builtin/providers/azurerm/resource_arm_storage_account_test.go @@ -60,7 +60,7 @@ func TestAccAzureRMStorageAccount_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists("azurerm_storage_account.testsa"), resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "account_type", "Standard_LRS"), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "tags.#", "1"), + resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "tags.%", "1"), resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "tags.environment", "production"), ), }, @@ -70,7 +70,7 @@ func TestAccAzureRMStorageAccount_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists("azurerm_storage_account.testsa"), resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "account_type", "Standard_GRS"), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "tags.#", "1"), + resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "tags.%", "1"), resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "tags.environment", "staging"), ), }, diff --git a/builtin/providers/azurerm/resource_arm_virtual_machine_test.go b/builtin/providers/azurerm/resource_arm_virtual_machine_test.go index 81f6c2597..1b600b5dc 100644 --- a/builtin/providers/azurerm/resource_arm_virtual_machine_test.go +++ b/builtin/providers/azurerm/resource_arm_virtual_machine_test.go @@ -42,7 +42,7 @@ func TestAccAzureRMVirtualMachine_tags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMVirtualMachineExists("azurerm_virtual_machine.test"), resource.TestCheckResourceAttr( - "azurerm_virtual_machine.test", "tags.#", "2"), + "azurerm_virtual_machine.test", "tags.%", "2"), resource.TestCheckResourceAttr( "azurerm_virtual_machine.test", "tags.environment", "Production"), resource.TestCheckResourceAttr( @@ -55,7 +55,7 @@ func TestAccAzureRMVirtualMachine_tags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMVirtualMachineExists("azurerm_virtual_machine.test"), resource.TestCheckResourceAttr( - "azurerm_virtual_machine.test", "tags.#", "1"), + "azurerm_virtual_machine.test", "tags.%", "1"), resource.TestCheckResourceAttr( "azurerm_virtual_machine.test", "tags.environment", "Production"), ), diff --git a/builtin/providers/azurerm/resource_arm_virtual_network_test.go b/builtin/providers/azurerm/resource_arm_virtual_network_test.go index d00a56eb0..9fabcebae 100644 --- a/builtin/providers/azurerm/resource_arm_virtual_network_test.go +++ b/builtin/providers/azurerm/resource_arm_virtual_network_test.go @@ -46,7 +46,7 @@ func TestAccAzureRMVirtualNetwork_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMVirtualNetworkExists("azurerm_virtual_network.test"), resource.TestCheckResourceAttr( - "azurerm_virtual_network.test", "tags.#", "2"), + "azurerm_virtual_network.test", "tags.%", "2"), resource.TestCheckResourceAttr( "azurerm_virtual_network.test", "tags.environment", "Production"), resource.TestCheckResourceAttr( @@ -59,7 +59,7 @@ func TestAccAzureRMVirtualNetwork_withTags(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMVirtualNetworkExists("azurerm_virtual_network.test"), resource.TestCheckResourceAttr( - "azurerm_virtual_network.test", "tags.#", "1"), + "azurerm_virtual_network.test", "tags.%", "1"), resource.TestCheckResourceAttr( "azurerm_virtual_network.test", "tags.environment", "staging"), ), From 7d71b8cc3c123554df857700076279aeee4f9c7e Mon Sep 17 00:00:00 2001 From: clint shryock Date: Fri, 10 Jun 2016 10:07:17 -0500 Subject: [PATCH 2/2] helper and terraform interpolate test update --- helper/schema/schema_test.go | 2 +- terraform/interpolate_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/helper/schema/schema_test.go b/helper/schema/schema_test.go index 9dac216f8..d9d023d6a 100644 --- a/helper/schema/schema_test.go +++ b/helper/schema/schema_test.go @@ -2169,7 +2169,7 @@ func TestSchemaMap_Diff(t *testing.T) { State: &terraform.InstanceState{ Attributes: map[string]string{ - "tags.#": "0", + "tags.%": "0", }, }, diff --git a/terraform/interpolate_test.go b/terraform/interpolate_test.go index f6de81060..7d25aacf6 100644 --- a/terraform/interpolate_test.go +++ b/terraform/interpolate_test.go @@ -469,7 +469,7 @@ func getInterpolaterFixture(t *testing.T) *Interpolater { "name_servers.3": "ns-601.awsdns-11.net", "listeners.#": "1", "listeners.0": "red", - "tags.#": "1", + "tags.%": "1", "tags.Name": "reindeer", "nothing.#": "0", }, @@ -490,7 +490,7 @@ func getInterpolaterFixture(t *testing.T) *Interpolater { "listeners.0": "blue", "special.#": "1", "special.0": "extra", - "tags.#": "1", + "tags.%": "1", "tags.Name": "white-hart", "nothing.#": "0", },