Skip to content

Commit

Permalink
Linters fail on master terraform-google-modules#32
Browse files Browse the repository at this point in the history
- Removed outdated doc_generator
- Added missing helper scripts
- Removed outdated docker linter
- Fixed flake8 errors reported in terraform-google-modules#32
- Fixed broken simlinks(fixes terraform fmt terraform-google-modules#32)
- Updated shared tfvars
- Updated README files
- Fixed trailing white-space from master

Migrate modules to 0.12 and make the rest of the code base 0.12-compatible terraform-google-modules#35

- Migrated modules to 0.12 syntax
- Added variable types constraints
- Updated README
- Removed outdated check_docker make target
- Added a temporary workgaround for terraform-google-modules#28 (skip not migrated files in `find_files`)

Updating image inside the example doesn't cause container to restart terraform-google-modules#29

- Updated examples/simple_instance/main.tf by introducing local.instance_name and adding substring of contianer image hash into instance_name
- Updated examples/simple_instance/outputs.tf by reflecting the change above
- Updated examples/instance_with_attached_disk/main.tf by introducing local.instance_name and adding substring of contianer image hash into instance_name
- Updated examples/instance_with_attached_disk/outputs.tf by reflecting the change above
  • Loading branch information
ivankorn committed Aug 19, 2019
1 parent dab523c commit 221f9d7
Show file tree
Hide file tree
Showing 28 changed files with 1,210 additions and 266 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ test/fixtures/**/.terraform
test/fixtures/**/terraform.tfstate.d
test/fixtures/**/ssh/key
*.pyc
test/fixtures/shared/terraform.tfvars
.idea
.vscode
.terraform/
modules/*/.terraform/

11 changes: 3 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ DOCKER_TAG_BASE_KITCHEN_TERRAFORM ?= 2.3.0
DOCKER_REPO_BASE_KITCHEN_TERRAFORM := ${DOCKER_ORG}/cft/kitchen-terraform:${DOCKER_TAG_BASE_KITCHEN_TERRAFORM}

# All is the first target in the file so it will get picked up when you just run 'make' on its own
all: check_shell check_python check_golang check_terraform check_docker check_base_files test_check_headers check_headers check_trailing_whitespace generate_docs
all: check_shell check_python check_golang check_terraform check_base_files test_check_headers check_headers check_trailing_whitespace generate_docs

# The .PHONY directive tells make that this isn't a real target and so
# the presence of a file named 'check_shell' won't cause this target to stop
Expand All @@ -43,10 +43,6 @@ check_golang:
check_terraform:
@source test/make.sh && check_terraform

.PHONY: check_docker
check_docker:
@source test/make.sh && docker

.PHONY: check_base_files
check_base_files:
@source test/make.sh && basefiles
Expand All @@ -65,9 +61,8 @@ test_check_headers:
@python test/test_verify_boilerplate.py

.PHONY: check_headers
check_headers:
@echo "Checking file headers"
@python test/verify_boilerplate.py
check_headers: ## Check that source files have appropriate boilerplate
@source test/make.sh && check_headers

# Integration tests
.PHONY: test_integration
Expand Down
Loading

0 comments on commit 221f9d7

Please sign in to comment.