Merge pull request #92 from docker/dependabot/npm_and_yarn/csv-parse-5.3.8

build(deps): bump csv-parse from 5.3.6 to 5.3.8

.github/docker-releases.json

@@ -1,8 +1,44 @@
 {
   "latest": {
-    "id": 91964526,
-    "tag_name": "v23.0.1",
-    "html_url": "https://github.com/moby/moby/releases/tag/v23.0.1",
+    "id": 99811576,
+    "tag_name": "v23.0.4",
+    "html_url": "https://github.com/moby/moby/releases/tag/v23.0.4",
+    "assets": []
+  },
+  "v23.0.4": {
+    "id": 99811576,
+    "tag_name": "v23.0.4",
+    "html_url": "https://github.com/moby/moby/releases/tag/v23.0.4",
+    "assets": []
+  },
+  "v24.0.0-beta.2": {
+    "id": 99544545,
+    "tag_name": "v24.0.0-beta.2",
+    "html_url": "https://github.com/moby/moby/releases/tag/v24.0.0-beta.2",
+    "assets": []
+  },
+  "v23.0.3": {
+    "id": 98122882,
+    "tag_name": "v23.0.3",
+    "html_url": "https://github.com/moby/moby/releases/tag/v23.0.3",
+    "assets": []
+  },
+  "v20.10.24": {
+    "id": 98096018,
+    "tag_name": "v20.10.24",
+    "html_url": "https://github.com/moby/moby/releases/tag/v20.10.24",
+    "assets": []
+  },
+  "v24.0.0-beta.1": {
+    "id": 97703002,
+    "tag_name": "v24.0.0-beta.1",
+    "html_url": "https://github.com/moby/moby/releases/tag/v24.0.0-beta.1",
+    "assets": []
+  },
+  "v23.0.2": {
+    "id": 97163508,
+    "tag_name": "v23.0.2",
+    "html_url": "https://github.com/moby/moby/releases/tag/v23.0.2",
     "assets": []
   },
   "v23.0.1": {

.github/workflows/buildx-releases-json.yml

@@ -45,7 +45,7 @@ jobs:
           git add -A .
       -
         name: Create PR
-        uses: peter-evans/create-pull-request@38e0b6e68b4c852a5500a94740f0e535e0d7ba54
+        uses: peter-evans/create-pull-request@5b4a9f6a9e2af26e5f02351490b90d01eb8ec1e5
         with:
           base: main
           branch: bot/buildx-releases-json

.github/workflows/docker-releases-json.yml

@@ -45,7 +45,7 @@ jobs:
           git add -A .
       -
         name: Create PR
-        uses: peter-evans/create-pull-request@38e0b6e68b4c852a5500a94740f0e535e0d7ba54
+        uses: peter-evans/create-pull-request@5b4a9f6a9e2af26e5f02351490b90d01eb8ec1e5
         with:
           base: main
           branch: bot/docker-releases-json

.github/workflows/virtual-env.yml

@@ -23,7 +23,6 @@ jobs:
           - ubuntu-latest
           - ubuntu-22.04
           - ubuntu-20.04
-          - ubuntu-18.04
     steps:
       -
         name: File system

__tests__/buildx/bake.test.ts

@@ -33,17 +33,25 @@ describe('parseDefinitions', () => {
     [
       [path.join(fixturesDir, 'bake-01.hcl')],
       ['validate'],
+      [],
       path.join(fixturesDir, 'bake-01-validate.json')
     ],
     [
       [path.join(fixturesDir, 'bake-02.hcl')],
       ['build'],
+      [],
       path.join(fixturesDir, 'bake-02-build.json')
+    ],
+    [
+      [path.join(fixturesDir, 'bake-01.hcl')],
+      ['image'],
+      ['*.output=type=docker', '*.platform=linux/amd64'],
+      path.join(fixturesDir, 'bake-01-overrides.json')
     ]
-  ])('given %p', async (sources: string[], targets: string[], out: string) => {
+  ])('given %p', async (sources: string[], targets: string[], overrides: string[], out: string) => {
     const bake = new Bake();
     const expectedDef = <BakeDefinition>JSON.parse(fs.readFileSync(out, {encoding: 'utf-8'}).trim())
-    expect(await bake.parseDefinitions(sources, targets)).toEqual(expectedDef);
+    expect(await bake.parseDefinitions(sources, targets, overrides)).toEqual(expectedDef);
   });
 });
 

__tests__/fixtures/bake-01-overrides.json

@@ -0,0 +1,29 @@
+{
+  "group": {
+    "default": {
+      "targets": [
+        "image"
+      ]
+    }
+  },
+  "target": {
+    "image": {
+      "context": ".",
+      "dockerfile": "Dockerfile",
+      "args": {
+        "BUILDKIT_CONTEXT_KEEP_GIT_DIR": "1",
+        "GO_VERSION": "1.20"
+      },
+      "tags": [
+        "docker/buildx-bin:local"
+      ],
+      "target": "binaries",
+      "platforms": [
+        "linux/amd64"
+      ],
+      "output": [
+        "type=docker"
+      ]
+    }
+  }
+}

package.json

@@ -52,10 +52,10 @@
     "@actions/io": "^1.1.2",
     "@actions/tool-cache": "^2.0.1",
     "async-retry": "^1.3.3",
-    "csv-parse": "^5.3.6",
+    "csv-parse": "^5.3.8",
     "handlebars": "^4.7.7",
     "jwt-decode": "^3.1.2",
-    "semver": "^7.3.8",
+    "semver": "^7.5.0",
     "tmp": "^0.2.1"
   },
   "devDependencies": {

src/buildx/bake.ts

@@ -32,13 +32,16 @@ export class Bake {
     this.buildx = opts?.buildx || new Buildx();
   }
 
-  public async parseDefinitions(sources: Array<string>, targets: Array<string>, workdir?: string): Promise<BakeDefinition> {
+  public async parseDefinitions(sources: Array<string>, targets?: Array<string>, overrides?: Array<string>, load?: boolean, push?: boolean, workdir?: string): Promise<BakeDefinition> {
     const args = ['bake'];
 
     let remoteDef;
     const files: Array<string> = [];
     if (sources) {
-      for (const source of sources) {
+      for (const source of sources.map(v => v.trim())) {
+        if (source.length == 0) {
+          continue;
+        }
         if (!Util.isValidRef(source)) {
           files.push(source);
           continue;
@@ -55,8 +58,19 @@ export class Bake {
     for (const file of files) {
       args.push('--file', file);
     }
+    if (overrides) {
+      for (const override of overrides) {
+        args.push('--set', override);
+      }
+    }
+    if (load) {
+      args.push('--load');
+    }
+    if (push) {
+      args.push('--push');
+    }
 
-    const printCmd = await this.buildx.getCommand([...args, '--print', ...targets]);
+    const printCmd = await this.buildx.getCommand([...args, '--print', ...(targets || [])]);
     return await Exec.getExecOutput(printCmd.command, printCmd.args, {
       cwd: workdir,
       ignoreReturnCode: true,

src/toolkit.ts

@@ -15,7 +15,8 @@
  */
 
 import {Buildx} from './buildx/buildx';
-import {Install} from './buildx/install';
+import {Install as BuildxInstall} from './buildx/install';
+import {Bake} from './buildx/bake';
 import {Builder} from './buildx/builder';
 import {BuildKit} from './buildkit/buildkit';
 import {GitHub} from './github';
@@ -31,14 +32,16 @@ export interface ToolkitOpts {
 export class Toolkit {
   public github: GitHub;
   public buildx: Buildx;
-  public buildxInstall: Install;
+  public buildxInstall: BuildxInstall;
+  public bake: Bake;
   public builder: Builder;
   public buildkit: BuildKit;
 
   constructor(opts: ToolkitOpts = {}) {
     this.github = new GitHub({token: opts.githubToken});
     this.buildx = new Buildx();
-    this.buildxInstall = new Install();
+    this.buildxInstall = new BuildxInstall();
+    this.bake = new Bake({buildx: this.buildx});
     this.builder = new Builder({buildx: this.buildx});
     this.buildkit = new BuildKit({buildx: this.buildx});
   }

yarn.lock

@@ -818,7 +818,7 @@ __metadata:
     "@typescript-eslint/parser": ^5.56.0
     async-retry: ^1.3.3
     cpy-cli: ^4.2.0
-    csv-parse: ^5.3.6
+    csv-parse: ^5.3.8
     dotenv: ^16.0.3
     eslint: ^8.36.0
     eslint-config-prettier: ^8.8.0
@@ -830,7 +830,7 @@ __metadata:
     jwt-decode: ^3.1.2
     prettier: ^2.8.7
     rimraf: ^4.4.1
-    semver: ^7.3.8
+    semver: ^7.5.0
     tmp: ^0.2.1
     ts-jest: ^29.0.5
     ts-node: ^10.9.1
@@ -2619,10 +2619,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"csv-parse@npm:*, csv-parse@npm:^5.3.6":
-  version: 5.3.6
-  resolution: "csv-parse@npm:5.3.6"
-  checksum: a6dcb61a0676121e84a29cdee4978a0516d1412fbe8895057d17e1a95a2013e6283b253135465ad562222d095988a74587d92b2fa04192bef15090acce2a0433
+"csv-parse@npm:*, csv-parse@npm:^5.3.8":
+  version: 5.3.8
+  resolution: "csv-parse@npm:5.3.8"
+  checksum: 24d17fad0720d6e2ed8cf895817e5758bfcbf68350277bb9a6e58dd89797d7db626ef67aa62784b7ab3549e1a4527212ff8b4bdc5c7e66e0be2b9963162677d8
   languageName: node
   linkType: hard
 
@@ -5860,14 +5860,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:7.x, semver@npm:^7.3.5, semver@npm:^7.3.7":
-  version: 7.3.7
-  resolution: "semver@npm:7.3.7"
+"semver@npm:7.x, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.0":
+  version: 7.5.0
+  resolution: "semver@npm:7.5.0"
   dependencies:
     lru-cache: ^6.0.0
   bin:
     semver: bin/semver.js
-  checksum: 2fa3e877568cd6ce769c75c211beaed1f9fce80b28338cadd9d0b6c40f2e2862bafd62c19a6cff42f3d54292b7c623277bcab8816a2b5521cf15210d43e75232
+  checksum: 2d266937756689a76f124ffb4c1ea3e1bbb2b263219f90ada8a11aebebe1280b13bb76cca2ca96bdee3dbc554cbc0b24752eb895b2a51577aa644427e9229f2b
   languageName: node
   linkType: hard
 
@@ -5880,17 +5880,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.3.4, semver@npm:^7.3.8":
-  version: 7.3.8
-  resolution: "semver@npm:7.3.8"
-  dependencies:
-    lru-cache: ^6.0.0
-  bin:
-    semver: bin/semver.js
-  checksum: ba9c7cbbf2b7884696523450a61fee1a09930d888b7a8d7579025ad93d459b2d1949ee5bbfeb188b2be5f4ac163544c5e98491ad6152df34154feebc2cc337c1
-  languageName: node
-  linkType: hard
-
 "set-blocking@npm:^2.0.0":
   version: 2.0.0
   resolution: "set-blocking@npm:2.0.0"