remove path_matchers conflicts (#3722) (#2247)

modular-magician · web-flow · commit bc709384ec93 · 2020-06-30T15:52:46.000-07:00
Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/3722.txt b/.changelog/3722.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+compute: fixed an issue in `compute_url_map` where `path_matcher` sub-fields would conflict with `default_service`
+```
diff --git a/google-beta/resource_compute_url_map.go b/google-beta/resource_compute_url_map.go
@@ -1124,7 +1124,6 @@ The value must be between 0 and 1000`,
 							Optional:         true,
 							DiffSuppressFunc: compareSelfLinkOrResourceName,
 							Description:      `The backend service or backend bucket to use when none of the given paths match.`,
-							ConflictsWith:    []string{"default_url_redirect"},
 						},
 						"default_url_redirect": {
 							Type:     schema.TypeList,
@@ -1191,7 +1190,7 @@ the request method will be retained. Possible values: ["FOUND", "MOVED_PERMANENT
 									},
 								},
 							},
-							ConflictsWith: []string{"default_service", "default_route_action"},
+							ConflictsWith: []string{"default_route_action"},
 						},
 						"description": {
 							Type:     schema.TypeString,

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:bug
	`2`	+compute: fixed an issue in `compute_url_map` where `path_matcher` sub-fields would conflict with `default_service`
	`3`	+```