fix: fixed issue with batch rescoring s3 trigger and small bug in /sc…

…ore/community/address endpoint (#762)
passportxyz · Jan 13, 2025 · 1e525f7 · 1e525f7
1 parent b3b523f
commit 1e525f7
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 22 deletions.
diff --git a/api/ceramic_cache/api/v1.py b/api/ceramic_cache/api/v1.py
@@ -509,7 +509,7 @@ def handle_get_ui_score(
             score.expiration_date is not None and score.expiration_date < now
         ):
             # This will re-calculate the score and update the expiration date
-            ret = get_detailed_score_response_for_address(address)
+            ret = get_detailed_score_response_for_address(address, scorer_id)
 
             return ret
 

diff --git a/infra/aws/index.ts b/infra/aws/index.ts
@@ -1573,14 +1573,15 @@ const createdTask = createTask({
   scorerSecretManagerArn: scorerSecret.arn,
 });
 
-export const s3TriggeredECSTask = createS3InitiatedECSTask(
-  `bulk-score-requests-${stack}`,
-  cluster.arn,
-  createdTask.task.arn,
-  vpcPrivateSubnetIds,
-  [secgrp.id],
-  createdTask.eventsStsAssumeRole.arn
-);
+export const s3TriggeredECSTask = createS3InitiatedECSTask({
+  bucketName: `bulk-score-requests-${stack}`,
+  clusterArn: cluster.arn,
+  taskDefinitionArn: createdTask.task.arn,
+  subnetIds: vpcPrivateSubnetIds,
+  securityGroupIds: [secgrp.id],
+  eventsStsAssumeRoleArn: createdTask.eventsStsAssumeRole.arn,
+  containerName: createdTask.containerName,
+});
 
 const PASSPORT_APP_GITHUB_URL =
   "https://github.com/passportxyz/passport-scorer";

diff --git a/infra/lib/scorer/s3_initiated_ecs_task.ts b/infra/lib/scorer/s3_initiated_ecs_task.ts
@@ -1,15 +1,24 @@
 import * as aws from "@pulumi/aws";
 import { Input, Output } from "@pulumi/pulumi";
-import {defaultTags} from "../tags";
+import { defaultTags } from "../tags";
 
-export function createS3InitiatedECSTask(
-  bucketName: string,
-  clusterArn: Output<string>,
-  taskDefinitionArn: Output<string>,
-  subnetIds: Output<any>,
-  securityGroupIds: Output<string>[],
-  eventsStsAssumeRoleArn: Input<string>
-) {
+export function createS3InitiatedECSTask({
+  bucketName,
+  clusterArn,
+  taskDefinitionArn,
+  subnetIds,
+  securityGroupIds,
+  eventsStsAssumeRoleArn,
+  containerName,
+}: {
+  bucketName: string;
+  clusterArn: Output<string>;
+  taskDefinitionArn: Output<string>;
+  subnetIds: Output<any>;
+  securityGroupIds: Output<string>[];
+  eventsStsAssumeRoleArn: Input<string>;
+  containerName: string;
+}) {
   // Create S3 bucket
   const bucket = new aws.s3.Bucket(bucketName, {
     bucket: bucketName,
@@ -34,7 +43,7 @@ export function createS3InitiatedECSTask(
       tags: {
         ...defaultTags,
         Name: folder,
-      }
+      },
     });
   });
 
@@ -59,7 +68,7 @@ export function createS3InitiatedECSTask(
     tags: {
       ...defaultTags,
       Name: "s3-to-ecs-rule",
-      Scope: "MBD batch processing"
+      Scope: "MBD batch processing",
     },
   });
 
@@ -86,7 +95,7 @@ export function createS3InitiatedECSTask(
       inputTemplate: JSON.stringify({
         containerOverrides: [
           {
-            name: "web", // Replace with actual container name or fetch dynamically
+            name: containerName,
             environment: [
               {
                 name: "S3_BUCKET",

diff --git a/infra/lib/scorer/scheduledTasks.ts b/infra/lib/scorer/scheduledTasks.ts
@@ -70,6 +70,8 @@ export function createTask({
     },
   });
 
+  const containerName = `${name}-container`;
+
   const task = new aws.ecs.TaskDefinition(`${name}-1`, {
     family: `${name}-1`,
     cpu: (cpu ? cpu : 256).toString(),
@@ -94,7 +96,7 @@ export function createTask({
       .apply(([env, secs, image, logGroupName, logGroupRegion]) =>
         JSON.stringify([
           {
-            name: `${name}-container`,
+            name: containerName,
             image,
             cpu: cpu ? cpu : 256,
             memory: memory ? memory : 2048,
@@ -232,6 +234,7 @@ export function createTask({
     subnets,
     alertTopic,
     commandSuccessMessage,
+    containerName,
   };
 }