public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-10-01 16:21:06 +00:00
Code Issues Projects Releases Wiki Activity

Add support for updating function code in place (#1781)

Browse Source 
Remove ForceNew from the source inputs on function resources, and add support for updating the function in place from a new source bucket+object.
This commit is contained in:
Luke Hoban 2018-07-18 14:48:00 -07:00 committed by Dana Hoffman
parent fb04555ada
commit cf4e731236
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
google/resource_cloudfunctions_function.go
View File

@ -123,13 +123,11 @@ func resourceCloudFunctionsFunction() *schema.Resource {
"source_archive_bucket": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"source_archive_object": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"description": {
@ -412,6 +410,13 @@ func resourceCloudFunctionsUpdate(d *schema.ResourceData, meta interface{}) erro
updateMaskArr = append(updateMaskArr, "availableMemoryMb")
}
if d.HasChange("source_archive_bucket") || d.HasChange("source_archive_object") {
sourceArchiveBucket := d.Get("source_archive_bucket").(string)
sourceArchiveObj := d.Get("source_archive_object").(string)
function.SourceArchiveUrl = fmt.Sprintf("gs://%v/%v", sourceArchiveBucket, sourceArchiveObj)
updateMaskArr = append(updateMaskArr, "sourceArchiveUrl")
}
if d.HasChange("description") {
function.Description = d.Get("description").(string)
updateMaskArr = append(updateMaskArr, "description")

6
google/resource_cloudfunctions_function_test.go
View File

@ -23,6 +23,7 @@ const (
)
const testHTTPTriggerPath = "./test-fixtures/cloudfunctions/http_trigger.js"
const testHTTPTriggerUpdatePath = "./test-fixtures/cloudfunctions/http_trigger_update.js"
const testPubSubTriggerPath = "./test-fixtures/cloudfunctions/pubsub_trigger.js"
const testBucketTriggerPath = "./test-fixtures/cloudfunctions/bucket_trigger.js"
@ -85,6 +86,7 @@ func TestAccCloudFunctionsFunction_update(t *testing.T) {
functionName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
bucketName := fmt.Sprintf("tf-test-bucket-%d", acctest.RandInt())
zipFilePath, err := createZIPArchiveForIndexJs(testHTTPTriggerPath)
zipFileUpdatePath, err := createZIPArchiveForIndexJs(testHTTPTriggerUpdatePath)
if err != nil {
t.Fatal(err.Error())
}
@ -105,7 +107,7 @@ func TestAccCloudFunctionsFunction_update(t *testing.T) {
),
},
{
Config: testAccCloudFunctionsFunction_updated(functionName, bucketName, zipFilePath),
Config: testAccCloudFunctionsFunction_updated(functionName, bucketName, zipFileUpdatePath),
Check: resource.ComposeTestCheckFunc(
testAccCloudFunctionsFunctionExists(
funcResourceName, &function),
@ -420,7 +422,7 @@ resource "google_storage_bucket" "bucket" {
}
resource "google_storage_bucket_object" "archive" {
name = "index.zip"
name = "index_update.zip"
bucket = "${google_storage_bucket.bucket.name}"
source = "%s"
}

9
google/test-fixtures/cloudfunctions/http_trigger_update.js Normal file
View File

@ -0,0 +1,9 @@
/**
* HTTP Cloud Function.
*
* @param {Object} req Cloud Function request context.
* @param {Object} res Cloud Function response context.
*/
exports.helloGET = function helloGET (req, res) {
res.send("Goodbye ${req.body.name || 'World'}!");
};