Use lineage instead of api_name for property conflicts (#3885) (#…

…7063) Signed-off-by: Modular Magician <[email protected]>
hashicorp · Aug 19, 2020 · b61d742 · b61d742
1 parent 4ed2414
commit b61d742
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.changelog/3885.txt b/.changelog/3885.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+compute: fixed an issue where `google_compute_url_map` `path_matcher.default_route_action` would conflict with `default_url_redirect`
+```
diff --git a/google/resource_compute_url_map.go b/google/resource_compute_url_map.go
@@ -1122,7 +1122,6 @@ The value must be between 0 and 1000`,
 									},
 								},
 							},
-							ConflictsWith: []string{"default_url_redirect"},
 						},
 						"default_service": {
 							Type:             schema.TypeString,
@@ -1200,7 +1199,6 @@ the request method will be retained. Possible values: ["FOUND", "MOVED_PERMANENT
 									},
 								},
 							},
-							ConflictsWith: []string{"default_route_action"},
 						},
 						"description": {
 							Type:     schema.TypeString,