-
Notifications
You must be signed in to change notification settings - Fork 249
[envsec] Use runx to install envsec #1497
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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,27 @@ package envsec | |
import ( | ||
"bytes" | ||
"encoding/json" | ||
"os" | ||
"os/exec" | ||
"path/filepath" | ||
|
||
"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 +32,23 @@ func Env(projectDir string) (map[string]string, error) { | |
return nil, err | ||
} | ||
|
||
return envsecList(projectDir) | ||
var err error | ||
envCache, err = envsecList(projectDir) | ||
|
||
return envCache, err | ||
} | ||
|
||
func ensureEnvsecInstalled() error { | ||
// In newer runx version this will return the paths | ||
if err := runx.Install("jetpack-io/envsec"); err != nil { | ||
return errors.Wrap(err, "failed to install envsec") | ||
} | ||
|
||
// temporary, mac only | ||
home, _ := os.UserHomeDir() | ||
path := filepath.Join(home, "Library/Caches/jetpack.io/pkgs/jetpack-io/envsec/v0.0.1/darwin/arm64/") | ||
os.Setenv("PATH", path+string(os.PathListSeparator)+os.Getenv("PATH")) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Does runx not handle macOS? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is for testing. The runx library will now return the path (for all os's) |
||
|
||
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 run
you 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.