Merge pull request #25 from johannes-huther/feature/random-request-id

Add random request ID (closes #22)

Author: distributhor

README.md

@@ -62,9 +62,12 @@ Will deliver a payload with the following properties:
     "commit": "a636b6f0861bbee98039bf3df66ee13d8fbc9c74",
     "ref": "refs/heads/master",
     "head": "",
-    "workflow": "Build and deploy"
+    "workflow": "Build and deploy",
+    "requestID": "74b1912d19cfe780f1fada4b525777fd"
 }
 ```
+`requestID` contains a randomly generated identifier for each request. 
+
 <br/>
 
 Add additional data to the payload:
@@ -92,7 +95,8 @@ and now look like:
     "data": {
         "weapon": "hammer",
         "drink": "beer"
-    }
+    },
+    "requestID": "74b1912d19cfe780f1fada4b525777fd"
 }
 ```
 

entrypoint.sh

@@ -29,6 +29,8 @@ if [ -z "$webhook_secret" ]; then
     exit 1
 fi
 
+REQUEST_ID=$(cat /dev/urandom | tr -dc '0-9a-f' | fold -w 32 | head -n 1)
+
 if [ -n "$webhook_type" ] && [ "$webhook_type" == "form-urlencoded" ]; then
 
     EVENT=`urlencode "$GITHUB_EVENT_NAME"`
@@ -39,7 +41,7 @@ if [ -n "$webhook_type" ] && [ "$webhook_type" == "form-urlencoded" ]; then
     WORKFLOW=`urlencode "$GITHUB_WORKFLOW"`
 
     CONTENT_TYPE="application/x-www-form-urlencoded"
-    WEBHOOK_DATA="event=$EVENT&repository=$REPOSITORY&commit=$COMMIT&ref=$REF&head=$HEAD&workflow=$WORKFLOW"
+    WEBHOOK_DATA="event=$EVENT&repository=$REPOSITORY&commit=$COMMIT&ref=$REF&head=$HEAD&workflow=$WORKFLOW&requestID=$REQUEST_ID"
 
     if [ -n "$data" ]; then
         WEBHOOK_DATA="${WEBHOOK_DATA}&${data}"
@@ -55,10 +57,13 @@ else
     else
         WEBHOOK_DATA="{\"event\":\"$GITHUB_EVENT_NAME\",\"repository\":\"$GITHUB_REPOSITORY\",\"commit\":\"$GITHUB_SHA\",\"ref\":\"$GITHUB_REF\",\"head\":\"$GITHUB_HEAD_REF\",\"workflow\":\"$GITHUB_WORKFLOW\"}"
     fi
+    
+    JSON_WITH_OPEN_CLOSE_BRACKETS_STRIPPED=`echo "$WEBHOOK_DATA" | sed 's/^{\(.*\)}$/\1/'`
     if [ -n "$data" ]; then
         CUSTOM_JSON_DATA=$(echo -n "$data" | jq -c '')
-        JSON_WITH_OPEN_CLOSE_BRACKETS_STRIPPED=`echo "$WEBHOOK_DATA" | sed 's/^{\(.*\)}$/\1/'`
-        WEBHOOK_DATA="{$JSON_WITH_OPEN_CLOSE_BRACKETS_STRIPPED,\"data\":$CUSTOM_JSON_DATA}"
+        WEBHOOK_DATA="{$JSON_WITH_OPEN_CLOSE_BRACKETS_STRIPPED,\"data\":$CUSTOM_JSON_DATA,\"requestID\":\"$REQUEST_ID\"}"
+    else
+        WEBHOOK_DATA="{$JSON_WITH_OPEN_CLOSE_BRACKETS_STRIPPED,\"requestID\":\"$REQUEST_ID\"}"
     fi
 
 fi