Added Environment Variables configuration to Cloud Functions (#1830)

Author: hpidcock

google/resource_cloudfunctions_function.go

@@ -169,6 +169,11 @@ func resourceCloudFunctionsFunction() *schema.Resource {
 				Optional: true,
 			},
 
+			"environment_variables": {
+				Type:     schema.TypeMap,
+				Optional: true,
+			},
+
 			"trigger_bucket": {
 				Type:          schema.TypeString,
 				Optional:      true,
@@ -319,6 +324,10 @@ func resourceCloudFunctionsCreate(d *schema.ResourceData, meta interface{}) erro
 		function.Labels = expandLabels(d)
 	}
 
+	if _, ok := d.GetOk("environment_variables"); ok {
+		function.EnvironmentVariables = expandEnvironmentVariables(d)
+	}
+
 	log.Printf("[DEBUG] Creating cloud function: %s", function.Name)
 	op, err := config.clientCloudFunctions.Projects.Locations.Functions.Create(
 		cloudFuncId.locationId(), function).Do()
@@ -361,6 +370,7 @@ func resourceCloudFunctionsRead(d *schema.ResourceData, meta interface{}) error
 	}
 	d.Set("timeout", timeout)
 	d.Set("labels", function.Labels)
+	d.Set("environment_variables", function.EnvironmentVariables)
 	if function.SourceArchiveUrl != "" {
 		// sourceArchiveUrl should always be a Google Cloud Storage URL (e.g. gs://bucket/object)
 		// https://cloud.google.com/functions/docs/reference/rest/v1/projects.locations.functions
@@ -440,6 +450,11 @@ func resourceCloudFunctionsUpdate(d *schema.ResourceData, meta interface{}) erro
 		updateMaskArr = append(updateMaskArr, "labels")
 	}
 
+	if d.HasChange("environment_variables") {
+		function.EnvironmentVariables = expandEnvironmentVariables(d)
+		updateMaskArr = append(updateMaskArr, "environment_variables")
+	}
+
 	if d.HasChange("retry_on_failure") {
 		if d.Get("retry_on_failure").(bool) {
 			if function.EventTrigger == nil {

google/resource_cloudfunctions_function_test.go

@@ -66,6 +66,8 @@ func TestAccCloudFunctionsFunction_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(funcResourceName,
 						"trigger_http", "true"),
 					testAccCloudFunctionsFunctionHasLabel("my-label", "my-label-value", &function),
+					testAccCloudFunctionsFunctionHasEnvironmentVariable("TEST_ENV_VARIABLE",
+						"test-env-variable-value", &function),
 				),
 			},
 			{
@@ -119,6 +121,10 @@ func TestAccCloudFunctionsFunction_update(t *testing.T) {
 						"timeout", "91"),
 					testAccCloudFunctionsFunctionHasLabel("my-label", "my-updated-label-value", &function),
 					testAccCloudFunctionsFunctionHasLabel("a-new-label", "a-new-label-value", &function),
+					testAccCloudFunctionsFunctionHasEnvironmentVariable("TEST_ENV_VARIABLE",
+						"test-env-variable-value", &function),
+					testAccCloudFunctionsFunctionHasEnvironmentVariable("NEW_ENV_VARIABLE",
+						"new-env-variable-value", &function),
 				),
 			},
 		},
@@ -347,6 +353,21 @@ func testAccCloudFunctionsFunctionHasLabel(key, value string,
 	}
 }
 
+func testAccCloudFunctionsFunctionHasEnvironmentVariable(key, value string,
+	function *cloudfunctions.CloudFunction) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		if val, ok := function.EnvironmentVariables[key]; ok {
+			if val != value {
+				return fmt.Errorf("Environment Variable value did not match for key %s: expected %s but found %s",
+					key, value, val)
+			}
+		} else {
+			return fmt.Errorf("Environment Variable with key %s not found", key)
+		}
+		return nil
+	}
+}
+
 func createZIPArchiveForIndexJs(sourcePath string) (string, error) {
 	source, err := ioutil.ReadFile(sourcePath)
 	if err != nil {
@@ -411,6 +432,9 @@ resource "google_cloudfunctions_function" "function" {
   labels {
 	my-label = "my-label-value"
   }
+  environment_variables {
+	TEST_ENV_VARIABLE = "test-env-variable-value"
+  }
 }
 `, bucketName, zipFilePath, functionName)
 }
@@ -440,6 +464,10 @@ resource "google_cloudfunctions_function" "function" {
 	my-label = "my-updated-label-value"
 	a-new-label = "a-new-label-value"
   }
+  environment_variables {
+	TEST_ENV_VARIABLE = "test-env-variable-value"
+	NEW_ENV_VARIABLE = "new-env-variable-value"
+  }
 }`, bucketName, zipFilePath, functionName)
 }
 

google/utils.go

@@ -272,6 +272,11 @@ func expandLabels(d *schema.ResourceData) map[string]string {
 	return expandStringMap(d, "labels")
 }
 
+// expandEnvironmentVariables pulls the value of "environment_variables" out of a schema.ResourceData as a map[string]string.
+func expandEnvironmentVariables(d *schema.ResourceData) map[string]string {
+	return expandStringMap(d, "environment_variables")
+}
+
 // expandStringMap pulls the value of key out of a schema.ResourceData as a map[string]string.
 func expandStringMap(d *schema.ResourceData, key string) map[string]string {
 	v, ok := d.GetOk(key)