Skip to content

Trim env. variable names and values; support trailing comma (#71) #72

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

Open
dimw wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Trim env. variable names and values; support trailing comma (#71) #72

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a24d813
Trim env. variable names and values; support trailing comma (#71)
dimw Sep 7, 2021
5e178ca
Trim label names and values (#71)
dimw Sep 7, 2021
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
29 changes: 23 additions & 6 deletions rancher_gitlab_deploy/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,14 @@ def main(
labels_as_array = labels.split(rancher_label_separator)

for label_item in labels_as_array:
key, value = label_item.split("=", 1)
defined_labels[key] = value
label_item = label_item.strip()

if label_item:
key, value = label_item.split("=", 1)
key = key.strip()
value = value.strip()

defined_labels[key] = value

if label:
for item in label:
Expand All @@ -254,8 +260,14 @@ def main(
variables_as_array = variables.split(",")

for variable_item in variables_as_array:
key, value = variable_item.split("=", 1)
defined_environment_variables[key] = value
variable_item = variable_item.strip()

if variable_item:
key, value = variable_item.split("=", 1)
key = key.strip()
value = value.strip()

defined_environment_variables[key] = value

if variable:
for item in variable:
Expand All @@ -269,8 +281,13 @@ def main(
secrets_as_array = secrets.split(",")

for secret_item in secrets_as_array:
key, value = secret_item.split("=", 1)
defined_secrets.append({"type": "secretReference", "name": key})
secret_item = secret_item.strip()

if secret_item:
key, value = secret_item.split("=", 1)
key = key.strip()

defined_secrets.append({"type": "secretReference", "name": key})

if secret:
for item in secret:
Expand Down