Merge pull request #1 from chad-bekmezian-snap/improve-error-message

Improve error message

Makefile

@@ -1,31 +1,31 @@
 package-windows-amd64:
 	mkdir composeForward_windows_x86_64
 	cp -r ./bin/* composeForward_windows_x86_64
-	env GOARCH=amd64 GOOS=windows go build -o ./composeForward_windows_x86_64/composeForward ./cmd/compose-forward/
+	env GOARCH=amd64 GOOS=windows go build -trimpath -o ./composeForward_windows_x86_64/composeForward ./cmd/compose-forward/
 	tar --exclude="*.DS_Store" -czf composeForward_windows_x86_64.tgz composeForward_windows_x86_64/
 	rm -r composeForward_windows_x86_64
 .PHONY: package-windows-amd64
 
 package-windows-arm64:
 	mkdir composeForward_windows_arm64
 	cp -r ./bin/* composeForward_windows_arm64
-	env GOARCH=arm64 GOOS=windows go build -o ./composeForward_windows_arm64/composeForward ./cmd/compose-forward/
+	env GOARCH=arm64 GOOS=windows go build -trimpath -o ./composeForward_windows_arm64/composeForward ./cmd/compose-forward/
 	tar --exclude="*.DS_Store" -czf composeForward_windows_arm64.tgz composeForward_windows_arm64/
 	rm -r composeForward_windows_arm64
 .PHONY: package-windows-amd64
 
 package-darwin-amd64:
 	mkdir composeForward_darwin_amd64
 	cp -r ./bin/* composeForward_darwin_amd64
-	env GOARCH=amd64 GOOS=darwin go build -o ./composeForward_darwin_amd64/composeForward ./cmd/compose-forward/
+	env GOARCH=amd64 GOOS=darwin go build -trimpath -o ./composeForward_darwin_amd64/composeForward ./cmd/compose-forward/
 	tar --exclude="*.DS_Store" -czf composeForward_darwin_amd64.tgz composeForward_darwin_amd64/
 	rm -r composeForward_darwin_amd64
 .PHONY: package-windows-amd64
 
 package-darwin-arm64:
 	mkdir composeForward_darwin_arm64
 	cp -r ./bin/* composeForward_darwin_arm64
-	env GOARCH=arm64 GOOS=darwin go build -o ./composeForward_darwin_arm64/composeForward ./cmd/compose-forward/
+	env GOARCH=arm64 GOOS=darwin go build -trimpath -o ./composeForward_darwin_arm64/composeForward ./cmd/compose-forward/
 	tar --exclude="*.DS_Store" -czf composeForward_darwin_arm64.tgz composeForward_darwin_arm64/
 	rm -r composeForward_darwin_arm64
 .PHONY: package-windows-arm64

cmd/compose-forward/main.go

@@ -11,12 +11,18 @@ import (
 
 func main() {
 	if listServices {
-		printAppsSilently(yamlPathFlag)
+		if err := printAppsSilently(yamlPathFlag); err != nil {
+			fmt.Println(color.Ize(color.Red, err))
+		}
 		return
 	}
 
 	if completions {
-		results, _ := compose.GetBashCompletions(yamlPathFlag)
+		results, err := compose.GetBashCompletions(yamlPathFlag)
+		if err != nil {
+			fmt.Println(color.Ize(color.Red, err))
+			return
+		}
 		fmt.Println(strings.Trim(fmt.Sprint(results), "[]"))
 		return
 	}
@@ -29,7 +35,7 @@ func main() {
 	nameToService, err := compose.Load(yamlPathFlag)
 	if err != nil {
 		fmt.Println(color.Ize(color.Red, err))
-		panic(err)
+		return
 	}
 
 	var wg sync.WaitGroup

cmd/compose-forward/printApps.go

@@ -2,21 +2,20 @@ package main
 
 import (
 	"fmt"
-	"github.com/TwiN/go-color"
 	"github.com/chad-bekmezian-snap/k8s-compose-forward/service/compose"
 	"os"
 	"sort"
 	"strings"
 )
 
-func printAppsSilently(path string) {
+func printAppsSilently(path string) error {
 	_ = os.Setenv("FORWARD_SILENT", "true")
 	nameToService, err := compose.Load(path)
 	if err != nil {
-		fmt.Println(color.Ize(color.Red, err))
-		panic(err)
+		return err
 	}
 	printValidApplications(nameToService)
+	return nil
 }
 
 func printValidApplications(nameToService map[string]compose.Service) {

service/k8s/dependencies.go

@@ -0,0 +1,7 @@
+package k8s
+
+import "os/exec"
+
+var (
+	executeCMD = exec.Command
+)

service/k8s/listServices.go

@@ -4,13 +4,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"os/exec"
-	"strings"
 )
 
 // ListServices kubectl get service --field-selector metadata.namespace!=default -A -o=json
 func ListServices() (ServiceSlice, error) {
-	cmd := exec.Command("kubectl", "get", "service", "-A", "-o=json", "--field-selector=metadata.namespace!=default")
+	cmd := executeCMD("kubectl", "get", "service", "-A", "-o=json", "--field-selector=metadata.namespace!=default")
 	cmd.Stderr = os.Stderr
 	out, err := cmd.Output()
 	if err != nil {
@@ -27,31 +25,3 @@ func ListServices() (ServiceSlice, error) {
 
 	return result.Services, nil
 }
-
-func (s ServiceSlice) FindServiceByClosestMatchingName(v string, namespace ...string) (Service, bool) {
-	currentMatchIndex := -1
-
-ServiceLoop:
-	for i, svc := range s {
-		for _, ns := range namespace {
-			// Skip this iteration if namespace doesn't match provided
-			if ns == svc.Detail.Namespace {
-				break
-			}
-			continue ServiceLoop
-		}
-
-		if strings.Contains(svc.Detail.Name, v) {
-			if currentMatchIndex > -1 && len(svc.Detail.Name) >= len(s[currentMatchIndex].Detail.Name) {
-				continue
-			}
-			currentMatchIndex = i
-		}
-	}
-
-	if currentMatchIndex == -1 {
-		return Service{}, false
-	}
-
-	return s[currentMatchIndex], true
-}

service/k8s/portForward.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/TwiN/go-color"
 	"os"
-	"os/exec"
 	"strings"
 	"sync"
 )
@@ -33,7 +32,7 @@ func PortForwardToService(s ForwardableService) {
 		return
 	}
 
-	cmd := exec.Command("kubectl", cmdArgs...)
+	cmd := executeCMD("kubectl", cmdArgs...)
 	cmd.Stdin = os.Stdin
 	cmd.Stderr = os.Stderr
 	if err := cmd.Start(); err != nil {
@@ -60,9 +59,9 @@ func cmdRunning(name string, args ...string) bool {
 	}
 
 	isDuplicateProcess := func() bool {
-		psCmd := exec.Command("ps", "aux")
-		grep := exec.Command("grep", fmt.Sprintf(`%s %s`, strings.TrimSpace(name), strings.Join(args, " ")))
-		removeGrep := exec.Command("grep", "-v", "grep")
+		psCmd := executeCMD("ps", "aux")
+		grep := executeCMD("grep", fmt.Sprintf(`%s %s`, strings.TrimSpace(name), strings.Join(args, " ")))
+		removeGrep := executeCMD("grep", "-v", "grep")
 
 		grepPipe, _ := psCmd.StdoutPipe()
 		defer grepPipe.Close()

service/k8s/service.go

@@ -1,7 +1,37 @@
 package k8s
 
+import "strings"
+
 type ServiceSlice []Service
 
+func (s ServiceSlice) FindServiceByClosestMatchingName(v string, namespace ...string) (Service, bool) {
+	currentMatchIndex := -1
+
+ServiceLoop:
+	for i, svc := range s {
+		for _, ns := range namespace {
+			// Skip this iteration if namespace doesn't match provided
+			if ns == svc.Detail.Namespace {
+				break
+			}
+			continue ServiceLoop
+		}
+
+		if strings.Contains(svc.Detail.Name, v) {
+			if currentMatchIndex > -1 && len(svc.Detail.Name) >= len(s[currentMatchIndex].Detail.Name) {
+				continue
+			}
+			currentMatchIndex = i
+		}
+	}
+
+	if currentMatchIndex == -1 {
+		return Service{}, false
+	}
+
+	return s[currentMatchIndex], true
+}
+
 type Service struct {
 	Kind   string `json:"kind"`
 	Detail struct {