diff --git a/aws/data_source_aws_connect_instance_test.go b/aws/data_source_aws_connect_instance_test.go index 03aee63353e1..cb18c4b7944c 100644 --- a/aws/data_source_aws_connect_instance_test.go +++ b/aws/data_source_aws_connect_instance_test.go @@ -12,6 +12,7 @@ import ( func TestAccAwsConnectInstanceDataSource_basic(t *testing.T) { rName := acctest.RandomWithPrefix("datasource-test-terraform") + dataSourceName := "data.aws_connect_instance.test" resourceName := "aws_connect_instance.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -24,40 +25,40 @@ func TestAccAwsConnectInstanceDataSource_basic(t *testing.T) { }, { Config: testAccAwsConnectInstanceDataSourceConfig_nonExistentAlias, - ExpectError: regexp.MustCompile(`error finding Connect Instance by instance_alias`), + ExpectError: regexp.MustCompile(`error finding Connect Instance Summary by instance_alias`), }, { Config: testAccAwsConnectInstanceDataSourceConfigBasic(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccMatchResourceAttrRegionalARN(resourceName, "arn", "connect", regexp.MustCompile(`instance/.+`)), - resource.TestCheckResourceAttrSet(resourceName, "created_time"), - resource.TestCheckResourceAttrSet(resourceName, "identity_management_type"), - resource.TestMatchResourceAttr(resourceName, "instance_alias", regexp.MustCompile(rName)), - resource.TestCheckResourceAttrSet(resourceName, "inbound_calls_enabled"), - resource.TestCheckResourceAttrSet(resourceName, "outbound_calls_enabled"), - resource.TestCheckResourceAttrSet(resourceName, "contact_flow_logs_enabled"), - resource.TestCheckResourceAttrSet(resourceName, "contact_lens_enabled"), - resource.TestCheckResourceAttrSet(resourceName, "auto_resolve_best_voices_enabled"), - resource.TestCheckResourceAttrSet(resourceName, "early_media_enabled"), - resource.TestCheckResourceAttrSet(resourceName, "status"), - resource.TestCheckResourceAttrSet(resourceName, "service_role"), + resource.TestCheckResourceAttrPair(resourceName, "arn", dataSourceName, "arn"), + resource.TestCheckResourceAttrPair(resourceName, "created_time", dataSourceName, "created_time"), + resource.TestCheckResourceAttrPair(resourceName, "identity_management_type", dataSourceName, "identity_management_type"), + resource.TestCheckResourceAttrPair(resourceName, "instance_alias", dataSourceName, "instance_alias"), + resource.TestCheckResourceAttrPair(resourceName, "inbound_calls_enabled", dataSourceName, "inbound_calls_enabled"), + resource.TestCheckResourceAttrPair(resourceName, "outbound_calls_enabled", dataSourceName, "outbound_calls_enabled"), + resource.TestCheckResourceAttrPair(resourceName, "contact_flow_logs_enabled", dataSourceName, "contact_flow_logs_enabled"), + resource.TestCheckResourceAttrPair(resourceName, "contact_lens_enabled", dataSourceName, "contact_lens_enabled"), + resource.TestCheckResourceAttrPair(resourceName, "auto_resolve_best_voices_enabled", dataSourceName, "auto_resolve_best_voices_enabled"), + resource.TestCheckResourceAttrPair(resourceName, "early_media_enabled", dataSourceName, "early_media_enabled"), + resource.TestCheckResourceAttrPair(resourceName, "status", dataSourceName, "status"), + resource.TestCheckResourceAttrPair(resourceName, "service_role", dataSourceName, "service_role"), ), }, { Config: testAccAwsConnectInstanceDataSourceConfigAlias(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccMatchResourceAttrRegionalARN(resourceName, "arn", "connect", regexp.MustCompile(`instance/.+`)), - resource.TestCheckResourceAttrSet(resourceName, "created_time"), - resource.TestCheckResourceAttrSet(resourceName, "identity_management_type"), - resource.TestMatchResourceAttr(resourceName, "instance_alias", regexp.MustCompile(rName)), - resource.TestCheckResourceAttrSet(resourceName, "inbound_calls_enabled"), - resource.TestCheckResourceAttrSet(resourceName, "outbound_calls_enabled"), - resource.TestCheckResourceAttrSet(resourceName, "contact_flow_logs_enabled"), - resource.TestCheckResourceAttrSet(resourceName, "contact_lens_enabled"), - resource.TestCheckResourceAttrSet(resourceName, "auto_resolve_best_voices_enabled"), - resource.TestCheckResourceAttrSet(resourceName, "early_media_enabled"), - resource.TestCheckResourceAttrSet(resourceName, "status"), - resource.TestCheckResourceAttrSet(resourceName, "service_role"), + resource.TestCheckResourceAttrPair(resourceName, "arn", dataSourceName, "arn"), + resource.TestCheckResourceAttrPair(resourceName, "created_time", dataSourceName, "created_time"), + resource.TestCheckResourceAttrPair(resourceName, "identity_management_type", dataSourceName, "identity_management_type"), + resource.TestCheckResourceAttrPair(resourceName, "instance_alias", dataSourceName, "instance_alias"), + resource.TestCheckResourceAttrPair(resourceName, "inbound_calls_enabled", dataSourceName, "inbound_calls_enabled"), + resource.TestCheckResourceAttrPair(resourceName, "outbound_calls_enabled", dataSourceName, "outbound_calls_enabled"), + resource.TestCheckResourceAttrPair(resourceName, "contact_flow_logs_enabled", dataSourceName, "contact_flow_logs_enabled"), + resource.TestCheckResourceAttrPair(resourceName, "contact_lens_enabled", dataSourceName, "contact_lens_enabled"), + resource.TestCheckResourceAttrPair(resourceName, "auto_resolve_best_voices_enabled", dataSourceName, "auto_resolve_best_voices_enabled"), + resource.TestCheckResourceAttrPair(resourceName, "early_media_enabled", dataSourceName, "early_media_enabled"), + resource.TestCheckResourceAttrPair(resourceName, "status", dataSourceName, "status"), + resource.TestCheckResourceAttrPair(resourceName, "service_role", dataSourceName, "service_role"), ), }, },