From c277f529a00837877d6e3bcf2af2033aea87cc13 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 14 Mar 2024 02:26:01 -0400 Subject: [PATCH] refactor: use CallPlugnTrigger instead of PlugnTriggerSetup Refs #6422 --- plugins/app-json/functions.go | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/plugins/app-json/functions.go b/plugins/app-json/functions.go index 2b3cc33af..3d1ef3eab 100644 --- a/plugins/app-json/functions.go +++ b/plugins/app-json/functions.go @@ -213,8 +213,13 @@ func executeScript(appName string, image string, imageTag string, phase string) } var dockerArgs []string - if b, err := common.PlugnTriggerSetup("docker-args-deploy", []string{appName, imageTag}...).SetInput("").Output(); err == nil { - words, err := shellquote.Split(strings.TrimSpace(string(b[:]))) + results, err := common.CallPlugnTrigger(common.PlugnTriggerInput{ + Trigger: "docker-args-deploy", + Args: []string{appName, imageTag}, + Stdin: strings.NewReader(""), + }) + if err == nil { + words, err := shellquote.Split(results.StdoutContents()) if err != nil { return err } @@ -222,8 +227,13 @@ func executeScript(appName string, image string, imageTag string, phase string) dockerArgs = append(dockerArgs, words...) } - if b, err := common.PlugnTriggerSetup("docker-args-process-deploy", []string{appName, imageSourceType, imageTag}...).SetInput("").Output(); err == nil { - words, err := shellquote.Split(strings.TrimSpace(string(b[:]))) + results, err = common.CallPlugnTrigger(common.PlugnTriggerInput{ + Trigger: "docker-args-process-deploy", + Args: []string{appName, imageSourceType, imageTag}, + Stdin: strings.NewReader(""), + }) + if err == nil { + words, err := shellquote.Split(results.StdoutContents()) if err != nil { return err }