refactor: log location

linz · Oct 20, 2024 · 570b97c · 570b97c
1 parent a6c3596
commit 570b97c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 15 deletions.
diff --git a/templates/common/__test__/get.location.test.ts b/templates/common/__test__/get.location.test.ts
@@ -29,17 +29,22 @@ describe('get-location script template', () => {
         throw new Error('Failed');
       },
     );
-    assert.equal(spy.mock.callCount(), 3);
+    assert.equal(spy.mock.callCount(), 1);
 
-    const location = String(spy.mock.calls[0]?.arguments[0]);
-    assert.equal(location, 'Location: s3://linz-workflows-scratch/2024-10/02-test-get-location-29l4x/');
+    const logOutputDict = JSON.parse(String(spy.mock.calls[0]?.arguments[0])) as { time: number };
 
-    const bucket = String(spy.mock.calls[1]?.arguments[0]);
-    assert.equal(bucket, 'Bucket: linz-workflows-scratch');
-
-    const key = String(spy.mock.calls[2]?.arguments[0]);
-    assert.equal(key, 'Key: 2024-10/02-test-get-location-29l4x');
+    // override time
+    logOutputDict.time = 1724037007216;
 
+    assert.deepEqual(logOutputDict, {
+      time: 1724037007216,
+      level: 20,
+      pid: 1,
+      msg: 'Workflow:Location',
+      location: 's3://linz-workflows-scratch/2024-10/02-test-get-location-29l4x/',
+      bucket: 'linz-workflows-scratch',
+      key: '2024-10/02-test-get-location-29l4x',
+    });
     assert.deepEqual(shimRequired, ['node:fs']);
   });
 });
diff --git a/templates/common/get.location.yml b/templates/common/get.location.yml
@@ -37,11 +37,19 @@ spec:
 
           const argoTemplate = JSON.parse(process.env['ARGO_TEMPLATE']);
           const podArchiveLoc = argoTemplate.archiveLocation.s3;
-          const workflowArchiveKey = podArchiveLoc.key.substr(0, podArchiveLoc.key.lastIndexOf('/'));
-          const location = `s3://${podArchiveLoc.bucket}/${workflowArchiveKey}/`
-          console.log(`Location: ${location}`);
-          console.log(`Bucket: ${podArchiveLoc.bucket}`);
-          console.log(`Key: ${workflowArchiveKey}`);
+          const key = podArchiveLoc.key.substr(0, podArchiveLoc.key.lastIndexOf('/'));
+          const bucket = podArchiveLoc.bucket;
+          const location = `s3://${bucket}/${key}/`
+
           fs.writeFileSync('/tmp/location', location);
-          fs.writeFileSync('/tmp/bucket', `${podArchiveLoc.bucket}`);
-          fs.writeFileSync('/tmp/key', `${workflowArchiveKey}`);
+          fs.writeFileSync('/tmp/bucket', bucket);
+          fs.writeFileSync('/tmp/key', key);
+          console.log(JSON.stringify({
+              time: Date.now(),
+              level: 20,
+              pid: 1,
+              msg: 'Workflow:Location',
+              location,
+              bucket,
+              key,
+            }),)