Merge pull request #3 from cytopia/release-0.3

Release 0.3
cytopia · Jul 6, 2019 · 4a3861f · 4a3861f
2 parents 60e7f45 + e61c38d
commit 4a3861f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ ifneq (,)
 .error This Makefile requires GNU Make.
 endif
 
-.PHONY: build rebuild lint test _test-tf-version _test-fmt-ok _test-fmt-fail tag pull login push enter
+.PHONY: build rebuild lint test _test-tf-version _test-fmt-ok _test-fmt-none _test-fmt-fail tag pull login push enter
 
 CURRENT_DIR = $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
@@ -28,6 +28,7 @@ lint:
 test:
 	@$(MAKE) --no-print-directory _test-tf-version
 	@$(MAKE) --no-print-directory _test-fmt-ok
+	@$(MAKE) --no-print-directory _test-fmt-none
 	@$(MAKE) --no-print-directory _test-fmt-fail
 
 _test-tf-version:
@@ -84,6 +85,24 @@ _test-fmt-ok:
 	fi; \
 	echo "Success";
 
+_test-fmt-none:
+	@echo "------------------------------------------------------------"
+	@echo "- Testing terragrunt-fmt (NONE) [recursive]"
+	@echo "------------------------------------------------------------"
+	@if ! docker run --rm -v $(CURRENT_DIR)/data:/data $(IMAGE) -write=false -list=true -check -diff -recursive; then \
+		echo "Failed"; \
+		exit 1; \
+	fi; \
+	echo "Success";
+	@echo "------------------------------------------------------------"
+	@echo "- Testing terragrunt-fmt (NONE) [dir]"
+	@echo "------------------------------------------------------------"
+	@if ! docker run --rm -v $(CURRENT_DIR)/data:/data $(IMAGE) -write=false -list=true -check -diff; then \
+		echo "Failed"; \
+		exit 1; \
+	fi; \
+	echo "Success";
+
 _test-fmt-fail:
 	@echo "------------------------------------------------------------"
 	@echo "- Testing terragrunt-fmt (FAIL) [recursive]"

diff --git a/README.md b/README.md
@@ -181,7 +181,7 @@ fix: _pull
 		-write -diff -recursive -ignore='$(IGNORE)'
 
 _pull:
-	docker pull cytopia/terraform-fmt:$(FMT_VERSION)
+	docker pull cytopia/terragrunt-fmt:$(FMT_VERSION)
 ```
 
 #### Travis CI integration

diff --git a/data/terragrunt-fmt.sh b/data/terragrunt-fmt.sh
@@ -283,8 +283,10 @@ else
 		echo "[INFO] Finding files: for file in *.hcl; do"
 		ret=0
 		for file in *.hcl; do
-			if ! /fmt.sh "${ARG_LIST}" "${ARG_WRITE}" "${ARG_DIFF}" "${ARG_CHECK}" "${file}"; then
-				ret="1"
+			if [ -f "${file}" ]; then
+				if ! /fmt.sh "${ARG_LIST}" "${ARG_WRITE}" "${ARG_DIFF}" "${ARG_CHECK}" "${file}"; then
+					ret="1"
+				fi
 			fi
 		done
 		exit "${ret}"