Skip to content

Commit 5b547b2

Browse files
Vault using vendored java
1 parent bf105c7 commit 5b547b2

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

cmd/aem/vault.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package main
22

33
import (
44
"github.com/spf13/cobra"
5+
"github.com/wttech/aemc/pkg"
56
)
67

78
func (c *CLI) vaultCmd() *cobra.Command {
@@ -10,17 +11,19 @@ func (c *CLI) vaultCmd() *cobra.Command {
1011
Short: "Executes Vault commands",
1112
Run: func(cmd *cobra.Command, args []string) {
1213
if err := c.aem.VendorManager().VaultCLI().CommandShell(args); err != nil {
13-
c.Error(err)
14+
c.Fail("command failed")
1415
return
1516
}
17+
c.Ok("command run")
1618
},
1719
Args: cobra.ArbitraryArgs,
1820
FParseErrWhitelist: cobra.FParseErrWhitelist{
1921
UnknownFlags: true,
2022
},
2123
}
2224
cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
23-
_ = c.aem.VendorManager().VaultCLI().CommandShell(args)
25+
aem := pkg.NewAEM(c.config) // c.onStart() not yet called
26+
_ = aem.VendorManager().VaultCLI().CommandShell(args[1:])
2427
})
2528
return cmd
2629
}

pkg/vault_cli.go

+5
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@ func (v VaultCLI) CommandShell(args []string) error {
105105
}
106106
vaultCliArgs := append([]string{v.VltFile()}, args...)
107107
cmd := execx.CommandShell(vaultCliArgs)
108+
env, err := v.vendorManager.JavaManager().Env()
109+
if err != nil {
110+
return err
111+
}
112+
cmd.Env = env
108113
v.vendorManager.aem.CommandOutput(cmd)
109114
if err = cmd.Run(); err != nil {
110115
return fmt.Errorf("cannot run Vault command: %w", err)

0 commit comments

Comments
 (0)