feat: add env block to cloud workstations resource. (#8911) (#6258)

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

Author: modular-magician

.changelog/8911.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+workstations: added `env` field to `google_workstations_workstation` resource (beta)
+```

google-beta/services/workstations/iam_workstations_workstation_generated_test.go

@@ -181,6 +181,10 @@ resource "google_workstations_workstation" "default" {
     "label" = "key"
   }
 
+  env = {
+    name = "foo"
+  }
+
   annotations = {
     label-one = "value-one"
   }
@@ -257,6 +261,10 @@ resource "google_workstations_workstation" "default" {
     "label" = "key"
   }
 
+  env = {
+    name = "foo"
+  }
+
   annotations = {
     label-one = "value-one"
   }
@@ -352,6 +360,10 @@ resource "google_workstations_workstation" "default" {
     "label" = "key"
   }
 
+  env = {
+    name = "foo"
+  }
+
   annotations = {
     label-one = "value-one"
   }
@@ -431,6 +443,10 @@ resource "google_workstations_workstation" "default" {
     "label" = "key"
   }
 
+  env = {
+    name = "foo"
+  }
+
   annotations = {
     label-one = "value-one"
   }
@@ -507,6 +523,10 @@ resource "google_workstations_workstation" "default" {
     "label" = "key"
   }
 
+  env = {
+    name = "foo"
+  }
+
   annotations = {
     label-one = "value-one"
   }

google-beta/services/workstations/resource_workstations_workstation.go

@@ -83,6 +83,12 @@ func ResourceWorkstationsWorkstation() *schema.Resource {
 				Optional:    true,
 				Description: `Human-readable name for this resource.`,
 			},
+			"env": {
+				Type:        schema.TypeMap,
+				Optional:    true,
+				Description: `'Client-specified environment variables passed to the workstation container's entrypoint.'`,
+				Elem:        &schema.Schema{Type: schema.TypeString},
+			},
 			"labels": {
 				Type:        schema.TypeMap,
 				Optional:    true,
@@ -153,6 +159,12 @@ func resourceWorkstationsWorkstationCreate(d *schema.ResourceData, meta interfac
 	} else if v, ok := d.GetOkExists("annotations"); !tpgresource.IsEmptyValue(reflect.ValueOf(annotationsProp)) && (ok || !reflect.DeepEqual(v, annotationsProp)) {
 		obj["annotations"] = annotationsProp
 	}
+	envProp, err := expandWorkstationsWorkstationEnv(d.Get("env"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("env"); !tpgresource.IsEmptyValue(reflect.ValueOf(envProp)) && (ok || !reflect.DeepEqual(v, envProp)) {
+		obj["env"] = envProp
+	}
 
 	url, err := tpgresource.ReplaceVars(d, config, "{{WorkstationsBasePath}}projects/{{project}}/locations/{{location}}/workstationClusters/{{workstation_cluster_id}}/workstationConfigs/{{workstation_config_id}}/workstations?workstationId={{workstation_id}}")
 	if err != nil {
@@ -263,6 +275,9 @@ func resourceWorkstationsWorkstationRead(d *schema.ResourceData, meta interface{
 	if err := d.Set("annotations", flattenWorkstationsWorkstationAnnotations(res["annotations"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Workstation: %s", err)
 	}
+	if err := d.Set("env", flattenWorkstationsWorkstationEnv(res["env"], d, config)); err != nil {
+		return fmt.Errorf("Error reading Workstation: %s", err)
+	}
 	if err := d.Set("create_time", flattenWorkstationsWorkstationCreateTime(res["createTime"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Workstation: %s", err)
 	}
@@ -310,6 +325,12 @@ func resourceWorkstationsWorkstationUpdate(d *schema.ResourceData, meta interfac
 	} else if v, ok := d.GetOkExists("annotations"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, annotationsProp)) {
 		obj["annotations"] = annotationsProp
 	}
+	envProp, err := expandWorkstationsWorkstationEnv(d.Get("env"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("env"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, envProp)) {
+		obj["env"] = envProp
+	}
 
 	url, err := tpgresource.ReplaceVars(d, config, "{{WorkstationsBasePath}}projects/{{project}}/locations/{{location}}/workstationClusters/{{workstation_cluster_id}}/workstationConfigs/{{workstation_config_id}}/workstations/{{workstation_id}}")
 	if err != nil {
@@ -330,6 +351,10 @@ func resourceWorkstationsWorkstationUpdate(d *schema.ResourceData, meta interfac
 	if d.HasChange("annotations") {
 		updateMask = append(updateMask, "annotations")
 	}
+
+	if d.HasChange("env") {
+		updateMask = append(updateMask, "env")
+	}
 	// updateMask is a URL parameter but not present in the schema, so ReplaceVars
 	// won't set it
 	url, err = transport_tpg.AddQueryParams(url, map[string]string{"updateMask": strings.Join(updateMask, ",")})
@@ -462,6 +487,10 @@ func flattenWorkstationsWorkstationAnnotations(v interface{}, d *schema.Resource
 	return v
 }
 
+func flattenWorkstationsWorkstationEnv(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenWorkstationsWorkstationCreateTime(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	return v
 }
@@ -499,3 +528,14 @@ func expandWorkstationsWorkstationAnnotations(v interface{}, d tpgresource.Terra
 	}
 	return m, nil
 }
+
+func expandWorkstationsWorkstationEnv(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
+	if v == nil {
+		return map[string]string{}, nil
+	}
+	m := make(map[string]string)
+	for k, val := range v.(map[string]interface{}) {
+		m[k] = val.(string)
+	}
+	return m, nil
+}

google-beta/services/workstations/resource_workstations_workstation_generated_test.go

@@ -113,6 +113,10 @@ resource "google_workstations_workstation" "default" {
     "label" = "key"
   }
 
+  env = {
+    name = "foo"
+  }
+
   annotations = {
     label-one = "value-one"
   }

google-beta/services/workstations/resource_workstations_workstation_test.go

@@ -87,6 +87,10 @@ resource "google_workstations_workstation" "default" {
   labels = {
 	  foo = "bar"
   }
+
+  env = {
+    name = "bar"
+  }
 }
 `, context)
 }
@@ -136,6 +140,10 @@ resource "google_workstations_workstation" "default" {
   labels = {
 	  foo = "bar"
   }
+
+  env = {
+    name = "test"
+  }
 }
 `, context)
 }

website/docs/r/workstations_workstation.html.markdown

@@ -95,6 +95,10 @@ resource "google_workstations_workstation" "default" {
     "label" = "key"
   }
 
+  env = {
+    name = "foo"
+  }
+
   annotations = {
     label-one = "value-one"
   }
@@ -138,6 +142,10 @@ The following arguments are supported:
   (Optional)
   Client-specified annotations. This is distinct from labels.
 
+* `env` -
+  (Optional)
+  'Client-specified environment variables passed to the workstation container's entrypoint.'
+
 * `project` - (Optional) The ID of the project in which the resource belongs.
     If it is not provided, the provider project is used.