Remove ExactlyOneOf restriction for `auto_provisioning_defaul… (#3106…

…) (#5642) Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Feb 11, 2020 · e364358 · e364358
1 parent 6073793
commit e364358
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/.changelog/3106.txt b/.changelog/3106.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+container: Removed restriction on `auto_provisioning_defaults` to allow both `oauth_scopes` and `service_account` to be set
+```
diff --git a/google/resource_container_cluster.go b/google/resource_container_cluster.go
@@ -267,19 +267,11 @@ func resourceContainerCluster() *schema.Resource {
 										Computed:         true,
 										Elem:             &schema.Schema{Type: schema.TypeString},
 										DiffSuppressFunc: containerClusterAddedScopesSuppress,
-										ExactlyOneOf: []string{
-											"cluster_autoscaling.0.auto_provisioning_defaults.0.oauth_scopes",
-											"cluster_autoscaling.0.auto_provisioning_defaults.0.service_account",
-										},
 									},
 									"service_account": {
 										Type:     schema.TypeString,
 										Optional: true,
 										Default:  "default",
-										ExactlyOneOf: []string{
-											"cluster_autoscaling.0.auto_provisioning_defaults.0.oauth_scopes",
-											"cluster_autoscaling.0.auto_provisioning_defaults.0.service_account",
-										},
 									},
 								},
 							},

diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown
@@ -378,12 +378,10 @@ for a list of types.
 The `auto_provisioning_defaults` block supports:
 
 * `oauth_scopes` - (Optional) Scopes that are used by NAP when creating node pools.
-If `oauth_scopes` are specified, `service_account` must be empty.
 
 -> `monitoring.write` is always enabled regardless of user input.  `monitoring` and `logging.write` may also be enabled depending on the values for `monitoring_service` and `logging_service`.
 
 * `service_account` - (Optional) The Google Cloud Platform Service Account to be used by the node VMs.
-If `service_account` is specified, `oauth_scopes` must be empty.
 
 The `authenticator_groups_config` block supports: