Merge 1e82ef6 into 4b252bc

GoogleCloudPlatform · Jan 31, 2019 · 420b8b7 · 420b8b7
2 parents 4b252bc + 1e82ef6
commit 420b8b7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/third_party/terraform/resources/resource_composer_environment.go.erb b/third_party/terraform/resources/resource_composer_environment.go.erb
@@ -96,8 +96,7 @@ func resourceComposerEnvironment() *schema.Resource {
 								Schema: map[string]*schema.Schema{
 									"zone": {
 										Type:             schema.TypeString,
-										Computed:         true,
-										Optional:         true,
+										Required:         true,
 										ForceNew:         true,
 										DiffSuppressFunc: compareSelfLinkOrResourceName,
 									},

diff --git a/third_party/terraform/website/docs/r/composer_environment.html.markdown b/third_party/terraform/website/docs/r/composer_environment.html.markdown
@@ -167,27 +167,19 @@ The `config` block supports:
 The `node_config` block supports:
 
 * `zone` -
-  (Optional)
+  (Required)
   The Compute Engine zone in which to deploy the VMs running the
   Apache Airflow software, specified as the zone name or
   relative resource name (e.g. "projects/{project}/zones/{zone}"). Must belong to the enclosing environment's project 
   and region.
 
-  If both zone and machineType are specified, machineType must belong to this zone. If neither is specified, the service 
-  will pick default values in the specified resource's region. If only one of zone or machineType is specified, the 
-  location information from the specified field will be used for the location-unspecified field.
-
 * `machine_type` -
   (Optional)
   The Compute Engine machine type used for cluster instances,
   specified as a name or relative resource name. For example:
   "projects/{project}/zones/{zone}/machineTypes/{machineType}". Must belong to the enclosing environment's project and 
   region/zone.
 
-  If both zone and machineType are specified, machineType must belong to this zone. If neither is specified, the service 
-  will pick default values in the specified resource's region. If only one of zone or machineType is specified, the 
-  location information from the specified field will be used for the location-unspecified field.
-
 * `network` -
   (Optional)
   The Compute Engine network to be used for machine