refactor: use CallPlugnTrigger instead of PlugnTriggerOutput

Refs #6422

plugins/common/common.go

@@ -124,8 +124,11 @@ func GetAppScheduler(appName string) string {
 }
 
 func getAppScheduler(appName string) string {
-	b, _ := PlugnTriggerOutput("scheduler-detect", []string{appName}...)
-	value := strings.TrimSpace(string(b[:]))
+	results, _ := CallPlugnTrigger(PlugnTriggerInput{
+		Trigger: "scheduler-detect",
+		Args:    []string{appName},
+	})
+	value := results.StdoutContents()
 	if value != "" {
 		return value
 	}
@@ -134,8 +137,11 @@ func getAppScheduler(appName string) string {
 
 // GetGlobalScheduler fetchs the global scheduler
 func GetGlobalScheduler() string {
-	b, _ := PlugnTriggerOutput("scheduler-detect", []string{"--global"}...)
-	value := strings.TrimSpace(string(b[:]))
+	results, _ := CallPlugnTrigger(PlugnTriggerInput{
+		Trigger: "scheduler-detect",
+		Args:    []string{"--global"},
+	})
+	value := results.StdoutContents()
 	if value != "" {
 		return value
 	}
@@ -152,24 +158,34 @@ func GetDeployingAppImageName(appName, imageTag, imageRepo string) (string, erro
 	ctx := context.Background()
 	errs, ctx := errgroup.WithContext(ctx)
 	errs.Go(func() error {
-		b, err := PlugnTriggerOutput("deployed-app-repository", []string{appName}...)
+		results, err := CallPlugnTrigger(PlugnTriggerInput{
+			Trigger: "deployed-app-repository",
+			Args:    []string{appName},
+		})
 		if err == nil {
-			imageRemoteRepository = strings.TrimSpace(string(b[:]))
+			imageRemoteRepository = results.StdoutContents()
 		}
 		return err
 	})
 	errs.Go(func() error {
-		b, err := PlugnTriggerOutput("deployed-app-image-tag", []string{appName}...)
+		results, err := CallPlugnTrigger(PlugnTriggerInput{
+			Trigger: "deployed-app-image-tag",
+			Args:    []string{appName},
+		})
+
 		if err == nil {
-			newImageTag = strings.TrimSpace(string(b[:]))
+			newImageTag = results.StdoutContents()
 		}
 		return err
 	})
 
 	errs.Go(func() error {
-		b, err := PlugnTriggerOutput("deployed-app-image-repo", []string{appName}...)
+		results, err := CallPlugnTrigger(PlugnTriggerInput{
+			Trigger: "deployed-app-image-repo",
+			Args:    []string{appName},
+		})
 		if err == nil {
-			newImageRepo = strings.TrimSpace(string(b[:]))
+			newImageRepo = results.StdoutContents()
 		}
 		return err
 	})
@@ -251,11 +267,14 @@ func GetAppRunningContainerIDs(appName string, containerType string) ([]string,
 
 // GetRunningImageTag retrieves current deployed image tag for a given app
 func GetRunningImageTag(appName string, imageTag string) (string, error) {
-	b, err := PlugnTriggerOutput("deployed-app-image-tag", []string{appName}...)
+	results, err := CallPlugnTrigger(PlugnTriggerInput{
+		Trigger: "deployed-app-image-tag",
+		Args:    []string{appName},
+	})
 	if err != nil {
 		return imageTag, err
 	}
-	newImageTag := strings.TrimSpace(string(b[:]))
+	newImageTag := results.StdoutContents()
 	if newImageTag != "" {
 		imageTag = newImageTag
 	}
@@ -326,7 +345,10 @@ func IsDeployed(appName string) bool {
 	if deployed == "" {
 		deployed = "false"
 		scheduler := GetAppScheduler(appName)
-		_, err := PlugnTriggerOutput("scheduler-is-deployed", []string{scheduler, appName}...)
+		_, err := CallPlugnTrigger(PlugnTriggerInput{
+			Trigger: "scheduler-is-deployed",
+			Args:    []string{scheduler, appName},
+		})
 		if err == nil {
 			deployed = "true"
 		}

plugins/common/docker.go

@@ -182,9 +182,11 @@ func DockerCleanup(appName string, forceCleanup bool) error {
 				triggerArgs = []string{"DOKKU_SKIP_CLEANUP"}
 			}
 
-			b, _ := PlugnTriggerOutput(triggerName, triggerArgs...)
-			output := strings.TrimSpace(string(b[:]))
-			if output == "true" {
+			results, _ := CallPlugnTrigger(PlugnTriggerInput{
+				Trigger: triggerName,
+				Args:    triggerArgs,
+			})
+			if results.StdoutContents() == "true" {
 				skipCleanup = true
 			}
 		}
@@ -309,9 +311,12 @@ func IsImageHerokuishBased(image string, appName string) bool {
 
 	dokkuAppUser := ""
 	if len(appName) != 0 {
-		b, err := PlugnTriggerOutput("config-get", []string{appName, "DOKKU_APP_USER"}...)
+		results, err := CallPlugnTrigger(PlugnTriggerInput{
+			Trigger: "config-get",
+			Args:    []string{appName, "DOKKU_APP_USER"},
+		})
 		if err == nil {
-			dokkuAppUser = strings.TrimSpace(string(b))
+			dokkuAppUser = results.StdoutContents()
 		}
 	}
 

plugins/common/exec.go

@@ -77,6 +77,16 @@ func (ecr ExecCommandResponse) StderrContents() string {
 	return strings.TrimSpace(ecr.Stderr)
 }
 
+// StderrBytes returns the trimmed stderr of the command as bytes
+func (ecr ExecCommandResponse) StderrBytes() []byte {
+	return []byte(ecr.StderrContents())
+}
+
+// StdoutBytes returns the trimmed stdout of the command as bytes
+func (ecr ExecCommandResponse) StdoutBytes() []byte {
+	return []byte(ecr.StdoutContents())
+}
+
 // CallExecCommand executes a command on the local host
 func CallExecCommand(input ExecCommandInput) (ExecCommandResponse, error) {
 	ctx := context.Background()

plugins/common/functions.go

@@ -25,8 +25,11 @@ func filterApps(apps []string) ([]string, error) {
 	}
 
 	args := append([]string{sshUser, sshName}, apps...)
-	b, _ := PlugnTriggerOutput("user-auth-app", args...)
-	filteredApps := strings.Split(strings.TrimSpace(string(b[:])), "\n")
+	results, _ := CallPlugnTrigger(PlugnTriggerInput{
+		Trigger: "user-auth-app",
+		Args:    args,
+	})
+	filteredApps := strings.Split(results.StdoutContents(), "\n")
 	filteredApps = removeEmptyEntries(filteredApps)
 
 	if len(filteredApps) == 0 {