From 1b78e77b54171c481a2cf328468f68118b868355 Mon Sep 17 00:00:00 2001
From: Sam Levenick <slevenick@google.com>
Date: Fri, 4 Jan 2019 15:11:26 -0800
Subject: [PATCH] Inspec signoff helper (#1163)

Merged PR #1163.
---
 .ci/magic-modules/create-pr.sh       | 6 +++---
 .ci/magic-modules/generate-inspec.sh | 2 +-
 .ci/magic-modules/helpers.sh         | 2 +-
 build/inspec                         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.ci/magic-modules/create-pr.sh b/.ci/magic-modules/create-pr.sh
index 57b28ee72763..1b245af7f3f7 100755
--- a/.ci/magic-modules/create-pr.sh
+++ b/.ci/magic-modules/create-pr.sh
@@ -41,7 +41,7 @@ if [ "$BRANCH_NAME" = "$ORIGINAL_PR_BRANCH" ]; then
 
       pushd build/$SUBMODULE_DIR
 
-      git log -1 --pretty=%B > ./downstream_body
+      git log -1 --pretty=%s > ./downstream_body
       echo "" >> ./downstream_body
       echo "<!-- This change is generated by MagicModules. -->" >> ./downstream_body
       if [ -n "$ORIGINAL_PR_USER" ]; then
@@ -61,7 +61,7 @@ if [ "$BRANCH_NAME" = "$ORIGINAL_PR_BRANCH" ]; then
   if [ -n "$ANSIBLE_REPO_USER" ]; then
     pushd build/ansible
 
-    git log -1 --pretty=%B > ./downstream_body
+    git log -1 --pretty=%s > ./downstream_body
     echo "" >> ./downstream_body
     echo "<!-- This change is generated by MagicModules. -->" >> ./downstream_body
     if [ -n "$ORIGINAL_PR_USER" ]; then
@@ -80,7 +80,7 @@ if [ "$BRANCH_NAME" = "$ORIGINAL_PR_BRANCH" ]; then
     if [ -n "$INSPEC_REPO_USER" ]; then
     pushd build/inspec
 
-    git log -1 --pretty=%B > ./downstream_body
+    git log -1 --pretty=%s > ./downstream_body
     echo "" >> ./downstream_body
     echo "<!-- This change is generated by MagicModules. -->" >> ./downstream_body
     if [ -n "$ORIGINAL_PR_USER" ]; then
diff --git a/.ci/magic-modules/generate-inspec.sh b/.ci/magic-modules/generate-inspec.sh
index 9b9c8dbf1bee..14fd592a478f 100755
--- a/.ci/magic-modules/generate-inspec.sh
+++ b/.ci/magic-modules/generate-inspec.sh
@@ -36,7 +36,7 @@ git config --global user.name "Modular Magician"
 
 git add -A
 # Set the "author" to the commit's real author.
-git commit -m "$INSPEC_COMMIT_MSG" --author="$LAST_COMMIT_AUTHOR" --signoff || true  # don't crash if no changes
+git commit -m "$INSPEC_COMMIT_MSG" --author="$LAST_COMMIT_AUTHOR" || true  # don't crash if no changes
 git checkout -B "$(cat ../../branchname)"
 
 apply_patches "$PATCH_DIR/modular-magician/inspec-gcp" "$INSPEC_COMMIT_MSG" "$LAST_COMMIT_AUTHOR" "master"
diff --git a/.ci/magic-modules/helpers.sh b/.ci/magic-modules/helpers.sh
index 8f8a44a31ae3..3c5c88489a9c 100644
--- a/.ci/magic-modules/helpers.sh
+++ b/.ci/magic-modules/helpers.sh
@@ -16,5 +16,5 @@ function apply_patches {
   # We keep all the changes (--soft).
   git reset --soft "$(git merge-base HEAD "$4")"
   # Then we commit again.
-  git commit -m "$2" --author="$3" || true  # don't crash if no changes
+  git commit -m "$2" --author="$3" --signoff || true  # don't crash if no changes
 }
diff --git a/build/inspec b/build/inspec
index 58b8b284ee2b..354263dcaad0 160000
--- a/build/inspec
+++ b/build/inspec
@@ -1 +1 @@
-Subproject commit 58b8b284ee2b42cc80b3cfb98720186d0507a124
+Subproject commit 354263dcaad0a04849a17a4d98913dd2cf11cba0