Merge pull request #7039 from hotosm/develop

Merge develop changes to staging

Author: nischalstha9

scripts/aws/infra/develop/purgeable/ecs-cron/terragrunt.hcl

@@ -64,6 +64,9 @@ inputs = {
     dependency.alb.outputs.load_balancer_app_security_group
   ]
 
+  #Enable Execute Command
+  enable_execute_command = get_env("ECS_TASK_ENABLE_EXECUTE_COMMAND", "false") == "true" ? true : false
+
   # Merge secrets with: key:ValueFrom together
   container_secrets = concat(dependency.extras.outputs.container_secrets,
   dependency.rds.outputs.database_config_as_ecs_secrets_inputs)

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

@@ -69,6 +69,9 @@ inputs = {
     dependency.alb.outputs.load_balancer_app_security_group
   ]
 
+  #Enable Execute Command
+  enable_execute_command = get_env("ECS_TASK_ENABLE_EXECUTE_COMMAND", "false") == "true" ? true : false
+
   # Merge secrets with: key:ValueFrom together
   container_secrets = concat(dependency.extras.outputs.container_secrets,
   dependency.rds.outputs.database_config_as_ecs_secrets_inputs)
@@ -82,8 +85,8 @@ inputs = {
   ## Task count for ECS services.
   tasks_count = {
     desired_count   = 1
-    min_healthy_pct = 25
-    max_pct         = 200
+    min_healthy_pct = 100
+    max_pct         = 300
   }
 
   health_check_grace_period_seconds = 60

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

@@ -65,7 +65,7 @@ inputs = {
   ]
 
   #Enable Execute Command
-  enable_execute_command = false
+  enable_execute_command = get_env("ECS_TASK_ENABLE_EXECUTE_COMMAND", "false") == "true" ? true : false
 
   # Merge secrets with: key:ValueFrom together
   container_secrets = concat(dependency.extras.outputs.container_secrets,

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

@@ -70,7 +70,7 @@ inputs = {
   ]
 
   #Enable Execute Command
-  enable_execute_command = false
+  enable_execute_command = get_env("ECS_TASK_ENABLE_EXECUTE_COMMAND", "false") == "true" ? true : false
 
   # Merge secrets with: key:ValueFrom together
   container_secrets = concat(dependency.extras.outputs.container_secrets,
@@ -85,8 +85,8 @@ inputs = {
   ## Task count for ECS services.
   tasks_count = {
     desired_count   = 1
-    min_healthy_pct = 25
-    max_pct         = 200
+    min_healthy_pct = 100
+    max_pct         = 600
   }
 
   ## Scaling Policy Target Values

scripts/aws/infra/staging/purgeable/ecs-cron/terragrunt.hcl

@@ -65,7 +65,7 @@ inputs = {
   ]
 
   #Enable Execute Command
-  enable_execute_command = false
+  enable_execute_command = get_env("ECS_TASK_ENABLE_EXECUTE_COMMAND", "false") == "true" ? true : false
 
   # Merge secrets with: key:ValueFrom together
   container_secrets = concat(dependency.extras.outputs.container_secrets,

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

@@ -70,7 +70,7 @@ inputs = {
   ]
 
   #Enable Execute Command
-  enable_execute_command = false
+  enable_execute_command = get_env("ECS_TASK_ENABLE_EXECUTE_COMMAND", "false") == "true" ? true : false
 
   # Merge secrets with: key:ValueFrom together
   container_secrets = concat(dependency.extras.outputs.container_secrets,
@@ -85,8 +85,8 @@ inputs = {
   ## Task count for ECS services.
   tasks_count = {
     desired_count   = 1
-    min_healthy_pct = 25
-    max_pct         = 200
+    min_healthy_pct = 100
+    max_pct         = 400
   }
 
   ## Scaling Policy Target Values

scripts/commands/refresh_mapper_level.py

@@ -7,7 +7,7 @@
 from typing import List
 
 from databases import Database
-from backend.services.users.user_service import UserService
+from backend.services.users.user_service import UserService, UserServiceError
 from backend.models.postgis.user import User
 from backend.config import settings
 
@@ -77,6 +77,21 @@ async def process_user(
                         )
                         await asyncio.sleep(RETRY_DELAY)
                         continue
+                except UserServiceError as exc:
+                    # Non-retriable external API error from UserService (e.g. OSM returned 404/410)
+                    # 404 for user not found.
+                    # 410 for user deleted from osm. Gone error code.
+                    async with failed_lock:
+                        failed_users.append(user_record.id)
+                    logger.info(
+                        "OSM error for user %s — recorded in osm_failed_users: %s",
+                        user_record.id,
+                        exc,
+                    )
+                    logger.debug(
+                        "UserServiceError for user %s", user_record.id, exc_info=True
+                    )
+                    break
                 except Exception:
                     async with failed_lock:
                         failed_users.append(user_record.id)