r/aws_glue_data_quality_ruleset - support target_table catalog_id

.changelog/31926.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_glue_data_quality_ruleset: Add `catalog_id` argument to `target_table` block
+```

internal/service/glue/data_quality_ruleset.go

@@ -75,13 +75,12 @@ func ResourceDataQualityRuleset() *schema.Resource {
 				MaxItems: 1,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
-						// not found in SDK
-						// "catalog_id": {
-						// 	Type:         schema.TypeString,
-						// 	Optional:     true,
-						// 	ForceNew:     true,
-						// 	ValidateFunc: validation.StringLenBetween(1, 255),
-						// },
+						"catalog_id": {
+							Type:         schema.TypeString,
+							Optional:     true,
+							ForceNew:     true,
+							ValidateFunc: validation.StringLenBetween(1, 255),
+						},
 						"database_name": {
 							Type:         schema.TypeString,
 							Required:     true,
@@ -223,6 +222,10 @@ func expandTargetTable(tfMap map[string]interface{}) *glue.DataQualityTargetTabl
 		TableName:    aws.String(tfMap["table_name"].(string)),
 	}
 
+	if v, ok := tfMap["catalog_id"].(string); ok && v != "" {
+		apiObject.CatalogId = aws.String(v)
+	}
+
 	return apiObject
 }
 
@@ -236,5 +239,9 @@ func flattenTargetTable(apiObject *glue.DataQualityTargetTable) []interface{} {
 		"table_name":    aws.StringValue(apiObject.TableName),
 	}
 
+	if v := apiObject.CatalogId; v != nil {
+		tfMap["catalog_id"] = aws.StringValue(v)
+	}
+
 	return []interface{}{tfMap}
 }

internal/service/glue/data_quality_ruleset_test.go

@@ -127,7 +127,7 @@ func TestAccGlueDataQualityRuleset_updateDescription(t *testing.T) {
 	})
 }
 
-func TestAccGlueDataQualityRuleset_targetTable(t *testing.T) {
+func TestAccGlueDataQualityRuleset_targetTableRequired(t *testing.T) {
 	ctx := acctest.Context(t)
 
 	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
@@ -148,6 +148,42 @@ func TestAccGlueDataQualityRuleset_targetTable(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckDataQualityRulesetExists(ctx, resourceName),
 					resource.TestCheckResourceAttr(resourceName, "target_table.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "target_table.0.catalog_id", ""),
+					resource.TestCheckResourceAttrPair(resourceName, "target_table.0.database_name", "aws_glue_catalog_database.test", "name"),
+					resource.TestCheckResourceAttrPair(resourceName, "target_table.0.table_name", "aws_glue_catalog_table.test", "name"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func TestAccGlueDataQualityRuleset_targetTableFull(t *testing.T) {
+	ctx := acctest.Context(t)
+
+	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
+	rName2 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
+	rName3 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
+	ruleset := "Rules = [Completeness \"colA\" between 0.4 and 0.8]"
+	resourceName := "aws_glue_data_quality_ruleset.test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.PreCheck(ctx, t) },
+		ErrorCheck:               acctest.ErrorCheck(t, glue.EndpointsID),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
+		CheckDestroy:             testAccCheckDataQualityRulesetDestroy(ctx),
+		Steps: []resource.TestStep{
+			{
+				Config:  testAccDataQualityRulesetConfig_targetTableFull(rName, rName2, rName3, ruleset),
+				Destroy: false,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckDataQualityRulesetExists(ctx, resourceName),
+					resource.TestCheckResourceAttr(resourceName, "target_table.#", "1"),
+					resource.TestCheckResourceAttrPair(resourceName, "target_table.0.catalog_id", "aws_glue_catalog_table.test", "catalog_id"),
 					resource.TestCheckResourceAttrPair(resourceName, "target_table.0.database_name", "aws_glue_catalog_database.test", "name"),
 					resource.TestCheckResourceAttrPair(resourceName, "target_table.0.table_name", "aws_glue_catalog_table.test", "name"),
 				),
@@ -342,6 +378,23 @@ resource "aws_glue_data_quality_ruleset" "test" {
 `, rName, ruleset))
 }
 
+func testAccDataQualityRulesetConfig_targetTableFull(rName, rName2, rName3, ruleset string) string {
+	return acctest.ConfigCompose(
+		testAccDataQualityRulesetConfigTargetTableConfigBasic(rName2, rName3),
+		fmt.Sprintf(`
+resource "aws_glue_data_quality_ruleset" "test" {
+  name    = %[1]q
+  ruleset = %[2]q
+
+  target_table {
+    catalog_id    = aws_glue_catalog_table.test.catalog_id
+    database_name = aws_glue_catalog_database.test.name
+    table_name    = aws_glue_catalog_table.test.name
+  }
+}
+`, rName, ruleset))
+}
+
 func testAccDataQualityRulesetConfig_tags1(rName, ruleset, tagKey1, tagValue1 string) string {
 	return fmt.Sprintf(`
 resource "aws_glue_data_quality_ruleset" "test" {

website/docs/r/glue_data_quality_ruleset.html.markdown

@@ -70,6 +70,7 @@ The following arguments are supported:
 
 ### target_table
 
+* `catalog_id` - (Optional, Forces new resource) The catalog id where the AWS Glue table exists.
 * `database_name` - (Required, Forces new resource) Name of the database where the AWS Glue table exists.
 * `table_name` - (Required, Forces new resource) Name of the AWS Glue table.