diff --git a/Makefile b/Makefile index 1fe633d..826ad8a 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ DOCKER_REPO_BASE_KITCHEN_TERRAFORM := ${DOCKER_ORG}/cft/kitchen-terraform:${DOC all: check generate_docs .PHONY: check -check: check_shell check_python check_golang check_terraform check_docker check_base_files test_check_headers check_headers check_trailing_whitespace +check: check_shell check_python check_terraform check_base_files test_check_headers check_headers check_trailing_whitespace .PHONY: check_shell check_shell: @@ -37,18 +37,10 @@ check_shell: check_python: @source test/make.sh && check_python -.PHONY: check_golang -check_golang: - @source test/make.sh && golang - .PHONY: check_terraform 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 diff --git a/test/make.sh b/test/make.sh index 5a9cd37..8297a53 100755 --- a/test/make.sh +++ b/test/make.sh @@ -62,14 +62,6 @@ function basefiles() { done } -# This function runs the hadolint linter on -# every file named 'Dockerfile' -function docker() { - echo "Running hadolint on Dockerfiles" - find_files . -name "Dockerfile" -print0 \ - | compat_xargs -0 hadolint -} - # This function runs 'terraform validate' against all # directory paths which contain *.tf files. function check_terraform() { @@ -81,14 +73,6 @@ function check_terraform() { | compat_xargs -t -n1 terraform validate --check-variables=false } -# This function runs 'go fmt' and 'go vet' on every file -# that ends in '.go' -function golang() { - echo "Running go fmt and go vet" - find_files . -name "*.go" -print0 | compat_xargs -0 -n1 go fmt - find_files . -name "*.go" -print0 | compat_xargs -0 -n1 go vet -} - # This function runs the flake8 linter on every file # ending in '.py' function check_python() {