Skip to content

Shell-quote values interpolated into Buildkite pipeline commands #2824

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
h1-mrz wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −8
Open

Shell-quote values interpolated into Buildkite pipeline commands #2824

Show file tree
Hide file tree
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
16 changes: 9 additions & 7 deletions buildkite/bazelci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3620,7 +3620,7 @@ def create_config_validation_steps(git_commit):
commands=[
fetch_ci_scripts_command(),
"{} bazelci.py project_pipeline --file_config={}".format(
PLATFORMS[DEFAULT_PLATFORM]["python"], f
PLATFORMS[DEFAULT_PLATFORM]["python"], shlex.quote(f)
),
],
platform=DEFAULT_PLATFORM,
Expand Down Expand Up @@ -3750,16 +3750,18 @@ def fetch_aggregate_incompatible_flags_test_result_command():
def upload_project_pipeline_step(
project_name, git_repository, http_config, file_config, git_commit=None
):
pipeline_command = (
'{0} bazelci.py project_pipeline --project_name="{1}" ' + "--git_repository={2}"
).format(PLATFORMS[DEFAULT_PLATFORM]["python"], project_name, git_repository)
pipeline_command = "{0} bazelci.py project_pipeline --project_name={1} --git_repository={2}".format(
PLATFORMS[DEFAULT_PLATFORM]["python"],
shlex.quote(project_name),
shlex.quote(git_repository),
)
pipeline_command += " --use_but"
if http_config:
pipeline_command += " --http_config=" + http_config
pipeline_command += " --http_config=" + shlex.quote(http_config)
if file_config:
pipeline_command += " --file_config=" + file_config
pipeline_command += " --file_config=" + shlex.quote(file_config)
if git_commit:
pipeline_command += " --git_commit=" + git_commit
pipeline_command += " --git_commit=" + shlex.quote(git_commit)
pipeline_command += " | tee /dev/tty | buildkite-agent pipeline upload"

return create_step(
Expand Down
2 changes: 1 addition & 1 deletion buildkite/bazelci_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ def test_upload_project_pipeline_step_with_git_commit(self):
commands = step["command"]
project_pipeline_cmd = [c for c in commands if "project_pipeline" in c][0]
self.assertIn("--git_commit=origin/35.x", project_pipeline_cmd)
self.assertIn('--project_name="Protobuf 35.x"', project_pipeline_cmd)
self.assertIn("--project_name='Protobuf 35.x'", project_pipeline_cmd)
self.assertIn('--file_config=.bazelci/presubmit.yml', project_pipeline_cmd)

def test_print_bazel_downstream_pipeline_passes_origin_branch_as_git_commit(self):
Expand Down