remove check on conflicts (#6276) (#12116)

* remove check on conflicts

* more changes

* add the corresponding conflicts to compute firewall

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/6276.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

google/resource_compute_firewall.go

@@ -324,7 +324,7 @@ one of 'source_ranges', 'source_tags' or 'source_service_accounts' is required.`
 					Type: schema.TypeString,
 				},
 				Set:           schema.HashString,
-				ConflictsWith: []string{"destination_ranges", "source_service_accounts", "target_service_accounts"},
+				ConflictsWith: []string{"source_service_accounts", "destination_ranges", "target_service_accounts"},
 			},
 			"target_service_accounts": {
 				Type:     schema.TypeSet,

google/resource_compute_region_network_endpoint_group.go

@@ -179,7 +179,7 @@ and { service="bar2", tag="foo2" } respectively.`,
 						},
 					},
 				},
-				ConflictsWith: []string{"app_engine", "cloud_function"},
+				ConflictsWith: []string{"cloud_function", "app_engine"},
 			},
 			"description": {
 				Type:     schema.TypeString,

google/resource_compute_resource_policy.go

@@ -94,7 +94,7 @@ exact number of VMs.`,
 						},
 					},
 				},
-				ConflictsWith: []string{"snapshot_schedule_policy", "instance_schedule_policy"},
+				ConflictsWith: []string{"instance_schedule_policy", "snapshot_schedule_policy"},
 			},
 			"instance_schedule_policy": {
 				Type:        schema.TypeList,