HBASE-24651 release script utils should set local user when GPG_KEY is defined. #1992
Conversation
This file contains 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
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
ndimiduk
approved these changes
Jun 29, 2020
| @@ -20,6 +20,9 @@ DRY_RUN=${DRY_RUN:-1} #default to dry run | |||
| DEBUG=${DEBUG:-0} | |||
| GPG=${GPG:-gpg} | |||
| GPG_ARGS=(--no-autostart --batch) | |||
| if [ -n "${GPG_KEY}" ]; then | |||
There was a problem hiding this comment.
When is GPG_KEY not set? The script builds up the @apache.org email address, so it should always be available. Shouldn't that be an error case?
There was a problem hiding this comment.
no, in the case of directly running do-release.sh then GPG_KEY isn't defined when we source release-util.sh. shortly thereafter we call get_release_info, which sets GPG_KEY. (with this change we use GPG_KEY to update GPG_ARGS in that function)
| @@ -20,6 +20,9 @@ DRY_RUN=${DRY_RUN:-1} #default to dry run | |||
| DEBUG=${DEBUG:-0} | |||
| GPG=${GPG:-gpg} | |||
| GPG_ARGS=(--no-autostart --batch) | |||
| if [ -n "${GPG_KEY}" ]; then | |||
| GPG_ARGS=("${GPG_ARGS[@]}" --local-user "${GPG_KEY}") | |||
There was a problem hiding this comment.
Again, to my previous comments, I'm surprised this script identifies GPG identity via an email address/--local-user. I expected that we'd manage everything via a key fingerprint/--default-key.
There was a problem hiding this comment.
it doesn't identify the gpg identity necessarily via email address. --local-user takes the name of a key, the same as --default-key does. that name can be a keyid, email address, or fingerprint. the --local-user option is defined as "I specifically want you to use this identity to sign" and overrides any given default. IMO that better fits our usage because we expressly want to sign with this key.
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.
If the release manager has multiple private keys defined and wants to use one for running a release that isn't configured to be the default then currently the release scripts will use the selected gpg key when doing the test signing but will fall back to using whatever is configured as the default when signing the source and binary tarballs.
this PR changes when we define the local user arg for gpg so that it is defined whenever we have GPG_KEY defined. tested both using
do-release-docker.shand directly withdo-release.sh.