Merge release branch into master branch [skip ci]

CHANGELOG.md

@@ -1,10 +1,27 @@
 # Change Log
 
+## [v0.14.0](https://github.com/nubisproject/nubis-docker-deploy/tree/v0.14.0) (2018-06-07)
+[Full Changelog](https://github.com/nubisproject/nubis-docker-deploy/compare/v0.13.0...v0.14.0)
+
+**Closed issues:**
+
+- Use json2hcl instead of toml2json [\#71](https://github.com/nubisproject/nubis-docker-deploy/issues/71)
+
+**Merged pull requests:**
+
+- \[please test\] Convert to json2hcl [\#72](https://github.com/nubisproject/nubis-docker-deploy/pull/72) ([limed](https://github.com/limed))
+
 ## [v0.13.0](https://github.com/nubisproject/nubis-docker-deploy/tree/v0.13.0) (2018-05-02)
 [Full Changelog](https://github.com/nubisproject/nubis-docker-deploy/compare/v0.12.0...v0.13.0)
 
+**Closed issues:**
+
+- Tag v0.13.0 release [\#68](https://github.com/nubisproject/nubis-docker-deploy/issues/68)
+
 **Merged pull requests:**
 
+- Update CHANGELOG for v0.13.0 release \[skip ci\] [\#70](https://github.com/nubisproject/nubis-docker-deploy/pull/70) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v0.13.0 release \[skip ci\] [\#69](https://github.com/nubisproject/nubis-docker-deploy/pull/69) ([nubis-automation](https://github.com/nubis-automation))
 - Add requirements for working with kubernetes [\#67](https://github.com/nubisproject/nubis-docker-deploy/pull/67) ([tinnightcap](https://github.com/tinnightcap))
 
 ## [v0.12.0](https://github.com/nubisproject/nubis-docker-deploy/tree/v0.12.0) (2018-04-26)

Dockerfile

@@ -11,7 +11,7 @@ ENV AwCliVersion=1.10.38 \
     KopsVersion=1.9.0 \
     KubeCtlVersion=1.10.2 \
     TerraformVersion=0.11.7 \
-    Toml2JSONVersion=0.1.0 \
+    Json2HclVersion=0.0.6 \
     UnicredsVersion=1.5.1
 
 WORKDIR /nubis
@@ -29,7 +29,6 @@ RUN apk add --no-cache \
     unzip \
     && rm -f /var/cache/apk/APKINDEX.* \
     && pip install awscli==${AwCliVersion} \
-    && pip install -v toml2json==${Toml2JSONVersion} \
     && mkdir -p /nubis/bin /nubis/work
 
 # Install Terraform & Unicreds & Kops & Kubectl
@@ -42,6 +41,9 @@ RUN ["/bin/bash", "-c", "set -o pipefail \
     && curl -LO --silent --show-error https://github.com/kubernetes/kops/releases/download/${KopsVersion}/kops-linux-amd64 \
     && mv kops-linux-amd64 /usr/local/bin/kops \
     && chmod +x /usr/local/bin/kops \
+    && curl -LO --silent --show-error https://github.com/kvz/json2hcl/releases/download/v${Json2HclVersion}/json2hcl_v${Json2HclVersion}_linux_amd64 \
+    && mv json2hcl_v${Json2HclVersion}_linux_amd64 /usr/local/bin/json2hcl \
+    && chmod +x /usr/local/bin/json2hcl \
     && curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KubeCtlVersion}/bin/linux/amd64/kubectl \
     && mv kubectl /usr/local/bin/kubectl \
     && chmod +x /usr/local/bin/kubectl" ]

nubis-deploy

@@ -39,7 +39,7 @@ setup-terraform () {
         exit 1
     fi
 
-    ACCOUNT=$(toml2json < "${MOUNT_TERRAFORM_PATH}/terraform.tfvars" | jq -r .account )
+    ACCOUNT=$(json2hcl -reverse < "${MOUNT_TERRAFORM_PATH}/terraform.tfvars" | jq -r .account )
     # Make sure we got an account name
     if [ "${ACCOUNT}" == 'null' ]; then
         echo -e "\033[1;31mERROR: 'account' not set ${MOUNT_TERRAFORM_PATH}/terraform.tfvars\033[0m"
@@ -53,7 +53,7 @@ setup-terraform () {
         fi
         export ACCOUNT
     fi
-    ARENA=$(toml2json < "${MOUNT_TERRAFORM_PATH}/terraform.tfvars" | jq -r .arena )
+    ARENA=$(json2hcl -reverse < "${MOUNT_TERRAFORM_PATH}/terraform.tfvars" | jq -r .arena )
     # Make sure we got an arena
     if [ "${ARENA}" == 'null' ]; then
         echo -e "\033[0;32mWARNING: 'arena' not set ${MOUNT_TERRAFORM_PATH}/terraform.tfvars\033[0m"
@@ -63,15 +63,15 @@ setup-terraform () {
     else
         export ARENA
     fi
-    DEPLOYMENT_REGION=$(toml2json < "${MOUNT_TERRAFORM_PATH}/terraform.tfvars" | jq -r .region )
+    DEPLOYMENT_REGION=$(json2hcl -reverse < "${MOUNT_TERRAFORM_PATH}/terraform.tfvars" | jq -r .region )
     # Make sure we got a deployment region
     if [ "${DEPLOYMENT_REGION}" == 'null' ]; then
         echo -e "\033[1;31mERROR: 'region' not set ${MOUNT_TERRAFORM_PATH}/terraform.tfvars\033[0m"
         exit 1
     else
         export DEPLOYMENT_REGION
     fi
-    SERVICE_NAME=$(toml2json < "${MOUNT_TERRAFORM_PATH}/terraform.tfvars" | jq -r .service_name )
+    SERVICE_NAME=$(json2hcl -reverse < "${MOUNT_TERRAFORM_PATH}/terraform.tfvars" | jq -r .service_name )
     # Make sure we got a service name
     if [ "${SERVICE_NAME}" == 'null' ]; then
         echo -e "\033[1;31mERROR: 'service_name' not set ${MOUNT_TERRAFORM_PATH}/terraform.tfvars\033[0m"