From f7e46e43fa05fc0067fc5499b21211ff65403c5b Mon Sep 17 00:00:00 2001
From: Baptiste Gauduchon <bgauduch@users.noreply.github.com>
Date: Thu, 23 Jul 2020 09:42:38 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=96=20=20Add=20Terrafom=200.13.0-rc1?=
 =?UTF-8?q?=20ans=20AWS=20CLI=201.18.102=20for=20release=20(#36)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* :arrow_up: bump default awscli version to 1.18.102

* :bookmark: prepare release, add tf 0.13.0-rc1 and awscli 1.18.102 support
---
 .github/workflows/release.yml       | 10 ++++++----
 Dockerfile                          |  2 +-
 tests/container-structure-tests.yml |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f2dfd7b..ded62ab 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,12 +27,14 @@ jobs:
         tf_version:
           - "0.11.14"
           - "0.12.28"
-          - "0.13.0-beta3"
+          - "0.13.0-rc1"
+        awscli_version:
+          - "1.18.101"
+          - "1.18.102"
 
     env:
       ORGANIZATION: "zenika"
       IMAGE_NAME: "terraform-aws-cli"
-      AWS_CLI_VERSION: "1.18.93"
 
     steps:
       - name: Check out the repo
@@ -42,10 +44,10 @@ jobs:
         run: echo "::set-env name=RELEASE_TAG::${GITHUB_REF##*/}"
 
       - name: Build and save the image release tag
-        run: echo "::set-env name=IMAGE_TAG::release-${RELEASE_TAG}_terraform-${{ matrix.tf_version }}_awscli-${AWS_CLI_VERSION}"
+        run: echo "::set-env name=IMAGE_TAG::release-${RELEASE_TAG}_terraform-${{ matrix.tf_version }}_awscli-${{ matrix.awscli_version }}"
 
       - name: Build image
-        run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${{ matrix.tf_version }} --build-arg AWS_CLI_VERSION=${AWS_CLI_VERSION} --tag ${ORGANIZATION}/${IMAGE_NAME}:${IMAGE_TAG}
+        run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${{ matrix.tf_version }} --build-arg AWS_CLI_VERSION=${{ matrix.awscli_version }} --tag ${ORGANIZATION}/${IMAGE_NAME}:${IMAGE_TAG}
 
       - name: Login to Docker Hub registry
         run: echo '${{ secrets.DOCKERHUB_PASS }}' | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
diff --git a/Dockerfile b/Dockerfile
index 85fdb4b..6e2ce34 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Setup build arguments with default versions
-ARG AWS_CLI_VERSION=1.18.93
+ARG AWS_CLI_VERSION=1.18.102
 ARG TERRAFORM_VERSION=0.12.28
 ARG PYTHON_MAJOR_VERSION=3.7
 ARG DEBIAN_VERSION=buster-20200514-slim
diff --git a/tests/container-structure-tests.yml b/tests/container-structure-tests.yml
index 3ac3993..7167581 100644
--- a/tests/container-structure-tests.yml
+++ b/tests/container-structure-tests.yml
@@ -31,4 +31,4 @@ commandTests:
   - name: "Check AWS CLI version"
     command: "aws"
     args: ["--version"]
-    expectedOutput: ["aws-cli/1.18.93"]
+    expectedOutput: ["aws-cli/1.18.102"]