Skip to content
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

Use BUILDKITE_REPO to retrieve repo owner and name #124

Merged
merged 3 commits into from
Sep 19, 2024
Merged

Use BUILDKITE_REPO to retrieve repo owner and name #124

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8478655
Use BUILDKITE_REPO to retrive repo owner and name
wzieba Sep 19, 2024
3769732
Use regex to support both ssh and https formats of repo address
wzieba Sep 19, 2024
d102611
Add changelog entry
wzieba Sep 19, 2024
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
10 changes: 7 additions & 3 deletions bin/upload_sarif_to_github
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
set -euo pipefail

sarif_file="${1:-}"
owner=$(basename "$(dirname "${BUILDKITE_PULL_REQUEST_REPO}")")
repo=$(basename "${BUILDKITE_PULL_REQUEST_REPO%.git}")

[[ $BUILDKITE_REPO =~ ^(https?://|git@)([^/:]+)[/:](.*)$ ]] && slug=${BASH_REMATCH[3]%%.git}
if [[ -z "${slug:-}" ]]; then
echo "Unable to determine the repo slug from the repo URL"
exit 1
fi

if [ -z "$sarif_file" ]; then
echo "Not enough arguments provided. Usage: ./upload_sarif_to_gh.sh <path to .sarif report>"
Expand Down Expand Up @@ -64,4 +68,4 @@ curl -L \
-H "Authorization: Bearer $GITHUB_TOKEN" \
-H "X-GitHub-Api-Version: 2022-11-28" \
--data-binary "@$sarif_json_temp_file" \
https://api.github.com/repos/"$owner"/"$repo"/code-scanning/sarifs
https://api.github.com/repos/"$slug"/code-scanning/sarifs
Comment on lines -67 to +71
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was going to suggest to use our github_api helper from this plugin while at it… but then looking at its code I just realized that has the similar issue of relying on BUILDKITE_PULL_REQUEST_REPO instead of BUILDKITE_REPO—and besides, the awk program it uses to attempt to extract the host if not provided is incorrect, as there's no field 4… so we'll need to fix that helper in a separate PR I guess, only at which point one could consider using it in your sarif helper implementation 🙃

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for checking this! I've added a task so we won't forget: #125