feat: Allow default values in client: env (#2122)

Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>
This commit is contained in:
Helder Correia
2022-04-11 18:31:36 +00:00
committed by GitHub
parent 732ef96a06
commit 80ae63928b
4 changed files with 30 additions and 9 deletions

View File

@@ -44,21 +44,26 @@ func (t clientEnvTask) Run(ctx context.Context, pctx *plancontext.Context, _ *so
}
func (t clientEnvTask) getEnv(envvar string, v *compiler.Value, pctx *plancontext.Context) (interface{}, error) {
env := os.Getenv(envvar)
if env == "" {
// Resolve default in disjunction if a type hasn't been specified
val, hasDefault := v.Default()
env, hasEnv := os.LookupEnv(envvar)
if !hasEnv {
if hasDefault {
// we can only have default strings so
// don't worry about secret values here
return val, nil
}
return nil, fmt.Errorf("environment variable %q not set", envvar)
}
// Resolve default in disjunction if a type hasn't been specified
val, _ := v.Default()
if plancontext.IsSecretValue(val) {
secret := pctx.Secrets.New(env)
return secret.MarshalCUE(), nil
}
if val.IsConcrete() {
return nil, fmt.Errorf("%s: unexpected concrete value, please use a type", envvar)
return nil, fmt.Errorf("%s: unexpected concrete value, please use a type or set a default", envvar)
}
k := val.IncompleteKind()