fix: tests and linting

sighupio · May 8, 2024 · 9635b09 · 9635b09
1 parent 1bccd19
commit 9635b09
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/internal/cluster/phase.go b/internal/cluster/phase.go
@@ -290,7 +290,7 @@ func (op *OperationPhase) CopyPathsToConfig(cfg *template.Config) {
 		"terraform":  op.TerraformPath,
 		"vendorPath": path.Join(op.Path, "..", "vendor"),
 		"yq":         op.YqPath,
-		"kapp":         op.KappPath,
+		"kapp":       op.KappPath,
 	}
 }
 

diff --git a/internal/dependencies/tools/kapp.go b/internal/dependencies/tools/kapp.go
@@ -65,7 +65,6 @@ func (k *Kapp) Rename(basePath string) error {
 	return nil
 }
 
-
 func (k *Kapp) CheckBinVersion() error {
 	if err := k.checker.version(k.version); err != nil {
 		return fmt.Errorf("kapp: %w", err)

diff --git a/internal/dependencies/tools/tool.go b/internal/dependencies/tools/tool.go
@@ -19,13 +19,13 @@ 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"
 	"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"
 )
 

diff --git a/internal/dependencies/tools/validator_test.go b/internal/dependencies/tools/validator_test.go
@@ -38,6 +38,7 @@ func Test_Validator_Validate(t *testing.T) {
 						Yq:        config.KFDTool{Version: "4.34.1"},
 						Helm:      config.KFDTool{Version: "3.12.3"},
 						Helmfile:  config.KFDTool{Version: "0.156.0"},
+						Kapp:      config.KFDTool{Version: "0.62.0"},
 					},
 				},
 			},
@@ -52,6 +53,7 @@ func Test_Validator_Validate(t *testing.T) {
 				"yq",
 				"helm",
 				"helmfile",
+				"kapp",
 			},
 		},
 		{
@@ -67,6 +69,7 @@ func Test_Validator_Validate(t *testing.T) {
 						Yq:        config.KFDTool{Version: "4.33.0"},
 						Helm:      config.KFDTool{Version: "3.11.3"},
 						Helmfile:  config.KFDTool{Version: "0.155.0"},
+						Kapp:      config.KFDTool{Version: "0.61.0"},
 					},
 				},
 			},
@@ -81,6 +84,7 @@ func Test_Validator_Validate(t *testing.T) {
 				errors.New("yq: wrong tool version - installed = 4.34.1, expected = 4.33.0"),
 				errors.New("helm: wrong tool version - installed = 3.12.3, expected = 3.11.3"),
 				errors.New("helmfile: wrong tool version - installed = 0.156.0, expected = 0.155.0"),
+				errors.New("kapp: wrong tool version - installed = 0.61.0, expected = 0.62.0"),
 			},
 		},
 		{
@@ -96,6 +100,7 @@ func Test_Validator_Validate(t *testing.T) {
 						Yq:        config.KFDTool{Version: "4.34.1"},
 						Helm:      config.KFDTool{Version: "3.12.3"},
 						Helmfile:  config.KFDTool{Version: "0.156.0"},
+						Kapp:      config.KFDTool{Version: "0.62.0"},
 					},
 					Eks: config.KFDToolsEks{
 						Awscli: config.KFDTool{Version: "2.8.12"},
@@ -117,6 +122,7 @@ func Test_Validator_Validate(t *testing.T) {
 				"helmfile",
 				"awscli",
 				"openvpn",
+				"kapp",
 			},
 		},
 	}

diff --git a/internal/tool/runner.go b/internal/tool/runner.go
@@ -13,13 +13,13 @@ 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"
 	"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"
 )
 
@@ -141,12 +141,12 @@ func (rf *RunnerFactory) Create(name Name, version, workDir string) Runner {
 			Helmfile: filepath.Join(rf.paths.Bin, string(name), version, string(name)),
 			WorkDir:  workDir,
 		})
-	
+
 	case Kapp:
 		return kapp.NewRunner(
 			rf.executor,
 			kapp.Paths{
-				Kapp: filepath.Join(rf.paths.Bin, string(name), version, string(name)),
+				Kapp:    filepath.Join(rf.paths.Bin, string(name), version, string(name)),
 				WorkDir: workDir,
 			},
 			false,