feat: modify workflow to pass individual file links

decentraland · Mar 4, 2024 · f225da0 · f225da0
1 parent e638f57
commit f225da0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 14 deletions.
diff --git a/consumer-server/src/components.ts b/consumer-server/src/components.ts
@@ -30,8 +30,8 @@ export async function initComponents(): Promise<AppComponents> {
 
   const sqsQueue = await config.getString('TASK_QUEUE')
   const taskQueue = sqsQueue ?
-  createSqsAdapter<DeploymentToSqs & { lodBucketDirectory: string | undefined }>({ logs, metrics }, { queueUrl: sqsQueue, queueRegion: AWS_REGION }) :
-  createMemoryQueueAdapter<DeploymentToSqs & { lodBucketDirectory: string | undefined }>({ logs, metrics }, { queueName: "ConversionTaskQueue" })
+  createSqsAdapter<DeploymentToSqs & { lods: string[] | undefined }>({ logs, metrics }, { queueUrl: sqsQueue, queueRegion: AWS_REGION }) :
+  createMemoryQueueAdapter<DeploymentToSqs & { lods: string[] | undefined }>({ logs, metrics }, { queueName: "ConversionTaskQueue" })
 
   const s3Bucket = await config.getString('CDN_BUCKET')
   const cdnS3 = s3Bucket ? new AWS.S3({}) : new MockAws.S3({})

diff --git a/consumer-server/src/controllers/handlers/queue-conversion-handle.ts b/consumer-server/src/controllers/handlers/queue-conversion-handle.ts
@@ -16,7 +16,7 @@ export async function queueTaskHandler(context: HandlerContextWithPath<"metrics"
 
   if (!DeploymentToSqs.validate(body)) return { status: 403, body: { errors: DeploymentToSqs.validate.errors } }
 
-  const message = await taskQueue.publish(body as DeploymentToSqs & { lodBucketDirectory: string | undefined; })
+  const message = await taskQueue.publish(body as DeploymentToSqs & { lods: string[] | undefined; })
 
   return {
     status: 201,

diff --git a/consumer-server/src/logic/conversion-task.ts b/consumer-server/src/logic/conversion-task.ts
@@ -73,7 +73,7 @@ function getAbVersionEnvName(buildTarget: string)
   }
 }
 
-export async function executeLODConversion(components: Pick<AppComponents, 'logs' | 'metrics' | 'config' | 'cdnS3'>, entityId: string, lodBucketDirectory: string) { 
+export async function executeLODConversion(components: Pick<AppComponents, 'logs' | 'metrics' | 'config' | 'cdnS3'>, entityId: string, lods: string[]) { 
   const $LOD_BUCKET = await components.config.getString('LOD_BUCKET')
   if (!$LOD_BUCKET) {
     throw new Error('LOD_BUCKET is not defined')
@@ -92,7 +92,7 @@ export async function executeLODConversion(components: Pick<AppComponents, 'logs
   const logFile = `/tmp/asset_bundles_logs/export_log_${entityId}_${Date.now()}.txt`
   const s3LogKey = `logs/${$AB_VERSION}/${entityId}/${new Date().toISOString()}.txt`
   const outDirectory = `/tmp/asset_bundles_contents/entity_${entityId}`
-  let defaultLoggerMetadata = { entityId, lodBucketDirectory, version: $AB_VERSION, logFile } as any
+  let defaultLoggerMetadata = { entityId, lods, version: $AB_VERSION, logFile } as any
 
   logger.info("Starting conversion for " + $BUILD_TARGET, defaultLoggerMetadata)
 
@@ -101,8 +101,7 @@ export async function executeLODConversion(components: Pick<AppComponents, 'logs
       entityId,
       logFile,
       outDirectory,
-      lodBucket: $LOD_BUCKET,
-      lodBucketDirectory,
+      lods,
       unityPath: $UNITY_PATH,
       projectPath: $PROJECT_PATH,
       timeout: 60 * 60 * 1000,

diff --git a/consumer-server/src/logic/run-conversion.ts b/consumer-server/src/logic/run-conversion.ts
@@ -45,8 +45,7 @@ export async function runLodsConversion(logger: ILoggerComponent.ILogger, compon
   logFile: string,
   outDirectory: string,
   entityId: string,
-  lodBucket: string,
-  lodBucketDirectory: string,
+  lods: string[],
   unityPath: string,
   projectPath: string,
   timeout: number
@@ -61,8 +60,7 @@ export async function runLodsConversion(logger: ILoggerComponent.ILogger, compon
     '-executeMethod', 'DCL.ABConverter.LODClient.ExportS3LODsToAssetBundles',
     '-sceneCid', options.entityId,
     '-logFile', options.logFile,
-    '-bucket', options.lodBucket,
-    '-bucketDirectory', options.lodBucketDirectory,
+    '-lods', options.lods.join(','),
     '-output', options.outDirectory
   ]
 

diff --git a/consumer-server/src/service.ts b/consumer-server/src/service.ts
@@ -36,8 +36,8 @@ export async function main(program: Lifecycle.EntryPointParameters<AppComponents
       await components.taskQueue.consumeAndProcessJob(async (job, message) => {
         try {
           components.metrics.increment('ab_converter_running_conversion')
-          if (job.lodBucketDirectory) {
-            await executeLODConversion(components, job.entity.entityId, job.lodBucketDirectory)
+          if (job.lods) {
+            await executeLODConversion(components, job.entity.entityId, job.lods)
           } else {
             await executeConversion(components, job.entity.entityId, job.contentServerUrls![0], job.force)
           }

diff --git a/consumer-server/src/types.ts b/consumer-server/src/types.ts
@@ -22,7 +22,7 @@ export type BaseComponents = {
   logs: ILoggerComponent
   server: IHttpServerComponent<GlobalContext>
   fetch: IFetchComponent
-  taskQueue: ITaskQueue<DeploymentToSqs & { lodBucketDirectory: string | undefined }>
+  taskQueue: ITaskQueue<DeploymentToSqs & { lods: string[] | undefined }>
   metrics: IMetricsComponent<keyof typeof metricDeclarations>
   cdnS3: S3
   runner: IRunnerComponent