From 13423b137efbd165ab0b1a7bb3f74e6a9c2c0281 Mon Sep 17 00:00:00 2001
From: Pepe Fagoaga <pepe@verica.io>
Date: Fri, 13 May 2022 10:13:03 +0200
Subject: [PATCH] fix(actions): Include AWS region (#1141)

* fix(actions): Include AWS regions

* fix(zip): Quiet output
---
 .github/workflows/build-lint-push-containers.yml | 11 ++++++-----
 util/Dockerfile                                  |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-lint-push-containers.yml b/.github/workflows/build-lint-push-containers.yml
index 8398d2bb..cbe6be7b 100644
--- a/.github/workflows/build-lint-push-containers.yml
+++ b/.github/workflows/build-lint-push-containers.yml
@@ -10,7 +10,8 @@ on:
     types: [published]
 
 env:
-  AWS_REGION: us-east-1
+  AWS_REGION_STG: eu-west-1
+  AWS_REGION_PRO: us-east-1
   IMAGE_NAME: prowler
   LATEST_TAG: latest
   TEMPORARY_TAG: temporary
@@ -126,13 +127,13 @@ jobs:
           username: ${{ secrets.PUBLIC_ECR_AWS_ACCESS_KEY_ID }}
           password: ${{ secrets.PUBLIC_ECR_AWS_SECRET_ACCESS_KEY }}
         env:
-          AWS_REGION: ${{ env.AWS_REGION }}
+          AWS_REGION: ${{ env.AWS_REGION_PRO }}
       -
         name: Configure AWS Credentials -- STG
         if: github.event_name == 'push'
         uses: aws-actions/configure-aws-credentials@v1
         with:
-          aws-region: ${{ env.AWS_REGION }}
+          aws-region: ${{ env.AWS_REGION_STG }}
           role-to-assume: ${{ secrets.STG_IAM_ROLE_ARN }}
           role-session-name: build-lint-containers-stg
       -
@@ -146,7 +147,7 @@ jobs:
         if: github.event_name == 'release'
         uses: aws-actions/configure-aws-credentials@v1
         with:
-          aws-region: ${{ env.AWS_REGION }}
+          aws-region: ${{ env.AWS_REGION_PRO }}
           role-to-assume: ${{ secrets.PRO_IAM_ROLE_ARN }}
           role-session-name: build-lint-containers-pro
       -
@@ -163,9 +164,9 @@ jobs:
         with:
           push: true
           tags: |
+            ${{ secrets.STG_ECR }}/${{ secrets.STG_ECR_REPOSITORY }}:${{ env.LATEST_TAG }}
             ${{ secrets.DOCKER_HUB_REPOSITORY }}/${{ env.IMAGE_NAME }}:${{ env.LATEST_TAG }}
             ${{ secrets.PUBLIC_ECR_REPOSITORY }}/${{ env.IMAGE_NAME }}:${{ env.LATEST_TAG }}
-            ${{ secrets.STG_ECR }}/${{ secrets.STG_ECR_REPOSITORY }}:${{ env.LATEST_TAG }}
           file: util/Dockerfile
       -
         # Push the new release
diff --git a/util/Dockerfile b/util/Dockerfile
index a0a1a9eb..887b382f 100644
--- a/util/Dockerfile
+++ b/util/Dockerfile
@@ -17,7 +17,7 @@ RUN yum install -y shadow-utils && \
   pip3 install boto3 detect-secrets==1.0.3 && \
   pip3 cache purge && \
   curl https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip -o awscliv2.zip && \
-  unzip awscliv2.zip && \
+  unzip -q awscliv2.zip && \
   aws/install && \
   rm -rf aws awscliv2.zip /var/cache/yum && \
   rm /usr/bin/python && \