From 45bbb6e0350ee12333a698c0cea425237cb94505 Mon Sep 17 00:00:00 2001
From: Alvin Huang <17609145+alvin-huang@users.noreply.github.com>
Date: Fri, 6 Mar 2020 17:59:14 -0500
Subject: [PATCH] add auto cherry-picking (#7406)

* add auto cherry-picking

* exit on git cherry-pick failure

* release branches are #.#.x
---
 .circleci/config.yml               | 19 +++++++++++
 .circleci/scripts/cherry-picker.sh | 55 ++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100755 .circleci/scripts/cherry-picker.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b194815b2f..6c775e8162 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -626,6 +626,17 @@ jobs:
       - store_test_results:
           path: *TEST_RESULTS_DIR
 
+  # only runs on master: checks latest commit to see if the PR associated has a backport/* or docs* label to cherry-pick
+  cherry-picker:
+    docker:
+      - image: *GOLANG_IMAGE
+    steps:
+      - checkout
+      - add_ssh_keys: # needs a key to push cherry-picked commits back to github
+          fingerprints:
+            - "c9:04:b7:85:bf:0e:ce:93:5f:b8:0e:68:8e:16:f3:71"
+      - run: .circleci/scripts/cherry-picker.sh
+
 workflows:
   version: 2
   go-tests:
@@ -748,3 +759,11 @@ workflows:
       - ember-test-ent:
           requires:
             - ember-build
+  cherry-pick:
+    jobs:
+      - cherry-picker:
+          context: team-consul
+          filters:
+            branches:
+              only:
+                - master
diff --git a/.circleci/scripts/cherry-picker.sh b/.circleci/scripts/cherry-picker.sh
new file mode 100755
index 0000000000..4be9e49823
--- /dev/null
+++ b/.circleci/scripts/cherry-picker.sh
@@ -0,0 +1,55 @@
+# This script is meant to run on every new commit to master in CircleCI. If the commit comes from a PR, it will
+# check the PR associated with the commit for labels. If the label matches `docs*` it will be cherry-picked
+# to stable-website. If the label matches `backport/*`, it will be cherry-picked to the appropriate `release/*`
+# branch.
+
+# Requires $CIRCLE_PROJECT_USERNAME, $CIRCLE_PROJECT_REPONAME, and $CIRCLE_SHA1 from CircleCI
+#!/bin/bash
+
+# search for the PR labels applicable to the specified commit
+resp=$(curl -f -s "https://api.github.com/search/issues?q=repo:$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME+sha:$CIRCLE_SHA1")
+status="$?"
+if [[ "$status" -ne 0 ]]; then
+  echo "The GitHub API returned $status which means it was probably rate limited."
+  exit $status
+fi
+
+# get the count from the GitHub API to check if the commit matched a PR
+count=$(echo "$resp" | jq '.total_count')
+if [[ "$count" -eq 0 ]]; then
+  echo "This commit was not associated with a PR"
+  exit 0
+fi
+
+# If the API returned a non-zero count, we have found a PR with that commit so we find
+# the labels from the PR
+labels=$(echo "$resp" | jq --raw-output '.items[].labels[] | .name')
+status="$?"
+if [[ "$status" -ne 0 ]]; then
+  pr_url=$(echo "$resp" | jq --raw-output '.items[].pull_request.url')
+  echo "jq exited with $status when trying to find label names. Are there labels applied to the PR ($pr_url)?"
+  # This can be a valid error but usually this means we do not have any labels so it doesn't signal
+  # cherry-picking is possible. Exit 0 for now unless we run into cases where these failures are important.
+  exit 0
+fi
+
+# loop through all labels on the PR
+for label in $labels; do
+    git config --local user.email "hashicorp-ci@users.noreply.github.com"
+    git config --local user.name "hashicorp-ci"
+    echo "checking label: $label"
+    # if the label matches docs*, it will attempt to cherry-pick to stable-website
+    if [[ $label =~ docs* ]]; then
+        echo "docs"
+        git checkout stable-website || exit 1
+        git cherry-pick $CIRCLE_SHA1 || exit 1
+        git push origin stable-website
+    # else if the label matches backport/*, it will attempt to cherry-pick to the release branch
+    elif [[ $label =~ backport/* ]]; then
+        echo "backporting to $label"
+        branch="${label/backport/release}.x"
+        git checkout $branch || exit 1
+        git cherry-pick $CIRCLE_SHA1 || exit 1
+        git push origin $branch
+    fi
+done