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

chore: update dev dependencies and workflow
docker · Mar 21, 2022 · 20111c6 · 20111c6
2 parents c62171c + 2e23606
commit 20111c6
Show file tree

Hide file tree

Showing 21 changed files with 2,157 additions and 16,299 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 os from 'os';
 import * as path from 'path';
@@ -21,35 +22,21 @@ jest.spyOn(context, 'tmpNameSync').mockImplementation((): string => {
 });
 
 describe('isAvailable', () => {
-  const execSpy: jest.SpyInstance = jest.spyOn(exec, 'getExecOutput');
+  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
   });
 });
 
 describe('getVersion', () => {
-  async function isDaemonRunning() {
-    return await exec
-      .getExecOutput(`docker`, ['version', '--format', '{{.Server.Os}}'], {
-        ignoreReturnCode: true,
-        silent: true
-      })
-      .then(res => {
-        return !res.stdout.trim().includes(' ') && res.exitCode == 0;
-      });
-  }
-  (isDaemonRunning() ? it : it.skip)(
-    'valid',
-    async () => {
-      const version = await buildx.getVersion();
-      console.log(`version: ${version}`);
-      expect(semver.valid(version)).not.toBeNull();
-    },
-    100000
-  );
+  it('valid', async () => {
+    const version = await buildx.getVersion();
+    expect(semver.valid(version)).not.toBeNull();
+  });
 });
 
 describe('parseVersion', () => {
@@ -74,54 +61,41 @@ describe('satisfies', () => {
 });
 
 describe('inspect', () => {
-  async function isDaemonRunning() {
-    return await exec
-      .getExecOutput(`docker`, ['version', '--format', '{{.Server.Os}}'], {
-        ignoreReturnCode: true,
-        silent: true
-      })
-      .then(res => {
-        return !res.stdout.trim().includes(' ') && res.exitCode == 0;
-      });
-  }
-  (isDaemonRunning() ? it : it.skip)(
-    'valid',
-    async () => {
-      const builder = await buildx.inspect('');
-      console.log('builder', builder);
-      expect(builder).not.toBeUndefined();
-      expect(builder.name).not.toEqual('');
-      expect(builder.driver).not.toEqual('');
-      expect(builder.node_platforms).not.toEqual('');
-    },
-    100000
-  );
+  it('valid', async () => {
+    const builder = await buildx.inspect('');
+    expect(builder).not.toBeUndefined();
+    expect(builder.name).not.toEqual('');
+    expect(builder.driver).not.toEqual('');
+    expect(builder.node_platforms).not.toEqual('');
+  }, 100000);
 });
 
 describe('build', () => {
   const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'setup-buildx-'));
+
+  // eslint-disable-next-line jest/no-disabled-tests
   it.skip('builds refs/pull/648/head', async () => {
     const buildxBin = await buildx.build('https://github.com/docker/buildx.git#refs/pull/648/head', tmpDir);
-    console.log(buildxBin);
     expect(fs.existsSync(buildxBin)).toBe(true);
   }, 100000);
+
+  // eslint-disable-next-line jest/no-disabled-tests
   it.skip('builds 67bd6f4dc82a9cd96f34133dab3f6f7af803bb14', async () => {
     const buildxBin = await buildx.build('https://github.com/docker/buildx.git#67bd6f4dc82a9cd96f34133dab3f6f7af803bb14', tmpDir);
-    console.log(buildxBin);
     expect(fs.existsSync(buildxBin)).toBe(true);
   }, 100000);
 });
 
 describe('install', () => {
   const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'setup-buildx-'));
+
   it('acquires v0.4.1 version of buildx', async () => {
     const buildxBin = await buildx.install('v0.4.1', tmpDir);
-    console.log(buildxBin);
     expect(fs.existsSync(buildxBin)).toBe(true);
   }, 100000);
+
   it('acquires latest version of buildx', async () => {
     const buildxBin = await buildx.install('latest', tmpDir);
-    console.log(buildxBin);
     expect(fs.existsSync(buildxBin)).toBe(true);
   }, 100000);
 });
@@ -148,13 +122,11 @@ describe('getConfig', () => {
         config = await buildx.getConfigInline(val);
       }
       expect(true).toBe(!invalid);
-      console.log(`config: ${config}`);
       expect(config).toEqual(`${tmpNameSync}`);
-      const configValue = await fs.readFileSync(tmpNameSync, 'utf-8');
-      console.log(`configValue: ${configValue}`);
+      const configValue = fs.readFileSync(tmpNameSync, 'utf-8');
       expect(configValue).toEqual(exValue);
     } catch (err) {
-      console.log(err);
+      // eslint-disable-next-line jest/no-conditional-expect
       expect(true).toBe(invalid);
     }
   });

diff --git a/__tests__/context.test.ts b/__tests__/context.test.ts
@@ -1,3 +1,4 @@
+import {beforeEach, describe, expect, it, jest} from '@jest/globals';
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
@@ -19,63 +20,54 @@ describe('getInputList', () => {
   it('handles single line correctly', async () => {
     await setInput('foo', 'bar');
     const res = await context.getInputList('foo');
-    console.log(res);
     expect(res).toEqual(['bar']);
   });
 
   it('handles multiple lines correctly', async () => {
     setInput('foo', 'bar\nbaz');
     const res = await context.getInputList('foo');
-    console.log(res);
     expect(res).toEqual(['bar', 'baz']);
   });
 
   it('remove empty lines correctly', async () => {
     setInput('foo', 'bar\n\nbaz');
     const res = await context.getInputList('foo');
-    console.log(res);
     expect(res).toEqual(['bar', 'baz']);
   });
 
   it('handles comma correctly', async () => {
     setInput('foo', 'bar,baz');
     const res = await context.getInputList('foo');
-    console.log(res);
     expect(res).toEqual(['bar', 'baz']);
   });
 
   it('remove empty result correctly', async () => {
     setInput('foo', 'bar,baz,');
     const res = await context.getInputList('foo');
-    console.log(res);
     expect(res).toEqual(['bar', 'baz']);
   });
 
   it('handles different new lines correctly', async () => {
     setInput('foo', 'bar\r\nbaz');
     const res = await context.getInputList('foo');
-    console.log(res);
     expect(res).toEqual(['bar', 'baz']);
   });
 
   it('handles different new lines and comma correctly', async () => {
     setInput('foo', 'bar\r\nbaz,bat');
     const res = await context.getInputList('foo');
-    console.log(res);
     expect(res).toEqual(['bar', 'baz', 'bat']);
   });
 
   it('handles multiple lines and ignoring comma correctly', async () => {
     setInput('driver-opts', 'image=moby/buildkit:master\nnetwork=host');
     const res = await context.getInputList('driver-opts', true);
-    console.log(res);
     expect(res).toEqual(['image=moby/buildkit:master', 'network=host']);
   });
 
   it('handles different new lines and ignoring comma correctly', async () => {
     setInput('driver-opts', 'image=moby/buildkit:master\r\nnetwork=host');
     const res = await context.getInputList('driver-opts', true);
-    console.log(res);
     expect(res).toEqual(['image=moby/buildkit:master', 'network=host']);
   });
 });
@@ -95,19 +87,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/__tests__/git.test.ts b/__tests__/git.test.ts
@@ -1,9 +1,9 @@
+import {describe, expect, it} from '@jest/globals';
 import * as git from '../src/git';
 
 describe('git', () => {
   it('returns git remote ref', async () => {
     const ref: string = await git.getRemoteSha('https://github.com/docker/buildx.git', 'refs/pull/648/head');
-    console.log(`ref: ${ref}`);
     expect(ref).toEqual('f11797113e5a9b86bd976329c5dbb8a8bfdfadfa');
   });
 });
diff --git a/__tests__/github.test.ts b/__tests__/github.test.ts
@@ -1,16 +1,15 @@
+import {describe, expect, it} from '@jest/globals';
 import * as github from '../src/github';
 
 describe('github', () => {
   it('returns latest buildx GitHub release', async () => {
     const release = await github.getRelease('latest');
-    console.log(release);
     expect(release).not.toBeNull();
     expect(release?.tag_name).not.toEqual('');
   });
 
   it('returns v0.2.2 buildx GitHub release', async () => {
     const release = await github.getRelease('v0.2.2');
-    console.log(release);
     expect(release).not.toBeNull();
     expect(release?.tag_name).toEqual('v0.2.2');
   });

diff --git a/__tests__/util.test.ts b/__tests__/util.test.ts
@@ -1,3 +1,4 @@
+import {describe, expect, test} from '@jest/globals';
 import * as util from '../src/util';
 
 describe('isValidUrl', () => {

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