Merge pull request #236 from Sahil-Connect/migrate-to-aws

Migrate to aws
Sahil-Connect · Dec 19, 2024 · 09507a1 · 09507a1
2 parents 922f481 + 7788071
commit 09507a1
Show file tree

Hide file tree

Showing 11 changed files with 338 additions and 36 deletions.
diff --git a/.github/sahil-pay.yml b/.github/sahil-pay.yml
@@ -56,6 +56,7 @@ jobs:
 
     outputs:
       image_tag: ${{ steps.build-publish.outputs.image_tag }}
+      version_tag: ${{ steps.build-publish.outputs.version_tag }}
       full_image: ${{ steps.build-publish.outputs.full_image }}
 
     steps:
@@ -94,7 +95,7 @@ jobs:
             -backend-config='bucket=${{ inputs.backend_s3_bucket }}' \
             -backend-config='key=docker-ecr/terraform-${{ env.ECR_REPO_NAME }}.tfstate' \
             -backend-config='dynamodb_table=${{ inputs.backend_dynamodb_table }}' \
-            -backend-config='role_arn=arn:aws:iam::${{ inputs.aws_account_id }}:role/${{ inputs.backend_iam_role }}'
+            -backend-config='assume_role={ role_arn = "arn:aws:iam::${{ inputs.aws_account_id }}:role/${{ inputs.backend_iam_role }}" }'
         working-directory: infra/terraform
 
       - name: Create ECR repo [TF apply]
@@ -123,8 +124,43 @@ jobs:
           ECR_REPOSITORY: ${{ env.ECR_REPO_NAME }}
           IMAGE_TAG: ${{ inputs.image_tag }}
         run: |
+          # Get the current latest image digest (if it exists)
+          PREVIOUS_IMAGE_MANIFEST=$(aws ecr batch-get-image \
+            --repository-name $ECR_REPOSITORY \
+            --image-ids imageTag=$IMAGE_TAG \
+            --output text \
+            --query 'images[].imageManifest' || echo "")
+          
+          # Build the new image
           docker build "${{ inputs.docker_build_dir }}" -f "${{ inputs.path_to_dockerfile }}" -t "$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+          
+          # Push the new image as latest
           docker push "$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
-          echo "IMAGE $IMAGE_TAG is pushed to $ECR_REGISTRY/$ECR_REPOSITORY"
-          echo "image_tag=$IMAGE_TAG" 
-          echo "full_image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+          
+          # If there was a previous image, tag it as v1, v2, etc.
+          if [ ! -z "$PREVIOUS_IMAGE_MANIFEST" ]; then
+            # Get the current highest version number
+            CURRENT_VERSION=$(aws ecr describe-images \
+              --repository-name $ECR_REPOSITORY \
+              --query 'imageDetails[].imageTags[?starts_with(@, `v`)]' \
+              --output text | grep -o 'v[0-9]*' | sed 's/v//' | sort -n | tail -1)
+            
+            # Calculate next version number
+            if [ -z "$CURRENT_VERSION" ]; then
+              NEW_VERSION="v1"
+            else
+              NEW_VERSION="v$((CURRENT_VERSION + 1))"
+            fi
+            
+            # Tag the previous image with the new version
+            aws ecr put-image \
+              --repository-name $ECR_REPOSITORY \
+              --image-tag $NEW_VERSION \
+              --image-manifest "$PREVIOUS_IMAGE_MANIFEST"
+            
+            echo "Previous image tagged as $NEW_VERSION"
+            echo "version_tag=$NEW_VERSION" >> $GITHUB_OUTPUT
+          fi
+          
+          echo "image_tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
+          echo "full_image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/sahil-admin.yml b/.github/workflows/sahil-admin.yml
@@ -56,6 +56,7 @@ jobs:
 
     outputs:
       image_tag: ${{ steps.build-publish.outputs.image_tag }}
+      version_tag: ${{ steps.build-publish.outputs.version_tag }}
       full_image: ${{ steps.build-publish.outputs.full_image }}
 
     steps:
@@ -94,7 +95,7 @@ jobs:
             -backend-config='bucket=${{ inputs.backend_s3_bucket }}' \
             -backend-config='key=docker-ecr/terraform-${{ env.ECR_REPO_NAME }}.tfstate' \
             -backend-config='dynamodb_table=${{ inputs.backend_dynamodb_table }}' \
-            -backend-config='role_arn=arn:aws:iam::${{ inputs.aws_account_id }}:role/${{ inputs.backend_iam_role }}'
+            -backend-config='assume_role={ role_arn = "arn:aws:iam::${{ inputs.aws_account_id }}:role/${{ inputs.backend_iam_role }}" }'
         working-directory: infra/terraform
 
       - name: Create ECR repo [TF apply]
@@ -123,8 +124,43 @@ jobs:
           ECR_REPOSITORY: ${{ env.ECR_REPO_NAME }}
           IMAGE_TAG: ${{ inputs.image_tag }}
         run: |
+          # Get the current latest image digest (if it exists)
+          PREVIOUS_IMAGE_MANIFEST=$(aws ecr batch-get-image \
+            --repository-name $ECR_REPOSITORY \
+            --image-ids imageTag=$IMAGE_TAG \
+            --output text \
+            --query 'images[].imageManifest' || echo "")
+          
+          # Build the new image
           docker build "${{ inputs.docker_build_dir }}" -f "${{ inputs.path_to_dockerfile }}" -t "$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+          
+          # Push the new image as latest
           docker push "$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
-          echo "IMAGE $IMAGE_TAG is pushed to $ECR_REGISTRY/$ECR_REPOSITORY"
-          echo "image_tag=$IMAGE_TAG" 
-          echo "full_image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+          
+          # If there was a previous image, tag it as v1, v2, etc.
+          if [ ! -z "$PREVIOUS_IMAGE_MANIFEST" ]; then
+            # Get the current highest version number
+            CURRENT_VERSION=$(aws ecr describe-images \
+              --repository-name $ECR_REPOSITORY \
+              --query 'imageDetails[].imageTags[?starts_with(@, `v`)]' \
+              --output text | grep -o 'v[0-9]*' | sed 's/v//' | sort -n | tail -1)
+            
+            # Calculate next version number
+            if [ -z "$CURRENT_VERSION" ]; then
+              NEW_VERSION="v1"
+            else
+              NEW_VERSION="v$((CURRENT_VERSION + 1))"
+            fi
+            
+            # Tag the previous image with the new version
+            aws ecr put-image \
+              --repository-name $ECR_REPOSITORY \
+              --image-tag $NEW_VERSION \
+              --image-manifest "$PREVIOUS_IMAGE_MANIFEST"
+            
+            echo "Previous image tagged as $NEW_VERSION"
+            echo "version_tag=$NEW_VERSION" >> $GITHUB_OUTPUT
+          fi
+          
+          echo "image_tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
+          echo "full_image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/sahil-agent.yml b/.github/workflows/sahil-agent.yml
@@ -56,6 +56,7 @@ jobs:
 
     outputs:
       image_tag: ${{ steps.build-publish.outputs.image_tag }}
+      version_tag: ${{ steps.build-publish.outputs.version_tag }}
       full_image: ${{ steps.build-publish.outputs.full_image }}
 
     steps:
@@ -94,7 +95,7 @@ jobs:
             -backend-config='bucket=${{ inputs.backend_s3_bucket }}' \
             -backend-config='key=docker-ecr/terraform-${{ env.ECR_REPO_NAME }}.tfstate' \
             -backend-config='dynamodb_table=${{ inputs.backend_dynamodb_table }}' \
-            -backend-config='role_arn=arn:aws:iam::${{ inputs.aws_account_id }}:role/${{ inputs.backend_iam_role }}'
+            -backend-config='assume_role={ role_arn = "arn:aws:iam::${{ inputs.aws_account_id }}:role/${{ inputs.backend_iam_role }}" }'
         working-directory: infra/terraform
 
       - name: Create ECR repo [TF apply]
@@ -123,8 +124,43 @@ jobs:
           ECR_REPOSITORY: ${{ env.ECR_REPO_NAME }}
           IMAGE_TAG: ${{ inputs.image_tag }}
         run: |
+          # Get the current latest image digest (if it exists)
+          PREVIOUS_IMAGE_MANIFEST=$(aws ecr batch-get-image \
+            --repository-name $ECR_REPOSITORY \
+            --image-ids imageTag=$IMAGE_TAG \
+            --output text \
+            --query 'images[].imageManifest' || echo "")
+          
+          # Build the new image
           docker build "${{ inputs.docker_build_dir }}" -f "${{ inputs.path_to_dockerfile }}" -t "$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+          
+          # Push the new image as latest
           docker push "$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
-          echo "IMAGE $IMAGE_TAG is pushed to $ECR_REGISTRY/$ECR_REPOSITORY"
-          echo "image_tag=$IMAGE_TAG" 
-          echo "full_image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+          
+          # If there was a previous image, tag it as v1, v2, etc.
+          if [ ! -z "$PREVIOUS_IMAGE_MANIFEST" ]; then
+            # Get the current highest version number
+            CURRENT_VERSION=$(aws ecr describe-images \
+              --repository-name $ECR_REPOSITORY \
+              --query 'imageDetails[].imageTags[?starts_with(@, `v`)]' \
+              --output text | grep -o 'v[0-9]*' | sed 's/v//' | sort -n | tail -1)
+            
+            # Calculate next version number
+            if [ -z "$CURRENT_VERSION" ]; then
+              NEW_VERSION="v1"
+            else
+              NEW_VERSION="v$((CURRENT_VERSION + 1))"
+            fi
+            
+            # Tag the previous image with the new version
+            aws ecr put-image \
+              --repository-name $ECR_REPOSITORY \
+              --image-tag $NEW_VERSION \
+              --image-manifest "$PREVIOUS_IMAGE_MANIFEST"
+            
+            echo "Previous image tagged as $NEW_VERSION"
+            echo "version_tag=$NEW_VERSION" >> $GITHUB_OUTPUT
+          fi
+          
+          echo "image_tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
+          echo "full_image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/sahil-api.yml b/.github/workflows/sahil-api.yml
@@ -56,6 +56,7 @@ jobs:
 
     outputs:
       image_tag: ${{ steps.build-publish.outputs.image_tag }}
+      version_tag: ${{ steps.build-publish.outputs.version_tag }}
       full_image: ${{ steps.build-publish.outputs.full_image }}
 
     steps:
@@ -94,7 +95,7 @@ jobs:
             -backend-config='bucket=${{ inputs.backend_s3_bucket }}' \
             -backend-config='key=docker-ecr/terraform-${{ env.ECR_REPO_NAME }}.tfstate' \
             -backend-config='dynamodb_table=${{ inputs.backend_dynamodb_table }}' \
-            -backend-config='role_arn=arn:aws:iam::${{ inputs.aws_account_id }}:role/${{ inputs.backend_iam_role }}'
+            -backend-config='assume_role={ role_arn = "arn:aws:iam::${{ inputs.aws_account_id }}:role/${{ inputs.backend_iam_role }}" }'
         working-directory: infra/terraform
 
       - name: Create ECR repo [TF apply]
@@ -123,8 +124,43 @@ jobs:
           ECR_REPOSITORY: ${{ env.ECR_REPO_NAME }}
           IMAGE_TAG: ${{ inputs.image_tag }}
         run: |
+          # Get the current latest image digest (if it exists)
+          PREVIOUS_IMAGE_MANIFEST=$(aws ecr batch-get-image \
+            --repository-name $ECR_REPOSITORY \
+            --image-ids imageTag=$IMAGE_TAG \
+            --output text \
+            --query 'images[].imageManifest' || echo "")
+          
+          # Build the new image
           docker build "${{ inputs.docker_build_dir }}" -f "${{ inputs.path_to_dockerfile }}" -t "$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+          
+          # Push the new image as latest
           docker push "$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
-          echo "IMAGE $IMAGE_TAG is pushed to $ECR_REGISTRY/$ECR_REPOSITORY"
-          echo "image_tag=$IMAGE_TAG" 
-          echo "full_image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+          
+          # If there was a previous image, tag it as v1, v2, etc.
+          if [ ! -z "$PREVIOUS_IMAGE_MANIFEST" ]; then
+            # Get the current highest version number
+            CURRENT_VERSION=$(aws ecr describe-images \
+              --repository-name $ECR_REPOSITORY \
+              --query 'imageDetails[].imageTags[?starts_with(@, `v`)]' \
+              --output text | grep -o 'v[0-9]*' | sed 's/v//' | sort -n | tail -1)
+            
+            # Calculate next version number
+            if [ -z "$CURRENT_VERSION" ]; then
+              NEW_VERSION="v1"
+            else
+              NEW_VERSION="v$((CURRENT_VERSION + 1))"
+            fi
+            
+            # Tag the previous image with the new version
+            aws ecr put-image \
+              --repository-name $ECR_REPOSITORY \
+              --image-tag $NEW_VERSION \
+              --image-manifest "$PREVIOUS_IMAGE_MANIFEST"
+            
+            echo "Previous image tagged as $NEW_VERSION"
+            echo "version_tag=$NEW_VERSION" >> $GITHUB_OUTPUT
+          fi
+          
+          echo "image_tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
+          echo "full_image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/sahil-client.yml b/.github/workflows/sahil-client.yml
@@ -56,6 +56,7 @@ jobs:
 
     outputs:
       image_tag: ${{ steps.build-publish.outputs.image_tag }}
+      version_tag: ${{ steps.build-publish.outputs.version_tag }}
       full_image: ${{ steps.build-publish.outputs.full_image }}
 
     steps:
@@ -94,7 +95,7 @@ jobs:
             -backend-config='bucket=${{ inputs.backend_s3_bucket }}' \
             -backend-config='key=docker-ecr/terraform-${{ env.ECR_REPO_NAME }}.tfstate' \
             -backend-config='dynamodb_table=${{ inputs.backend_dynamodb_table }}' \
-            -backend-config='role_arn=arn:aws:iam::${{ inputs.aws_account_id }}:role/${{ inputs.backend_iam_role }}'
+            -backend-config='assume_role={ role_arn = "arn:aws:iam::${{ inputs.aws_account_id }}:role/${{ inputs.backend_iam_role }}" }'
         working-directory: infra/terraform
 
       - name: Create ECR repo [TF apply]
@@ -123,8 +124,43 @@ jobs:
           ECR_REPOSITORY: ${{ env.ECR_REPO_NAME }}
           IMAGE_TAG: ${{ inputs.image_tag }}
         run: |
+          # Get the current latest image digest (if it exists)
+          PREVIOUS_IMAGE_MANIFEST=$(aws ecr batch-get-image \
+            --repository-name $ECR_REPOSITORY \
+            --image-ids imageTag=$IMAGE_TAG \
+            --output text \
+            --query 'images[].imageManifest' || echo "")
+          
+          # Build the new image
           docker build "${{ inputs.docker_build_dir }}" -f "${{ inputs.path_to_dockerfile }}" -t "$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+          
+          # Push the new image as latest
           docker push "$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
-          echo "IMAGE $IMAGE_TAG is pushed to $ECR_REGISTRY/$ECR_REPOSITORY"
-          echo "image_tag=$IMAGE_TAG" 
-          echo "full_image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+          
+          # If there was a previous image, tag it as v1, v2, etc.
+          if [ ! -z "$PREVIOUS_IMAGE_MANIFEST" ]; then
+            # Get the current highest version number
+            CURRENT_VERSION=$(aws ecr describe-images \
+              --repository-name $ECR_REPOSITORY \
+              --query 'imageDetails[].imageTags[?starts_with(@, `v`)]' \
+              --output text | grep -o 'v[0-9]*' | sed 's/v//' | sort -n | tail -1)
+            
+            # Calculate next version number
+            if [ -z "$CURRENT_VERSION" ]; then
+              NEW_VERSION="v1"
+            else
+              NEW_VERSION="v$((CURRENT_VERSION + 1))"
+            fi
+            
+            # Tag the previous image with the new version
+            aws ecr put-image \
+              --repository-name $ECR_REPOSITORY \
+              --image-tag $NEW_VERSION \
+              --image-manifest "$PREVIOUS_IMAGE_MANIFEST"
+            
+            echo "Previous image tagged as $NEW_VERSION"
+            echo "version_tag=$NEW_VERSION" >> $GITHUB_OUTPUT
+          fi
+          
+          echo "image_tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
+          echo "full_image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/sahil-courier.yml b/.github/workflows/sahil-courier.yml
@@ -56,6 +56,7 @@ jobs:
 
     outputs:
       image_tag: ${{ steps.build-publish.outputs.image_tag }}
+      version_tag: ${{ steps.build-publish.outputs.version_tag }}
       full_image: ${{ steps.build-publish.outputs.full_image }}
 
     steps:
@@ -94,7 +95,7 @@ jobs:
             -backend-config='bucket=${{ inputs.backend_s3_bucket }}' \
             -backend-config='key=docker-ecr/terraform-${{ env.ECR_REPO_NAME }}.tfstate' \
             -backend-config='dynamodb_table=${{ inputs.backend_dynamodb_table }}' \
-            -backend-config='role_arn=arn:aws:iam::${{ inputs.aws_account_id }}:role/${{ inputs.backend_iam_role }}'
+            -backend-config='assume_role={ role_arn = "arn:aws:iam::${{ inputs.aws_account_id }}:role/${{ inputs.backend_iam_role }}" }'
         working-directory: infra/terraform
 
       - name: Create ECR repo [TF apply]
@@ -123,8 +124,43 @@ jobs:
           ECR_REPOSITORY: ${{ env.ECR_REPO_NAME }}
           IMAGE_TAG: ${{ inputs.image_tag }}
         run: |
+          # Get the current latest image digest (if it exists)
+          PREVIOUS_IMAGE_MANIFEST=$(aws ecr batch-get-image \
+            --repository-name $ECR_REPOSITORY \
+            --image-ids imageTag=$IMAGE_TAG \
+            --output text \
+            --query 'images[].imageManifest' || echo "")
+          
+          # Build the new image
           docker build "${{ inputs.docker_build_dir }}" -f "${{ inputs.path_to_dockerfile }}" -t "$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+          
+          # Push the new image as latest
           docker push "$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
-          echo "IMAGE $IMAGE_TAG is pushed to $ECR_REGISTRY/$ECR_REPOSITORY"
-          echo "image_tag=$IMAGE_TAG" 
-          echo "full_image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+          
+          # If there was a previous image, tag it as v1, v2, etc.
+          if [ ! -z "$PREVIOUS_IMAGE_MANIFEST" ]; then
+            # Get the current highest version number
+            CURRENT_VERSION=$(aws ecr describe-images \
+              --repository-name $ECR_REPOSITORY \
+              --query 'imageDetails[].imageTags[?starts_with(@, `v`)]' \
+              --output text | grep -o 'v[0-9]*' | sed 's/v//' | sort -n | tail -1)
+            
+            # Calculate next version number
+            if [ -z "$CURRENT_VERSION" ]; then
+              NEW_VERSION="v1"
+            else
+              NEW_VERSION="v$((CURRENT_VERSION + 1))"
+            fi
+            
+            # Tag the previous image with the new version
+            aws ecr put-image \
+              --repository-name $ECR_REPOSITORY \
+              --image-tag $NEW_VERSION \
+              --image-manifest "$PREVIOUS_IMAGE_MANIFEST"
+            
+            echo "Previous image tagged as $NEW_VERSION"
+            echo "version_tag=$NEW_VERSION" >> $GITHUB_OUTPUT
+          fi
+          
+          echo "image_tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
+          echo "full_image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT