Remove AWS SDKv2

geekcell · Aug 8, 2024 · f73c82a · f73c82a
1 parent 9c2f82b
commit f73c82a
Show file tree

Hide file tree

Showing 4 changed files with 833 additions and 1,491 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,9 @@
 [![Geek Cell GmbH](https://raw.githubusercontent.com/geekcell/.github/main/geekcell-github-banner.png)](https://www.geekcell.io/)
 
+[![Linter](https://github.com/geekcell/github-action-aws-ecs-run-task/actions/workflows/linter.yaml/badge.svg)](https://github.com/geekcell/github-action-aws-ecs-run-task/actions/workflows/linter.yaml)
+[![Test](https://github.com/geekcell/github-action-aws-ecs-run-task/actions/workflows/test.yaml/badge.svg)](https://github.com/geekcell/github-action-aws-ecs-run-task/actions/workflows/test.yaml)
+[![Check dist/](https://github.com/geekcell/github-action-aws-ecs-run-task/actions/workflows/check-dist.yaml/badge.svg)](https://github.com/geekcell/github-action-aws-ecs-run-task/actions/workflows/check-dist.yaml)
+
 <!-- action-docs-description -->
 ## Description
 

diff --git a/dist/index.js b/dist/index.js
@@ -56578,6 +56578,9 @@ const main = async () => {
             return;
         }
 
+        // Get CWLogsClient
+        let CWLogClient = new CloudWatchLogsClient();
+
         // Only create logFilterStream if tailLogs is enabled, and we wait for the task to stop in the pipeline
         if (tailLogs) {
             core.debug(`Logging enabled. Getting logConfiguration from TaskDefinition.`)
@@ -56612,7 +56615,6 @@ const main = async () => {
 
                         // Start Live Tail
                         try {
-                            const CWLogClient = new CloudWatchLogsClient();
                             const response = await CWLogClient.send(new StartLiveTailCommand({
                                 logGroupIdentifiers: [logGroupIdentifier],
                                 logStreamNames: [logStreamName]
@@ -56645,6 +56647,7 @@ const main = async () => {
         }
 
         // Close LogStream and store output
+        CWLogClient.destroy();
         core.setOutput('log-output', logOutput);
 
         // Describe Task to get Exit Code and Exceptions
@@ -56684,7 +56687,15 @@ async function handleCWResponseAsync(response) {
             core.error("CWLiveTailSession error: Unknown event type.");
         }
     } catch (err) {
-        core.error(err.message)
+        // If we close the connection, we will get an error with message 'aborted' which we can ignore as it will
+        // just show as an error in the logs.
+        if (err.message === 'aborted') {
+            core.debug("CWLiveTailSession aborted.");
+
+            return;
+        }
+
+        core.error(err.name + ": " + err.message);
     }
 }
 

diff --git a/index.js b/index.js
@@ -130,6 +130,9 @@ const main = async () => {
             return;
         }
 
+        // Get CWLogsClient
+        let CWLogClient = new CloudWatchLogsClient();
+
         // Only create logFilterStream if tailLogs is enabled, and we wait for the task to stop in the pipeline
         if (tailLogs) {
             core.debug(`Logging enabled. Getting logConfiguration from TaskDefinition.`)
@@ -164,7 +167,6 @@ const main = async () => {
 
                         // Start Live Tail
                         try {
-                            const CWLogClient = new CloudWatchLogsClient();
                             const response = await CWLogClient.send(new StartLiveTailCommand({
                                 logGroupIdentifiers: [logGroupIdentifier],
                                 logStreamNames: [logStreamName]
@@ -197,6 +199,7 @@ const main = async () => {
         }
 
         // Close LogStream and store output
+        CWLogClient.destroy();
         core.setOutput('log-output', logOutput);
 
         // Describe Task to get Exit Code and Exceptions
@@ -236,7 +239,15 @@ async function handleCWResponseAsync(response) {
             core.error("CWLiveTailSession error: Unknown event type.");
         }
     } catch (err) {
-        core.error(err.message)
+        // If we close the connection, we will get an error with message 'aborted' which we can ignore as it will
+        // just show as an error in the logs.
+        if (err.message === 'aborted') {
+            core.debug("CWLiveTailSession aborted.");
+
+            return;
+        }
+
+        core.error(err.name + ": " + err.message);
     }
 }