Merge pull request #38 from crazy-max/dev-deps

Update dev deps

.github/workflows/ci.yml

@@ -56,7 +56,27 @@ jobs:
         if: always()
         uses: crazy-max/ghaction-dump-context@v1
 
-  error:
+  error-msg:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Build
+        continue-on-error: true
+        uses: ./
+        with:
+          files: |
+            ./test/config.hcl
+          set: |
+            *.platform=linux/amd64,linux/ppc64le,linux/s390x
+      -
+        name: Dump context
+        if: always()
+        uses: crazy-max/ghaction-dump-context@v1
+
+  error-check:
     runs-on: ubuntu-latest
     steps:
       -

.prettierrc.json

@@ -1,5 +1,5 @@
 {
-  "printWidth": 120,
+  "printWidth": 240,
   "tabWidth": 2,
   "useTabs": false,
   "semi": true,

README.md

@@ -14,6 +14,8 @@ of  this action in your workflow (i.e `docker/bake-action@v1.1.3`).
 GitHub Action to use Docker [Buildx Bake](https://github.com/docker/buildx/blob/master/docs/reference/buildx_bake.md)
 as a high-level build command.
 
+![Screenshot](.github/bake-action.png)
+
 ___
 
 * [Usage](#usage)

__tests__/buildx.test.ts

@@ -2,9 +2,26 @@ import * as semver from 'semver';
 import * as buildx from '../src/buildx';
 import * as exec from '@actions/exec';
 
+describe('isAvailable', () => {
+  const execSpy: jest.SpyInstance = jest.spyOn(exec, 'getExecOutput');
+  execSpy.mockImplementation(() =>
+    Promise.resolve({
+      exitCode: expect.any(Number),
+      stdout: expect.any(Function),
+      stderr: expect.any(Function)
+    })
+  );
+
+  buildx.isAvailable();
+
+  expect(execSpy).toHaveBeenCalledWith(`docker`, ['buildx'], {
+    silent: true,
+    ignoreReturnCode: true
+  });
+});
+
 describe('getVersion', () => {
   it('valid', async () => {
-    await exec.exec('docker', ['buildx', 'version']);
     const version = await buildx.getVersion();
     console.log(`version: ${version}`);
     expect(semver.valid(version)).not.toBeNull();
@@ -15,8 +32,9 @@ describe('parseVersion', () => {
   test.each([
     ['github.com/docker/buildx 0.4.1+azure bda4882a65349ca359216b135896bddc1d92461c', '0.4.1'],
     ['github.com/docker/buildx v0.4.1 bda4882a65349ca359216b135896bddc1d92461c', '0.4.1'],
-    ['github.com/docker/buildx v0.4.2 fb7b670b764764dc4716df3eba07ffdae4cc47b2', '0.4.2']
+    ['github.com/docker/buildx v0.4.2 fb7b670b764764dc4716df3eba07ffdae4cc47b2', '0.4.2'],
+    ['github.com/docker/buildx f117971 f11797113e5a9b86bd976329c5dbb8a8bfdfadfa', 'f117971']
   ])('given %p', async (stdout, expected) => {
-    expect(await buildx.parseVersion(stdout)).toEqual(expected);
+    expect(buildx.parseVersion(stdout)).toEqual(expected);
   });
 });

__tests__/context.test.ts

@@ -124,13 +124,7 @@ FOO=bar`
     );
     const res = await context.getInputList('secrets', true);
     console.log(res);
-    expect(res).toEqual([
+    expect(res).toEqual(['GIT_AUTH_TOKEN=abcdefgh,ijklmno=0123456789', 'MYSECRET=aaaaaaaa', 'bbbbbbb', 'ccccccccc', 'FOO=bar']);
-      'GIT_AUTH_TOKEN=abcdefgh,ijklmno=0123456789',
-      'MYSECRET=aaaaaaaa',
-      'bbbbbbb',
-      'ccccccccc',
-      'FOO=bar'
-    ]);
   });
 
   it('multiline values escape quotes', async () => {
@@ -188,7 +182,7 @@ describe('setOutput', () => {
   });
 });
 
-// See: https://github.com/actions/toolkit/blob/master/packages/core/src/core.ts#L67
+// See: https://github.com/actions/toolkit/blob/a1b068ec31a042ff1e10a522d8fdf0b8869d53ca/packages/core/src/core.ts#L89
 function getInputName(name: string): string {
   return `INPUT_${name.replace(/ /g, '_').toUpperCase()}`;
 }

codecov.yml

@@ -0,0 +1,3 @@
+comment: false
+github_checks:
+  annotations: false

jest.config.js

@@ -1,5 +1,6 @@
 module.exports = {
   clearMocks: true,
+  restoreMocks: true,
   moduleFileExtensions: ['js', 'ts'],
   setupFiles: ["dotenv/config"],
   testEnvironment: 'node',

package.json

@@ -28,23 +28,23 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "@actions/core": "^1.2.7",
+    "@actions/core": "^1.4.0",
-    "@actions/exec": "^1.0.4",
+    "@actions/exec": "^1.1.0",
-    "csv-parse": "^4.15.4",
+    "csv-parse": "^4.16.0",
     "semver": "^7.3.5"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.3",
+    "@types/jest": "^26.0.23",
-    "@types/node": "^14.0.14",
+    "@types/node": "^14.17.4",
     "@types/tmp": "^0.2.0",
-    "@vercel/ncc": "^0.23.0",
+    "@vercel/ncc": "^0.28.6",
-    "dotenv": "^8.2.0",
+    "dotenv": "^8.6.0",
-    "jest": "^26.1.0",
+    "jest": "^26.6.3",
-    "jest-circus": "^26.1.0",
+    "jest-circus": "^26.6.3",
-    "jest-runtime": "^26.1.0",
+    "jest-runtime": "^26.6.3",
-    "prettier": "^2.0.5",
+    "prettier": "^2.3.2",
-    "ts-jest": "^26.1.1",
+    "ts-jest": "^26.5.6",
-    "typescript": "^3.9.5",
+    "typescript": "^4.3.4",
     "typescript-formatter": "^7.2.2"
   }
 }

src/buildx.ts

@@ -1,28 +1,38 @@
 import * as semver from 'semver';
-import * as exec from './exec';
+import * as exec from '@actions/exec';
 
 export async function isAvailable(): Promise<Boolean> {
-  return await exec.exec(`docker`, ['buildx'], true).then(res => {
+  return await exec
-    if (res.stderr != '' && !res.success) {
+    .getExecOutput('docker', ['buildx'], {
-      return false;
+      ignoreReturnCode: true,
-    }
+      silent: true
-    return res.success;
+    })
-  });
+    .then(res => {
+      if (res.stderr.length > 0 && res.exitCode != 0) {
+        return false;
+      }
+      return res.exitCode == 0;
+    });
 }
 
 export async function getVersion(): Promise<string> {
-  return await exec.exec(`docker`, ['buildx', 'version'], true).then(res => {
+  return await exec
-    if (res.stderr != '' && !res.success) {
+    .getExecOutput('docker', ['buildx', 'version'], {
-      throw new Error(res.stderr);
+      ignoreReturnCode: true,
-    }
+      silent: true
-    return parseVersion(res.stdout);
+    })
-  });
+    .then(res => {
+      if (res.stderr.length > 0 && res.exitCode != 0) {
+        throw new Error(res.stderr);
+      }
+      return parseVersion(res.stdout);
+    });
 }
 
-export async function parseVersion(stdout: string): Promise<string> {
+export function parseVersion(stdout: string): string {
-  const matches = /\sv?([0-9.]+)/.exec(stdout);
+  const matches = /\sv?([0-9a-f]{7}|[0-9.]+)/.exec(stdout);
   if (!matches) {
-    throw new Error(`Cannot parse Buildx version`);
+    throw new Error(`Cannot parse buildx version`);
   }
-  return semver.clean(matches[1]);
+  return matches[1];
 }

src/context.ts

@@ -19,10 +19,10 @@ export async function getInputs(): Promise<Inputs> {
     builder: core.getInput('builder'),
     files: getInputList('files'),
     targets: getInputList('targets'),
-    noCache: /true/i.test(core.getInput('no-cache')),
+    noCache: core.getBooleanInput('no-cache'),
-    pull: /true/i.test(core.getInput('pull')),
+    pull: core.getBooleanInput('pull'),
-    load: /true/i.test(core.getInput('load')),
+    load: core.getBooleanInput('load'),
-    push: /true/i.test(core.getInput('push')),
+    push: core.getBooleanInput('push'),
     set: getInputList('set', true)
   };
 }

src/exec.ts

@@ -1,34 +0,0 @@
-import * as aexec from '@actions/exec';
-import {ExecOptions} from '@actions/exec';
-
-export interface ExecResult {
-  success: boolean;
-  stdout: string;
-  stderr: string;
-}
-
-export const exec = async (command: string, args: string[] = [], silent: boolean): Promise<ExecResult> => {
-  let stdout: string = '';
-  let stderr: string = '';
-
-  const options: ExecOptions = {
-    silent: silent,
-    ignoreReturnCode: true
-  };
-  options.listeners = {
-    stdout: (data: Buffer) => {
-      stdout += data.toString();
-    },
-    stderr: (data: Buffer) => {
-      stderr += data.toString();
-    }
-  };
-
-  const returnCode: number = await aexec.exec(command, args, options);
-
-  return {
-    success: returnCode === 0,
-    stdout: stdout.trim(),
-    stderr: stderr.trim()
-  };
-};

src/main.ts

@@ -15,18 +15,23 @@ async function run(): Promise<void> {
       return;
     }
 
-    const buildxVersion = await buildx.getVersion();
+    const bxVersion = await buildx.getVersion();
-    core.info(`Using buildx ${buildxVersion}`);
+    const inputs: context.Inputs = await context.getInputs();
-
+    const args: string[] = await context.getArgs(inputs, bxVersion);
-    let inputs: context.Inputs = await context.getInputs();
-    const args: string[] = await context.getArgs(inputs, buildxVersion);
 
     core.startGroup(`Bake definition`);
     await exec.exec('docker', [...args, '--print']);
     core.endGroup();
 
-    core.info(`Building...`);
+    await exec
-    await exec.exec('docker', args);
+      .getExecOutput('docker', args, {
+        ignoreReturnCode: true
+      })
+      .then(res => {
+        if (res.stderr.length > 0 && res.exitCode != 0) {
+          throw new Error(`buildx bake failed with: ${res.stderr.match(/(.*)\s*$/)![0].trim()}`);
+        }
+      });
   } catch (error) {
     core.setFailed(error.message);
   }