More try / catch

simplificator · Dec 7, 2023 · 61dea08 · 61dea08
1 parent 2cde44a
commit 61dea08
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 21 deletions.
diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts
@@ -94,6 +94,7 @@ describe('action', () => {
 
     await main.run()
     expect(runMock).toHaveReturned()
+    expect(setFailedMock).not.toHaveBeenCalled()
     expect(infoMock).toHaveBeenCalledWith('Cleaning up ...')
 
     const response = await axios.get('http://127.0.0.1:8888')

diff --git a/badges/coverage.svg b/badges/coverage.svg
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/main.ts b/src/main.ts
@@ -27,28 +27,44 @@ export async function run(): Promise<void> {
     }
 
     core.info('Creating docker context ...')
-    execSync(
-      `docker context create target --docker "host=ssh://${sshUserAtHost}:${sshPort}"`,
-      { stdio: [] }
-    )
-    execSync(`docker context use target`, { stdio: [] })
+    try {
+      execSync(
+        `docker context create target --docker "host=ssh://${sshUserAtHost}:${sshPort}"`,
+        { stdio: [] }
+      )
+      execSync(`docker context use target`, { stdio: [] })
+    } catch (error: unknown) {
+      core.setFailed(`Failed to initialise context: ${error}`)
+    }
 
-    core.info('Initialising Swarm if required ...')
-    execSync('docker node ls || docker swarm init', { stdio: [] })
+    try {
+      core.info('Initialising Swarm if required ...')
+      execSync('docker node ls || docker swarm init', { stdio: [] })
+    } catch (error: unknown) {
+      core.setFailed(`Failed to initialise Swarm: ${error}`)
+    }
 
     const dockerStackAwaitImage = 'sudobmitch/docker-stack-wait:v0.2.5'
     execSync(`docker pull ${dockerStackAwaitImage}`, { stdio: [] })
 
     core.info('Deploying stack ...')
-    execSync(
-      `docker stack deploy --compose-file ${composeFile} --prune --with-registry-auth ${stackName}`,
-      { stdio: [] }
-    )
+    try {
+      execSync(
+        `docker stack deploy --compose-file ${composeFile} --prune --with-registry-auth ${stackName}`,
+        { stdio: [] }
+      )
+    } catch (error: unknown) {
+      core.setFailed(`Failed to initialise deploy stack: ${error}`)
+    }
 
     core.info('Waiting for deployment to complete ...')
-    execSync(
-      `docker run --rm -i -v $(pwd)/${composeFile}:/docker-compose.yml -v /var/run/docker.sock:/var/run/docker.sock ${dockerStackAwaitImage} -l "--since 2m" -t 120 ${stackName}`
-    )
+    try {
+      execSync(
+        `docker run --rm -i -v $(pwd)/${composeFile}:/docker-compose.yml -v /var/run/docker.sock:/var/run/docker.sock ${dockerStackAwaitImage} -l "--since 2m" -t 120 ${stackName}`
+      )
+    } catch (error: unknown) {
+      core.setFailed(`Deployment appears to not complete: ${error}`)
+    }
 
     core.info('Cleaning up ...')
     execSync('docker system prune -af', { stdio: [] })