Allow Private Worker Pool for Cloud Functions Cloud Builds. (#6510) (#12591)

* Allow custom worker pools for Cloud Functions build

* Fix test for cloud functions cloud build worker pool

* Add build_worker_pool to CRU operations

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

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

Author: modular-magician

.changelog/6510.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+cloudfunctions: Added `build_worker_pool` to `google_cloudfunctions_function`
+```

google/resource_cloudfunctions_function.go

@@ -112,6 +112,12 @@ func resourceCloudFunctionsFunction() *schema.Resource {
 				ValidateFunc: validateResourceCloudFunctionsFunctionName,
 			},
 
+			"build_worker_pool": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: `Name of the Cloud Build Custom Worker Pool that should be used to build the function.`,
+			},
+
 			"source_archive_bucket": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -483,6 +489,10 @@ func resourceCloudFunctionsCreate(d *schema.ResourceData, meta interface{}) erro
 		function.Description = v.(string)
 	}
 
+	if v, ok := d.GetOk("build_worker_pool"); ok {
+		function.BuildWorkerPool = v.(string)
+	}
+
 	if v, ok := d.GetOk("entry_point"); ok {
 		function.EntryPoint = v.(string)
 	}
@@ -593,6 +603,9 @@ func resourceCloudFunctionsRead(d *schema.ResourceData, meta interface{}) error
 	if err := d.Set("description", function.Description); err != nil {
 		return fmt.Errorf("Error setting description: %s", err)
 	}
+	if err := d.Set("build_worker_pool", function.BuildWorkerPool); err != nil {
+		return fmt.Errorf("Error setting build_worker_pool: %s", err)
+	}
 	if err := d.Set("entry_point", function.EntryPoint); err != nil {
 		return fmt.Errorf("Error setting entry_point: %s", err)
 	}
@@ -760,6 +773,11 @@ func resourceCloudFunctionsUpdate(d *schema.ResourceData, meta interface{}) erro
 		updateMaskArr = append(updateMaskArr, "description")
 	}
 
+	if d.HasChange("build_worker_pool") {
+		function.BuildWorkerPool = d.Get("build_worker_pool").(string)
+		updateMaskArr = append(updateMaskArr, "build_worker_pool")
+	}
+
 	if d.HasChange("timeout") {
 		function.Timeout = fmt.Sprintf("%vs", d.Get("timeout").(int))
 		updateMaskArr = append(updateMaskArr, "timeout")

google/resource_cloudfunctions_function_test.go

@@ -245,6 +245,46 @@ func TestAccCloudFunctionsFunction_update(t *testing.T) {
 	})
 }
 
+func TestAccCloudFunctionsFunction_buildworkerpool(t *testing.T) {
+	t.Parallel()
+
+	var function cloudfunctions.CloudFunction
+
+	funcResourceName := "google_cloudfunctions_function.function"
+	functionName := fmt.Sprintf("tf-test-%s", randString(t, 10))
+	bucketName := fmt.Sprintf("tf-test-bucket-%d", randInt(t))
+	location := "us-central1"
+	zipFilePath := createZIPArchiveForCloudFunctionSource(t, testHTTPTriggerPath)
+	proj := getTestProjectFromEnv()
+
+	defer os.Remove(zipFilePath) // clean up
+
+	vcrTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckCloudFunctionsFunctionDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCloudFunctionsFunction_buildworkerpool(functionName, bucketName, zipFilePath, location),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCloudFunctionsFunctionExists(
+						t, funcResourceName, &function),
+					resource.TestCheckResourceAttr(funcResourceName,
+						"name", functionName),
+					resource.TestCheckResourceAttr(funcResourceName,
+						"build_worker_pool", fmt.Sprintf("projects/%s/locations/%s/workerPools/pool-%s", proj, location, functionName)),
+				),
+			},
+			{
+				ResourceName:            funcResourceName,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"build_environment_variables"},
+			},
+		},
+	})
+}
+
 func TestAccCloudFunctionsFunction_pubsub(t *testing.T) {
 	t.Parallel()
 
@@ -766,6 +806,44 @@ resource "google_cloudfunctions_function" "function" {
 `, bucketName, zipFilePath, functionName)
 }
 
+func testAccCloudFunctionsFunction_buildworkerpool(functionName string, bucketName string, zipFilePath string, location string) string {
+	return fmt.Sprintf(`
+resource "google_storage_bucket" "bucket" {
+  name     = "%s"
+  location = "US"
+}
+
+resource "google_storage_bucket_object" "archive" {
+  name   = "index.zip"
+  bucket = google_storage_bucket.bucket.name
+  source = "%s"
+}
+
+resource "google_cloudbuild_worker_pool" "pool" {
+  name     = "pool-%[3]s"
+  location = "%s"
+  worker_config {
+    disk_size_gb   = 100
+    machine_type   = "e2-standard-4"
+    no_external_ip = false
+  }
+}
+
+resource "google_cloudfunctions_function" "function" {
+  name                  = "%[3]s"
+  runtime               = "nodejs10"
+  description           = "test function"
+  docker_registry       = "CONTAINER_REGISTRY"
+  available_memory_mb   = 128
+  source_archive_bucket = google_storage_bucket.bucket.name
+  source_archive_object = google_storage_bucket_object.archive.name
+  trigger_http          = true
+  timeout               = 61
+  entry_point           = "helloGET"
+  build_worker_pool		= google_cloudbuild_worker_pool.pool.id
+}`, bucketName, zipFilePath, functionName, location)
+}
+
 func testAccCloudFunctionsFunction_pubsub(functionName string, bucketName string,
 	topic string, zipFilePath string) string {
 	return fmt.Sprintf(`