Skip to content

Commit fd0900c

Browse files
maximmimaximmi
authored
Terraform 0.14 upgrade (#32)
1 parent a107bcc commit fd0900c

File tree

10 files changed

+75
-43
lines changed

10 files changed

+75
-43
lines changed

‎.github/auto-release.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,3 @@ change-template: |
4343
4444
template: |
4545
$CHANGES
46-
47-
replacers:
48-
# Remove irrelevant information from Renovate bot
49-
- search: '/---\s+^#.*Renovate configuration(?:.|\n)*?This PR has been generated .*/gm'
50-
replace: ''
51-
# Remove Renovate bot banner image
52-
- search: '/\[!\[[^\]]*Renovate\][^\]]*\](\([^)]*\))?\s*\n+/gm'
53-
replace: ''

‎.github/mergify.yml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
# https://docs.mergify.io/conditions.html
2-
# https://docs.mergify.io/actions.html
31
pull_request_rules:
42
- name: "approve automated PRs that have passed checks"
53
conditions:
6-
- "author~=^(cloudpossebot|renovate\\[bot\\])$"
4+
- "check-success~=test/bats"
5+
- "check-success~=test/readme"
6+
- "check-success~=test/terratest"
77
- "base=master"
8-
- "-closed"
9-
- "head~=^(auto-update|renovate)/.*"
10-
- "check-success=test/bats"
11-
- "check-success=test/readme"
12-
- "check-success=test/terratest"
13-
- "check-success=validate-codeowners"
8+
- "author=cloudpossebot"
9+
- "head~=auto-update/.*"
1410
actions:
1511
review:
1612
type: "APPROVE"
@@ -19,17 +15,16 @@ pull_request_rules:
1915

2016
- name: "merge automated PRs when approved and tests pass"
2117
conditions:
22-
- "author~=^(cloudpossebot|renovate\\[bot\\])$"
18+
- "check-success~=test/bats"
19+
- "check-success~=test/readme"
20+
- "check-success~=test/terratest"
2321
- "base=master"
24-
- "-closed"
25-
- "head~=^(auto-update|renovate)/.*"
26-
- "check-success=test/bats"
27-
- "check-success=test/readme"
28-
- "check-success=test/terratest"
29-
- "check-success=validate-codeowners"
22+
- "head~=auto-update/.*"
3023
- "#approved-reviews-by>=1"
3124
- "#changes-requested-reviews-by=0"
3225
- "#commented-reviews-by=0"
26+
- "base=master"
27+
- "author=cloudpossebot"
3328
actions:
3429
merge:
3530
method: "squash"
@@ -43,7 +38,6 @@ pull_request_rules:
4338
- name: "ask to resolve conflict"
4439
conditions:
4540
- "conflict"
46-
- "-closed"
4741
actions:
4842
comment:
4943
message: "This pull request is now in conflict. Could you fix it @{{author}}? 🙏"

‎.github/workflows/auto-context.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
fi
3535
3636
- name: Create Pull Request
37-
if: steps.update.outputs.create_pull_request == 'true'
37+
if: {{ steps.update.outputs.create_pull_request == 'true' }}
3838
uses: cloudposse/actions/github/[email protected]
3939
with:
4040
token: ${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }}

‎.github/workflows/auto-readme.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: "auto-readme"
2+
on:
3+
schedule:
4+
# Update README.md nightly
5+
- cron: '0 4 * * *'
6+
7+
jobs:
8+
update:
9+
if: github.event_name == 'schedule'
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
14+
- name: Update readme
15+
shell: bash
16+
id: update
17+
env:
18+
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
19+
run: |
20+
make init
21+
make readme/build
22+
23+
- name: Create Pull Request
24+
uses: cloudposse/actions/github/[email protected]
25+
with:
26+
token: ${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }}
27+
commit-message: Update README.md and docs
28+
title: Update README.md and docs
29+
body: |-
30+
## what
31+
This is an auto-generated PR that updates the README.md and docs
32+
33+
## why
34+
To have most recent changes of README.md and doc from origin templates
35+
36+
branch: auto-update/readme
37+
base: master
38+
delete-branch: true
39+
labels: |
40+
auto-update
41+
readme

‎.github/workflows/auto-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- master
77

88
jobs:
9-
publish:
9+
semver:
1010
runs-on: ubuntu-latest
1111
steps:
1212
# Drafts your next Release notes as Pull Requests are merged into "master"

‎.github/workflows/validate-codeowners.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,10 @@ jobs:
99
- name: "Checkout source code at current commit"
1010
uses: actions/checkout@v2
1111
- uses: mszostok/[email protected]
12-
if: github.event.pull_request.head.repo.full_name == github.repository
13-
name: "Full check of CODEOWNERS"
1412
with:
1513
# For now, remove "files" check to allow CODEOWNERS to specify non-existent
1614
# files so we can use the same CODEOWNERS file for Terraform and non-Terraform repos
1715
# checks: "files,syntax,owners,duppatterns"
1816
checks: "syntax,owners,duppatterns"
1917
# GitHub access token is required only if the `owners` check is enabled
2018
github_access_token: "${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }}"
21-
- uses: mszostok/[email protected]
22-
if: github.event.pull_request.head.repo.full_name != github.repository
23-
name: "Syntax check of CODEOWNERS"
24-
with:
25-
checks: "syntax,duppatterns"

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Available targets:
8686

8787
| Name | Version |
8888
|------|---------|
89-
| terraform | >= 0.12.0 |
89+
| terraform | >= 0.12.26 |
9090
| aws | >= 2.0 |
9191
| local | >= 1.2 |
9292

@@ -217,7 +217,7 @@ In general, PRs are welcome. We follow the typical "fork-and-pull" Git workflow.
217217

218218
## Copyright
219219

220-
Copyright © 2017-2020 [Cloud Posse, LLC](https://cpco.io/copyright)
220+
Copyright © 2017-2021 [Cloud Posse, LLC](https://cpco.io/copyright)
221221

222222

223223

‎docs/terraform.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
| Name | Version |
55
|------|---------|
6-
| terraform | >= 0.12.0 |
6+
| terraform | >= 0.12.26 |
77
| aws | >= 2.0 |
88
| local | >= 1.2 |
99

‎examples/complete/versions.tf

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
terraform {
2-
required_version = ">= 0.12.0"
2+
required_version = ">= 0.12.26"
33

44
required_providers {
5-
aws = ">= 2.0"
6-
local = ">= 1.2"
5+
aws = {
6+
source = "hashicorp/aws"
7+
version = ">= 2.0"
8+
}
9+
local = {
10+
source = "hashicorp/local"
11+
version = ">= 1.2"
12+
}
713
}
814
}

‎versions.tf

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
terraform {
2-
required_version = ">= 0.12.0"
2+
required_version = ">= 0.12.26"
33

44
required_providers {
5-
aws = ">= 2.0"
6-
local = ">= 1.2"
5+
aws = {
6+
source = "hashicorp/aws"
7+
version = ">= 2.0"
8+
}
9+
local = {
10+
source = "hashicorp/local"
11+
version = ">= 1.2"
12+
}
713
}
814
}

0 commit comments

Comments
 (0)