Merge pull request #43183 from robsonpiere/fix/query-definition-bug

Fix: add ARN support in log_group_names for aws_cloudwatch_query_definition

Author: ewbankkit

.changelog/43183.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_cloudwatch_query_definition: Support ARNs as valid values for `log_group_names`
+```

internal/service/logs/query_definition.go

@@ -51,8 +51,11 @@ func resourceQueryDefinition() *schema.Resource {
 				Type:     schema.TypeList,
 				Optional: true,
 				Elem: &schema.Schema{
-					Type:         schema.TypeString,
-					ValidateFunc: validLogGroupName,
+					Type: schema.TypeString,
+					ValidateFunc: validation.Any(
+						validLogGroupName,
+						verify.ValidARN,
+					),
 				},
 			},
 			"query_definition_id": {

internal/service/logs/query_definition_test.go

@@ -60,20 +60,6 @@ func TestAccLogsQueryDefinition_basic(t *testing.T) {
 	})
 }
 
-func testAccQueryDefinitionImportStateID(ctx context.Context, v *types.QueryDefinition) resource.ImportStateIdFunc {
-	return func(*terraform.State) (string, error) {
-		id := arn.ARN{
-			AccountID: acctest.AccountID(ctx),
-			Partition: acctest.Partition(),
-			Region:    acctest.Region(),
-			Service:   "logs",
-			Resource:  fmt.Sprintf("query-definition:%s", aws.ToString(v.QueryDefinitionId)),
-		}
-
-		return id.String(), nil
-	}
-}
-
 func TestAccLogsQueryDefinition_disappears(t *testing.T) {
 	ctx := acctest.Context(t)
 	var v types.QueryDefinition
@@ -176,6 +162,52 @@ func TestAccLogsQueryDefinition_logGroups(t *testing.T) {
 	})
 }
 
+func TestAccLogsQueryDefinition_logGroupARNs(t *testing.T) {
+	ctx := acctest.Context(t)
+	var v types.QueryDefinition
+	resourceName := "aws_cloudwatch_query_definition.test"
+	queryName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.PreCheck(ctx, t) },
+		ErrorCheck:               acctest.ErrorCheck(t, names.LogsServiceID),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
+		CheckDestroy:             testAccCheckQueryDefinitionDestroy(ctx),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccQueryDefinitionConfig_logGroupARNs(queryName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckQueryDefinitionExists(ctx, resourceName, &v),
+					resource.TestCheckResourceAttr(resourceName, names.AttrName, queryName),
+					resource.TestCheckResourceAttr(resourceName, "log_group_names.#", "2"),
+					resource.TestCheckResourceAttrPair(resourceName, "log_group_names.0", "aws_cloudwatch_log_group.test.0", names.AttrARN),
+					resource.TestCheckResourceAttrPair(resourceName, "log_group_names.1", "aws_cloudwatch_log_group.test.1", names.AttrARN),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateIdFunc: testAccQueryDefinitionImportStateID(ctx, &v),
+			},
+		},
+	})
+}
+
+func testAccQueryDefinitionImportStateID(ctx context.Context, v *types.QueryDefinition) resource.ImportStateIdFunc {
+	return func(*terraform.State) (string, error) {
+		id := arn.ARN{
+			AccountID: acctest.AccountID(ctx),
+			Partition: acctest.Partition(),
+			Region:    acctest.Region(),
+			Service:   "logs",
+			Resource:  fmt.Sprintf("query-definition:%s", aws.ToString(v.QueryDefinitionId)),
+		}
+
+		return id.String(), nil
+	}
+}
+
 func testAccCheckQueryDefinitionExists(ctx context.Context, n string, v *types.QueryDefinition) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
@@ -258,3 +290,28 @@ resource "aws_cloudwatch_log_group" "test" {
 }
 `, rName, count)
 }
+
+func testAccQueryDefinitionConfig_logGroupARNs(rName string) string {
+	return fmt.Sprintf(`
+resource "aws_cloudwatch_query_definition" "test" {
+  name = %[1]q
+
+  log_group_names = [
+    aws_cloudwatch_log_group.test[0].arn,
+    aws_cloudwatch_log_group.test[1].arn,
+  ]
+
+  query_string = <<EOF
+fields @timestamp, @message
+| sort @timestamp desc
+| limit 20
+EOF
+}
+
+resource "aws_cloudwatch_log_group" "test" {
+  count = 2
+
+  name = "%[1]s-${count.index}"
+}
+`, rName)
+}