Update step version

NASA-IMPACT · Oct 26, 2024 · 9796cc6 · 9796cc6
1 parent 3ffea1f
commit 9796cc6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4

diff --git a/bin/apply-config.mjs b/bin/apply-config.mjs
@@ -18,6 +18,8 @@ import {
 
 let exitCode = null;
 
+const ecs = new ECSClient({});
+
 main()
   .then((logs) => {
     console.log(`Task output:\n${"-".repeat(100)}`);
@@ -32,14 +34,13 @@ main()
 async function main() {
   const [, , lambdaArn] = process.argv;
   const { taskArn, clusterArn } = await invokeLambda(lambdaArn);
-  const ecs = new ECSClient({});
-  const task = await pollEcsTask(ecs, taskArn, clusterArn);
+  const task = await pollEcsTask(taskArn, clusterArn);
   exitCode = task.containers[0]?.exitCode ?? null;
   if (exitCode === null)
     throw new Error("Could not retrieve exit code from the ECS task.");
 
   const { logGroup, logStreamPrefix, region, containerName } =
-    await getLogConfig(ecs, task.taskDefinitionArn);
+    await getLogConfig(task.taskDefinitionArn);
   const taskId = taskArn.split("/").pop();
   const logStreamName = `${logStreamPrefix}/${containerName}/${taskId}`;
   return fetchCloudWatchLogs(logGroup, logStreamName, region);
@@ -57,7 +58,7 @@ async function invokeLambda(lambdaArn) {
   return JSON.parse(new TextDecoder().decode(response.Payload));
 }
 
-async function pollEcsTask(ecs, taskArn, clusterArn) {
+async function pollEcsTask(taskArn, clusterArn) {
   while (true) {
     const { tasks } = await ecs.send(
       new DescribeTasksCommand({ cluster: clusterArn, tasks: [taskArn] })
@@ -70,7 +71,7 @@ async function pollEcsTask(ecs, taskArn, clusterArn) {
   }
 }
 
-async function getLogConfig(ecs, taskDefinitionArn) {
+async function getLogConfig(taskDefinitionArn) {
   const { taskDefinition } = await ecs.send(
     new DescribeTaskDefinitionCommand({ taskDefinition: taskDefinitionArn })
   );

diff --git a/deploy/lib/KeycloakConfig.ts b/deploy/lib/KeycloakConfig.ts
@@ -70,6 +70,7 @@ export class KeycloakConfig extends Construct {
       },
     });
 
+    // Helper to simplify triggering the ECS task
     const applyConfigLambda = new lambda.Function(this, "ApplyConfigLambda", {
       code: lambda.Code.fromInline(`
         const { ECSClient, RunTaskCommand } = require('@aws-sdk/client-ecs');