github-mirrors/terraform-aws-eks
1
0
Fork 0
mirror of https://github.com/ysoftdevs/terraform-aws-eks.git synced 2026-03-31 22:43:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from terraform-aws-modules/fix/git_hooks_and_ci

Browse Source 
fixing up CI and git hooks
This commit is contained in:
Brandon J. O'Connor
2018-06-07 03:13:59 -07:00
committed by GitHub
parent 67d2946b58 2e7897bd85
commit fbe64df188
5 changed files with 137 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@@ -6,8 +6,8 @@ Please explain the changes you made here and link to any relevant issues.
### Checklist ### Checklist
* [ ] `terraform fmt` and `terraform validate` both work from the root and `examples/alb_test_fixture` directories (look in CI for an example) - [ ] `terraform fmt` and `terraform validate` both work from the root and `examples/eks_test_fixture` directories (look in CI for an example)
* [ ] Tests for the changes have been added and passing (for bug fixes/features) - [ ] Tests for the changes have been added and passing (for bug fixes/features)
* [ ] Test results are pasted in this PR (in lieu of CI) - [ ] Test results are pasted in this PR (in lieu of CI)
* [ ] Docs have been added/updated (for bug fixes/features) - [ ] Docs have been added/updated (for bug fixes/features)
* [ ] Any breaking changes are noted in the description above - [ ] Any breaking changes are noted in the description above

2
.pre-commit-config.yaml
View File

@@ -3,13 +3,11 @@
repos: repos:
- repo: git://github.com/antonbabenko/pre-commit-terraform - repo: git://github.com/antonbabenko/pre-commit-terraform
rev: v1.7.1 rev: v1.7.1
sha: 091f8b15d7b458e5a0aca642483deb2205e7db02
hooks: hooks:
- id: terraform_fmt - id: terraform_fmt
# - id: terraform_docs # - id: terraform_docs
- repo: git://github.com/pre-commit/pre-commit-hooks - repo: git://github.com/pre-commit/pre-commit-hooks
rev: v1.2.3 rev: v1.2.3
sha: 92e1570c282e3c69a1f8b5b8dd8d286fe27cfaa7
hooks: hooks:
- id: check-merge-conflict - id: check-merge-conflict
- id: trailing-whitespace - id: trailing-whitespace

2
.travis.yml
View File

@@ -26,7 +26,7 @@ script:
- echo 'script' - echo 'script'
- terraform init - terraform init
- terraform fmt -check=true - terraform fmt -check=true
- terraform validate -var "region=${AWS_REGION}" -var "vpc_id=vpc-123456" -var "subnets=['subnet-12345a']" -var "workers_ami_id=ami-123456" -var "cluster_ingress_cidrs=[]" -var "cluster_name=test_cluster" - terraform validate -var "region=${AWS_REGION}" -var "vpc_id=vpc-123456" -var "subnets=[\"subnet-12345a\"]" -var "workers_ami_id=ami-123456" -var "cluster_ingress_cidrs=[]" -var "cluster_name=test_cluster"
- docker run --rm -v $(pwd):/app/ --workdir=/app/ -t wata727/tflint --error-with-issues - docker run --rm -v $(pwd):/app/ --workdir=/app/ -t wata727/tflint --error-with-issues
- cd examples/eks_test_fixture - cd examples/eks_test_fixture
- terraform init - terraform init

2
version
View File

@@ -1 +1 @@
v0.1.0 v0.1.1