Merge pull request #863 from laverya/other-terraform-version-bumps

continue upgrading terraform from 0.11.10 to 0.11.13
replicatedhq · Mar 12, 2019 · c2e0e8f · c2e0e8f
2 parents 116f755 + eb4dd66
commit c2e0e8f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -17,10 +17,10 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
 RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - && \
   apt-get install -y nodejs
 
-ENV TERRAFORM_VERSION=0.11.10
+ENV TERRAFORM_VERSION=0.11.13
 ENV TERRAFORM_URL="https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
 ENV TERRAFORM_ZIP="terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
-ENV TERRAFORM_SHA256SUM=43543a0e56e31b0952ea3623521917e060f2718ab06fe2b2d506cfaa14d54527
+ENV TERRAFORM_SHA256SUM=5925cd4d81e7d8f42a0054df2aafd66e2ab7408dbed2bd748f0022cfe592f8d2
 
 RUN curl -fsSLO "$TERRAFORM_URL" \
 	&& echo "${TERRAFORM_SHA256SUM}  ${TERRAFORM_ZIP}" | sha256sum -c - \

diff --git a/hack/get_run_deps.sh b/hack/get_run_deps.sh
@@ -4,10 +4,10 @@
 # used in circle
 set -ex
 
-TERRAFORM_VERSION=0.11.10
+TERRAFORM_VERSION=0.11.13
 TERRAFORM_URL="https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
 TERRAFORM_ZIP="terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
-TERRAFORM_SHA256SUM=43543a0e56e31b0952ea3623521917e060f2718ab06fe2b2d506cfaa14d54527
+TERRAFORM_SHA256SUM=5925cd4d81e7d8f42a0054df2aafd66e2ab7408dbed2bd748f0022cfe592f8d2
 
 KUBECTL_VERSION=v1.11.1
 KUBECTL_URL=https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl

diff --git a/integration/base/terraform/expected/.ship/state.json b/integration/base/terraform/expected/.ship/state.json
@@ -4,10 +4,10 @@
       "id_length": "1"
     },
     "terraform": {
-      "rawState": "{\n    \"version\": 3,\n    \"terraform_version\": \"0.11.10\",\n    \"serial\": 5,\n    \"lineage\": \"9c4547a4-c042-5ef9-01de-12509401b810\",\n    \"modules\": [\n        {\n            \"path\": [\n                \"root\"\n            ],\n            \"outputs\": {},\n            \"resources\": {\n                \"local_file.foo\": {\n                    \"type\": \"local_file\",\n                    \"depends_on\": [],\n                    \"primary\": {\n                        \"id\": \"356a192b7913b04c54574d18c28d46e6395428ab\",\n                        \"attributes\": {\n                            \"content\": \"1\",\n                            \"filename\": \"/tmp/foo.bar\",\n                            \"id\": \"356a192b7913b04c54574d18c28d46e6395428ab\"\n                        },\n                        \"meta\": {},\n                        \"tainted\": false\n                    },\n                    \"deposed\": [],\n                    \"provider\": \"provider.local\"\n                }\n            },\n            \"depends_on\": []\n        }\n    ]\n}\n",
+      "rawState": "{\n    \"version\": 3,\n    \"terraform_version\": \"0.11.13\",\n    \"serial\": 5,\n    \"lineage\": \"9c4547a4-c042-5ef9-01de-12509401b810\",\n    \"modules\": [\n        {\n            \"path\": [\n                \"root\"\n            ],\n            \"outputs\": {},\n            \"resources\": {\n                \"local_file.foo\": {\n                    \"type\": \"local_file\",\n                    \"depends_on\": [],\n                    \"primary\": {\n                        \"id\": \"356a192b7913b04c54574d18c28d46e6395428ab\",\n                        \"attributes\": {\n                            \"content\": \"1\",\n                            \"filename\": \"/tmp/foo.bar\",\n                            \"id\": \"356a192b7913b04c54574d18c28d46e6395428ab\"\n                        },\n                        \"meta\": {},\n                        \"tainted\": false\n                    },\n                    \"deposed\": [],\n                    \"provider\": \"provider.local\"\n                }\n            },\n            \"depends_on\": []\n        }\n    ]\n}\n",
       "state": {
         "version": 3,
-        "terraform_version": "0.11.10",
+        "terraform_version": "0.11.13",
         "serial": 5,
         "lineage": "9c4547a4-c042-5ef9-01de-12509401b810",
         "modules": [
@@ -50,4 +50,4 @@
     "contentSHA": "f6d06c39a698b830ba4ffb02821447199639c8a6d4b74bdc3eb28082ac6a5605",
     "upstream": "__upstream__"
   }
-}
+}
diff --git a/integration/base/terraform/expected/installer/terraform/terraform.tfstate b/integration/base/terraform/expected/installer/terraform/terraform.tfstate
@@ -1,6 +1,6 @@
 {
     "version": 3,
-    "terraform_version": "0.11.10",
+    "terraform_version": "0.11.13",
     "serial": 5,
     "lineage": "9c4547a4-c042-5ef9-01de-12509401b810",
     "modules": [

diff --git a/integration/base/terraform/metadata.yaml b/integration/base/terraform/metadata.yaml
@@ -2,5 +2,5 @@ customer_id: "-Am-_6i5pw0u4AbspOwKN4lZUCn49u_G"
 installation_id: "lZk73HnLmatQ-s1nk7l3Q3QKA45orDFi"
 release_version: "0.0.5"
 set_channel_name: "terraform"
-skip_cleanup: true
+skip_cleanup: false
 disable_online: true