feat: EXPERIMENTAL add kapp support on furyctl

go.mod

@@ -2,6 +2,8 @@ module github.com/sighupio/furyctl
 
 go 1.23.2
 
+//replace github.com/sighupio/fury-distribution => ../fury-distribution
+
 require (
 	github.com/Al-Pragliola/go-version v1.6.2
 	github.com/Masterminds/sprig/v3 v3.3.0

internal/cluster/phase.go

@@ -160,6 +160,7 @@ type OperationPhase struct {
 	YqPath               string
 	HelmPath             string
 	HelmfilePath         string
+	KappPath             string
 	TerraformPlanPath    string
 	TerraformLogsPath    string
 	TerraformOutputsPath string
@@ -181,6 +182,7 @@ func NewOperationPhase(folder string, kfdTools config.KFDTools, binPath string)
 	yqPath := path.Join(binPath, "yq", kfdTools.Common.Yq.Version, "yq")
 	helmPath := path.Join(binPath, "helm", kfdTools.Common.Helm.Version, "helm")
 	helmfilePath := path.Join(binPath, "helmfile", kfdTools.Common.Helmfile.Version, "helmfile")
+	kappPath := path.Join(binPath, "kapp", kfdTools.Common.Kapp.Version, "kapp")
 
 	planPath := path.Join(basePath, "terraform", "plan")
 	logsPath := path.Join(basePath, "terraform", "logs")
@@ -200,6 +202,7 @@ func NewOperationPhase(folder string, kfdTools config.KFDTools, binPath string)
 		YqPath:               yqPath,
 		HelmPath:             helmPath,
 		HelmfilePath:         helmfilePath,
+		KappPath:             kappPath,
 	}
 }
 
@@ -300,6 +303,7 @@ func (op *OperationPhase) CopyPathsToConfig(cfg *template.Config) {
 		"terraform":  op.TerraformPath,
 		"vendorPath": path.Join(op.Path, "..", "vendor"),
 		"yq":         op.YqPath,
+		"kapp":         op.KappPath,
 	}
 }
 

internal/dependencies/tools/kapp.go

@@ -0,0 +1,75 @@
+// Copyright (c) 2017-present SIGHUP s.r.l All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package tools
+
+import (
+	"fmt"
+	"path/filepath"
+	"regexp"
+	"runtime"
+	"strings"
+
+	"github.com/sighupio/furyctl/internal/semver"
+	"github.com/sighupio/furyctl/internal/tool/kapp"
+	iox "github.com/sighupio/furyctl/internal/x/io"
+)
+
+func NewKapp(runner *kapp.Runner, version string) *Kapp {
+	return &Kapp{
+		arch:    runtime.GOARCH,
+		os:      runtime.GOOS,
+		version: version,
+		checker: &checker{
+			regex:  regexp.MustCompile(fmt.Sprintf("kapp version %s", semver.Regex)),
+			runner: runner,
+			splitFn: func(version string) []string {
+				return strings.Split(version, " ")
+			},
+			trimFn: func(tokens []string) string {
+				return tokens[len(tokens)-1]
+			},
+		},
+	}
+}
+
+type Kapp struct {
+	arch    string
+	checker *checker
+	os      string
+	version string
+}
+
+func (*Kapp) SupportsDownload() bool {
+	return true
+}
+
+func (k *Kapp) SrcPath() string {
+	return fmt.Sprintf(
+		"https://github.com/carvel-dev/kapp/releases/download/%s/kapp-%s-%s",
+		semver.EnsurePrefix(k.version),
+		k.os,
+		k.arch,
+	)
+}
+
+func (k *Kapp) Rename(basePath string) error {
+	oldPath := filepath.Join(basePath, fmt.Sprintf("kapp-%s-%s", k.os, k.arch))
+	newPath := filepath.Join(basePath, "kapp")
+
+	if err := iox.CopyFile(oldPath, newPath); err != nil {
+		return fmt.Errorf("error while renaming kapp: %w", err)
+	}
+
+	return nil
+}
+
+
+func (k *Kapp) CheckBinVersion() error {
+	if err := k.checker.version(k.version); err != nil {
+		return fmt.Errorf("kapp: %w", err)
+	}
+
+	return nil
+}

internal/dependencies/tools/tool.go

@@ -26,6 +26,7 @@ import (
 	"github.com/sighupio/furyctl/internal/tool/shell"
 	"github.com/sighupio/furyctl/internal/tool/terraform"
 	"github.com/sighupio/furyctl/internal/tool/yq"
+	"github.com/sighupio/furyctl/internal/tool/kapp"
 	execx "github.com/sighupio/furyctl/internal/x/exec"
 )
 
@@ -173,6 +174,14 @@ func (f *Factory) Create(name tool.Name, version string) Tool {
 
 		return NewHelmfile(hfr, version)
 
+	case tool.Kapp:
+		ka, ok := t.(*kapp.Runner)
+		if !ok {
+			panic(fmt.Sprintf("expected kapp.Runner, got %T", t))
+		}
+
+		return NewKapp(ka, version)
+
 	default:
 		return nil
 	}

internal/distribution/iac.go

@@ -114,6 +114,7 @@ func (m *IACBuilder) Build() error {
 		"terraform":  "",
 		"vendorPath": "",
 		"yq":         "",
+		"kapp":       "",
 	}
 
 	tmplCfg.Data["checks"] = map[any]any{

internal/tool/kapp/runner.go

@@ -0,0 +1,107 @@
+// Copyright (c) 2017-present SIGHUP s.r.l All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package kapp
+
+import (
+	"fmt"
+
+	"github.com/google/uuid"
+
+	execx "github.com/sighupio/furyctl/internal/x/exec"
+)
+
+type Paths struct {
+	Kapp    string
+	WorkDir string
+}
+
+type Runner struct {
+	executor   execx.Executor
+	paths      Paths
+	serverSide bool
+	cmds       map[string]*execx.Cmd
+}
+
+func NewRunner(executor execx.Executor, paths Paths, serverSide bool) *Runner {
+	return &Runner{
+		executor:   executor,
+		paths:      paths,
+		serverSide: serverSide,
+		cmds:       make(map[string]*execx.Cmd),
+	}
+}
+
+func (r *Runner) CmdPath() string {
+	return r.paths.Kapp
+}
+
+func (r *Runner) newCmd(args []string, sensitive bool) (*execx.Cmd, string) {
+	cmd := execx.NewCmd(r.paths.Kapp, execx.CmdOptions{
+		Args:      args,
+		Executor:  r.executor,
+		WorkDir:   r.paths.WorkDir,
+		Sensitive: sensitive,
+	})
+
+	id := uuid.NewString()
+	r.cmds[id] = cmd
+
+	return cmd, id
+}
+
+func (r *Runner) deleteCmd(id string) {
+	delete(r.cmds, id)
+}
+
+func (r *Runner) Deploy(manifestPath string, params ...string) error {
+	args := []string{"deploy"}
+
+	if r.serverSide {
+		args = append(args, "--server-side")
+	}
+
+	if len(params) > 0 {
+		args = append(args, params...)
+	}
+
+	args = append(args, "-a", "kfd")
+
+	args = append(args, "-n", "kube-system")
+
+	args = append(args, "-f", manifestPath)
+
+	cmd, id := r.newCmd(args, false)
+	defer r.deleteCmd(id)
+
+	if _, err := execx.CombinedOutput(cmd); err != nil {
+		return fmt.Errorf("error applying manifests: %w", err)
+	}
+
+	return nil
+}
+
+func (r *Runner) Version() (string, error) {
+	args := []string{"version"}
+
+	cmd, id := r.newCmd(args, false)
+	defer r.deleteCmd(id)
+
+	out, err := execx.CombinedOutput(cmd)
+	if err != nil {
+		return "", fmt.Errorf("error getting kapp version: %w", err)
+	}
+
+	return out, nil
+}
+
+func (r *Runner) Stop() error {
+	for _, cmd := range r.cmds {
+		if err := cmd.Stop(); err != nil {
+			return fmt.Errorf("error stopping kapp runner: %w", err)
+		}
+	}
+
+	return nil
+}

internal/tool/runner.go

@@ -13,6 +13,7 @@ import (
 	"github.com/sighupio/furyctl/internal/tool/git"
 	"github.com/sighupio/furyctl/internal/tool/helm"
 	"github.com/sighupio/furyctl/internal/tool/helmfile"
+	"github.com/sighupio/furyctl/internal/tool/kapp"
 	"github.com/sighupio/furyctl/internal/tool/kubectl"
 	"github.com/sighupio/furyctl/internal/tool/kustomize"
 	"github.com/sighupio/furyctl/internal/tool/openvpn"
@@ -39,6 +40,7 @@ const (
 	Helm      Name = "helm"
 	Helmfile  Name = "helmfile"
 	Sed       Name = "sed"
+	Kapp      Name = "kapp"
 )
 
 type Runner interface {
@@ -148,6 +150,16 @@ func (rf *RunnerFactory) Create(name Name, version, workDir string) Runner {
 			WorkDir:  workDir,
 		})
 
+	case Kapp:
+		return kapp.NewRunner(
+			rf.executor,
+			kapp.Paths{
+				Kapp:    filepath.Join(rf.paths.Bin, string(name), version, string(name)),
+				WorkDir: workDir,
+			},
+			false,
+		)
+
 	default:
 		return nil
 	}