From 003234861f2efaedeb36629504fa9702e18a4edd Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Thu, 6 Sep 2018 12:48:37 -0700
Subject: [PATCH 1/2] Bump Terraform from 0.11.7 to 0.11.8

0.11.8 was cut on 2018-08-15 [1,2].

Removing the leading slash is because with v0.11.8, terraform-alpine
is dropping the terraform binary into the PATH [3,4,5].

[1]: https://github.com/hashicorp/terraform/releases/tag/v0.11.8
[2]: https://releases.hashicorp.com/terraform/0.11.8/
[3]: https://github.com/sallyom/scripts-images/pull/3
[4]: https://github.com/sallyom/scripts-images/commit/72211141233dbde7bf065b2cfe354a68e887db4f
[5]: https://github.com/openshift/installer/pull/218#discussion_r217600483
---
 WORKSPACE                               | 2 +-
 hack/tf-fmt.sh                          | 4 ++--
 images/tectonic-installer/Dockerfile.ci | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index cf1706817e9..00b82d47552 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,6 +1,6 @@
 workspace(name = "installer")
 
-terrafom_version = "0.11.7"
+terrafom_version = "0.11.8"
 
 supported_platforms = [
     "linux",
diff --git a/hack/tf-fmt.sh b/hack/tf-fmt.sh
index 64dc20cca2f..b863171a803 100755
--- a/hack/tf-fmt.sh
+++ b/hack/tf-fmt.sh
@@ -6,12 +6,12 @@ if [ "$IS_CONTAINER" != "" ]; then
     set -- -list -check -write=false
   fi
   set -x
-  /terraform fmt "${@}"
+  terraform fmt "${@}"
 else
   podman run --rm \
     --env IS_CONTAINER=TRUE \
     --volume "${PWD}:${PWD}:z" \
     --workdir "${PWD}" \
-    quay.io/coreos/terraform-alpine:v0.11.7 \
+    quay.io/coreos/terraform-alpine:v0.11.8 \
     ./hack/tf-fmt.sh
 fi
diff --git a/images/tectonic-installer/Dockerfile.ci b/images/tectonic-installer/Dockerfile.ci
index 4f7647887dc..1ea0855a56a 100644
--- a/images/tectonic-installer/Dockerfile.ci
+++ b/images/tectonic-installer/Dockerfile.ci
@@ -4,7 +4,7 @@ FROM openshift/origin-release:golang-1.10 as build
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 ### Install Terraform
-ENV TERRAFORM_VERSION="0.11.1"
+ENV TERRAFORM_VERSION="0.11.8"
 ARG TERRAFORM_URL=https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip
 
 RUN go build -o ./installer/tectonic ./installer/cmd/tectonic && \

From 856350d5160722e93e7a0817a24f0d27e55e9fea Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 14 Sep 2018 10:06:26 -0700
Subject: [PATCH 2/2] hack/tf-fmt: Add a workaround for origin/release's
 hardcoding v0.11.7

We'll want to revert this once we bump [1] to point to the new image.
I've filed [2] with that bump.

[1]: https://github.com/openshift/release/blob/4ea9040eeb4131730af491d2feb926a889a0bd62/ci-operator/jobs/openshift/installer/openshift-installer-presubmits.yaml#L281
[2]: https://github.com/openshift/release/pull/1515
---
 hack/tf-fmt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hack/tf-fmt.sh b/hack/tf-fmt.sh
index b863171a803..0173dda4ea9 100755
--- a/hack/tf-fmt.sh
+++ b/hack/tf-fmt.sh
@@ -6,7 +6,7 @@ if [ "$IS_CONTAINER" != "" ]; then
     set -- -list -check -write=false
   fi
   set -x
-  terraform fmt "${@}"
+  /terraform fmt "${@}"  # FIXME: drop this slash after we update openshift/release
 else
   podman run --rm \
     --env IS_CONTAINER=TRUE \