Fixed conflicts in SDP settings for Model Armor (#14541) (#10361)

modular-magician · web-flow · commit d426a62f8183 · 2025-07-16T10:44:13.000-07:00
[upstream:88d2f81608fee70e7e88c59bbac4434ef3c9294c]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/14541.txt b/.changelog/14541.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+modelarmor: fixed conflicting field validation for `filter_config.sdp_settings` on `google_model_armor_template`
+```
diff --git a/google-beta/services/modelarmor/resource_model_armor_template.go b/google-beta/services/modelarmor/resource_model_armor_template.go
@@ -184,7 +184,7 @@ e.g:-
 												},
 											},
 										},
-										ConflictsWith: []string{},
+										ConflictsWith: []string{"filter_config.0.sdp_settings.0.basic_config"},
 									},
 									"basic_config": {
 										Type:        schema.TypeList,
@@ -204,7 +204,7 @@ DISABLED`,
 												},
 											},
 										},
-										ConflictsWith: []string{},
+										ConflictsWith: []string{"filter_config.0.sdp_settings.0.advanced_config"},
 									},
 								},
 							},

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:bug
	`2`	+modelarmor: fixed conflicting field validation for `filter_config.sdp_settings` on `google_model_armor_template`
	`3`	+```