Make cloud composer environment image version updateable.

Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · May 21, 2019 · 86b4df8 · 86b4df8
1 parent dab8fa8
commit 86b4df8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/google/data_source_google_client_config.go b/google/data_source_google_client_config.go
@@ -20,6 +20,11 @@ func dataSourceGoogleClientConfig() *schema.Resource {
 				Computed: true,
 			},
 
+			"zone": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"access_token": {
 				Type:      schema.TypeString,
 				Computed:  true,
@@ -35,6 +40,7 @@ func dataSourceClientConfigRead(d *schema.ResourceData, meta interface{}) error
 	d.SetId(time.Now().UTC().String())
 	d.Set("project", config.Project)
 	d.Set("region", config.Region)
+	d.Set("zone", config.Zone)
 
 	token, err := config.tokenSource.Token()
 	if err != nil {

diff --git a/google/data_source_google_client_config_test.go b/google/data_source_google_client_config_test.go
@@ -20,6 +20,7 @@ func TestAccDataSourceGoogleClientConfig_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(resourceName, "project"),
 					resource.TestCheckResourceAttrSet(resourceName, "region"),
+					resource.TestCheckResourceAttrSet(resourceName, "zone"),
 					resource.TestCheckResourceAttrSet(resourceName, "access_token"),
 				),
 			},

diff --git a/google/resource_composer_environment.go b/google/resource_composer_environment.go
@@ -317,8 +317,7 @@ func resourceComposerEnvironmentUpdate(d *schema.ResourceData, meta interface{})
 		}
 
 		if d.HasChange("config.0.software_config.0.airflow_config_overrides") {
-
-			patchObj := &composer.Environment{
+			patchObj := &composer.Envirconment{
 				Config: &composer.EnvironmentConfig{
 					SoftwareConfig: &composer.SoftwareConfig{
 						AirflowConfigOverrides: make(map[string]string),

diff --git a/website/docs/d/datasource_client_config.html.markdown b/website/docs/d/datasource_client_config.html.markdown
@@ -51,4 +51,6 @@ In addition to the arguments listed above, the following attributes are exported
 
 * `region` - The region to operate under.
 
+* `zone` - The zone to operate under.
+
 * `access_token` - The OAuth2 access token used by the client to authenticate against the Google Cloud API.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,4 +51,6 @@ In addition to the arguments listed above, the following attributes are exported

		* `region` - The region to operate under.

		* `zone` - The zone to operate under.

		* `access_token` - The OAuth2 access token used by the client to authenticate against the Google Cloud API.