这是indexloc提供的服务，不要输入任何密码
Skip to content

Set granular update mask for Dialogflow cx playbook instruction; #15702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+39 −1
Open

Set granular update mask for Dialogflow cx playbook instruction; #15702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abf561e
Set update_mask to false to overwrite the instructions;
zhihaos Nov 12, 2025
588ba2a
Use granular update mask custom code;
zhihaos Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mmv1/products/dialogflowcx/Playbook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ update_mask: true
custom_code:
pre_create: 'templates/terraform/pre_create/dialogflow_set_location.go.tmpl'
pre_read: 'templates/terraform/pre_create/dialogflow_set_location.go.tmpl'
pre_update: 'templates/terraform/pre_create/dialogflow_set_location.go.tmpl'
pre_update: 'templates/terraform/pre_update/dialogflowcx_playbook_granular_update_mask.go.tmpl'
pre_delete: 'templates/terraform/pre_create/dialogflow_set_location.go.tmpl'
custom_import: 'templates/terraform/custom_import/dialogflowcx_playbook.go.tmpl'

Expand Down
38 changes: 38 additions & 0 deletions mmv1/templates/terraform/pre_update/dialogflowcx_playbook_granular_update_mask.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// extract location from the parent
location := ""

if parts := regexp.MustCompile(`locations\/([^\/]*)\/`).FindStringSubmatch(d.Get("parent").(string)); parts != nil {
location = parts[1]
} else {
return fmt.Errorf(
"Saw %s when the parent is expected to contains location %s",
d.Get("parent"),
"projects/{{"{{"}}project{{"}}"}}/locations/{{"{{"}}location{{"}}"}}/...",
)
}

// only insert location into url if the base_url in products/dialogflowcx/product.yaml is used
if strings.HasPrefix(url, "https://-dialogflow.googleapis.com/v3/") {
url = strings.Replace(url, "-dialogflow", fmt.Sprintf("%s-dialogflow", location), 1)
}

// The generated code sets the wrong masks for the following fields.
newUpdateMask := []string{}
if d.HasChange("instruction.0.steps") {
newUpdateMask = append(newUpdateMask, "instruction.steps")
}
if d.HasChange("instruction.0.guidelines") {
newUpdateMask = append(newUpdateMask, "instruction.guidelines")
}
// Pull out any other set fields from the generated mask.
for _, mask := range updateMask {
if mask == "instruction" {
continue
}
newUpdateMask = append(newUpdateMask, mask)
}
// Overwrite the previously set mask.
url, err = transport_tpg.AddQueryParams(url, map[string]string{"updateMask": strings.Join(newUpdateMask, ",")})
if err != nil {
return err
}
Loading