Merge pull request #250 from Tradeshift/exec-fix

Tradeshift · Mar 26, 2022 · f5be74b · f5be74b
2 parents cbac167 + 0b2afcd
commit f5be74b
Show file tree

Hide file tree

Showing 8 changed files with 48,327 additions and 50,482 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/licenses.txt b/dist/licenses.txt
diff --git a/src/aws.ts b/src/aws.ts
@@ -1,8 +1,8 @@
 import * as semver from 'semver';
 
-import {exec} from './exec';
 import {info} from '@actions/core';
 import {which} from '@actions/io';
+import {getExecOutput} from '@actions/exec';
 
 const ecrRepositoryRegex =
   /^(([0-9]{12})\.dkr\.ecr\.(.+)\.amazonaws\.com(.cn)?)(\/([^:]+)(:.+)?)?$/;
@@ -37,8 +37,8 @@ async function parseCLIVersion(stdout: string): Promise<string> {
 
 async function execCLI(args: string[]): Promise<string> {
   const cli = await getCLI();
-  const res = await exec(cli, args, true);
-  if (res.stderr !== '' && !res.success) {
+  const res = await getExecOutput(cli, args, {silent: true});
+  if (res.stderr !== '' && res.exitCode) {
     throw new Error(res.stderr);
   } else if (res.stderr !== '') {
     return res.stderr.trim();

diff --git a/src/buildx.ts b/src/buildx.ts
@@ -9,8 +9,7 @@ import * as uuid from 'uuid';
 
 import {debug, endGroup, info, startGroup, warning} from '@actions/core';
 import {HttpClient} from '@actions/http-client';
-
-import {exec} from './exec';
+import {exec, getExecOutput} from '@actions/exec';
 
 export async function setup(builderName: string): Promise<void> {
   if (!(await isAvailable())) {
@@ -37,8 +36,8 @@ export async function stop(builderName: string): Promise<void> {
 
   startGroup(`🧹 Cleaning up builder`);
 
-  const res = await exec('docker', ['buildx', 'rm', builderName], false);
-  if (res.stderr !== '' && !res.success) {
+  const res = await getExecOutput('docker', ['buildx', 'rm', builderName]);
+  if (res.stderr !== '' && res.exitCode) {
     warning(res.stderr);
   }
 
@@ -56,7 +55,7 @@ async function createBuilder(name: string): Promise<void> {
     '--driver',
     'docker-container'
   ];
-  await exec('docker', args, false);
+  await exec('docker', args);
 
   endGroup();
 }
@@ -65,7 +64,7 @@ async function bootBuilder(name: string): Promise<void> {
   startGroup(`🏃 Booting builder`);
 
   const args = ['buildx', 'inspect', '--bootstrap', '--builder', name];
-  await exec('docker', args, false);
+  await exec('docker', args);
 
   endGroup();
 }
@@ -74,36 +73,39 @@ async function useBuilder(name: string): Promise<void> {
   startGroup(`Using builder`);
 
   const args = ['buildx', 'use', name];
-  await exec('docker', args, false);
+  await exec('docker', args);
   await ls();
 
   endGroup();
 }
 
 async function getVersion(): Promise<string> {
-  const res = await exec('docker', ['buildx', 'version'], true);
-  if (res.stderr !== '' && !res.success) {
+  const res = await getExecOutput('docker', ['buildx', 'version'], {
+    silent: true
+  });
+  if (res.stderr !== '' && res.exitCode) {
     throw new Error(res.stderr);
   }
   return parseVersion(res.stdout);
 }
 
 export async function inspect(shatag: string): Promise<void> {
   startGroup(`📦 Pushed image`);
-  const res = await exec(
-    'docker',
-    ['buildx', 'imagetools', 'inspect', shatag],
-    false
-  );
-  if (res.stderr !== '' && !res.success) {
+  const res = await getExecOutput('docker', [
+    'buildx',
+    'imagetools',
+    'inspect',
+    shatag
+  ]);
+  if (res.stderr !== '' && res.exitCode) {
     throw new Error(res.stderr);
   }
   endGroup();
 }
 
 async function ls(): Promise<void> {
-  const res = await exec('docker', ['buildx', 'ls'], false);
-  if (res.stderr !== '' && !res.success) {
+  const res = await getExecOutput('docker', ['buildx', 'ls']);
+  if (res.stderr !== '' && res.exitCode) {
     throw new Error(res.stderr);
   }
 }
@@ -121,8 +123,8 @@ async function parseVersion(stdout: string): Promise<string> {
 }
 
 async function isAvailable(): Promise<boolean> {
-  const res = await exec('docker', ['buildx'], true);
-  return res.stderr === '' && res.success;
+  const res = await getExecOutput('docker', ['buildx']);
+  return res.stderr === '' && !res.exitCode;
 }
 
 async function install(inputVersion = 'latest'): Promise<void> {

diff --git a/src/docker.ts b/src/docker.ts
@@ -1,18 +1,18 @@
+import * as exec from '@actions/exec';
 import * as outputs from './outputs';
 import * as state from './state';
 import {buildxCachePath, buildxNewCachePath} from './cache';
 import {debug, endGroup, info, startGroup, warning} from '@actions/core';
 import {Inputs} from './inputs';
-import {exec} from './exec';
 
 export async function build(inputs: Inputs): Promise<string> {
   startGroup('🏃 Starting build');
 
   const shaTag = await getSHATag(inputs.repository);
   outputs.setImage(shaTag);
   const args = await getBuildArgs(inputs, shaTag);
-  const res = await exec('docker', args, false);
-  if (res.stderr !== '' && !res.success) {
+  const res = await exec.getExecOutput('docker', args);
+  if (res.stderr !== '' && res.exitCode) {
     throw new Error(`buildx call failed: ${res.stderr.trim()}`);
   }
   endGroup();
@@ -67,16 +67,18 @@ export function isDockerhubRepository(repository: string): boolean {
 }
 
 async function getSHATag(repository: string): Promise<string> {
-  const res = await exec('git', ['rev-parse', 'HEAD'], true);
-  if (res.stderr !== '' && !res.success) {
+  const res = await exec.getExecOutput('git', ['rev-parse', 'HEAD'], {
+    silent: true
+  });
+  if (res.stderr !== '' && res.exitCode) {
     throw new Error(`git rev-parse HEAD failed: ${res.stderr.trim()}`);
   }
   return `${repository}:${res.stdout.trim()}`;
 }
 
 export async function version(): Promise<void> {
-  const res = await exec('docker', ['version'], false);
-  if (res.stderr !== '' && !res.success) {
+  const res = await exec.getExecOutput('docker', ['version']);
+  if (res.stderr !== '' && res.exitCode) {
     warning(res.stderr);
     return;
   }
@@ -103,8 +105,10 @@ export async function login(
     info(`🔑 Logging into Docker Hub...`);
   }
 
-  const res = await exec('docker', args, false, password);
-  if (res.stderr !== '' && !res.success) {
+  const res = await exec.getExecOutput('docker', args, {
+    input: Buffer.from(password, 'utf-8')
+  });
+  if (res.stderr !== '' && res.exitCode) {
     throw new Error(res.stderr);
   }
   state.setRegistry(registry);
@@ -123,8 +127,8 @@ async function asyncForEach<T>(
 }
 
 export async function logout(registry: string): Promise<void> {
-  const res = await exec('docker', ['logout', registry], false);
-  if (res.stderr !== '' && !res.success) {
+  const res = await exec.getExecOutput('docker', ['logout', registry]);
+  if (res.stderr !== '' && res.exitCode) {
     warning(res.stderr);
     return;
   }

diff --git a/src/exec.ts b/src/exec.ts
diff --git a/src/qemu.ts b/src/qemu.ts
@@ -1,21 +1,17 @@
 import {endGroup, startGroup, warning} from '@actions/core';
-import {exec} from './exec';
+import {getExecOutput} from '@actions/exec';
 
 export async function setup(): Promise<void> {
   startGroup(`🖥️ Setup qemu`);
-  const res = await exec(
-    'docker',
-    [
-      'run',
-      '--privileged',
-      '--rm',
-      'eu.gcr.io/tradeshift-base/tonistiigi/binfmt:qemu-v6.1.0',
-      '--install',
-      'all'
-    ],
-    false
-  );
-  if (res.stderr !== '' && !res.success) {
+  const res = await getExecOutput('docker', [
+    'run',
+    '--privileged',
+    '--rm',
+    'eu.gcr.io/tradeshift-base/tonistiigi/binfmt:qemu-v6.1.0',
+    '--install',
+    'all'
+  ]);
+  if (res.stderr !== '' && res.exitCode) {
     warning(res.stderr);
   }
   endGroup();