From 4eee7b8c0dabe5f0490e017b1bb65565bd7d5fc3 Mon Sep 17 00:00:00 2001 From: Pavlo Tkach <3469726+ptkach@users.noreply.github.com> Date: Wed, 3 Jan 2024 17:38:42 -0500 Subject: [PATCH] Add support for bsa service to cloud tasks config (#2268) --- release/builder/deployCloudSchedulerAndQueue.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/release/builder/deployCloudSchedulerAndQueue.go b/release/builder/deployCloudSchedulerAndQueue.go index c386db26b..74ef57ca2 100644 --- a/release/builder/deployCloudSchedulerAndQueue.go +++ b/release/builder/deployCloudSchedulerAndQueue.go @@ -65,6 +65,7 @@ type Queue struct { type Task struct { URL string `xml:"url"` Description string `xml:"description"` + Service string `xml:"service"` Schedule string `xml:"schedule"` Name string `xml:"name"` } @@ -180,13 +181,18 @@ func (manager TasksSyncManager) getArgs(task Task, operationType string) []strin } description = strings.ReplaceAll(description, "\n", " ") + var service = "backend" + if task.Service != "backend" && task.Service != "" { + service = task.Service + } + return []string{ "--project", projectName, "scheduler", "jobs", operationType, "http", task.Name, "--location", GcpLocation, "--schedule", task.Schedule, - "--uri", fmt.Sprintf("https://backend-dot-%s.appspot.com%s", projectName, strings.TrimSpace(task.URL)), + "--uri", fmt.Sprintf("https://%s-dot-%s.appspot.com%s", service, projectName, strings.TrimSpace(task.URL)), "--description", description, "--http-method", "get", "--oidc-service-account-email", getCloudSchedulerServiceAccountEmail(), @@ -313,7 +319,7 @@ func getExistingEntries(cmd *exec.Cmd) ExistingEntries { func main() { if len(os.Args) < 4 || os.Args[1] == "" || os.Args[2] == "" || os.Args[3] == "" { panic("Error - Invalid Parameters.\n" + - "Required params: 1 - Nomulu config YAML path; 2 - config XML path; 3 - project name;") + "Required params: 1 - Nomulus config YAML path; 2 - config XML path; 3 - project name;") } // Nomulus YAML config file path, used to extract OAuth client ID. nomulusConfigFileLocation := os.Args[1]