Fix awscli v2 (#86)

Author: JonZeolla

Dockerfile

@@ -89,7 +89,7 @@ WORKDIR /iac
 COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 
-FROM minimal AS  az
+FROM minimal AS az
 ARG AZURE_CLI_VERSION
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # hadolint ignore=DL3008
@@ -114,19 +114,22 @@ RUN apt-get update \
  && rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*
 
 FROM minimal AS aws
-# pip installs
-ARG AWSCLI_VERSION
-# hadolint ignore=DL3013
-RUN python3 -m pip install --upgrade --no-cache-dir pip \
- && pip install --user --no-cache-dir git+git://github.com/aws/aws-cli.git#${AWSCLI_VERSION}
+ARG AWS_CLI_VERSION
+RUN curl -L https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip -o /tmp/awscliv2.zip \
+ && unzip /tmp/awscliv2.zip -d /tmp/ \
+ && /tmp/aws/install --bin-dir /aws-cli-bin/ \
+ # Required for the *-aws images to be functional
+ && ln -sf /aws-cli-bin/* /usr/local/bin/ \
+ && rm -rf /tmp/*
 
 # Add aws autocomplete
-RUN echo 'complete -C /root/.local/bin/aws_completer aws' >> ~/.bashrc
+RUN echo 'complete -C /usr/local/bin/aws_completer aws' >> ~/.bashrc
 
 FROM minimal AS final
 
 # AWS
-COPY --from=aws /root/.local /root/.local
+COPY --from=aws /usr/local/aws-cli/ /usr/local/aws-cli/
+COPY --from=aws /aws-cli-bin/ /usr/local/bin/
 COPY --from=aws /root/.bashrc /root/.bashrc
 
 # Azure

tasks.py

@@ -25,7 +25,7 @@
 CLIENT = docker.from_env()
 CONFIG = utils.parse_config(config_file=constants.CONFIG_FILE)
 
-TARGETS = {}
+TARGETS: dict[str, dict[str, list[str]]] = {}
 for target in constants.TARGETS:
     TARGETS[target] = {}
     if target == "final":

tests/test.py

@@ -154,7 +154,7 @@ def run_terraform(*, image: str):
     # Ensure insecure configurations fail due to checkov
     # Tests is a list of tuples containing the test environment, command, and
     # expected exit code
-    tests: list[tuple[dict, str, int]] = [
+    tests: list[tuple[dict, str, int]] = [  # type: ignore
         ({}, "terraform --skip-tfsec --skip-terrascan plan", 1),
         ({}, "tfenv exec --skip-tfsec --skip-terrascan plan", 1),
         (
@@ -192,7 +192,7 @@ def run_terraform(*, image: str):
     # Ensure insecure configurations fail due to terrascan
     # Tests is a list of tuples containing the test environment, command, and
     # expected exit code
-    tests: list[tuple[dict, str, int]] = [
+    tests: list[tuple[dict, str, int]] = [  # type: ignore
         ({}, "terraform --skip-tfsec --skip-checkov plan", 3),
         ({}, "tfenv exec --skip-tfsec --skip-checkov plan", 3),
         (
@@ -231,7 +231,7 @@ def run_terraform(*, image: str):
     # disabled
     # Tests is a list of tuples containing the test environment, command, and
     # expected exit code
-    tests: list[tuple[dict, str, int]] = [
+    tests: list[tuple[dict, str, int]] = [  # type: ignore
         ({"DISABLE_SECURITY": "true"}, "terraform init", 0),
         ({"DISABLE_SECURITY": "true"}, "tfenv exec init", 0),
         (
@@ -296,7 +296,7 @@ def run_terraform(*, image: str):
     # Ensure secure configurations pass
     # Tests is a list of tuples containing the test environment, command, and
     # expected exit code
-    tests: list[tuple[dict, str, int]] = [
+    tests: list[tuple[dict, str, int]] = [  # type: ignore
         ({}, "terraform init", 0),
         ({}, "tfenv exec init", 0),
         (