From 085dfa5ce4dae0f0261d72007a1fe54d924b23b7 Mon Sep 17 00:00:00 2001
From: Maxim Mironenko <maxim@cloudposse.com>
Date: Thu, 7 Jan 2021 00:07:59 +0700
Subject: [PATCH] Terraform 0.14 upgrade (#34)

---
 .github/auto-release.yml                  |  8 -------
 .github/mergify.yml                       | 28 +++++++++--------------
 .github/workflows/auto-context.yml        |  2 +-
 .github/workflows/auto-release.yml        |  2 +-
 .github/workflows/validate-codeowners.yml |  7 ------
 5 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/.github/auto-release.yml b/.github/auto-release.yml
index c78a4d8..18a1ca6 100644
--- a/.github/auto-release.yml
+++ b/.github/auto-release.yml
@@ -43,11 +43,3 @@ change-template: |
 
 template: |
   $CHANGES
-
-replacers:
-# Remove irrelevant information from Renovate bot
-- search: '/---\s+^#.*Renovate configuration(?:.|\n)*?This PR has been generated .*/gm'
-  replace: ''
-# Remove Renovate bot banner image
-- search: '/\[!\[[^\]]*Renovate\][^\]]*\](\([^)]*\))?\s*\n+/gm'
-  replace: ''
diff --git a/.github/mergify.yml b/.github/mergify.yml
index b010656..485982f 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,16 +1,12 @@
-# https://docs.mergify.io/conditions.html
-# https://docs.mergify.io/actions.html
 pull_request_rules:
 - name: "approve automated PRs that have passed checks"
   conditions:
-  - "author~=^(cloudpossebot|renovate\\[bot\\])$"
+  - "check-success~=test/bats"
+  - "check-success~=test/readme"
+  - "check-success~=test/terratest"
   - "base=master"
-  - "-closed"
-  - "head~=^(auto-update|renovate)/.*"
-  - "check-success=test/bats"
-  - "check-success=test/readme"
-  - "check-success=test/terratest"
-  - "check-success=validate-codeowners"
+  - "author=cloudpossebot"
+  - "head~=auto-update/.*"
   actions:
     review:
       type: "APPROVE"
@@ -19,17 +15,16 @@ pull_request_rules:
 
 - name: "merge automated PRs when approved and tests pass"
   conditions:
-  - "author~=^(cloudpossebot|renovate\\[bot\\])$"
+  - "check-success~=test/bats"
+  - "check-success~=test/readme"
+  - "check-success~=test/terratest"
   - "base=master"
-  - "-closed"
-  - "head~=^(auto-update|renovate)/.*"
-  - "check-success=test/bats"
-  - "check-success=test/readme"
-  - "check-success=test/terratest"
-  - "check-success=validate-codeowners"
+  - "head~=auto-update/.*"
   - "#approved-reviews-by>=1"
   - "#changes-requested-reviews-by=0"
   - "#commented-reviews-by=0"
+  - "base=master"
+  - "author=cloudpossebot"
   actions:
     merge:
       method: "squash"
@@ -43,7 +38,6 @@ pull_request_rules:
 - name: "ask to resolve conflict"
   conditions:
   - "conflict"
-  - "-closed"
   actions:
     comment:
       message: "This pull request is now in conflict. Could you fix it @{{author}}? 🙏"
diff --git a/.github/workflows/auto-context.yml b/.github/workflows/auto-context.yml
index df1a857..739a3c9 100644
--- a/.github/workflows/auto-context.yml
+++ b/.github/workflows/auto-context.yml
@@ -34,7 +34,7 @@ jobs:
         fi
 
     - name: Create Pull Request
-      if: steps.update.outputs.create_pull_request == 'true'
+      if: {{ steps.update.outputs.create_pull_request == 'true' }}
       uses: cloudposse/actions/github/create-pull-request@0.22.0
       with:
         token: ${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }}
diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml
index 3f48017..ccc27be 100644
--- a/.github/workflows/auto-release.yml
+++ b/.github/workflows/auto-release.yml
@@ -6,7 +6,7 @@ on:
     - master
 
 jobs:
-  publish:
+  semver:
     runs-on: ubuntu-latest
     steps:
     # Drafts your next Release notes as Pull Requests are merged into "master"
diff --git a/.github/workflows/validate-codeowners.yml b/.github/workflows/validate-codeowners.yml
index 386eb28..8044289 100644
--- a/.github/workflows/validate-codeowners.yml
+++ b/.github/workflows/validate-codeowners.yml
@@ -9,8 +9,6 @@ jobs:
     - name: "Checkout source code at current commit"
       uses: actions/checkout@v2
     - uses: mszostok/codeowners-validator@v0.5.0
-      if: github.event.pull_request.head.repo.full_name == github.repository
-      name: "Full check of CODEOWNERS"
       with:
         # For now, remove "files" check to allow CODEOWNERS to specify non-existent
         # files so we can use the same CODEOWNERS file for Terraform and non-Terraform repos
@@ -18,8 +16,3 @@ jobs:
         checks: "syntax,owners,duppatterns"
         # GitHub access token is required only if the `owners` check is enabled
         github_access_token: "${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }}"
-    - uses: mszostok/codeowners-validator@v0.5.0
-      if: github.event.pull_request.head.repo.full_name != github.repository
-      name: "Syntax check of CODEOWNERS"
-      with:
-        checks: "syntax,duppatterns"