Skip to content

Commit 877b190

Browse files
pserranopserrano
committed
Merge branch 'master' into feature/enable-ec2-autoscaling-vpc-endpoint
2 parents 881211d + d9e7a6f commit 877b190

File tree

30 files changed

+1328
-647
lines changed

30 files changed

+1328
-647
lines changed

‎.chglog/CHANGELOG.tpl.md

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,48 @@
1+
# Change Log
2+
3+
All notable changes to this project will be documented in this file.
4+
15
{{ if .Versions -}}
26
<a name="unreleased"></a>
37
## [Unreleased]
48
{{ if .Unreleased.CommitGroups -}}
59
{{ range .Unreleased.CommitGroups -}}
610
### {{ .Title }}
711
{{ range .Commits -}}
12+
{{/* SKIPPING RULES - START */ -}}
13+
{{- if not (hasPrefix .Subject "Updated CHANGELOG") -}}
14+
{{- if not (contains .Subject "[ci skip]") -}}
15+
{{- if not (contains .Subject "[skip ci]") -}}
16+
{{- if not (hasPrefix .Subject "Merge pull request ") -}}
17+
{{- if not (hasPrefix .Subject "Added CHANGELOG") -}}
18+
{{- /* SKIPPING RULES - END */ -}}
819
- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
20+
{{/* SKIPPING RULES - START */ -}}
21+
{{ end -}}
22+
{{ end -}}
23+
{{ end -}}
24+
{{ end -}}
25+
{{ end -}}
26+
{{/* SKIPPING RULES - END */ -}}
927
{{ end }}
1028
{{ end -}}
1129
{{ else }}
1230
{{ range .Unreleased.Commits -}}
31+
{{/* SKIPPING RULES - START */ -}}
32+
{{- if not (hasPrefix .Subject "Updated CHANGELOG") -}}
33+
{{- if not (contains .Subject "[ci skip]") -}}
34+
{{- if not (contains .Subject "[skip ci]") -}}
35+
{{- if not (hasPrefix .Subject "Merge pull request ") -}}
36+
{{- if not (hasPrefix .Subject "Added CHANGELOG") -}}
37+
{{- /* SKIPPING RULES - END */ -}}
1338
- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
39+
{{/* SKIPPING RULES - START */ -}}
40+
{{ end -}}
41+
{{ end -}}
42+
{{ end -}}
43+
{{ end -}}
44+
{{ end -}}
45+
{{/* SKIPPING RULES - END */ -}}
1446
{{ end }}
1547
{{ end -}}
1648
{{ end -}}
@@ -22,12 +54,40 @@
2254
{{ range .CommitGroups -}}
2355
### {{ .Title }}
2456
{{ range .Commits -}}
57+
{{/* SKIPPING RULES - START */ -}}
58+
{{- if not (hasPrefix .Subject "Updated CHANGELOG") -}}
59+
{{- if not (contains .Subject "[ci skip]") -}}
60+
{{- if not (contains .Subject "[skip ci]") -}}
61+
{{- if not (hasPrefix .Subject "Merge pull request ") -}}
62+
{{- if not (hasPrefix .Subject "Added CHANGELOG") -}}
63+
{{- /* SKIPPING RULES - END */ -}}
2564
- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
65+
{{/* SKIPPING RULES - START */ -}}
66+
{{ end -}}
67+
{{ end -}}
68+
{{ end -}}
69+
{{ end -}}
70+
{{ end -}}
71+
{{/* SKIPPING RULES - END */ -}}
2672
{{ end }}
2773
{{ end -}}
2874
{{ else }}
2975
{{ range .Commits -}}
76+
{{/* SKIPPING RULES - START */ -}}
77+
{{- if not (hasPrefix .Subject "Updated CHANGELOG") -}}
78+
{{- if not (contains .Subject "[ci skip]") -}}
79+
{{- if not (contains .Subject "[skip ci]") -}}
80+
{{- if not (hasPrefix .Subject "Merge pull request ") -}}
81+
{{- if not (hasPrefix .Subject "Added CHANGELOG") -}}
82+
{{- /* SKIPPING RULES - END */ -}}
3083
- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
84+
{{/* SKIPPING RULES - START */ -}}
85+
{{ end -}}
86+
{{ end -}}
87+
{{ end -}}
88+
{{ end -}}
89+
{{ end -}}
90+
{{/* SKIPPING RULES - END */ -}}
3191
{{ end }}
3292
{{ end -}}
3393

@@ -48,4 +108,4 @@
48108
[{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}
49109
{{ end -}}
50110
{{ end -}}
51-
{{ end -}}
111+
{{ end -}}

‎.circleci/config.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,14 @@ version: 2
22

33
terraform: &terraform
44
docker:
5-
- image: hashicorp/terraform:0.12.0
5+
- image: hashicorp/terraform:0.12.6
66
working_directory: /tmp/workspace/terraform
77

88
jobs:
99
validate:
1010
<<: *terraform
11-
environment:
12-
AWS_DEFAULT_REGION: us-east-1
1311
steps:
1412
- checkout
15-
- run:
16-
name: Install curl
17-
command: apk add --update curl
1813
# - run:
1914
# name: Add github.com to ~/.ssh/known_hosts
2015
# command: mkdir ~/.ssh && ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
@@ -24,12 +19,14 @@ jobs:
2419
- run:
2520
name: Validate Terraform configurations
2621
command: find . -name ".terraform" -prune -o -type f -name "*.tf" -exec dirname {} \;|sort -u | while read m; do (cd "$m" && terraform validate && echo "√ $m") || exit 1 ; done
22+
environment:
23+
AWS_DEFAULT_REGION: us-east-1
2724
- run:
2825
name: Check if Terraform configurations are properly formatted
2926
command: if [[ -n "$(terraform fmt -write=false)" ]]; then echo "Some terraform files need be formatted, run 'terraform fmt' to fix"; exit 1; fi
3027
- run:
3128
name: Install tflint
32-
command: curl -L -o /tmp/tflint.zip https://github.com/wata727/tflint/releases/download/v0.12.1/tflint_linux_amd64.zip && unzip /tmp/tflint.zip -d /usr/local/bin
29+
command: wget -O /tmp/tflint.zip https://github.com/wata727/tflint/releases/download/v0.12.1/tflint_linux_amd64.zip && unzip /tmp/tflint.zip -d /usr/local/bin
3330
- run:
3431
name: Check Terraform configurations with tflint
3532
command: tflint

‎.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ tab_width = 2
2727
indent_style = tab
2828

2929
[COMMIT_EDITMSG]
30-
max_line_length = 0
30+
max_line_length = 0

‎.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
.terraform
2-
*.tfstate*
3-
.kitchen
42
terraform.tfstate
3+
*.tfstate*
54
terraform.tfvars
6-
Gemfile.lock

‎.pre-commit-config.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
repos:
2-
- repo: git://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.20.0
4-
hooks:
5-
- id: terraform_fmt
6-
- id: terraform_docs
7-
- repo: git://github.com/pre-commit/pre-commit-hooks
8-
rev: v2.4.0
9-
hooks:
10-
- id: check-merge-conflict
2+
- repo: git://github.com/antonbabenko/pre-commit-terraform
3+
rev: v1.27.0
4+
hooks:
5+
- id: terraform_fmt
6+
- id: terraform_docs
7+
- repo: git://github.com/pre-commit/pre-commit-hooks
8+
rev: v2.5.0
9+
hooks:
10+
- id: check-merge-conflict

0 commit comments

Comments
 (0)