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.

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

Don't overwrite BUILDKITE_METAHOOK_HOOKS_PATH, and shard vars by plugin configuration #12

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 11 additions & 4 deletions hooks/environment
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
#!/usr/bin/env bash
set -euo pipefail

BUILDKITE_METAHOOK_HOOKS_PATH="$(mktemp -d)"
export BUILDKITE_METAHOOK_HOOKS_PATH
env | sort | grep "BUILDKITE_PLUGIN_METAHOOK" | uniq >"${BUILDKITE_METAHOOK_HOOKS_PATH}/vars"
# If users add multiple `metahook` instances, we'll just store our `vars` in the same directory.
# We store the `vars` in a file that is namespaced by a hash of the plugin configuration, which
# allows us to avoid having multiple metahook instances clobber eachother.
if [[ ! -v "BUILDKITE_METAHOOK_HOOKS_PATH" ]]; then
export BUILDKITE_METAHOOK_HOOKS_PATH="$(mktemp -d)"
fi

PLUGIN_CONFIG_HASH=$(cksum <<<"${BUILDKITE_PLUGIN_CONFIGURATION}" | awk '{ print $1 }')
VARS_FILENAME="vars-${PLUGIN_CONFIG_HASH}"
env | sort | grep "BUILDKITE_PLUGIN_METAHOOK" | uniq >"${BUILDKITE_METAHOOK_HOOKS_PATH}/${VARS_FILENAME}"

if grep -E 'BUILDKITE_PLUGIN_METAHOOK_.+(\.BAT|\.CMD)=' "${BUILDKITE_METAHOOK_HOOKS_PATH}/vars"; then
if grep -E 'BUILDKITE_PLUGIN_METAHOOK_.+(\.BAT|\.CMD)=' "${BUILDKITE_METAHOOK_HOOKS_PATH}/${VARS_FILENAME}"; then
echo "Sorry, we had to remove Windows Batch file support in 0.4.0."
echo "Please refer to https://github.com/improbable-eng/metahook-buildkite-plugin/tree/master/changelog.md#0.4.0"
echo ""
Expand Down
6 changes: 5 additions & 1 deletion hooks/pre-exit
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
#!/usr/bin/env bash
set -euo pipefail

PLUGIN_CONFIG_HASH=$(cksum <<<"${BUILDKITE_PLUGIN_CONFIGURATION}" | awk '{ print $1 }')
VARS_FILENAME="vars-${PLUGIN_CONFIG_HASH}"
cleanup() {
rm -rf "${BUILDKITE_METAHOOK_HOOKS_PATH}"
# Delete our `vars` directory, then if the directory itself is empty, delete that too
rm -rf "${BUILDKITE_METAHOOK_HOOKS_PATH}/${VARS_FILENAME}"
rmdir "${BUILDKITE_METAHOOK_HOOKS_PATH}" 2>/dev/null || true
}
trap cleanup EXIT

Expand Down
4 changes: 3 additions & 1 deletion hooks/run-hook.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ hook_name="${1:?1st arg needs to be hook name}"
upperd="$(echo "${hook_name}" | tr "[:lower:]" "[:upper:]" | sed "s:-:_:")"
var_name="BUILDKITE_PLUGIN_METAHOOK_${upperd}"

if grep -q "${var_name}" <"${BUILDKITE_METAHOOK_HOOKS_PATH}/vars"; then
PLUGIN_CONFIG_HASH=$(cksum <<<"${BUILDKITE_PLUGIN_CONFIGURATION}" | awk '{ print $1 }')
VARS_FILENAME="vars-${PLUGIN_CONFIG_HASH}"
if grep -q "${var_name}" <"${BUILDKITE_METAHOOK_HOOKS_PATH}/${VARS_FILENAME}"; then
hook_file="${BUILDKITE_METAHOOK_HOOKS_PATH}/${hook_name}"

echo "#\!/usr/bin/env bash" >"${hook_file}"
Expand Down