Inspec signoff helper (#1163)

Merged PR #1163.
GoogleCloudPlatform · Jan 4, 2019 · 1b78e77 · 1b78e77
1 parent 9e31b8a
commit 1b78e77
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
+6 −6		test/integration/verify/controls/google_compute_ssl_policies.rb
+5 −5		test/integration/verify/controls/google_compute_ssl_policy.rb