Added missing file types in file_types enum and removed broken exactl…

…yOneOf blocks in google_data_loss_prevention_job_trigger resource (#8100) (#5749) Signed-off-by: Modular Magician <[email protected]>
hashicorp · Jun 8, 2023 · 60cfad1 · 60cfad1
1 parent ff8b48b
commit 60cfad1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/.changelog/8100.txt b/.changelog/8100.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+dlp: added missing file types `POWERPOINT` and `EXCEL` in `inspect_job.storage_config.cloud_storage_options.file_types` enum to `google_data_loss_prevention_job_trigger` resource
+```
diff --git a/google-beta/resource_data_loss_prevention_job_trigger_test.go b/google-beta/resource_data_loss_prevention_job_trigger_test.go
@@ -509,6 +509,7 @@ resource "google_data_loss_prevention_job_trigger" "basic" {
 				file_set {
 					url = "gs://mybucket/directory/"
 				}
+				file_types = ["POWERPOINT", "EXCEL", "CSV", "TSV"]
 			}
 		}
 	}

diff --git a/google-beta/services/datalossprevention/resource_data_loss_prevention_job_trigger.go b/google-beta/services/datalossprevention/resource_data_loss_prevention_job_trigger.go
@@ -301,10 +301,10 @@ Must be between 0 and 100, inclusively. Both 0 and 100 means no limit.`,
 													Optional: true,
 													Description: `List of file type groups to include in the scan. If empty, all files are scanned and available data
 format processors are applied. In addition, the binary content of the selected files is always scanned as well.
-Images are scanned only as binary if the specified region does not support image inspection and no fileTypes were specified. Possible values: ["BINARY_FILE", "TEXT_FILE", "IMAGE", "WORD", "PDF", "AVRO", "CSV", "TSV"]`,
+Images are scanned only as binary if the specified region does not support image inspection and no fileTypes were specified. Possible values: ["BINARY_FILE", "TEXT_FILE", "IMAGE", "WORD", "PDF", "AVRO", "CSV", "TSV", "POWERPOINT", "EXCEL"]`,
 													Elem: &schema.Schema{
 														Type:         schema.TypeString,
-														ValidateFunc: verify.ValidateEnum([]string{"BINARY_FILE", "TEXT_FILE", "IMAGE", "WORD", "PDF", "AVRO", "CSV", "TSV"}),
+														ValidateFunc: verify.ValidateEnum([]string{"BINARY_FILE", "TEXT_FILE", "IMAGE", "WORD", "PDF", "AVRO", "CSV", "TSV", "POWERPOINT", "EXCEL"}),
 													},
 												},
 												"files_limit_percent": {
@@ -596,7 +596,6 @@ is 1,024 characters.`,
 												},
 											},
 										},
-										ExactlyOneOf: []string{},
 									},
 									"job_notification_emails": {
 										Type:        schema.TypeList,
@@ -606,7 +605,6 @@ is 1,024 characters.`,
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{},
 										},
-										ExactlyOneOf: []string{},
 									},
 									"pub_sub": {
 										Type:        schema.TypeList,
@@ -622,7 +620,6 @@ is 1,024 characters.`,
 												},
 											},
 										},
-										ExactlyOneOf: []string{},
 									},
 									"publish_findings_to_cloud_data_catalog": {
 										Type:        schema.TypeList,
@@ -632,7 +629,6 @@ is 1,024 characters.`,
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{},
 										},
-										ExactlyOneOf: []string{},
 									},
 									"publish_summary_to_cscc": {
 										Type:        schema.TypeList,
@@ -642,7 +638,6 @@ is 1,024 characters.`,
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{},
 										},
-										ExactlyOneOf: []string{},
 									},
 									"publish_to_stackdriver": {
 										Type:        schema.TypeList,
@@ -652,7 +647,6 @@ is 1,024 characters.`,
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{},
 										},
-										ExactlyOneOf: []string{},
 									},
 									"save_findings": {
 										Type:        schema.TypeList,
@@ -712,7 +706,6 @@ Only for use with external storage. Possible values: ["BASIC_COLUMNS", "GCS_COLU
 												},
 											},
 										},
-										ExactlyOneOf: []string{},
 									},
 								},
 							},

diff --git a/website/docs/r/data_loss_prevention_job_trigger.html.markdown b/website/docs/r/data_loss_prevention_job_trigger.html.markdown
@@ -1047,7 +1047,7 @@ The following arguments are supported:
   List of file type groups to include in the scan. If empty, all files are scanned and available data
   format processors are applied. In addition, the binary content of the selected files is always scanned as well.
   Images are scanned only as binary if the specified region does not support image inspection and no fileTypes were specified.
-  Each value may be one of: `BINARY_FILE`, `TEXT_FILE`, `IMAGE`, `WORD`, `PDF`, `AVRO`, `CSV`, `TSV`.
+  Each value may be one of: `BINARY_FILE`, `TEXT_FILE`, `IMAGE`, `WORD`, `PDF`, `AVRO`, `CSV`, `TSV`, `POWERPOINT`, `EXCEL`.
 
 * `sample_method` -
   (Optional)
-Original file line number
+Diff line change
@@ Expand Up @@
     				file_set {
     					url = "gs://mybucket/directory/"
     				}
+    				file_types = ["POWERPOINT", "EXCEL", "CSV", "TSV"]
     			}
     		}
     	}
@@ Expand Down @@