Merge pull request #691 from LaurentGoderre/stackbrew-pr-report

Add a commit comment when creating an upstream PR via script

Author: LaurentGoderre

generate-stackbrew-pr.sh

@@ -16,10 +16,18 @@ else
 	fi
 fi
 
+if [[ "$COMMIT_MESSAGE" =~ Merge\ pull\ request\ \#([0-9]*) ]]; then
+
+	# This is a merge from a pull request
+	PR_NUMBER="${BASH_REMATCH[1]}"
+	COMMIT_MESSAGE="$(printf "%s" "$COMMIT_MESSAGE" | tail -n 1)"
+fi
+
 IMAGES_FILE="library/node"
 REPO_NAME="official-images"
 ORIGIN_SLUG="$GITHUB_USERNAME/$REPO_NAME"
 UPSTREAM_SLUG="docker-library/$REPO_NAME"
+DOCKER_SLUG="nodejs/docker-node"
 gitpath="$REPO_NAME"
 
 function updated() {
@@ -86,6 +94,14 @@ function pr_payload() {
 	}'
 }
 
+function comment_payload() {
+	local pr_url
+	pr_url="$1"
+	echo '{
+		"body": "Created PR to the '"$REPO_NAME"' repo ('"$pr_url"')"
+	}'
+}
+
 if updated; then
 
 	permission_check
@@ -108,16 +124,38 @@ if updated; then
 	info "Pushing..."
 	git push "https://$GITHUB_API_TOKEN:x-oauth-basic@github.com/$ORIGIN_SLUG.git" -f "$BRANCH_NAME" 2> /dev/null || fatal "Error pushing the updated stackbrew"
 
+	cd - && rm -rf $gitpath
+
 	info "Creating Pull request"
 	pr_response_payload="$(curl -H "$(auth_header)" \
 		-s \
 		-X POST \
 		-d "$(pr_payload)" \
 		"https://api.github.com/repos/$UPSTREAM_SLUG/pulls")"
 
-	url="$(echo "$pr_response_payload" | jq .html_url)"
+	url="$(echo "$pr_response_payload" | jq -r .html_url)"
 	if [ "$url" != "null" ]; then
 		info "Pull request created at $url"
+
+		if [ ! -z "$PR_NUMBER" ]; then
+			comment_endpoint="https://api.github.com/repos/$DOCKER_SLUG/issues/$PR_NUMBER/comments"
+		else
+			comment_endpoint="https://api.github.com/repos/$DOCKER_SLUG/commits/$COMMIT_ID/comments"
+		fi
+
+		info "Creating Commit Comment"
+		commit_response_payload="$(curl -H "$(auth_header)" \
+			-s \
+			-X POST \
+			-d "$(comment_payload "$url")" \
+			"$comment_endpoint")"
+
+		if [ "$(echo "$commit_response_payload" | jq .message)" != "null" ]; then
+			fatal "Error linking the pull request ($error_message)"
+		else
+			comment_url="$(echo "$commit_response_payload" | jq -r .html_url)"
+			info "Created comment at $comment_url"
+		fi
 	else
 		error_message=$(echo "$pr_response_payload" | jq .message)
 		fatal "Error creating pull request ($error_message)"