From 64e105906ccc8cba156462d34fb02bb867622d01 Mon Sep 17 00:00:00 2001
From: Jubblin <14090755+Jubblin@users.noreply.github.com>
Date: Wed, 9 Aug 2023 12:48:40 +0100
Subject: [PATCH 01/16] Update dockerhub-description.yml (#1)

---
 .github/workflows/dockerhub-description.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dockerhub-description.yml b/.github/workflows/dockerhub-description.yml
index 065a2f9..ab9c9f7 100644
--- a/.github/workflows/dockerhub-description.yml
+++ b/.github/workflows/dockerhub-description.yml
@@ -20,4 +20,4 @@ jobs:
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_PASS }}
-        repository: zenika/terraform-azure-cli
+        repository: ${{ secrets.DOCKERHUB_USERNAME }}/terraform-azure-cli

From 7a86c3e4425b359389d902ecf5787fb8358f839a Mon Sep 17 00:00:00 2001
From: Jubblin <14090755+Jubblin@users.noreply.github.com>
Date: Wed, 9 Aug 2023 18:32:48 +0100
Subject: [PATCH 02/16] Merge version update changes (#2)

Merge refactor

---------

Co-authored-by: Richard Worwood <richard.worwood@endava.com>
---
 .github/workflows/push-latest.yml |  2 +-
 .github/workflows/release.yml     |  2 +-
 Dockerfile                        | 54 +++++++++++++++++--------------
 supported_versions.json           | 20 +++++++-----
 4 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/push-latest.yml b/.github/workflows/push-latest.yml
index d0cb6ad..ea82a0b 100644
--- a/.github/workflows/push-latest.yml
+++ b/.github/workflows/push-latest.yml
@@ -42,7 +42,7 @@ jobs:
         run: docker push $ORGANIZATION/$IMAGE_NAME:$IMAGE_TAG
 
       - name: Save image
-        run: docker image save -o $IMAGE_NAME-$IMAGE_TAG.tar $ORGANIZATION/$IMAGE_NAME:$IMAGE_TAG
+        run: docker image save -o $IMAGE_NAME-$IMAGE_TAG.tar ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:$IMAGE_TAG
 
       - name: Upload image artifact
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 821dda1..6df5733 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -57,7 +57,7 @@ jobs:
         run: docker push ${ORGANIZATION}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
 
       - name: Save image
-        run: docker image save -o ${IMAGE_NAME}-${IMAGE_RELEASE_TAG}.tar ${ORGANIZATION}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
+        run: docker image save -o ${IMAGE_NAME}-${IMAGE_RELEASE_TAG}.tar ${{ secrets.DOCKERHUB_USERNAME }}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
 
       - name: Upload image artifact
         uses: actions/upload-artifact@v2
diff --git a/Dockerfile b/Dockerfile
index e386286..3ce89fd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,45 +7,51 @@ ARG DEBIAN_VERSION=bullseye-20220125-slim
 # Download Terraform binary
 FROM debian:${DEBIAN_VERSION} as terraform-cli
 ARG TERRAFORM_VERSION
-RUN apt-get update
-RUN apt-get install --no-install-recommends -y curl=7.74.0-1.3+deb11u1
-RUN apt-get install --no-install-recommends -y ca-certificates=20210119
-RUN apt-get install --no-install-recommends -y unzip=6.0-26
-RUN apt-get install --no-install-recommends -y gnupg=2.2.27-2
+RUN apt-get update && \
+    apt-get install --no-install-recommends -y \
+    curl=7.74.0-1.3+deb11u7 \
+    ca-certificates=20210119 \
+    unzip=6.0-26+deb11u1 \
+    gnupg=2.2.27-2+deb11u2 && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 WORKDIR /workspace
-RUN curl -Os https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS
-RUN curl -Os https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip
-RUN curl -Os https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS.sig
+RUN curl -Os https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS && \
+    curl -Os https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip && \
+    curl -Os https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS.sig
 COPY hashicorp.asc hashicorp.asc
-RUN gpg --import hashicorp.asc
-RUN gpg --verify terraform_${TERRAFORM_VERSION}_SHA256SUMS.sig terraform_${TERRAFORM_VERSION}_SHA256SUMS
+RUN gpg --import hashicorp.asc && \
+    gpg --verify terraform_${TERRAFORM_VERSION}_SHA256SUMS.sig terraform_${TERRAFORM_VERSION}_SHA256SUMS
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN grep terraform_${TERRAFORM_VERSION}_linux_amd64.zip terraform_${TERRAFORM_VERSION}_SHA256SUMS | sha256sum -c -
-RUN unzip -j terraform_${TERRAFORM_VERSION}_linux_amd64.zip
+RUN grep terraform_${TERRAFORM_VERSION}_linux_amd64.zip terraform_${TERRAFORM_VERSION}_SHA256SUMS | sha256sum -c - && \
+    unzip -j terraform_${TERRAFORM_VERSION}_linux_amd64.zip
 
 # Install az CLI using PIP
 FROM debian:${DEBIAN_VERSION} as azure-cli
 ARG AZURE_CLI_VERSION
 ARG PYTHON_MAJOR_VERSION
-RUN apt-get update
-RUN apt-get install -y --no-install-recommends python3=${PYTHON_MAJOR_VERSION}.2-3
-RUN apt-get install -y --no-install-recommends python3-pip=20.3.4-4
-RUN pip3 install --no-cache-dir setuptools==60.8.2
-RUN pip3 install --no-cache-dir azure-cli==${AZURE_CLI_VERSION}
+RUN apt-get update && \
+  apt-get install -y --no-install-recommends \
+  python3=${PYTHON_MAJOR_VERSION}.2-3 \
+  python3-pip=20.3.4-4+deb11u1 && \
+  apt-get clean && \
+  rm -rf /var/lib/apt/lists/* && \
+  pip3 install --no-cache-dir setuptools==58 && \
+  pip3 install --no-cache-dir azure-cli==${AZURE_CLI_VERSION}
 
 # Build final image
 FROM debian:${DEBIAN_VERSION}
 LABEL maintainer="bgauduch@github"
 ARG PYTHON_MAJOR_VERSION
-RUN apt-get update \
-  && apt-get install -y --no-install-recommends \
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
     ca-certificates=20210119 \
-    git=1:2.30.2-1 \
+    git=1:2.30.2-1+deb11u2 \
     python3=${PYTHON_MAJOR_VERSION}.2-3 \
-    python3-distutils=${PYTHON_MAJOR_VERSION}.2-1 \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/* \
-  && update-alternatives --install /usr/bin/python python /usr/bin/python${PYTHON_MAJOR_VERSION} 1
+    python3-distutils=${PYTHON_MAJOR_VERSION}.2-1 && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* && \
+    update-alternatives --install /usr/bin/python python /usr/bin/python${PYTHON_MAJOR_VERSION} 1
 WORKDIR /workspace
 COPY --from=terraform-cli /workspace/terraform /usr/local/bin/terraform
 COPY --from=azure-cli /usr/local/bin/az* /usr/local/bin/
diff --git a/supported_versions.json b/supported_versions.json
index 666a72e..6120574 100644
--- a/supported_versions.json
+++ b/supported_versions.json
@@ -1,14 +1,18 @@
 {
   "tf_version": [
-    "0.11.15",
-    "0.12.31",
-    "0.13.7",
-    "0.14.11",
-    "0.15.5",
-    "1.0.11",
-    "1.1.5"
+    "1.5.4",
+    "1.5.3",
+    "1.5.2",
+    "1.5.1",
+    "1.5.0",
+    "1.4.0",
+    "1.3.0",
+    "1.2.0",
+    "1.1.5",
+    "1.0.11"
   ],
   "azcli_version": [
-    "2.33.1"
+    "2.51.0",
+    "2.22.1"
   ]
 }

From 6bcfd19956a6da370f55c0b9399c6fbad6c725be Mon Sep 17 00:00:00 2001
From: Jubblin <14090755+Jubblin@users.noreply.github.com>
Date: Wed, 9 Aug 2023 18:39:58 +0100
Subject: [PATCH 03/16] correct push organisation (#3)

* Update supported_versions.json to latest

* Update supported_versions.json

* Update supported_versions.json

* Update supported_versions.json

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update Dockerfil formatting and safety

* Push update to Dockerfile

* specify devian version

* add gosu

* remove gosu

* switch to curl

* specify azure-cli version

* simplify structure

* update versions

* change setuptools version

* switch to 58

* uses DOCKERHUB_USERNAME secret as

* correct push name

---------

Co-authored-by: Richard Worwood <richard.worwood@endava.com>
---
 .github/workflows/push-latest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/push-latest.yml b/.github/workflows/push-latest.yml
index ea82a0b..5341d9d 100644
--- a/.github/workflows/push-latest.yml
+++ b/.github/workflows/push-latest.yml
@@ -39,7 +39,7 @@ jobs:
         run: echo '${{ secrets.DOCKERHUB_PASS }}' | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
 
       - name: Push image to registry
-        run: docker push $ORGANIZATION/$IMAGE_NAME:$IMAGE_TAG
+        run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:$IMAGE_TAG
 
       - name: Save image
         run: docker image save -o $IMAGE_NAME-$IMAGE_TAG.tar ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:$IMAGE_TAG

From 655cec76afa851776972412bbbc33d55a5be36df Mon Sep 17 00:00:00 2001
From: Richard Worwood <richard.worwood@endava.com>
Date: Wed, 9 Aug 2023 18:49:57 +0100
Subject: [PATCH 04/16] update to use ORGANIZATION vars

---
 .github/workflows/dockerhub-description.yml | 2 +-
 .github/workflows/push-latest.yml           | 4 ++--
 .github/workflows/release.yml               | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/dockerhub-description.yml b/.github/workflows/dockerhub-description.yml
index ab9c9f7..ccc9a90 100644
--- a/.github/workflows/dockerhub-description.yml
+++ b/.github/workflows/dockerhub-description.yml
@@ -20,4 +20,4 @@ jobs:
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_PASS }}
-        repository: ${{ secrets.DOCKERHUB_USERNAME }}/terraform-azure-cli
+        repository: ${{ vars.ORGANIZATION }}/terraform-azure-cli
diff --git a/.github/workflows/push-latest.yml b/.github/workflows/push-latest.yml
index d0cb6ad..0b7d608 100644
--- a/.github/workflows/push-latest.yml
+++ b/.github/workflows/push-latest.yml
@@ -39,10 +39,10 @@ jobs:
         run: echo '${{ secrets.DOCKERHUB_PASS }}' | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
 
       - name: Push image to registry
-        run: docker push $ORGANIZATION/$IMAGE_NAME:$IMAGE_TAG
+        run: docker push ${{ vars.ORGANIZATION }}/$IMAGE_NAME:$IMAGE_TAG
 
       - name: Save image
-        run: docker image save -o $IMAGE_NAME-$IMAGE_TAG.tar $ORGANIZATION/$IMAGE_NAME:$IMAGE_TAG
+        run: docker image save -o $IMAGE_NAME-$IMAGE_TAG.tar ${{ vars.ORGANIZATION }}/$IMAGE_NAME:$IMAGE_TAG
 
       - name: Upload image artifact
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 821dda1..4dd9111 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -54,10 +54,10 @@ jobs:
         run: echo '${{ secrets.DOCKERHUB_PASS }}' | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
 
       - name: Push image to registry
-        run: docker push ${ORGANIZATION}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
+        run: docker push ${{ vars.ORGANIZATION }}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
 
       - name: Save image
-        run: docker image save -o ${IMAGE_NAME}-${IMAGE_RELEASE_TAG}.tar ${ORGANIZATION}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
+        run: docker image save -o ${IMAGE_NAME}-${IMAGE_RELEASE_TAG}.tar ${{ vars.ORGANIZATION }}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
 
       - name: Upload image artifact
         uses: actions/upload-artifact@v2

From 22bcf11ee9e15e4b7ca7e0feaa2ed62532956008 Mon Sep 17 00:00:00 2001
From: Jubblin <14090755+Jubblin@users.noreply.github.com>
Date: Thu, 10 Aug 2023 11:35:09 +0100
Subject: [PATCH 05/16] Jubblin patch 1 (#4)

* Update to push using secrets

* Update Dockerfile "Remove line"

---------

Co-authored-by: Richard Worwood <richard.worwood@endava.com>
---
 .github/workflows/dockerhub-description.yml | 2 +-
 .github/workflows/push-latest.yml           | 7 +++----
 .github/workflows/release.yml               | 6 +++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/dockerhub-description.yml b/.github/workflows/dockerhub-description.yml
index ccc9a90..ab9c9f7 100644
--- a/.github/workflows/dockerhub-description.yml
+++ b/.github/workflows/dockerhub-description.yml
@@ -20,4 +20,4 @@ jobs:
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_PASS }}
-        repository: ${{ vars.ORGANIZATION }}/terraform-azure-cli
+        repository: ${{ secrets.DOCKERHUB_USERNAME }}/terraform-azure-cli
diff --git a/.github/workflows/push-latest.yml b/.github/workflows/push-latest.yml
index 0b7d608..69cfd95 100644
--- a/.github/workflows/push-latest.yml
+++ b/.github/workflows/push-latest.yml
@@ -15,7 +15,6 @@ on:
       - ".github/workflows/push-latest.yml"
 
 env:
-  ORGANIZATION: "zenika"
   IMAGE_NAME: "terraform-azure-cli"
   IMAGE_TAG: "latest"
 
@@ -33,16 +32,16 @@ jobs:
           echo "TF_VERSION=$(jq -r '.tf_version | sort | .[-1]' supported_versions.json)" >> $GITHUB_ENV
 
       - name: Build image
-        run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${TF_VERSION} --build-arg AZURE_CLI_VERSION=${AZ_VERSION} --tag $ORGANIZATION/$IMAGE_NAME:$IMAGE_TAG
+        run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${TF_VERSION} --build-arg AZURE_CLI_VERSION=${AZ_VERSION} --tag ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:$IMAGE_TAG
 
       - name: Login to Docker Hub registry
         run: echo '${{ secrets.DOCKERHUB_PASS }}' | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
 
       - name: Push image to registry
-        run: docker push ${{ vars.ORGANIZATION }}/$IMAGE_NAME:$IMAGE_TAG
+        run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:$IMAGE_TAG
 
       - name: Save image
-        run: docker image save -o $IMAGE_NAME-$IMAGE_TAG.tar ${{ vars.ORGANIZATION }}/$IMAGE_NAME:$IMAGE_TAG
+        run: docker image save -o $IMAGE_NAME-$IMAGE_TAG.tar ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:$IMAGE_TAG
 
       - name: Upload image artifact
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4dd9111..ad884d1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -48,16 +48,16 @@ jobs:
         run: echo "IMAGE_RELEASE_TAG=release-${RELEASE_TAG}_terraform-${{ matrix.tf_version }}_azcli-${{ matrix.azcli_version }}" >> $GITHUB_ENV
 
       - name: Build image
-        run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${{ matrix.tf_version }} --build-arg AZURE_CLI_VERSION=${{ matrix.azcli_version }} --tag ${ORGANIZATION}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
+        run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${{ matrix.tf_version }} --build-arg AZURE_CLI_VERSION=${{ matrix.azcli_version }} --tag ${{ secrets.DOCKERHUB_USERNAME }}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
 
       - name: Login to Docker Hub registry
         run: echo '${{ secrets.DOCKERHUB_PASS }}' | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
 
       - name: Push image to registry
-        run: docker push ${{ vars.ORGANIZATION }}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
+        run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
 
       - name: Save image
-        run: docker image save -o ${IMAGE_NAME}-${IMAGE_RELEASE_TAG}.tar ${{ vars.ORGANIZATION }}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
+        run: docker image save -o ${IMAGE_NAME}-${IMAGE_RELEASE_TAG}.tar ${{ secrets.DOCKERHUB_USERNAME }}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
 
       - name: Upload image artifact
         uses: actions/upload-artifact@v2

From 422aba60c5830bbbf5c741084acd204e025e998d Mon Sep 17 00:00:00 2001
From: Richard Worwood <richard.worwood@endava.com>
Date: Thu, 10 Aug 2023 11:42:07 +0100
Subject: [PATCH 06/16] update to actions/upload-artifact@v3

---
 .github/workflows/push-latest.yml | 2 +-
 .github/workflows/release.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/push-latest.yml b/.github/workflows/push-latest.yml
index 69cfd95..d52755a 100644
--- a/.github/workflows/push-latest.yml
+++ b/.github/workflows/push-latest.yml
@@ -44,7 +44,7 @@ jobs:
         run: docker image save -o $IMAGE_NAME-$IMAGE_TAG.tar ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:$IMAGE_TAG
 
       - name: Upload image artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_TAG }}
           path: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_TAG }}.tar
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ad884d1..6f97315 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -60,7 +60,7 @@ jobs:
         run: docker image save -o ${IMAGE_NAME}-${IMAGE_RELEASE_TAG}.tar ${{ secrets.DOCKERHUB_USERNAME }}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
 
       - name: Upload image artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_RELEASE_TAG }}
           path: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_RELEASE_TAG }}.tar

From 2226d7a15d18f7665d2818a9ea59bad7f1f2eed9 Mon Sep 17 00:00:00 2001
From: Jubblin <14090755+Jubblin@users.noreply.github.com>
Date: Thu, 10 Aug 2023 11:47:31 +0100
Subject: [PATCH 07/16] :arrow_up: Bump
 plexsystems/container-structure-test-action (#7)

Bumps [plexsystems/container-structure-test-action](https://github.com/plexsystems/container-structure-test-action) from 0.2.0 to 0.3.0.
- [Release notes](https://github.com/plexsystems/container-structure-test-action/releases)
- [Commits](https://github.com/plexsystems/container-structure-test-action/compare/v0.2.0...v0.3.0)

---
updated-dependencies:
- dependency-name: plexsystems/container-structure-test-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/build-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 30d45b6..1a75d0c 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -102,7 +102,7 @@ jobs:
           envsubst '${TF_VERSION},${AZ_VERSION}' < tests/container-structure-tests.yml.template > tests/container-structure-tests.yml
 
       - name: run structure tests
-        uses: plexsystems/container-structure-test-action@v0.2.0
+        uses: plexsystems/container-structure-test-action@v0.3.0
         with:
           image: ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
           config: tests/container-structure-tests.yml

From 792f639733aa8220a68c03dfc370749b5467d529 Mon Sep 17 00:00:00 2001
From: Jubblin <14090755+Jubblin@users.noreply.github.com>
Date: Thu, 10 Aug 2023 11:48:25 +0100
Subject: [PATCH 08/16] :arrow_up: Bump actions/upload-artifact from 2 to 3
 (#6)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/build-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 1a75d0c..d0d4942 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -64,7 +64,7 @@ jobs:
         run: docker image save --output ${IMAGE_NAME}_${IMAGE_TAG}.tar ${IMAGE_NAME}:${IMAGE_TAG}
 
       - name: Upload image artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.IMAGE_NAME }}_${{ env.IMAGE_TAG }}
           path: ${{ env.IMAGE_NAME }}_${{ env.IMAGE_TAG }}.tar

From 7c5648dcd59af6b5f6a5bfa80460642bed224092 Mon Sep 17 00:00:00 2001
From: Jubblin <14090755+Jubblin@users.noreply.github.com>
Date: Thu, 10 Aug 2023 11:48:38 +0100
Subject: [PATCH 09/16] :arrow_up: Bump actions/download-artifact from 2 to 3
 (#5)

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/build-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index d0d4942..7a7a261 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -88,7 +88,7 @@ jobs:
         run: echo "IMAGE_TAG=${BRANCH}_terraform-${{ matrix.tf_version }}_azcli-${{ matrix.azcli_version }}" >> $GITHUB_ENV
 
       - name: Download image artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: ${{ env.IMAGE_NAME }}_${{ env.IMAGE_TAG }}
 

From 3385c7da6530ed356107cd867e3feebd4d75c4db Mon Sep 17 00:00:00 2001
From: Jubblin <14090755+Jubblin@users.noreply.github.com>
Date: Thu, 10 Aug 2023 11:56:15 +0100
Subject: [PATCH 10/16] Update README.md

---
 README.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index e53c0f8..403ffdf 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-[![lint-dockerfile](https://github.com/zenika-open-source/terraform-azure-cli/actions/workflows/lint-dockerfile.yml/badge.svg)](https://github.com/zenika-open-source/terraform-azure-cli/actions/workflows/lint-dockerfile.yml)
-[![build-test](https://github.com/zenika-open-source/terraform-azure-cli/actions/workflows/build-test.yml/badge.svg)](https://github.com/zenika-open-source/terraform-azure-cli/actions/workflows/build-test.yml)
-[![push-latest](https://github.com/zenika-open-source/terraform-azure-cli/actions/workflows/push-latest.yml/badge.svg)](https://github.com/zenika-open-source/terraform-azure-cli/actions/workflows/push-latest.yml)
-[![release](https://github.com/zenika-open-source/terraform-azure-cli/actions/workflows/release.yml/badge.svg)](https://github.com/zenika-open-source/terraform-azure-cli/actions/workflows/release.yml)
+[![lint-dockerfile](/actions/workflows/lint-dockerfile.yml/badge.svg)](/actions/workflows/lint-dockerfile.yml)
+[![build-test](/actions/workflows/build-test.yml/badge.svg)](/actions/workflows/build-test.yml)
+[![push-latest](/actions/workflows/push-latest.yml/badge.svg)](/actions/workflows/push-latest.yml)
+[![release](/actions/workflows/release.yml/badge.svg)](/actions/workflows/release.yml)
 
-[![Update Docker Hub Description](https://github.com/zenika-open-source/terraform-azure-cli/actions/workflows/dockerhub-description.yml/badge.svg)](https://github.com/zenika-open-source/terraform-azure-cli/actions/workflows/dockerhub-description.yml)
+[![Update Docker Hub Description](/actions/workflows/dockerhub-description.yml/badge.svg)](/actions/workflows/dockerhub-description.yml)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Docker Pulls](https://img.shields.io/docker/pulls/zenika/terraform-azure-cli.svg)](https://hub.docker.com/r/zenika/terraform-azure-cli/)
 
@@ -17,17 +17,17 @@
 ## 📦 Supported tags and respective Dockerfile links
 Available image tags can be found on the Docker Hub registry: [zenika/terraform-azure-cli](https://hub.docker.com/r/zenika/terraform-azure-cli/tags)
 
-Supported versions are listed in the [`supported_versions.json` ](https://github.com/zenika-open-source/terraform-azure-cli/blob/master/supported_versions.json) file in project root folder.
+Supported versions are listed in the [`supported_versions.json` ](/supported_versions.json) file in project root folder.
 
 The following image tag strategy is applied:
 * `zenika/terraform-azure-cli:latest` - build from master
-  * Included CLI versions are the newest in the [`supported_versions.json` ](https://github.com/zenika-open-source/terraform-azure-cli/blob/master/supported_versions.json) file.
+  * Included CLI versions are the newest in the [`supported_versions.json` ](/supported_versions.json) file.
 * `zenika/terraform-azure-cli:release-S.T_terraform-UU.VV.WW_azcli-XX.YY.ZZ` - build from releases
   * `release-S.T` is the release tag
   * `terraform-UU.VV.WWW` is the included **Terraform CLI** version
   * `azcli-XX.YY.ZZ` is the included **Azure CLI** version
 
-Please report to the [releases page](https://github.com/zenika-open-source/terraform-azure-cli/releases) for the changelogs.
+Please report to the [releases page](/releases) for the changelogs.
 
 > Any other tags are not supported even if available.
 
@@ -80,9 +80,9 @@ TERRAFORM_VERSION=0.15.5
 ```
 
 ## 🙏 Roadmap & Contributions
-Please refer to the [github project](https://github.com/zenika-open-source/terraform-azure-cli/projects/1) to track new features.
+Please refer to the [github project](/projects/1) to track new features.
 
-Do not hesitate to contribute by [filling an issue](https://github.com/zenika-open-source/terraform-azure-cli/issues/new) or [opening a PR](https://github.com/zenika-open-source/terraform-azure-cli/pulls) !
+Do not hesitate to contribute by [filling an issue](/issues/new) or [opening a PR](/pulls) !
 
 ## ⬆️ Dependencies upgrades checklist
 

From 701b0806381ad6b1608899cad86518c7f28672d9 Mon Sep 17 00:00:00 2001
From: Jubblin <14090755+Jubblin@users.noreply.github.com>
Date: Thu, 10 Aug 2023 12:03:10 +0100
Subject: [PATCH 11/16] Update README.md

---
 README.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 403ffdf..55ad4de 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,21 @@
-[![lint-dockerfile](/actions/workflows/lint-dockerfile.yml/badge.svg)](/actions/workflows/lint-dockerfile.yml)
-[![build-test](/actions/workflows/build-test.yml/badge.svg)](/actions/workflows/build-test.yml)
-[![push-latest](/actions/workflows/push-latest.yml/badge.svg)](/actions/workflows/push-latest.yml)
-[![release](/actions/workflows/release.yml/badge.svg)](/actions/workflows/release.yml)
+[![lint-dockerfile](https://github.com/worwoods/terraform-azure-cli/actions/workflows/lint-dockerfile.yml/badge.svg)](https://github.com/worwoods/terraform-azure-cli/actions/workflows/lint-dockerfile.yml)
+[![build-test](https://github.com/worwoods/terraform-azure-cli/actions/workflows/build-test.yml/badge.svg)](https://github.com/worwoods/terraform-azure-cli/actions/workflows/build-test.yml)
+[![push-latest](https://github.com/worwoods/terraform-azure-cli/actions/workflows/push-latest.yml/badge.svg)](https://github.com/worwoods/terraform-azure-cli/actions/workflows/push-latest.yml)
+[![release](https://github.com/worwoods/terraform-azure-cli/actions/workflows/release.yml/badge.svg)](https://github.com/worwoods/terraform-azure-cli/actions/workflows/release.yml)
 
-[![Update Docker Hub Description](/actions/workflows/dockerhub-description.yml/badge.svg)](/actions/workflows/dockerhub-description.yml)
+[![Update Docker Hub Description](https://github.com/worwoods/terraform-azure-cli/actions/workflows/dockerhub-description.yml/badge.svg)](https://github.com/worwoods/terraform-azure-cli/actions/workflows/dockerhub-description.yml)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-[![Docker Pulls](https://img.shields.io/docker/pulls/zenika/terraform-azure-cli.svg)](https://hub.docker.com/r/zenika/terraform-azure-cli/)
+[![Docker Pulls](https://img.shields.io/docker/pulls/worwoods/terraform-azure-cli.svg)](https://hub.docker.com/r/worwoods/terraform-azure-cli/)
 
 <p align="center">
-  <a href="https://azure.microsoft.com"><img width="200" src="https://github.com/Zenika/terraform-azure-cli/raw/master/resources/azure-logo.png"></a>
-  <a href="https://www.terraform.io/"><img width="200" src="https://github.com/Zenika/terraform-azure-cli/raw/master/resources/terraform-logo.png"></a>
+  <a href="https://azure.microsoft.com"><img width="200" src="https://github.com/worwoods/terraform-azure-cli/raw/master/resources/azure-logo.png"></a>
+  <a href="https://www.terraform.io/"><img width="200" src="https://github.com/worwoods/terraform-azure-cli/raw/master/resources/terraform-logo.png"></a>
 </p>
 
 # Terraform and Azure CLI Docker image
 
 ## 📦 Supported tags and respective Dockerfile links
-Available image tags can be found on the Docker Hub registry: [zenika/terraform-azure-cli](https://hub.docker.com/r/zenika/terraform-azure-cli/tags)
+Available image tags can be found on the Docker Hub registry: [worwoods/terraform-azure-cli](https://hub.docker.com/r/worwoods/terraform-azure-cli/tags)
 
 Supported versions are listed in the [`supported_versions.json` ](/supported_versions.json) file in project root folder.
 

From 95d23c3fcff4b2fae31ba201a6d44196e4d914b3 Mon Sep 17 00:00:00 2001
From: Jubblin <14090755+Jubblin@users.noreply.github.com>
Date: Thu, 10 Aug 2023 12:18:33 +0100
Subject: [PATCH 12/16] Update release.yml

---
 .github/workflows/release.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6f97315..7f236c3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -54,7 +54,9 @@ jobs:
         run: echo '${{ secrets.DOCKERHUB_PASS }}' | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
 
       - name: Push image to registry
-        run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
+        run: |
+              docker images 
+              docker push ${{ secrets.DOCKERHUB_USERNAME }}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
 
       - name: Save image
         run: docker image save -o ${IMAGE_NAME}-${IMAGE_RELEASE_TAG}.tar ${{ secrets.DOCKERHUB_USERNAME }}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}

From 09551c3aeee01d5f71c82ca88e9f361583ef0b81 Mon Sep 17 00:00:00 2001
From: Jubblin <14090755+Jubblin@users.noreply.github.com>
Date: Thu, 10 Aug 2023 12:55:34 +0100
Subject: [PATCH 13/16] Update build-test.yml (#8)

---
 .github/workflows/build-test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 7a7a261..bfcd99d 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -4,6 +4,7 @@ name: build-test
 # but not on master or tags
 # and only for Dockerfile related modifications
 on:
+  workflow_dispatch:
   push:
     tags-ignore:
       - "**"

From 7ee72c5d09221fb5ef61f90cdc090baa76cdd088 Mon Sep 17 00:00:00 2001
From: Jubblin <14090755+Jubblin@users.noreply.github.com>
Date: Fri, 11 Aug 2023 12:03:29 +0100
Subject: [PATCH 14/16] Breakout supported versions and latest versions to
 reusable workflows (#9)

* Create supported-versions.yml

* Create test-harness for testing supported versions workflow

* Update build-test.yml

* Update supported-versions.yml

* Update test-harness.yml

* Update test-harness.yml

* commit test for supported-versions workflow

* test for matrix content

* add latest version workflow

* move from includes/ directory and rename to includes_

* update to use include_latest-version.yml

---------

Co-authored-by: Richard Worwood <richard.worwood@endava.com>
---
 .github/workflows/build-test.yml              | 38 +++++---------
 .github/workflows/include_latest-version.yml  | 43 ++++++++++++++++
 .../workflows/include_supported-versions.yml  | 50 +++++++++++++++++++
 .github/workflows/push-latest.yml             | 11 ++--
 .github/workflows/release.yml                 | 27 ++--------
 .github/workflows/test-harness.yml            | 29 +++++++++++
 6 files changed, 144 insertions(+), 54 deletions(-)
 create mode 100644 .github/workflows/include_latest-version.yml
 create mode 100644 .github/workflows/include_supported-versions.yml
 create mode 100644 .github/workflows/test-harness.yml

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index bfcd99d..94e0779 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -23,30 +23,14 @@ env:
   IMAGE_NAME: "terraform-azure-cli"
 
 jobs:
-  load_supported_versions:
-    runs-on: ubuntu-20.04
-
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Save supported versions as output
-        id: set-matrix
-        run: |
-          SUPPORTED_VERSIONS=$(cat ./supported_versions.json)
-          SUPPORTED_VERSIONS="${SUPPORTED_VERSIONS//'%'/%25}"
-          SUPPORTED_VERSIONS="${SUPPORTED_VERSIONS//$'\n'/%0A}"
-          SUPPORTED_VERSIONS="${SUPPORTED_VERSIONS//$'\r'/%0D}"
-          echo "::set-output name=matrix::${SUPPORTED_VERSIONS}"
+  load_versions:
+    uses: ./.github/workflows/include_supported-versions.yml
 
-  build:
+  build_containers:
     runs-on: ubuntu-20.04
-    needs: load_supported_versions
+    needs: load_versions
     strategy:
-      matrix: ${{ fromJSON(needs.load_supported_versions.outputs.matrix) }}
+      matrix: ${{ fromJSON(needs.load_versions.outputs.matrix) }}
 
     steps:
       - name: Check out the repo
@@ -56,7 +40,9 @@ jobs:
         run: echo "BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
 
       - name: Build and save image tag
-        run: echo "IMAGE_TAG=${BRANCH}_terraform-${{ matrix.tf_version }}_azcli-${{ matrix.azcli_version }}" >> $GITHUB_ENV
+        run: |
+            echo "IMAGE_TAG=${BRANCH}_terraform-${{ matrix.tf_version }}_azcli-${{ matrix.azcli_version }}" >> $GITHUB_ENV
+            echo $IMAGE_TAG
 
       - name: Build image
         run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${{ matrix.tf_version }} --build-arg AZURE_CLI_VERSION=${{ matrix.azcli_version }} --tag ${IMAGE_NAME}:${IMAGE_TAG}
@@ -70,13 +56,13 @@ jobs:
           name: ${{ env.IMAGE_NAME }}_${{ env.IMAGE_TAG }}
           path: ${{ env.IMAGE_NAME }}_${{ env.IMAGE_TAG }}.tar
 
-  test:
+  test_container:
     runs-on: ubuntu-20.04
     needs:
-      - build
-      - load_supported_versions
+      - build_containers
+      - load_versions
     strategy:
-      matrix: ${{ fromJSON(needs.load_supported_versions.outputs.matrix) }}
+      matrix: ${{ fromJSON(needs.load_versions.outputs.matrix) }}
 
     steps:
       - name: Checkout source
diff --git a/.github/workflows/include_latest-version.yml b/.github/workflows/include_latest-version.yml
new file mode 100644
index 0000000..c113198
--- /dev/null
+++ b/.github/workflows/include_latest-version.yml
@@ -0,0 +1,43 @@
+name: Load Supported Versions
+
+on:
+  workflow_call:
+    outputs:
+      azcli_version:
+        description: "Latest supported azcli version"
+        value: ${{ jobs.load_versions.outputs.azcli_version }}
+      tf_version:
+        description:  "Latest supported terraform version"
+        value: ${{ jobs.load_versions.outputs.tf_version }}
+  workflow_dispatch:
+
+jobs:
+  load_versions:
+    runs-on: ubuntu-20.04
+    outputs:
+      azcli_version: ${{ env.azcli_version }}
+      tf_version: ${{ env.tf_version }}
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Save supported versions as output
+        id: set-matrix
+        run: |
+          echo "azcli_version=$(jq -r '.azcli_version | sort | .[-1]' supported_versions.json)" >> $GITHUB_ENV
+          echo "tf_version=$(jq -r '.tf_version | sort | .[-1]' supported_versions.json)" >> $GITHUB_ENV
+
+      - name: output
+        run: |
+          echo $azcli_version
+          echo $tf_version
+
+  display_versions:
+    needs: load_versions
+    runs-on: ubuntu-latest
+    steps:
+        - name: Access Variable
+          run: |
+            echo "azcli_version=${{ needs.load_versions.outputs.azcli_version }}"
+            echo "tf_version=${{ needs.load_versions.outputs.tf_version }}"
diff --git a/.github/workflows/include_supported-versions.yml b/.github/workflows/include_supported-versions.yml
new file mode 100644
index 0000000..4b46ab4
--- /dev/null
+++ b/.github/workflows/include_supported-versions.yml
@@ -0,0 +1,50 @@
+name: Load Supported Versions
+
+on:
+  workflow_call:
+    outputs:
+      matrix:
+        description: "Matrix of supported versions"
+        value: ${{ jobs.load_versions.outputs.matrix }}
+      azcli_version:
+        description: "Matrix of supported azcli versions"
+        value: ${{ jobs.load_versions.outputs.azcli_version }}
+      tf_version:
+        description: "Matrix of supported terraform versions"
+        value: ${{ jobs.load_versions.outputs.tf_version }}
+  workflow_dispatch:
+
+jobs:
+  load_versions:
+    runs-on: ubuntu-20.04
+    outputs:
+      azcli_version: ${{ env.azcli_version }}
+      tf_version: ${{ env.tf_version }}
+      matrix: ${{ env.matrix }}
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Save supported versions as output
+        id: set-matrix
+        run: |
+          echo "azcli_version=$(jq -r -c '.azcli_version | sort | reverse' supported_versions.json)" >> $GITHUB_ENV
+          echo "tf_version=$(jq -r -c '.tf_version | sort | reverse' supported_versions.json)" >> $GITHUB_ENV
+          echo -e matrix=\{"azcli_version": $(jq -r -c '.azcli_version | sort | reverse' supported_versions.json), "tf_version": $(jq -r -c '.tf_version | sort | reverse' supported_versions.json)\} >> $GITHUB_ENV
+
+      - name: output
+        run: |
+          echo $azcli_version
+          echo $tf_version
+          echo $matrix
+
+  display_versions:
+    needs: load_versions
+    runs-on: ubuntu-latest
+    steps:
+        - name: Access Variable
+          run: |
+            echo "azcli_version=${{ needs.load_versions.outputs.azcli_version }}"
+            echo "tf_version=${{ needs.load_versions.outputs.tf_version }}"
+            echo "matrix=${{ needs.load_versions.outputs.matrix }}"
diff --git a/.github/workflows/push-latest.yml b/.github/workflows/push-latest.yml
index d52755a..27f7203 100644
--- a/.github/workflows/push-latest.yml
+++ b/.github/workflows/push-latest.yml
@@ -19,20 +19,19 @@ env:
   IMAGE_TAG: "latest"
 
 jobs:
+  latest_version:
+    uses: ./.github/workflows/include_latest-version.yml
+
   build_push_latest:
     runs-on: ubuntu-20.04
+    needs: latest_version
 
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
 
-      - name: Retrieve latest suported versions
-        run: |
-          echo "AZ_VERSION=$(jq -r '.azcli_version | sort | .[-1]' supported_versions.json)" >> $GITHUB_ENV
-          echo "TF_VERSION=$(jq -r '.tf_version | sort | .[-1]' supported_versions.json)" >> $GITHUB_ENV
-
       - name: Build image
-        run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${TF_VERSION} --build-arg AZURE_CLI_VERSION=${AZ_VERSION} --tag ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:$IMAGE_TAG
+        run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${{ needs.latest_version.outputs.tf_version }} --build-arg AZURE_CLI_VERSION=${{ needs.latest_version.outputs.azcli_version }} --tag ${{ secrets.DOCKERHUB_USERNAME }}/$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/.github/workflows/release.yml b/.github/workflows/release.yml
index 7f236c3..014b2bd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,35 +6,18 @@ on:
     types: [published]
 
 jobs:
-  load_supported_versions:
-    runs-on: ubuntu-20.04
-
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Save supported versions as output
-        id: set-matrix
-        run: |
-          SUPPORTED_VERSIONS=$(cat ./supported_versions.json)
-          SUPPORTED_VERSIONS="${SUPPORTED_VERSIONS//'%'/%25}"
-          SUPPORTED_VERSIONS="${SUPPORTED_VERSIONS//$'\n'/%0A}"
-          SUPPORTED_VERSIONS="${SUPPORTED_VERSIONS//$'\r'/%0D}"
-          echo "::set-output name=matrix::${SUPPORTED_VERSIONS}"
+  load_versions:
+    uses: ./.github/workflows/include_supported-versions.yml
 
   build_push_release:
     runs-on: ubuntu-20.04
     needs:
-      - load_supported_versions
+      - load_versions
 
     strategy:
-      matrix: ${{ fromJSON(needs.load_supported_versions.outputs.matrix) }}
+      matrix: ${{ fromJSON(needs.load_versions.outputs.matrix) }}
 
     env:
-      ORGANIZATION: "zenika"
       IMAGE_NAME: "terraform-azure-cli"
 
     steps:
@@ -55,7 +38,7 @@ jobs:
 
       - name: Push image to registry
         run: |
-              docker images 
+              docker images
               docker push ${{ secrets.DOCKERHUB_USERNAME }}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
 
       - name: Save image
diff --git a/.github/workflows/test-harness.yml b/.github/workflows/test-harness.yml
new file mode 100644
index 0000000..5dd570a
--- /dev/null
+++ b/.github/workflows/test-harness.yml
@@ -0,0 +1,29 @@
+name: test_supported-versions.yaml
+on:
+  push:
+jobs:
+  load_versions:
+    uses: ./.github/workflows/include_supported-versions.yml
+
+  latest_version:
+    uses: ./.github/workflows/include_latest-version.yml
+
+  check_values:
+    runs-on: ubuntu-latest
+    needs: load_versions
+    strategy:
+      matrix: ${{ fromJSON(needs.load_versions.outputs.matrix) }}
+    steps:
+      - name: Test access to values
+        run: |
+          echo ${{ needs.load_versions.outputs.matrix }}
+          echo tf_${{ matrix.tf_version }}_azcli-${{ matrix.azcli_version }}
+
+  check_latest:
+    runs-on: ubuntu-latest
+    needs: latest_version
+    steps:
+      - name: Test access to values
+        run: |
+          echo terraform: ${{ needs.latest_version.outputs.tf_version }}
+          echo azcli: ${{ needs.latest_version.outputs.azcli_version }}

From 42f673309f4122136d165b59c283d5e17672ca69 Mon Sep 17 00:00:00 2001
From: Jubblin <14090755+Jubblin@users.noreply.github.com>
Date: Thu, 17 Aug 2023 11:01:19 +0100
Subject: [PATCH 15/16] Simplified build-test.yml to remove need to upload and
 download images using artifact repository (#11)

* Simplified build-test.yml to remove need to upload and download images to artifact repository
---
 .github/workflows/build-test.yml | 37 +-------------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 94e0779..4a59bc3 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -43,45 +43,10 @@ jobs:
         run: |
             echo "IMAGE_TAG=${BRANCH}_terraform-${{ matrix.tf_version }}_azcli-${{ matrix.azcli_version }}" >> $GITHUB_ENV
             echo $IMAGE_TAG
-
+            
       - name: Build image
         run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${{ matrix.tf_version }} --build-arg AZURE_CLI_VERSION=${{ matrix.azcli_version }} --tag ${IMAGE_NAME}:${IMAGE_TAG}
 
-      - name: Save image
-        run: docker image save --output ${IMAGE_NAME}_${IMAGE_TAG}.tar ${IMAGE_NAME}:${IMAGE_TAG}
-
-      - name: Upload image artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.IMAGE_NAME }}_${{ env.IMAGE_TAG }}
-          path: ${{ env.IMAGE_NAME }}_${{ env.IMAGE_TAG }}.tar
-
-  test_container:
-    runs-on: ubuntu-20.04
-    needs:
-      - build_containers
-      - load_versions
-    strategy:
-      matrix: ${{ fromJSON(needs.load_versions.outputs.matrix) }}
-
-    steps:
-      - name: Checkout source
-        uses: actions/checkout@v3
-
-      - name: Save branch name as env var
-        run: echo "BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
-
-      - name: Build and save image tag
-        run: echo "IMAGE_TAG=${BRANCH}_terraform-${{ matrix.tf_version }}_azcli-${{ matrix.azcli_version }}" >> $GITHUB_ENV
-
-      - name: Download image artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ env.IMAGE_NAME }}_${{ env.IMAGE_TAG }}
-
-      - name: Load image
-        run: docker image load --input ${{ env.IMAGE_NAME }}_${{ env.IMAGE_TAG }}.tar
-
       - name: Generate test config
         run: |
           export TF_VERSION=${{ matrix.tf_version }}

From 0c24711e9fcc16473a2b2b8859748b8322218ef8 Mon Sep 17 00:00:00 2001
From: Jubblin <14090755+Jubblin@users.noreply.github.com>
Date: Thu, 17 Aug 2023 11:21:44 +0100
Subject: [PATCH 16/16] Update supported_versions.json (#14)

---
 supported_versions.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/supported_versions.json b/supported_versions.json
index 6120574..c84ceaf 100644
--- a/supported_versions.json
+++ b/supported_versions.json
@@ -1,5 +1,6 @@
 {
   "tf_version": [
+    "1.5.5",
     "1.5.4",
     "1.5.3",
     "1.5.2",