From 4b24e6c687bfb6bf7693d05e3356991a03035fe6 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Wed, 26 Jan 2022 16:24:43 -0500 Subject: [PATCH] add missing import and update data source tests --- .../cloudwatchlogs/group_data_source.go | 1 + .../cloudwatchlogs/group_data_source_test.go | 39 +++++++++---------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/internal/service/cloudwatchlogs/group_data_source.go b/internal/service/cloudwatchlogs/group_data_source.go index 3a0df3d2f941..a3df9461871d 100644 --- a/internal/service/cloudwatchlogs/group_data_source.go +++ b/internal/service/cloudwatchlogs/group_data_source.go @@ -3,6 +3,7 @@ package cloudwatchlogs import ( "fmt" + "github.com/aws/aws-sdk-go/aws" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/conns" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" diff --git a/internal/service/cloudwatchlogs/group_data_source_test.go b/internal/service/cloudwatchlogs/group_data_source_test.go index 50698853fbc8..21ed2ade6f0d 100644 --- a/internal/service/cloudwatchlogs/group_data_source_test.go +++ b/internal/service/cloudwatchlogs/group_data_source_test.go @@ -22,10 +22,10 @@ func TestAccCloudWatchLogsGroupDataSource_basic(t *testing.T) { { Config: testAccCheckGroupDataSourceConfig(rName), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceName, "name", rName), - resource.TestCheckResourceAttrSet(resourceName, "arn"), - resource.TestCheckResourceAttrSet(resourceName, "creation_time"), - resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + resource.TestCheckResourceAttrPair(resourceName, "name", "aws_cloudwatch_log_group.test", "name"), + resource.TestCheckResourceAttrPair(resourceName, "arn", "aws_cloudwatch_log_group.test", "arn"), + resource.TestCheckResourceAttrPair(resourceName, "creation_time", "aws_cloudwatch_log_group.test", "creation_time"), + resource.TestCheckResourceAttrPair(resourceName, "tags", "aws_cloudwatch_log_group.test", "tags"), ), }, }, @@ -44,13 +44,10 @@ func TestAccCloudWatchLogsGroupDataSource_tags(t *testing.T) { { Config: testAccCheckGroupTagsDataSourceConfig(rName), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceName, "name", rName), - resource.TestCheckResourceAttrSet(resourceName, "arn"), - resource.TestCheckResourceAttrSet(resourceName, "creation_time"), - resource.TestCheckResourceAttr(resourceName, "tags.%", "3"), - resource.TestCheckResourceAttr(resourceName, "tags.Environment", "Production"), - resource.TestCheckResourceAttr(resourceName, "tags.Foo", "Bar"), - resource.TestCheckResourceAttr(resourceName, "tags.Empty", ""), + resource.TestCheckResourceAttrPair(resourceName, "name", "aws_cloudwatch_log_group.test", "name"), + resource.TestCheckResourceAttrPair(resourceName, "arn", "aws_cloudwatch_log_group.test", "arn"), + resource.TestCheckResourceAttrPair(resourceName, "creation_time", "aws_cloudwatch_log_group.test", "creation_time"), + resource.TestCheckResourceAttrPair(resourceName, "tags", "aws_cloudwatch_log_group.test", "tags"), ), }, }, @@ -69,11 +66,11 @@ func TestAccCloudWatchLogsGroupDataSource_kms(t *testing.T) { { Config: testAccCheckGroupKMSDataSourceConfig(rName), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceName, "name", rName), - resource.TestCheckResourceAttrSet(resourceName, "arn"), - resource.TestCheckResourceAttrSet(resourceName, "creation_time"), - resource.TestCheckResourceAttrSet(resourceName, "kms_key_id"), - resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + resource.TestCheckResourceAttrPair(resourceName, "name", "aws_cloudwatch_log_group.test", "name"), + resource.TestCheckResourceAttrPair(resourceName, "arn", "aws_cloudwatch_log_group.test", "arn"), + resource.TestCheckResourceAttrPair(resourceName, "creation_time", "aws_cloudwatch_log_group.test", "creation_time"), + resource.TestCheckResourceAttrPair(resourceName, "kms_key_id", "aws_cloudwatch_log_group.test", "kms_key_id"), + resource.TestCheckResourceAttrPair(resourceName, "tags", "aws_cloudwatch_log_group.test", "tags"), ), }, }, @@ -92,11 +89,11 @@ func TestAccCloudWatchLogsGroupDataSource_retention(t *testing.T) { { Config: testAccCheckGroupRetentionDataSourceConfig(rName), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceName, "name", rName), - resource.TestCheckResourceAttrSet(resourceName, "arn"), - resource.TestCheckResourceAttrSet(resourceName, "creation_time"), - resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), - resource.TestCheckResourceAttr(resourceName, "retention_in_days", "365"), + resource.TestCheckResourceAttrPair(resourceName, "name", "aws_cloudwatch_log_group.test", "name"), + resource.TestCheckResourceAttrPair(resourceName, "arn", "aws_cloudwatch_log_group.test", "arn"), + resource.TestCheckResourceAttrPair(resourceName, "creation_time", "aws_cloudwatch_log_group.test", "creation_time"), + resource.TestCheckResourceAttrPair(resourceName, "tags", "aws_cloudwatch_log_group.test", "tags"), + resource.TestCheckResourceAttrPair(resourceName, "retention_in_days", "aws_cloudwatch_log_group.test", "retention_in_days"), ), }, },