Fix export failure when masked secret is empty#2766
Closed
plengauer wants to merge 1 commit into
Closed
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a bug where empty masked secrets cause export failures in the GitHub Actions instrumentation job initialization. The fix adds || true to the grep command to prevent pipeline failures when no non-empty secrets are found.
Key Changes
- Modified the secrets redaction pipeline to handle empty values gracefully by preventing
grepfrom causing the pipeline to fail when no matches are found
| *) echo ::error::Unsupported traces exporter: "${OTEL_TRACES_EXPORTER:-otlp}" && exit 1;; | ||
| esac | ||
| ( set +x && echo "$INPUT_SECRETS_TO_REDACT" | jq -r '. | to_entries[].value' | sed 's/[.[\(*^$+?{|]/\\\\&/g' | xargs -I '{}' echo '::add-mask::{}' ) && mask_patterns="$(echo "$INPUT_SECRETS_TO_REDACT" | jq -r '. | to_entries[].value' | grep -v '^$' | sed 's/[.[\(*^$+?{|]/\\\\&/g')" | ||
| ( set +x && echo "$INPUT_SECRETS_TO_REDACT" | jq '. | to_entries[].value' -r | ( grep -v '^$' || true ) | sed 's/[.[\(*^$+?{|]/\\\\&/g' | xargs -I '{}' echo '::add-mask::{}' ) && mask_patterns="$(echo "$INPUT_SECRETS_TO_REDACT" | jq -r '. | to_entries[].value' | grep -v '^$' | sed 's/[.[\(*^$+?{|]/\\\\&/g')" |
There was a problem hiding this comment.
The second mask_patterns assignment still lacks the || true guard after grep -v '^$', making it inconsistent with the first pipeline. If all secrets are empty, this will cause the same export failure that the first part of the line is trying to fix.
Suggested change
| ( set +x && echo "$INPUT_SECRETS_TO_REDACT" | jq '. | to_entries[].value' -r | ( grep -v '^$' || true ) | sed 's/[.[\(*^$+?{|]/\\\\&/g' | xargs -I '{}' echo '::add-mask::{}' ) && mask_patterns="$(echo "$INPUT_SECRETS_TO_REDACT" | jq -r '. | to_entries[].value' | grep -v '^$' | sed 's/[.[\(*^$+?{|]/\\\\&/g')" | |
| ( set +x && echo "$INPUT_SECRETS_TO_REDACT" | jq '. | to_entries[].value' -r | ( grep -v '^$' || true ) | sed 's/[.[\(*^$+?{|]/\\\\&/g' | xargs -I '{}' echo '::add-mask::{}' ) && mask_patterns="$(echo "$INPUT_SECRETS_TO_REDACT" | jq -r '. | to_entries[].value' | ( grep -v '^$' || true ) | sed 's/[.[\(*^$+?{|]/\\\\&/g')" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.