feat(deisctl): removed unneccessary code

Author: smothiki

updatectl/instance.go

@@ -289,15 +289,6 @@ func randSleep(n, m int) {
 	time.Sleep(time.Duration(r) * time.Second)
 }
 
-// getClientID returns the CoreOS Machine ID or an unknown UUID string
-func getClientID() string {
-	machineID := utils.GetMachineID("/")
-	if machineID == "" {
-		return fmt.Sprintf("{unknown-" + utils.NewUuid() + "}")
-	}
-	return machineID
-
-}
 func instanceDeis(args []string, service *update.Service, out *tabwriter.Writer) int {
 	if instanceFlags.appId == "" || instanceFlags.groupId == "" {
 		return ERROR_USAGE
@@ -308,7 +299,7 @@ func instanceDeis(args []string, service *update.Service, out *tabwriter.Writer)
 	}
 
 	c := &Client{
-		Id:             getClientID(),
+		Id:             utils.GetClientID(),
 		SessionId:      uuid.New(),
 		Version:        instanceFlags.version,
 		AppId:          instanceFlags.appId,

utils/utils.go

@@ -1,4 +1,4 @@
-// Package utils contains commonly useful functions from Deis testing.
+// Package utils contains commonly useful functions from Deisctl
 
 package utils
 
@@ -14,7 +14,6 @@ import (
 	"path/filepath"
 	"strings"
 	"syscall"
-	"testing"
 	"time"
 
 	"github.com/deis/deisctl/constant"
@@ -62,6 +61,15 @@ func GetServices() []string {
 	return service
 }
 
+// getClientID returns the CoreOS Machine ID or an unknown UUID string
+func GetClientID() string {
+	machineID := GetMachineID("/")
+	if machineID == "" {
+		return fmt.Sprintf("{unknown-" + utils.NewUuid() + "}")
+	}
+	return machineID
+}
+
 func GetMachineID(root string) string {
 	fullPath := filepath.Join(root, constant.MachineId)
 	id, err := ioutil.ReadFile(fullPath)
@@ -235,49 +243,6 @@ func Execute(script string) error {
 	return nil
 }
 
-func runCommandWithOutput(cmd *exec.Cmd) (output string, exitCode int, err error) {
-	exitCode = 0
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		var exiterr error
-		if exitCode, exiterr = getExitCode(err); exiterr != nil {
-			// TODO: Fix this so we check the error's text.
-			// we've failed to retrieve exit code, so we set it to 127
-			exitCode = 127
-		}
-	}
-	output = string(out)
-	return
-}
-
-func runCommand(cmd *exec.Cmd) (exitCode int, err error) {
-	exitCode = 0
-	err = cmd.Run()
-	if err != nil {
-		var exiterr error
-		if exitCode, exiterr = getExitCode(err); exiterr != nil {
-			// TODO: Fix this so we check the error's text.
-			// we've failed to retrieve exit code, so we set it to 127
-			exitCode = 127
-		}
-	}
-	return
-}
-
-func startCommand(cmd *exec.Cmd) (exitCode int, err error) {
-	exitCode = 0
-	err = cmd.Start()
-	if err != nil {
-		var exiterr error
-		if exitCode, exiterr = getExitCode(err); exiterr != nil {
-			// TODO: Fix this so we check the error's text.
-			// we've failed to retrieve exit code, so we set it to 127
-			exitCode = 127
-		}
-	}
-	return
-}
-
 func logDone(message string) {
 	fmt.Printf("[PASSED]: %s\n", message)
 }
@@ -288,18 +253,6 @@ func stripTrailingCharacters(target string) string {
 	return target
 }
 
-func errorOut(err error, t *testing.T, message string) {
-	if err != nil {
-		t.Fatal(message)
-	}
-}
-
-func errorOutOnNonNilError(err error, t *testing.T, message string) {
-	if err == nil {
-		t.Fatalf(message)
-	}
-}
-
 func nLines(s string) int {
 	return strings.Count(s, "\n")
 }