fixed vault-cli

Author: Dominik Przybyl

cmd/aem/vault.go

@@ -2,16 +2,17 @@ package main
 
 import (
 	"github.com/spf13/cobra"
-	"os"
 )
 
 func (c *CLI) vaultCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "vlt",
 		Short: "Executes Vault commands",
 		Run: func(cmd *cobra.Command, args []string) {
-			argsWithVlt := os.Args[1:]                                     // TODO why not 'args' from the Run function?
-			_ = c.aem.VendorManager().VaultCLI().CommandShell(argsWithVlt) // TODO proper error handling
+			if err := c.aem.VendorManager().VaultCLI().CommandShell(args); err != nil {
+				c.Error(err)
+				return
+			}
 		},
 		Args: cobra.ArbitraryArgs,
 		FParseErrWhitelist: cobra.FParseErrWhitelist{

cmd/aem/vendor.go

@@ -43,8 +43,8 @@ func (c *CLI) vendorListCmd() *cobra.Command {
 			}
 			c.SetOutput("javaExecutable", javaExecutable)
 
-			vaultJar := c.aem.VendorManager().VaultCLI().JarFile()
-			c.setOutput("vaultJar", vaultJar)
+			vaultExecutable := c.aem.VendorManager().VaultCLI().VltFile()
+			c.setOutput("vaultExecutable", vaultExecutable)
 
 			oakRunJar := c.aem.VendorManager().OakRun().JarFile()
 			c.setOutput("oakRunJar", oakRunJar)

pkg/vault_cli.go

@@ -40,13 +40,13 @@ func (v VaultCLI) dir() string {
 	return filepath.Join(v.vendorManager.aem.baseOpts.ToolDir, "vault-cli")
 }
 
-func (v VaultCLI) execDir() string {
+func (v VaultCLI) VltFile() string {
 	vaultDir, _, _ := strings.Cut(filepath.Base(v.DownloadURL), "-bin")
-	return filepath.Join(v.dir(), vaultDir, "bin")
-}
-
-func (v VaultCLI) JarFile() string {
-	return "<path>/bin/vlt" // TODO c.aem.VaultCLI().JarFile()
+	execDir := filepath.Join(v.dir(), vaultDir, "bin")
+	if osx.IsWindows() {
+		return pathx.Canonical(execDir + "/vlt.bat")
+	}
+	return pathx.Canonical(execDir + "/vlt")
 }
 
 func (v VaultCLI) lock() osx.Lock[VaultCLILock] {
@@ -64,12 +64,10 @@ func (v VaultCLI) PrepareWithChanged() (bool, error) {
 		return false, nil
 	}
 	log.Infof("preparing new Vault '%s'", v.DownloadURL)
-	err = v.prepare()
-	if err != nil {
+	if err = v.prepare(); err != nil {
 		return false, err
 	}
-	err = lock.Lock()
-	if err != nil {
+	if err = lock.Lock(); err != nil {
 		return false, err
 	}
 	log.Infof("prepared new Vault '%s'", v.DownloadURL)
@@ -101,12 +99,14 @@ func (v VaultCLI) prepare() error {
 }
 
 func (v VaultCLI) CommandShell(args []string) error {
-	// TODO check if vault is prepared
-
-	cmd := execx.CommandShell(args)
-	cmd.Dir = v.execDir() // TODO do not change dir, but prepend with absolute executable; so args should skip 'vlt'
+	_, err := v.PrepareWithChanged()
+	if err != nil {
+		return fmt.Errorf("cannot prepare Vault before running command: %w", err)
+	}
+	vaultCliArgs := append([]string{v.VltFile()}, args...)
+	cmd := execx.CommandShell(vaultCliArgs)
 	v.vendorManager.aem.CommandOutput(cmd)
-	if err := cmd.Run(); err != nil {
+	if err = cmd.Run(); err != nil {
 		return fmt.Errorf("cannot run Vault command: %w", err)
 	}
 	return nil