Skip to content

Fix error msg since secrets and env vars are space delimited #4593

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.

Sign up for GitHub

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
calvinsID merged 1 commit into from
Mar 30, 2022
Merged

Fix error msg since secrets and env vars are space delimited #4593

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/containerapp/azext_containerapp/_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ def parse_env_var_flags(env_list, is_update_containerapp=False):
key_val = pair.split('=', 1)
if len(key_val) != 2:
if is_update_containerapp:
raise ValidationError("Environment variables must be in the format \"<key>=<value>\" \"<key>=secretref:<value>\" ...\".")
raise ValidationError("Environment variables must be in the format \"<key>=<value>\" \"<key>=secretref:<value>\" ...\".")
raise ValidationError("Environment variables must be in the format \"<key>=<value> <key>=secretref:<value> ...\".")
raise ValidationError("Environment variables must be in the format \"<key>=<value> <key>=secretref:<value> ...\".")
if key_val[0] in env_pairs:
raise ValidationError("Duplicate environment variable {env} found, environment variable names must be unique.".format(env=key_val[0]))
value = key_val[1].split('secretref:')
Expand Down Expand Up @@ -101,9 +101,9 @@ def parse_secret_flags(secret_list):
for pair in secret_list:
key_val = pair.split('=', 1)
if len(key_val) != 2:
raise ValidationError("--secrets: must be in format \"<key>=<value>,<key>=<value>,...\"")
raise ValidationError("Secrets must be in format \"<key>=<value> <key>=<value> ...\".")
if key_val[0] in secret_pairs:
raise ValidationError("--secrets: duplicate secret {secret} found, secret names must be unique.".format(secret=key_val[0]))
raise ValidationError("Duplicate secret \"{secret}\" found, secret names must be unique.".format(secret=key_val[0]))
secret_pairs[key_val[0]] = key_val[1]

secret_var_def = []
Expand Down