Merge pull request #6857 from hotosm/fix/scaling-policy

Fix/scaling policy

Author: dakotabenjamin

.github/workflows/terragrunt.yml

@@ -19,6 +19,7 @@ jobs:
     name: Get Deployment Meta
     runs-on: ubuntu-latest
     outputs:
+      INFRA_ENV_NAME: ${{ steps.export_meta.outputs.INFRA_ENV_NAME }}
       INFRA_BRANCH_NAME: ${{ steps.export_meta.outputs.INFRA_BRANCH_NAME }}
       INFRA_BRANCH_URL: ${{ steps.export_meta.outputs.INFRA_BRANCH_URL }}
       PLAN_ID: ${{ steps.export_meta.outputs.PLAN_ID }}
@@ -29,18 +30,22 @@ jobs:
         run: |
           case "${{ github.ref }}" in
           refs/heads/develop)
+            export INFRA_ENV_NAME=develop
             export INFRA_BRANCH_NAME=develop
             export INFRA_BRANCH_URL=https://tasks-dev.hotosm.org
             ;;
           refs/heads/staging)
+            export INFRA_ENV_NAME=staging
             export INFRA_BRANCH_NAME=staging
             export INFRA_BRANCH_URL=https://tasks-stage.hotosm.org
             ;;
           refs/heads/main)
-            export INFRA_BRANCH_NAME=main
+            export INFRA_ENV_NAME=main
+            export INFRA_BRANCH_NAME=production
             export INFRA_BRANCH_URL=https://tasks.hotosm.org
             ;;
           esac
+          echo "INFRA_ENV_NAME=${INFRA_ENV_NAME}" >> $GITHUB_OUTPUT
           echo "INFRA_BRANCH_NAME=${INFRA_BRANCH_NAME}" >> $GITHUB_OUTPUT
           echo "INFRA_BRANCH_URL=${INFRA_BRANCH_URL}" >> $GITHUB_OUTPUT
 
@@ -58,7 +63,7 @@ jobs:
       terragrunt_version: "0.67.15"
       aws_region: us-east-1
       load_env: true
-      environment_name: ${{ needs.get_deployment_meta.outputs.INFRA_BRANCH_NAME }}
+      environment_name: ${{ needs.get_deployment_meta.outputs.INFRA_ENV_NAME }}
       environment_url: ${{ needs.get_deployment_meta.outputs.INFRA_BRANCH_URL }}
       encrypt_plan_file: true
     secrets: inherit
@@ -71,7 +76,7 @@ jobs:
       - get_deployment_meta
     if: ${{ success() }}
     environment:
-      name: ${{ needs.get_deployment_meta.outputs.INFRA_BRANCH_NAME }}-approval
+      name: ${{ needs.get_deployment_meta.outputs.INFRA_ENV_NAME }}-approval
       url: ${{ needs.get_deployment_meta.outputs.INFRA_BRANCH_URL }}
     steps:
       - name: Manual approval step
@@ -94,7 +99,7 @@ jobs:
       load_env: true
       plan_file_name: ${{ github.event.repository.name }}-${{ github.run_id }}-${{github.run_attempt}}
       use_gh_artifacts: true
-      environment_name: ${{ needs.get_deployment_meta.outputs.INFRA_BRANCH_NAME }}
+      environment_name: ${{ needs.get_deployment_meta.outputs.INFRA_ENV_NAME }}
       environment_url: ${{ needs.get_deployment_meta.outputs.INFRA_BRANCH_URL }}
       decrypt_plan_file: true
     secrets: inherit

scripts/aws/infra/production/purgeable/ecs/terragrunt.hcl

@@ -156,13 +156,13 @@ inputs = {
     scale_up_cooldown   = 60
     scale_down_cooldown = 180
     scale_up_steps = [
-      { lower_bound = 0, upper_bound = 100, adjustment = 1 },
-      { lower_bound = 100, upper_bound = 300, adjustment = 2 },
-      { lower_bound = 300, upper_bound = null, adjustment = 3 }
+      { lower_bound = 0, upper_bound = 300, adjustment = 1 },
+      { lower_bound = 300, upper_bound = 900, adjustment = 2 },
+      { lower_bound = 900, upper_bound = null, adjustment = 3 }
     ]
     scale_down_steps = [
-      { lower_bound = null, upper_bound = -20, adjustment = -2 },
-      { lower_bound = -20, upper_bound = 0, adjustment = -1 }
+      { lower_bound = null, upper_bound = -200, adjustment = -2 },
+      { lower_bound = -200, upper_bound = -100, adjustment = -1 }
     ]
   }
 }