From 2e99e8061d70f015d699f1a60335e61cd25901d3 Mon Sep 17 00:00:00 2001 From: The Magician Date: Tue, 15 Jan 2019 09:06:59 -0800 Subject: [PATCH] Removing "input=true" from ignoredFiles and includedFiles (#2871) /cc @naseemkullah --- google/resource_cloudbuild_trigger.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/google/resource_cloudbuild_trigger.go b/google/resource_cloudbuild_trigger.go index c5b1226e..692d1241 100644 --- a/google/resource_cloudbuild_trigger.go +++ b/google/resource_cloudbuild_trigger.go @@ -102,7 +102,6 @@ func resourceCloudBuildTrigger() *schema.Resource { "ignored_files": { Type: schema.TypeList, Optional: true, - ForceNew: true, Elem: &schema.Schema{ Type: schema.TypeString, }, @@ -110,7 +109,6 @@ func resourceCloudBuildTrigger() *schema.Resource { "included_files": { Type: schema.TypeList, Optional: true, - ForceNew: true, Elem: &schema.Schema{ Type: schema.TypeString, }, @@ -347,6 +345,18 @@ func resourceCloudBuildTriggerUpdate(d *schema.ResourceData, meta interface{}) e } else if v, ok := d.GetOkExists("filename"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, filenameProp)) { obj["filename"] = filenameProp } + ignoredFilesProp, err := expandCloudBuildTriggerIgnoredFiles(d.Get("ignored_files"), d, config) + if err != nil { + return err + } else if v, ok := d.GetOkExists("ignored_files"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, ignoredFilesProp)) { + obj["ignoredFiles"] = ignoredFilesProp + } + includedFilesProp, err := expandCloudBuildTriggerIncludedFiles(d.Get("included_files"), d, config) + if err != nil { + return err + } else if v, ok := d.GetOkExists("included_files"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, includedFilesProp)) { + obj["includedFiles"] = includedFilesProp + } triggerTemplateProp, err := expandCloudBuildTriggerTriggerTemplate(d.Get("trigger_template"), d, config) if err != nil { return err