[envsec] Use runx to install envsec #1497
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,15 +3,26 @@ package envsec | |
| import ( | ||
| "bytes" | ||
| "encoding/json" | ||
| "os" | ||
| "os/exec" | ||
|
|
||
| "github.com/pkg/errors" | ||
| "go.jetpack.io/devbox/internal/boxcli/usererr" | ||
| "go.jetpack.io/devbox/internal/cmdutil" | ||
| "go.jetpack.io/devbox/internal/debug" | ||
| "go.jetpack.io/pkg/sandbox/runx" | ||
| ) | ||
|
|
||
| var envCache map[string]string | ||
|
|
||
| func Env(projectDir string) (map[string]string, error) { | ||
|
|
||
| defer debug.FunctionTimer().End() | ||
|
|
||
| if envCache != nil { | ||
| return envCache, nil | ||
| } | ||
|
|
||
| if err := ensureEnvsecInstalled(); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
@@ -20,10 +31,23 @@ func Env(projectDir string) (map[string]string, error) { | |
| return nil, err | ||
| } | ||
|
|
||
| var err error | ||
| envCache, err = envsecList(projectDir) | ||
|
|
||
| return envCache, err | ||
| } | ||
|
|
||
| func ensureEnvsecInstalled() error { | ||
| // In newer runx version this will return the paths | ||
| paths, err := runx.Install("jetpack-io/[email protected]") | ||
|
There was a problem hiding this comment. Should we not pin this? Or pinning is necessary? There was a problem hiding this comment. I'll unpin it for now, but if we want to keep it unpinned that means we can't make backward incompatible changes to envsec. |
||
| if err != nil { | ||
| return errors.Wrap(err, "failed to install envsec") | ||
| } | ||
|
|
||
| for _, path := range paths { | ||
| os.Setenv("PATH", path+string(os.PathListSeparator)+os.Getenv("PATH")) | ||
| } | ||
|
|
||
| if !cmdutil.Exists("envsec") { | ||
| return usererr.New("envsec is not installed or not in path") | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How do you validate/invalidate this cache
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It never gets invalidated, it's lifetime is just the command. So if you do
devbox runyou only fetch it once.Later on I think we can look into refreshing env vars for long running shells, but even then this cache is OK.