Repository: chanzuckerberg/fogg
Pull request #354 (2019-08-21 17:53:57)

[fix] hard code path to fogg in Makefile and .travis.yml
Fixes the issue where the fogg apply before the git --porcelain check is unable to find the fogg that was downloaded by make setup.


codecov[bot]: # [Codecov](https://codecov.io/gh/chanzuckerberg/fogg/pull/354?src=pr&el=h1) Report
> Merging [#354](https://codecov.io/gh/chanzuckerberg/fogg/pull/354?src=pr&el=desc) into [master](https://codecov.io/gh/chanzuckerberg/fogg/commit/2640c2d13d4e396d543644c142044b86a0ecdd7e?src=pr&el=desc) will **not change** coverage.
> The diff coverage is `n/a`.

[![Impacted file tree graph](https://codecov.io/gh/chanzuckerberg/fogg/pull/354/graphs/tree.svg?width=650&token=57DhtZ7g2A&height=150&src=pr)](https://codecov.io/gh/chanzuckerberg/fogg/pull/354?src=pr&el=tree)

```diff
@@           Coverage Diff           @@
##           master     #354   +/-   ##
=======================================
  Coverage   77.74%   77.74%           
=======================================
  Files          25       25           
  Lines        1896     1896           
=======================================
  Hits         1474     1474           
  Misses        285      285           
  Partials      137      137
```



------

[Continue to review full report at Codecov](https://codecov.io/gh/chanzuckerberg/fogg/pull/354?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/chanzuckerberg/fogg/pull/354?src=pr&el=footer). Last update [2640c2d...7363839](https://codecov.io/gh/chanzuckerberg/fogg/pull/354?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).


Patch:
diff --git a/templates/repo/Makefile.tmpl b/templates/repo/Makefile.tmpl
index c5866741..3d7204d1 100644
--- a/templates/repo/Makefile.tmpl
+++ b/templates/repo/Makefile.tmpl
@@ -11,7 +11,7 @@ all: check
 
 setup:
 	curl -s https://raw.githubusercontent.com/chanzuckerberg/fogg/master/download.sh | bash -s -- -b .fogg/bin $(FOGG_VERSION)
-	fogg setup
+	.fogg/bin/fogg setup
 .PHONY: setup
 
 lint: lint-terraform
diff --git a/templates/travis-ci/.travis.yml.tmpl b/templates/travis-ci/.travis.yml.tmpl
index d7feac11..fb6d3f17 100644
--- a/templates/travis-ci/.travis.yml.tmpl
+++ b/templates/travis-ci/.travis.yml.tmpl
@@ -26,7 +26,7 @@ jobs:
       script:
         - |
           set -e
-          fogg apply
+          .fogg/bin/fogg apply
           if [ "$(git status --porcelain)" != "" ]; then
             echo "git tree is dirty after running fogg apply"
             echo "ensure you run fogg apply on your branch"


Test patch:
diff --git a/testdata/bless_provider/Makefile b/testdata/bless_provider/Makefile
index 70511f04..af8a87a1 100644
--- a/testdata/bless_provider/Makefile
+++ b/testdata/bless_provider/Makefile
@@ -11,7 +11,7 @@ all: check
 
 setup:
 	curl -s https://raw.githubusercontent.com/chanzuckerberg/fogg/master/download.sh | bash -s -- -b .fogg/bin $(FOGG_VERSION)
-	fogg setup
+	.fogg/bin/fogg setup
 .PHONY: setup
 
 lint: lint-terraform
diff --git a/testdata/github_provider/Makefile b/testdata/github_provider/Makefile
index 70511f04..af8a87a1 100644
--- a/testdata/github_provider/Makefile
+++ b/testdata/github_provider/Makefile
@@ -11,7 +11,7 @@ all: check
 
 setup:
 	curl -s https://raw.githubusercontent.com/chanzuckerberg/fogg/master/download.sh | bash -s -- -b .fogg/bin $(FOGG_VERSION)
-	fogg setup
+	.fogg/bin/fogg setup
 .PHONY: setup
 
 lint: lint-terraform
diff --git a/testdata/okta_provider/Makefile b/testdata/okta_provider/Makefile
index 70511f04..af8a87a1 100644
--- a/testdata/okta_provider/Makefile
+++ b/testdata/okta_provider/Makefile
@@ -11,7 +11,7 @@ all: check
 
 setup:
 	curl -s https://raw.githubusercontent.com/chanzuckerberg/fogg/master/download.sh | bash -s -- -b .fogg/bin $(FOGG_VERSION)
-	fogg setup
+	.fogg/bin/fogg setup
 .PHONY: setup
 
 lint: lint-terraform
diff --git a/testdata/snowflake_provider/Makefile b/testdata/snowflake_provider/Makefile
index 70511f04..af8a87a1 100644
--- a/testdata/snowflake_provider/Makefile
+++ b/testdata/snowflake_provider/Makefile
@@ -11,7 +11,7 @@ all: check
 
 setup:
 	curl -s https://raw.githubusercontent.com/chanzuckerberg/fogg/master/download.sh | bash -s -- -b .fogg/bin $(FOGG_VERSION)
-	fogg setup
+	.fogg/bin/fogg setup
 .PHONY: setup
 
 lint: lint-terraform
diff --git a/testdata/v1_full/.travis.yml b/testdata/v1_full/.travis.yml
index c10865d1..7d37f002 100644
--- a/testdata/v1_full/.travis.yml
+++ b/testdata/v1_full/.travis.yml
@@ -38,7 +38,7 @@ jobs:
       script:
         - |
           set -e
-          fogg apply
+          .fogg/bin/fogg apply
           if [ "$(git status --porcelain)" != "" ]; then
             echo "git tree is dirty after running fogg apply"
             echo "ensure you run fogg apply on your branch"
diff --git a/testdata/v1_full/Makefile b/testdata/v1_full/Makefile
index 999355d5..7649f90e 100644
--- a/testdata/v1_full/Makefile
+++ b/testdata/v1_full/Makefile
@@ -11,7 +11,7 @@ all: check
 
 setup:
 	curl -s https://raw.githubusercontent.com/chanzuckerberg/fogg/master/download.sh | bash -s -- -b .fogg/bin $(FOGG_VERSION)
-	fogg setup
+	.fogg/bin/fogg setup
 .PHONY: setup
 
 lint: lint-terraform
diff --git a/testdata/v2_full/Makefile b/testdata/v2_full/Makefile
index 5fb9c053..42e856fa 100644
--- a/testdata/v2_full/Makefile
+++ b/testdata/v2_full/Makefile
@@ -11,7 +11,7 @@ all: check
 
 setup:
 	curl -s https://raw.githubusercontent.com/chanzuckerberg/fogg/master/download.sh | bash -s -- -b .fogg/bin $(FOGG_VERSION)
-	fogg setup
+	.fogg/bin/fogg setup
 .PHONY: setup
 
 lint: lint-terraform
diff --git a/testdata/v2_minimal_valid/Makefile b/testdata/v2_minimal_valid/Makefile
index 269ceca3..e12959bd 100644
--- a/testdata/v2_minimal_valid/Makefile
+++ b/testdata/v2_minimal_valid/Makefile
@@ -11,7 +11,7 @@ all: check
 
 setup:
 	curl -s https://raw.githubusercontent.com/chanzuckerberg/fogg/master/download.sh | bash -s -- -b .fogg/bin $(FOGG_VERSION)
-	fogg setup
+	.fogg/bin/fogg setup
 .PHONY: setup
 
 lint: lint-terraform
diff --git a/testdata/v2_no_aws_provider/Makefile b/testdata/v2_no_aws_provider/Makefile
index 5fb9c053..42e856fa 100644
--- a/testdata/v2_no_aws_provider/Makefile
+++ b/testdata/v2_no_aws_provider/Makefile
@@ -11,7 +11,7 @@ all: check
 
 setup:
 	curl -s https://raw.githubusercontent.com/chanzuckerberg/fogg/master/download.sh | bash -s -- -b .fogg/bin $(FOGG_VERSION)
-	fogg setup
+	.fogg/bin/fogg setup
 .PHONY: setup
 
 lint: lint-terraform
diff --git a/testdata/version_detection/Makefile b/testdata/version_detection/Makefile
index 09eae0a2..ae023192 100644
--- a/testdata/version_detection/Makefile
+++ b/testdata/version_detection/Makefile
@@ -11,7 +11,7 @@ all: check
 
 setup:
 	curl -s https://raw.githubusercontent.com/chanzuckerberg/fogg/master/download.sh | bash -s -- -b .fogg/bin $(FOGG_VERSION)
-	fogg setup
+	.fogg/bin/fogg setup
 .PHONY: setup
 
 lint: lint-terraform