Merge pull request #63 from crazy-max/update-dev

chore: update dev dependencies and workflow
docker · Mar 21, 2022 · c468a05 · c468a05
2 parents aa64419 + 0be89e2
commit c468a05
Show file tree

Hide file tree

Showing 16 changed files with 2,152 additions and 14,039 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,23 @@
+{
+  "env": {
+    "node": true,
+    "es2021": true,
+    "jest/globals": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:jest/recommended",
+    "plugin:prettier/recommended"
+  ],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module"
+  },
+  "plugins": [
+    "@typescript-eslint",
+    "jest",
+    "prettier"
+  ]
+}
diff --git a/__tests__/buildx.test.ts b/__tests__/buildx.test.ts
@@ -1,3 +1,4 @@
+import {describe, expect, it, jest, test} from '@jest/globals';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as semver from 'semver';
@@ -26,26 +27,17 @@ jest.spyOn(context, 'tmpNameSync').mockImplementation((): string => {
 describe('getMetadata', () => {
   it('matches', async () => {
     const metadataFile = await buildx.getMetadataFile();
-    console.log(`metadataFile: ${metadataFile}`);
     await fs.writeFileSync(metadataFile, metadata);
     const expected = await buildx.getMetadata();
-    console.log(`metadata: ${expected}`);
     expect(expected).toEqual(metadata);
   });
 });
 
 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)
-    })
-  );
-
+  const execSpy = jest.spyOn(exec, 'getExecOutput');
   buildx.isAvailable();
 
+  // eslint-disable-next-line jest/no-standalone-expect
   expect(execSpy).toHaveBeenCalledWith(`docker`, ['buildx'], {
     silent: true,
     ignoreReturnCode: true
@@ -55,7 +47,6 @@ describe('isAvailable', () => {
 describe('getVersion', () => {
   it('valid', async () => {
     const version = await buildx.getVersion();
-    console.log(`version: ${version}`);
     expect(semver.valid(version)).not.toBeNull();
   }, 100000);
 });

diff --git a/__tests__/context.test.ts b/__tests__/context.test.ts
@@ -1,67 +1,59 @@
+import {beforeEach, describe, expect, it, jest} from '@jest/globals';
 import * as os from 'os';
 import * as context from '../src/context';
 
 describe('getInputList', () => {
   it('single line correctly', async () => {
     await setInput('foo', 'bar');
-    const res = await context.getInputList('foo');
-    console.log(res);
+    const res = context.getInputList('foo');
     expect(res).toEqual(['bar']);
   });
 
   it('multiline correctly', async () => {
     setInput('foo', 'bar\nbaz');
-    const res = await context.getInputList('foo');
-    console.log(res);
+    const res = context.getInputList('foo');
     expect(res).toEqual(['bar', 'baz']);
   });
 
   it('empty lines correctly', async () => {
     setInput('foo', 'bar\n\nbaz');
-    const res = await context.getInputList('foo');
-    console.log(res);
+    const res = context.getInputList('foo');
     expect(res).toEqual(['bar', 'baz']);
   });
 
   it('comma correctly', async () => {
     setInput('foo', 'bar,baz');
-    const res = await context.getInputList('foo');
-    console.log(res);
+    const res = context.getInputList('foo');
     expect(res).toEqual(['bar', 'baz']);
   });
 
   it('empty result correctly', async () => {
     setInput('foo', 'bar,baz,');
-    const res = await context.getInputList('foo');
-    console.log(res);
+    const res = context.getInputList('foo');
     expect(res).toEqual(['bar', 'baz']);
   });
 
   it('different new lines correctly', async () => {
     setInput('foo', 'bar\r\nbaz');
-    const res = await context.getInputList('foo');
-    console.log(res);
+    const res = context.getInputList('foo');
     expect(res).toEqual(['bar', 'baz']);
   });
 
   it('different new lines and comma correctly', async () => {
     setInput('foo', 'bar\r\nbaz,bat');
-    const res = await context.getInputList('foo');
-    console.log(res);
+    const res = context.getInputList('foo');
     expect(res).toEqual(['bar', 'baz', 'bat']);
   });
 
   it('multiline and ignoring comma correctly', async () => {
     setInput('cache-from', 'user/app:cache\ntype=local,src=path/to/dir');
-    const res = await context.getInputList('cache-from', true);
-    console.log(res);
+    const res = context.getInputList('cache-from', true);
     expect(res).toEqual(['user/app:cache', 'type=local,src=path/to/dir']);
   });
 
   it('different new lines and ignoring comma correctly', async () => {
     setInput('cache-from', 'user/app:cache\r\ntype=local,src=path/to/dir');
-    const res = await context.getInputList('cache-from', true);
-    console.log(res);
+    const res = context.getInputList('cache-from', true);
     expect(res).toEqual(['user/app:cache', 'type=local,src=path/to/dir']);
   });
 
@@ -74,8 +66,7 @@ bbbbbbb
 ccccccccc"
 FOO=bar`
     );
-    const res = await context.getInputList('secrets', true);
-    console.log(res);
+    const res = context.getInputList('secrets', true);
     expect(res).toEqual([
       'GIT_AUTH_TOKEN=abcdefgh,ijklmno=0123456789',
       `MYSECRET=aaaaaaaa
@@ -98,8 +89,7 @@ FOO=bar
 bbbb
 ccc"`
     );
-    const res = await context.getInputList('secrets', true);
-    console.log(res);
+    const res = context.getInputList('secrets', true);
     expect(res).toEqual([
       'GIT_AUTH_TOKEN=abcdefgh,ijklmno=0123456789',
       `MYSECRET=aaaaaaaa
@@ -122,8 +112,7 @@ bbbbbbb
 ccccccccc
 FOO=bar`
     );
-    const res = await context.getInputList('secrets', true);
-    console.log(res);
+    const res = context.getInputList('secrets', true);
     expect(res).toEqual(['GIT_AUTH_TOKEN=abcdefgh,ijklmno=0123456789', 'MYSECRET=aaaaaaaa', 'bbbbbbb', 'ccccccccc', 'FOO=bar']);
   });
 
@@ -136,12 +125,11 @@ bbbb""bbb
 ccccccccc"
 FOO=bar`
     );
-    const res = await context.getInputList('secrets', true);
-    console.log(res);
+    const res = context.getInputList('secrets', true);
     expect(res).toEqual([
       'GIT_AUTH_TOKEN=abcdefgh,ijklmno=0123456789',
       `MYSECRET=aaaaaaaa
-bbbb\"bbb
+bbbb"bbb
 ccccccccc`,
       'FOO=bar'
     ]);
@@ -163,19 +151,22 @@ describe('asyncForEach', () => {
 
 describe('setOutput', () => {
   beforeEach(() => {
-    process.stdout.write = jest.fn();
+    process.stdout.write = jest.fn() as typeof process.stdout.write;
   });
 
+  // eslint-disable-next-line jest/expect-expect
   it('setOutput produces the correct command', () => {
     context.setOutput('some output', 'some value');
     assertWriteCalls([`::set-output name=some output::some value${os.EOL}`]);
   });
 
+  // eslint-disable-next-line jest/expect-expect
   it('setOutput handles bools', () => {
     context.setOutput('some output', false);
     assertWriteCalls([`::set-output name=some output::false${os.EOL}`]);
   });
 
+  // eslint-disable-next-line jest/expect-expect
   it('setOutput handles numbers', () => {
     context.setOutput('some output', 1.01);
     assertWriteCalls([`::set-output name=some output::1.01${os.EOL}`]);

diff --git a/hack/build.Dockerfile → dev.Dockerfile b/hack/build.Dockerfile → dev.Dockerfile
@@ -1,8 +1,8 @@
-# syntax=docker/dockerfile:1.3-labs
+# syntax=docker/dockerfile:1
 
-ARG NODE_VERSION
-ARG DOCKER_VERSION=20.10.10
-ARG BUILDX_VERSION=0.7.0
+ARG NODE_VERSION=12
+ARG DOCKER_VERSION=20.10.13
+ARG BUILDX_VERSION=0.8.1
 
 FROM node:${NODE_VERSION}-alpine AS base
 RUN apk add --no-cache cpio findutils git
@@ -57,10 +57,10 @@ RUN --mount=type=bind,target=.,rw \
 FROM scratch AS format-update
 COPY --from=format /out /
 
-FROM deps AS format-validate
+FROM deps AS lint
 RUN --mount=type=bind,target=.,rw \
   --mount=type=cache,target=/src/node_modules \
-  yarn run format-check
+  yarn run lint
 
 FROM docker:${DOCKER_VERSION} as docker
 FROM docker/buildx-bin:${BUILDX_VERSION} as buildx