Skip to content

Commit 8fc385e

Browse files
authored
[secrets] Fix working dir for secrets upload/download (#1800)
## Summary TSIA ## How was it tested?
1 parent 44f079f commit 8fc385e

File tree

2 files changed

+28
-3
lines changed

2 files changed

+28
-3
lines changed

internal/boxcli/secrets.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/spf13/cobra"
99
"go.jetpack.io/devbox/internal/devbox"
1010
"go.jetpack.io/devbox/internal/devbox/devopt"
11+
"go.jetpack.io/devbox/internal/fileutil"
1112
"go.jetpack.io/devbox/internal/ux"
1213
"go.jetpack.io/envsec/pkg/envsec"
1314
)
@@ -60,7 +61,6 @@ func secretsCmd() *cobra.Command {
6061
cmd.AddCommand(secretsRemoveCmd(flags))
6162
cmd.AddCommand(secretsSetCmd(flags))
6263
cmd.AddCommand(secretsUploadCmd(flags))
63-
cmd.Hidden = true
6464

6565
flags.config.registerPersistent(cmd)
6666

@@ -183,7 +183,11 @@ func secretsDownloadCmd(commonFlags *secretsFlags) *cobra.Command {
183183
if err != nil {
184184
return errors.WithStack(err)
185185
}
186-
return secrets.Download(cmd.Context(), args[0], flags.format)
186+
absPaths, err := fileutil.EnsureAbsolutePaths(args)
187+
if err != nil {
188+
return errors.WithStack(err)
189+
}
190+
return secrets.Download(cmd.Context(), absPaths[0], flags.format)
187191
},
188192
}
189193

@@ -210,7 +214,11 @@ func secretsUploadCmd(commonFlags *secretsFlags) *cobra.Command {
210214
if err != nil {
211215
return errors.WithStack(err)
212216
}
213-
return secrets.Upload(cmd.Context(), paths, flags.format)
217+
absPaths, err := fileutil.EnsureAbsolutePaths(paths)
218+
if err != nil {
219+
return errors.WithStack(err)
220+
}
221+
return secrets.Upload(cmd.Context(), absPaths, flags.format)
214222
},
215223
}
216224

internal/fileutil/fileutil.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package fileutil
66
import (
77
"io/fs"
88
"os"
9+
"path/filepath"
910
"strings"
1011

1112
"github.com/pkg/errors"
@@ -70,3 +71,19 @@ func EnsureDirExists(path string, perm fs.FileMode, chmod bool) error {
7071
}
7172
return nil
7273
}
74+
75+
func EnsureAbsolutePaths(paths []string) ([]string, error) {
76+
wd, err := os.Getwd()
77+
if err != nil {
78+
return nil, errors.WithStack(err)
79+
}
80+
absPaths := make([]string, len(paths))
81+
for i, path := range paths {
82+
if filepath.IsAbs(path) {
83+
absPaths[i] = path
84+
} else {
85+
absPaths[i] = filepath.Join(wd, path)
86+
}
87+
}
88+
return absPaths, nil
89+
}

0 commit comments

Comments
 (0)