.gitignore-project

@@ -1,7 +1,6 @@
 # Source: https://github.com/github/gitignore/blob/main/Terraform.gitignore
 # Local .terraform directories
 **/.terraform/*
-**/Docs/*
 
 # .tfstate files
 *.tfstate

automation/jinja2/templates/.env.dist.j2

@@ -36,10 +36,6 @@ CICD_RUNNER_TAGS={{ CICD_RUNNER_TAGS | join(',') }}
 {% if CICD_ROLE_NAME %}
 CICD_ROLE_NAME={{ CICD_ROLE_NAME }}
 
-{% endif %}
-{% if CICD_ACCOUNT_ID %}
-CICD_ACCOUNT_ID={{ CICD_ACCOUNT_ID }}
-
 {% endif %}
 ########################################################################################################################
 # Docker Compose image tags to use

automation/jinja2/templates/.gitlab-ci.yml.j2

@@ -66,7 +66,7 @@ stages:
   script: |
     #!/usr/bin/env bash
     echo "Getting temporary credentials associated to assume role"
-    STS_CREDS=$(aws sts assume-role --role-arn arn:aws:iam::{{ environ('CICD_ACCOUNT_ID') }}:role/{{ environ('CICD_ROLE_NAME') }} --role-session-name ${CI_COMMIT_SHA})
+    STS_CREDS=$(aws sts assume-role --role-arn arn:aws:iam::903534291474:role/Vocalcom-CiCd-CrossAccountRole --role-session-name ${CI_COMMIT_SHA})
     AWS_ACCESS_KEY_ID=$(echo $STS_CREDS | jq -r '.Credentials.AccessKeyId')
     AWS_SECRET_ACCESS_KEY=$(echo $STS_CREDS | jq -r '.Credentials.SecretAccessKey')
     AWS_SESSION_TOKEN=$(echo $STS_CREDS | jq -r '.Credentials.SessionToken')

configure.yaml.dist

@@ -57,8 +57,7 @@ GITLAB_JOBS:
     apply_all: True
     delete_all: True
 
-CICD_ROLE_NAME: XXXXXX-CiCd-CrossAccountRole
-CICD_ACCOUNT_ID: 123546789123
+CICD_ROLE_NAME: Vocalcom-CiCd-CrossAccountRole
 
 # Run Terraform apply only on main branch 
 TF_APPLY_ONLY_MAIN: True

docker-compose-tools.yml

@@ -107,7 +107,7 @@ services:
     container_name: jinja2docker
     build:
       dockerfile: Dockerfile
-      context: ./automation/jinja2/
+      #context: ./automation/jinja2/
     hostname: jinja2docker
     entrypoint: python3 /scripts/entities/render.py
     #entrypoint: tail -f /etc/alpine-release

get-starter-kit.sh

@@ -14,15 +14,21 @@
 set -o errexit -o nounset -o pipefail
 
 # Set Starterkit version
-STARTER_KIT_VERSION="${1:-latest}"
-STARTER_KIT_PROJECT="${2:-Orange-OpenSource/AWSTerraformStarterKit}"
-
-STARTER_KIT_FORMAT="tar"
-STARTER_KIT_URL="https://api.github.com/repos/${STARTER_KIT_PROJECT}"
-STARTER_KIT_LOCATION="${STARTER_KIT_URL}/${STARTER_KIT_FORMAT}ball/${STARTER_KIT_VERSION}"
+STARTER_KIT_VERSION="latest"
 
 if [ "$STARTER_KIT_VERSION" == "latest" ]; then
-    STARTER_KIT_LOCATION=$(curl -s ${STARTER_KIT_URL}/releases/latest | jq -r ".${STARTER_KIT_FORMAT}ball_url")
+
+    LOCATION=$(curl -s https://api.github.com/repos/Orange-OpenSource/AWSTerraformStarterKit/releases/latest  \
+    | grep "tag_name" \
+    | awk '{print "https://github.com/Orange-OpenSource/AWSTerraformStarterKit/archive/" substr($2, 2, length($2)-3) ".zip"}') \
+    ; curl -L -o /tmp/archive.zip "$LOCATION"
+else
+  curl  -L\
+   "https://github.com/Orange-OpenSource/AWSTerraformStarterKit/archive/refs/tags/${STARTER_KIT_VERSION}.zip" \
+  -o /tmp/archive.zip
 fi
 
-curl --fail -L "${STARTER_KIT_LOCATION}" | tar -xz --strip-components 1
+unzip /tmp/archive.zip -d .
+cp -r AWSTerraformStarterKit-*/. .
+rm -rf AWSTerraformStarterKit-*
+rm /tmp/archive.zip