chore: reorganize, fix goreleaser and update readme

.goreleaser.yml

@@ -2,11 +2,11 @@
 # Build customization
 builds:
   - binary: gograpple
-    main:   ./cmd/main.go
+    main:   ./main.go
     env:
       - CGO_ENABLED=0
     ldflags:
-      - -s -w -X github.com/foomo/gograpple/cmd/actions.version={{.Version}}
+      - -s -w -X github.com/foomo/gograpple/cmd.version={{.Version}}
     goos:
       - darwin
       - linux

Makefile

@@ -1,8 +1,8 @@
 build:
-	go build -o bin/gograpple cmd/gograpple/main.go
+	go build -o bin/gograpple main.go
 
 install:
-	go build -o /usr/local/bin/gograpple cmd/gograpple/main.go
+	go build -o /usr/local/bin/gograpple main.go
 
 test:
 	go test ./...

README.md

@@ -3,9 +3,16 @@
 gograpple that go program and delve into the high seas ...
 or in other words: delve debugger injection for your golang code running in k8 pods
 
+## requirements
+ - helm
+ - kubectl
+ - docker
+
 ## quick start
 ```
-go install github.com/foomo/gograpple/cmd/gograpple@latest
+brew install foomo/gograpple/gograpple
+OR
+go install github.com/foomo/gograpple@latest
 ```
 start patch debugging in interactive mode
 ```
@@ -15,6 +22,12 @@ when you configure your patch correctly a file will be saved in your cwd and the
 
 ## common issues
 
+### stuck with patched deployment
+in case your deployment is styck in patched state, use
+```
+gograpple rollback [namespace] [deployment]
+```
+
 ### vscode
  > The debug session doesnt start until the entrypoint is triggered more than once.
 

cmd/gograpple/actions/flags.go → cmd/flags.go

@@ -1,11 +1,11 @@
-package actions
+package cmd
 
 import (
 	"fmt"
 	"strconv"
 	"strings"
 
-	"github.com/foomo/gograpple"
+	"github.com/foomo/gograpple/internal/grapple"
 )
 
 type HostPort struct {
@@ -14,7 +14,7 @@ type HostPort struct {
 }
 
 func NewHostPort(host string, port int) *HostPort {
-	addr, err := gograpple.CheckTCPConnection(host, port)
+	addr, err := grapple.CheckTCPConnection(host, port)
 	if err == nil {
 		host = addr.IP.String()
 		port = addr.Port
@@ -45,7 +45,7 @@ func (lf *HostPort) Set(value string) error {
 	default:
 		return fmt.Errorf("invalid address %q provided", value)
 	}
-	addr, err := gograpple.CheckTCPConnection(lf.Host, lf.Port)
+	addr, err := grapple.CheckTCPConnection(lf.Host, lf.Port)
 	if err != nil {
 		return err
 	}

cmd/gograpple/actions/interactive.go → cmd/interactive.go

@@ -1,15 +1,19 @@
-package actions
+package cmd
 
 import (
 	"path"
 
-	"github.com/foomo/gograpple"
-	"github.com/foomo/gograpple/config"
-	"github.com/foomo/gograpple/kubectl"
+	"github.com/foomo/gograpple/internal/config"
+	"github.com/foomo/gograpple/internal/grapple"
+	"github.com/foomo/gograpple/internal/kubectl"
 	"github.com/spf13/cobra"
 )
 
-const commandNameInteractive = "interactive"
+func init() {
+	interactiveCmd.Flags().BoolVar(&flagAttach, "attach", false, "debug with attach (default will patch)")
+	interactiveCmd.Flags().StringVar(&flagSaveDir, "save", ".", "directory to save interactive configuration")
+	rootCmd.AddCommand(interactiveCmd)
+}
 
 var (
 	flagAttach     bool
@@ -37,7 +41,7 @@ func attachDebug(baseDir string) error {
 	if err != nil {
 		return err
 	}
-	g, err := gograpple.NewGrapple(newLogger(flagVerbose, flagJSONLog), c.Namespace, c.Deployment, flagDebug)
+	g, err := grapple.NewGrapple(newLogEntry(flagDebug), c.Namespace, c.Deployment)
 	if err != nil {
 		return err
 	}
@@ -48,7 +52,7 @@ func attachDebug(baseDir string) error {
 	if err := kubectl.SetContext(c.Cluster); err != nil {
 		return err
 	}
-	return g.Attach(c.Namespace, c.Deployment, c.Container, c.AttachTo, c.Arch, host, port)
+	return g.Attach(c.Namespace, c.Deployment, c.Container, c.AttachTo, c.Arch, host, port, flagDebug)
 }
 
 func patchDebug(baseDir string) error {
@@ -64,7 +68,7 @@ func patchDebug(baseDir string) error {
 	if &c == nil {
 		return nil
 	}
-	g, err := gograpple.NewGrapple(newLogger(flagVerbose, flagJSONLog), c.Namespace, c.Deployment, flagDebug)
+	g, err := grapple.NewGrapple(newLogEntry(flagDebug), c.Namespace, c.Deployment)
 	if err != nil {
 		return err
 	}

cmd/rollback.go

@@ -0,0 +1,25 @@
+package cmd
+
+import (
+	"github.com/foomo/gograpple/internal/grapple"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	rootCmd.AddCommand(rollbackCmd)
+}
+
+var (
+	rollbackCmd = &cobra.Command{
+		Use:   "rollback [namespace] [deployment]",
+		Short: "rollback the patched deployment",
+		Args:  cobra.MinimumNArgs(2),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			g, err := grapple.NewGrapple(newLogEntry(flagDebug), args[0], args[1])
+			if err != nil {
+				return err
+			}
+			return g.Rollback()
+		},
+	}
+)

cmd/root.go

@@ -0,0 +1,50 @@
+package cmd
+
+import (
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	rootCmd.PersistentFlags().BoolVarP(&flagDebug, "debug", "", false, "debug mode")
+}
+
+var (
+	// flagImage      string
+	// flagDir        string
+	flagDebug bool
+	// flagNamespace  string
+	// flagPod        string
+	// flagContainer  string
+	// flagRepo       string
+	// flagMounts     []string
+	// flagSourcePath string
+	// flagArgs       = NewStringList(" ")
+	// flagRollback   bool
+	// flagListen     = NewHostPort("127.0.0.1", 0)
+	// flagVscode     bool
+	// flagContinue   bool
+	// flagJSONLog    bool
+	// flagDebug bool
+)
+
+var (
+	rootCmd = &cobra.Command{
+		Use: "gograpple",
+	}
+)
+
+func Execute() {
+	if err := rootCmd.Execute(); err != nil {
+		le := newLogEntry(flagDebug)
+		le.Fatal(err)
+	}
+}
+
+func newLogEntry(debug bool) *logrus.Entry {
+	logger := logrus.New()
+	if debug {
+		logger.SetLevel(logrus.TraceLevel)
+	}
+	return logrus.NewEntry(logger)
+}