Skip to content

Commit a927b0f

Browse files
authored
[secrets] Show better error if secrets not initialized (#1740)
## Summary TSIA ## How was it tested?
1 parent ad46c20 commit a927b0f

File tree

1 file changed

+17
-10
lines changed

1 file changed

+17
-10
lines changed

internal/devbox/devbox.go

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,20 +1108,27 @@ func (d *Devbox) configEnvs(
11081108
env := map[string]string{}
11091109
if d.cfg.IsEnvsecEnabled() {
11101110
secrets, err := d.Secrets(ctx)
1111-
if err != nil {
1111+
// TODO: replace this with error.Is check once envsec exports it.
1112+
if err != nil && !strings.Contains(err.Error(), "project not initialized") {
11121113
return nil, err
1113-
}
1114-
1115-
cloudSecrets, err := secrets.List(ctx)
1116-
if err != nil {
1114+
} else if err != nil {
11171115
ux.Fwarning(
1118-
os.Stderr,
1119-
"Error reading secrets from jetpack cloud: %s\n\n",
1120-
err,
1116+
d.stderr,
1117+
"Ignoring env_from directive. jetpack cloud secrets is not "+
1118+
"initialized. Run `devbox secrets init` to initialize it.\n",
11211119
)
11221120
} else {
1123-
for _, secret := range cloudSecrets {
1124-
env[secret.Name] = secret.Value
1121+
cloudSecrets, err := secrets.List(ctx)
1122+
if err != nil {
1123+
ux.Fwarning(
1124+
os.Stderr,
1125+
"Error reading secrets from jetpack cloud: %s\n\n",
1126+
err,
1127+
)
1128+
} else {
1129+
for _, secret := range cloudSecrets {
1130+
env[secret.Name] = secret.Value
1131+
}
11251132
}
11261133
}
11271134
} else if d.cfg.EnvFrom != "" {

0 commit comments

Comments
 (0)