Skip to content

feat: add flag to define whether approval only from the author from is enough #17

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

Draft
Mariusz Wojakowski (mariusz89016) wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: add flag to define whether approval only from the author from is enough #17

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
13 changes: 12 additions & 1 deletion app/check-gitlab-approvals.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# REPOSITORY:
# allowed_approvers:
# - GITLAB_USERNAME
# allow_author_approval: false
# getindata/devops/dummy-test-project:
# allowed_approvers:
# - john.doe
Expand Down Expand Up @@ -55,12 +56,15 @@ declare -a RESULT

# Get repository approvers configuration
YQ_QUERY=".repository.$REPO_NAME.allowed_approvers.[] // .allowed_approvers.[]"
ALLOW_AUTHOR_APPROVAL_QUERY=".repository.$REPO_NAME.allow_author_approval // true"
if [ -v APPROVAL_CONFIG ] && [ ! -z "$APPROVAL_CONFIG" ]; then
# If env is set and not empty - read approvers configuration yaml directly from ENV
APPROVERS_ALLOWED=($(yq --null-input eval "env(APPROVAL_CONFIG)" | yq eval "${YQ_QUERY}" - | sort))
ALLOW_AUTHOR_APPROVAL=$(yq --null-input eval "env(APPROVAL_CONFIG)" | yq eval "${ALLOW_AUTHOR_APPROVAL_QUERY}" -)
elif [ -f $APPROVAL_CONFIG_PATH ]; then
# If file passed through APPROVAL_CONFIG_PATH env exists, try to parse it
APPROVERS_ALLOWED=($(yq eval "${YQ_QUERY}" ${APPROVAL_CONFIG_PATH} | sort))
ALLOW_AUTHOR_APPROVAL=$(yq eval "${ALLOW_AUTHOR_APPROVAL_QUERY}" ${APPROVAL_CONFIG_PATH})
else
printf "GitLab approval configuration file not found in '%s' nor in \$APPROVAL_CONFIG - will not continue...\n" ${APPROVAL_CONFIG_PATH}
exit 1;
Expand All @@ -73,7 +77,14 @@ APPROVERS_GITLAB=($(jq -rn --arg x "${REPO_NAME}" '$x|@uri' | xargs -i glab api
RESULT=($(comm -12 <(printf '%s\n' ${APPROVERS_ALLOWED[@]}) <(printf '%s\n' ${APPROVERS_GITLAB[@]})))

if [ ${#RESULT[@]} -gt 0 ]; then
printf "MR approved correctly by [%s]\n" $(IFS=,; printf %s "${RESULT[*]}")
MERGE_REQUEST_AUTHOR=$(jq -rn --arg x "${REPO_NAME}" '$x|@uri' | xargs -i glab api projects/{}/merge_requests/$PULL_NUM | jq '.author.username')

if [ "${RESULT[*]}" == "$MERGE_REQUEST_AUTHOR" ] && [ "$ALLOW_AUTHOR_APPROVAL" == "false" ]; then
printf "MR approved only by the author - will not continue...\n"
Copy link
Copy Markdown
Contributor

@moss2k13 Piotr Mossakowski (moss2k13) Aug 16, 2023

Choose a reason for hiding this comment

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

Suggested change
printf "MR approved only by the author - will not continue...\n"
printf "MR approved only by the author - merge has been canceled.\n"

exit 1;
else
printf "MR approved correctly by [%s]\n" $(IFS=,; printf %s "${RESULT[*]}")
fi
elif [ ${#APPROVERS_ALLOWED[@]} -eq 0 ]; then
printf "Missing or bad configuration for '$REPO_NAME' repo in approval configuration - will not continue...\n"
exit 1;
Expand Down