4 files changed, 6 insertions, 37 deletions

diff --git a/client/go/cmd/clusterstate/detect_model.go b/client/go/cmd/clusterstate/detect_model.go
index ff924e5fa83..41bb602559b 100644
--- a/client/go/cmd/clusterstate/detect_model.go
+++ b/client/go/cmd/clusterstate/detect_model.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/util"
 	"github.com/vespa-engine/vespa/client/go/vespa"
 )
 
@@ -16,7 +17,7 @@ func getConfigServerHosts(s string) []string {
 	if s != "" {
 		return []string{s}
 	}
-	got, err := getOutputFromCmd(vespa.FindHome()+"/bin/vespa-print-default", "configservers")
+	got, err := util.GetOutputFromProgram(vespa.FindHome()+"/bin/vespa-print-default", "configservers")
 	res := strings.Fields(got)
 	if err != nil || len(res) < 1 {
 		panic("bad configservers: " + got)
@@ -29,7 +30,7 @@ func getConfigServerPort(i int) int {
 	if i > 0 {
 		return i
 	}
-	got, err := getOutputFromCmd(vespa.FindHome()+"/bin/vespa-print-default", "configserver_rpc_port")
+	got, err := util.GetOutputFromProgram(vespa.FindHome()+"/bin/vespa-print-default", "configserver_rpc_port")
 	if err == nil {
 		i, err = strconv.Atoi(strings.TrimSpace(got))
 	}
@@ -52,7 +53,7 @@ func detectModel(opts *Options) *VespaModelConfig {
 			"-p", strconv.Itoa(cfgPort),
 			"-s", cfgHost,
 		}
-		data, err := getOutputFromCmd(vespa.FindHome()+"/bin/vespa-get-config", args...)
+		data, err := util.GetOutputFromProgram(vespa.FindHome()+"/bin/vespa-get-config", args...)
 		parsed := parseModelConfig(data)
 		if err == nil && parsed != nil {
 			return parsed
diff --git a/client/go/cmd/clusterstate/run_cmd.go b/client/go/cmd/clusterstate/run_cmd.go
deleted file mode 100644
index 4b67ad46a86..00000000000
--- a/client/go/cmd/clusterstate/run_cmd.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-// Author: arnej
-
-// utilities to get and manipulate node states in a storage cluster
-package clusterstate
-
-import (
-	"bytes"
-	"os"
-	"os/exec"
-	"strings"
-
-	"github.com/vespa-engine/vespa/client/go/trace"
-)
-
-func getOutputFromCmd(program string, args ...string) (string, error) {
-	cmd := exec.Command(program, args...)
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	cmd.Stderr = os.Stderr
-	trace.Debug("running command:", program, strings.Join(args, " "))
-	err := cmd.Run()
-	return out.String(), err
-}
diff --git a/client/go/cmd/deploy/curl.go b/client/go/cmd/deploy/curl.go
index 7b7b478b84b..cc55cbc7e4b 100644
--- a/client/go/cmd/deploy/curl.go
+++ b/client/go/cmd/deploy/curl.go
@@ -82,15 +82,6 @@ func newCurlCommand(url string, args []string) *curl.Command {
 	return cmd
 }
 
-func getOutputFromCmd(program string, args ...string) (string, error) {
-	cmd := exec.Command(program, args...)
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	cmd.Stderr = os.Stderr
-	err := cmd.Run()
-	return out.String(), err
-}
-
 func runCurl(cmd *curl.Command, stdout io.Writer) error {
 	trace.Trace("running curl:", cmd.String())
 	err := cmd.Run(stdout, os.Stderr)
diff --git a/client/go/cmd/deploy/urls.go b/client/go/cmd/deploy/urls.go
index 54b779b6682..93235121122 100644
--- a/client/go/cmd/deploy/urls.go
+++ b/client/go/cmd/deploy/urls.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	"github.com/vespa-engine/vespa/client/go/trace"
+	"github.com/vespa-engine/vespa/client/go/util"
 	"github.com/vespa-engine/vespa/client/go/vespa"
 )
 
@@ -27,7 +28,7 @@ func makeConfigsourceUrls(opts *Options) []string {
 	var results = make([]string, 0, 3)
 	if opts.ServerHost == "" {
 		home := vespa.FindHome()
-		configsources, _ := getOutputFromCmd(home+"/bin/vespa-print-default", "configservers_http")
+		configsources, _ := util.GetOutputFromProgram(home+"/bin/vespa-print-default", "configservers_http")
 		for _, src := range strings.Split(configsources, "\n") {
 			colonParts := strings.Split(src, ":")
 			if len(colonParts) > 1 {