Merge pull request #432 from concourse/issue/389

Add [include/exclude]_all_match

Author: taylorsilva

Dockerfile

@@ -32,9 +32,6 @@ RUN git config --global user.name "git"
 RUN git config --global pull.rebase "false"
 RUN git config --global protocol.file.allow "always"
 
-ADD assets/ /opt/resource/
-RUN chmod +x /opt/resource/*
-
 ENV CXXFLAGS -DOPENSSL_API_COMPAT=0x30000000L
 ADD scripts/install_git_crypt.sh install_git_crypt.sh
 RUN ./install_git_crypt.sh && rm ./install_git_crypt.sh
@@ -186,6 +183,9 @@ WORKDIR         /usr/lib
 RUN             rm -rf \
                     perl
 
+ADD assets/ /opt/resource/
+RUN chmod +x /opt/resource/*
+
 FROM resource AS tests
 ADD test/ /tests
 RUN /tests/all.sh

README.md

@@ -140,9 +140,11 @@ Tracks the commits in a [git](http://git-scm.com/) repository.
 * `commit_filter`: *Optional.* Object containing commit message filters
   * `exclude`: *Optional.* Array containing strings that should
     cause a commit to be skipped
+  * `exclude_all_match`: *Optional.* Boolean wheater it should match all the exclude filters "AND", default: false
   * `include`: *Optional.* Array containing strings that
     *MUST* be included in commit messages for the commit to not be
     skipped
+  * `include_all_match`: *Optional.* Boolean wheater it should match all the include filters "AND", default: false
 
   **Note**: *You must escape any regex sensitive characters, since the string is used as a regex filter.*  
   For example, using `[skip deploy]` or `[deploy skip]` to skip non-deployment related commits in a deployment pipeline:

assets/check

@@ -28,7 +28,9 @@ git_config_payload=$(jq -r '.source.git_config // []' <<< "$payload")
 ref=$(jq -r '.version.ref // ""' <<< "$payload")
 skip_ci_disabled=$(jq -r '.source.disable_ci_skip // false' <<< "$payload")
 filter_include=$(jq '.source.commit_filter.include // []' <<< "$payload")
+filter_include_all_match=$(jq -r '.source.commit_filter.include_all_match // false' <<< "$payload")
 filter_exclude=$(jq '.source.commit_filter.exclude // []' <<< "$payload")
+filter_exclude_all_match=$(jq -r '.source.commit_filter.exclude_all_match // false' <<< "$payload")
 version_depth=$(jq -r '.source.version_depth // 1' <<< "$payload")
 reverse=false
 
@@ -120,25 +122,32 @@ else
   paths_search=`echo "-- $paths $ignore_paths" | tr "\n\r" " "`
 fi
 
+set -x
 list_command="git rev-list --all --first-parent $log_range $paths_search"
 if jq -e 'length > 0' <<<"$filter_include"
 then
     list_command+=" | git rev-list --stdin --date-order  --first-parent --no-walk=unsorted "
-    whitelist_items=$(echo $filter_include | jq -r -c '.[]')
-    for wli in "$whitelist_items"
+    include_items=$(echo $filter_include | jq -r -c '.[]')
+    for wli in "$include_items"
     do
         list_command+=" --grep=\"$wli\""
     done
+    if [ "$filter_include_all_match" == "true" ]; then
+      list_command+=" --all-match"
+    fi
 fi
 
 if jq -e 'length > 0' <<<"$filter_exclude"
 then
-    list_command+=" | git rev-list --stdin --date-order  --invert-grep --first-parent --no-walk=unsorted "
-    blacklist_items=$(echo $filter_exclude | jq -r -c '.[]')
-    for bli in "$blacklist_items"
+    list_command+=" | git rev-list --stdin --date-order --invert-grep --first-parent --no-walk=unsorted "
+    exclude_items=$(echo $filter_exclude | jq -r -c '.[]')
+    for bli in "$exclude_items"
     do
         list_command+=" --grep=\"$bli\""
     done
+    if [ "$filter_exclude_all_match" == "true" ]; then
+      list_command+=" --all-match"
+    fi
 fi
 
 

test/check.sh

@@ -513,6 +513,21 @@ it_skips_non_included_commits() {
   "
 }
 
+it_skips_all_non_included_commits() {
+  local repo=$(init_repo)
+  local ref1=$(make_commit $repo)
+  local ref2=$(make_commit_to_future $repo "not skipped commit")
+  local ref3=$(make_commit $repo "not skipped commit 2")
+  local ref4=$(make_commit $repo "should skip this commit")
+  local ref5=$(make_commit $repo)
+
+  check_uri_with_filter $repo $ref1 "include" 'not\nskipped\n2' "true"| jq -e "
+    . == [
+      {ref: $(echo $ref3 | jq -R .)}
+    ]
+  "
+}
+
 it_skips_excluded_commits_conventional() {
   local repo=$(init_repo)
   local ref1=$(make_commit $repo)
@@ -995,6 +1010,7 @@ run it_skips_excluded_commits_conventional
 run it_skips_non_included_commits
 run it_skips_non_included_and_excluded_commits
 run it_rejects_filter_with_incorrect_format
+run it_skips_all_non_included_commits
 run it_does_not_skip_marked_commits_when_disable_skip_configured
 run it_fails_if_key_has_password_not_provided
 run it_can_unlock_key_with_password

test/helpers.sh

@@ -636,14 +636,15 @@ check_uri_with_filter() {
   local ref=$2
   local type=$3
   local value=$4
+  local all_match=${5:-"false"}
 
   jq -n "{
     source: {
       uri: $(echo $uri| jq -R .),
       commit_filter: {
-        $(echo $type | jq -R .): [
-            $(echo $value | jq -R .)
-        ]
+        $(echo $type | jq -R .): $(echo -en $value | jq -sR 'split("\n") | if type=="string" then [.]  else . end' ),
+        $(echo $type"_all_match" | jq -R .): $(echo $all_match | jq -R .)
+
       }
     },
     version: {