Removed required tag on maxFindingsPerInfoType.infoType (#10818) (#18285)

[upstream:f630747146b8a3ad8adc6b775abfb311de9401d8]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

google/services/datalossprevention/resource_data_loss_prevention_inspect_template.go

@@ -336,9 +336,14 @@ at https://cloud.google.com/dlp/docs/infotypes-reference when specifying a built
 										Description: `Configuration of findings limit given for specified infoTypes.`,
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{
+												"max_findings": {
+													Type:        schema.TypeInt,
+													Required:    true,
+													Description: `Max findings limit for the given infoType.`,
+												},
 												"info_type": {
 													Type:     schema.TypeList,
-													Required: true,
+													Optional: true,
 													Description: `Type of information the findings limit applies to. Only one limit per infoType should be provided. If InfoTypeLimit does
 not have an infoType, the DLP API applies the limit against all infoTypes that are found but not
 specified in another InfoTypeLimit.`,
@@ -375,11 +380,6 @@ at https://cloud.google.com/dlp/docs/infotypes-reference when specifying a built
 														},
 													},
 												},
-												"max_findings": {
-													Type:        schema.TypeInt,
-													Required:    true,
-													Description: `Max findings limit for the given infoType.`,
-												},
 											},
 										},
 									},

google/services/datalossprevention/resource_data_loss_prevention_inspect_template_generated_test.go

@@ -428,6 +428,59 @@ resource "google_data_loss_prevention_inspect_template" "with_template_id" {
 `, context)
 }
 
+func TestAccDataLossPreventionInspectTemplate_dlpInspectTemplateMaxInfotypePerFindingDefaultExample(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"project":       envvar.GetTestProjectFromEnv(),
+		"random_suffix": acctest.RandString(t, 10),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckDataLossPreventionInspectTemplateDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDataLossPreventionInspectTemplate_dlpInspectTemplateMaxInfotypePerFindingDefaultExample(context),
+			},
+			{
+				ResourceName:            "google_data_loss_prevention_inspect_template.max_infotype_per_finding_default",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"parent", "template_id"},
+			},
+		},
+	})
+}
+
+func testAccDataLossPreventionInspectTemplate_dlpInspectTemplateMaxInfotypePerFindingDefaultExample(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_data_loss_prevention_inspect_template" "max_infotype_per_finding_default" {
+  parent = "projects/%{project}"
+
+  inspect_config {
+    info_types {
+      name = "EMAIL_ADDRESS"
+    }
+    info_types {
+      name = "PERSON_NAME"
+    }
+
+    min_likelihood = "UNLIKELY"
+    limits {
+        max_findings_per_request = 333
+        max_findings_per_item = 222
+        max_findings_per_info_type {
+          # Entry with no info_type specifies the default value used by all info_types that don't specify their own limit
+          max_findings = 111
+        }
+    }
+  }
+}
+`, context)
+}
+
 func testAccCheckDataLossPreventionInspectTemplateDestroyProducer(t *testing.T) func(s *terraform.State) error {
 	return func(s *terraform.State) error {
 		for name, rs := range s.RootModule().Resources {

website/docs/r/data_loss_prevention_inspect_template.html.markdown

@@ -269,6 +269,33 @@ resource "google_data_loss_prevention_inspect_template" "custom_type_surrogate"
   }
 }
 ```
+## Example Usage - Dlp Inspect Template Max Infotype Per Finding Default
+
+
+```hcl
+resource "google_data_loss_prevention_inspect_template" "max_infotype_per_finding_default" {
+  parent = "projects/my-project-name"
+
+  inspect_config {
+    info_types {
+      name = "EMAIL_ADDRESS"
+    }
+    info_types {
+      name = "PERSON_NAME"
+    }
+
+    min_likelihood = "UNLIKELY"
+    limits {
+        max_findings_per_request = 333
+        max_findings_per_item = 222
+        max_findings_per_info_type {
+          # Entry with no info_type specifies the default value used by all info_types that don't specify their own limit
+          max_findings = 111
+        }
+    }
+  }
+}
+```
 
 ## Argument Reference
 
@@ -372,7 +399,7 @@ The following arguments are supported:
 <a name="nested_max_findings_per_info_type"></a>The `max_findings_per_info_type` block supports:
 
 * `info_type` -
-  (Required)
+  (Optional)
   Type of information the findings limit applies to. Only one limit per infoType should be provided. If InfoTypeLimit does
   not have an infoType, the DLP API applies the limit against all infoTypes that are found but not
   specified in another InfoTypeLimit.