feat!: Make enable_floor_setting_enforcement field optional

Google APIs · copybara-github · commit 478799c34562 · 2025-02-24T20:21:45.000-08:00
fix: fix typo in csam_filter_filter_result in SanitizationResult output
feat: Add SDP info types in SdpDeidentify results
docs: A comment for field `inspect_template` in message `.google.cloud.modelarmor.v1.SdpAdvancedConfig` is changed
docs: A comment for field `deidentify_template` in message `.google.cloud.modelarmor.v1.SdpAdvancedConfig` is changed

PiperOrigin-RevId: 730701858
diff --git a/google/cloud/modelarmor/v1/service.proto b/google/cloud/modelarmor/v1/service.proto
@@ -317,7 +317,7 @@ message FloorSetting {
   FilterConfig filter_config = 4 [(google.api.field_behavior) = REQUIRED];
 
   // Optional. Floor Settings enforcement status.
-  bool enable_floor_setting_enforcement = 5
+  optional bool enable_floor_setting_enforcement = 5
       [(google.api.field_behavior) = OPTIONAL];
 }
 
@@ -624,10 +624,9 @@ message SdpAdvancedConfig {
   // If only inspect template is provided (de-identify template not provided),
   // then Sensitive Data Protection InspectContent action is performed during
   // Sanitization. All Sensitive Data Protection findings identified during
-  // inspection will be returned as SdpFinding in SdpInsepctionResult e.g.
-  // `organizations/{organization}/inspectTemplates/{inspect_template}`,
-  // `projects/{project}/inspectTemplates/{inspect_template}`
-  // `organizations/{organization}/locations/{location}/inspectTemplates/{inspect_template}`
+  // inspection will be returned as SdpFinding in SdpInsepctionResult.
+  //
+  //  e.g.
   // `projects/{project}/locations/{location}/inspectTemplates/{inspect_template}`
   string inspect_template = 1 [(google.api.field_behavior) = OPTIONAL];
 
@@ -641,9 +640,6 @@ message SdpAdvancedConfig {
   // in inspect template.
   //
   // e.g.
-  // `organizations/{organization}/deidentifyTemplates/{deidentify_template}`,
-  // `projects/{project}/deidentifyTemplates/{deidentify_template}`
-  // `organizations/{organization}/locations/{location}/deidentifyTemplates/{deidentify_template}`
   // `projects/{project}/locations/{location}/deidentifyTemplates/{deidentify_template}`
   string deidentify_template = 2 [(google.api.field_behavior) = OPTIONAL];
 }
@@ -753,7 +749,7 @@ message FilterResult {
     MaliciousUriFilterResult malicious_uri_filter_result = 4;
 
     // CSAM filter results.
-    CsamFilterResult csam_filter_filter_result = 5;
+    CsamFilterResult csam_filter_result = 5;
 
     // Virus scan results.
     VirusScanFilterResult virus_scan_filter_result = 6;
@@ -893,6 +889,9 @@ message SdpDeidentifyResult {
 
   // Total size in bytes that were transformed during deidentification.
   int64 transformed_bytes = 5;
+
+  // List of Sensitive Data Protection info-types that were de-identified.
+  repeated string info_types = 6;
 }
 
 // Finding corresponding to Sensitive Data Protection filter.
