Merge pull request #68 from crazy-max/fix-driver-opts-parsing

builder: fix regex to parse driver-opts
2023-03-11 16:47:42 +00:00 · 2023-03-11 16:48:56 +01:00 · 2023-03-08 18:16:10 +00:00 · 2023-03-08 18:15:51 +00:00 · 2023-03-06 23:20:20 +00:00 · 2023-03-06 23:18:48 +00:00
4 changed files with 15 additions and 21 deletions
--- a/tests/buildx/builder.test.ts
+++ b/tests/buildx/builder.test.ts
@@ -38,7 +38,7 @@ jest.spyOn(Builder.prototype, 'inspect').mockImplementation(async (): Promise<Bu
      {
        buildkit: 'v0.11.0',
        'buildkitd-flags': '--debug --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host',
-        'driver-opts': ['BUILDKIT_STEP_LOG_MAX_SIZE=10485760', 'BUILDKIT_STEP_LOG_MAX_SPEED=10485760', 'JAEGER_TRACE=localhost:6831', 'image=moby/buildkit:latest', 'network=host'],
+        'driver-opts': ['BUILDKIT_STEP_LOG_MAX_SIZE=10485760', 'BUILDKIT_STEP_LOG_MAX_SPEED=10485760', 'JAEGER_TRACE=localhost:6831', 'image=moby/buildkit:latest', 'network=host', 'qemu.install=true'],
        endpoint: 'unix:///var/run/docker.sock',
        name: 'builder20',
        platforms: 'linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6',
@@ -196,11 +196,12 @@ describe('parseInspect', () => {
           "buildkit": "v0.11.0",
           "buildkitd-flags": "--debug --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host",
           "driver-opts": [
-             "BUILDKIT_STEP_LOG_MAX_SIZE=10485760",
-             "BUILDKIT_STEP_LOG_MAX_SPEED=10485760",
-             "JAEGER_TRACE=localhost:6831",
+             "env.BUILDKIT_STEP_LOG_MAX_SIZE=10485760",
+             "env.BUILDKIT_STEP_LOG_MAX_SPEED=10485760",
+             "env.JAEGER_TRACE=localhost:6831",
             "image=moby/buildkit:latest",
-             "network=host"
+             "network=host",
+             "qemu.install=true"
           ],
           "endpoint": "unix:///var/run/docker.sock",
           "name": "builder20",
--- a/tests/fixtures/inspect7.txt
+++ b/tests/fixtures/inspect7.txt
@@ -5,7 +5,7 @@ Last Activity: 2023-01-16 09:45:23 +0000 UTC
 Nodes:
 Name:           builder20
 Endpoint:       unix:///var/run/docker.sock
-Driver Options: env.BUILDKIT_STEP_LOG_MAX_SIZE="10485760" env.BUILDKIT_STEP_LOG_MAX_SPEED="10485760" env.JAEGER_TRACE="localhost:6831" image="moby/buildkit:latest" network="host"
+Driver Options: env.BUILDKIT_STEP_LOG_MAX_SIZE="10485760" env.BUILDKIT_STEP_LOG_MAX_SPEED="10485760" env.JAEGER_TRACE="localhost:6831" image="moby/buildkit:latest" network="host" qemu.install="true"
 Status:         running
 Flags:          --debug --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host
 Buildkit:       v0.11.0
--- a/src/buildx/builder.ts
+++ b/src/buildx/builder.ts
@@ -105,7 +105,7 @@ export class Builder {
          break;
        }
        case 'driver options': {
-          node['driver-opts'] = (value.match(/(\w+)="([^"]*)"/g) || []).map(v => v.replace(/^(.*)="(.*)"$/g, '$1=$2'));
+          node['driver-opts'] = (value.match(/([a-zA-Z0-9_.]+)="([^"]*)"/g) || []).map(v => v.replace(/^(.*)="(.*)"$/g, '$1=$2'));
          break;
        }
        case 'status': {
--- a/yarn.lock
+++ b/yarn.lock
@@ -37,11 +37,11 @@ __metadata:
  linkType: hard

 "@actions/http-client@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@actions/http-client@npm:2.0.1"
+  version: 2.1.0
+  resolution: "@actions/http-client@npm:2.1.0"
  dependencies:
    tunnel: ^0.0.6
-  checksum: 799ec3df91e28a9da91ce6592e94f8b8923ccf6cc21a2f72c7429be5af5273f1625335411adc2a1bb222d56c852d5767214dfa6fa32a6da7e81dba8290e08f17
+  checksum: 25a72a952cc95fb4b3ab086da73a5754dd0957c206637cace69be2e16f018cc1b3d3c40d3bcf89ffd8a5929d5e8445594b498b50db306a50ad7536023f8e3800
  languageName: node
  linkType: hard

@@ -2573,17 +2573,10 @@ __metadata:
  languageName: node
  linkType: hard

-"csv-parse@npm:*":
-  version: 5.3.3
-  resolution: "csv-parse@npm:5.3.3"
-  checksum: 9f16e2003ef47c901aab31d202e1c9edb70c00faa7777e17a50087314c9da6561233bc60542c15d71f7973c7a0e947c35515ea2689929881c9430a8af374089e
-  languageName: node
-  linkType: hard
-
-"csv-parse@npm:^5.3.5":
-  version: 5.3.5
-  resolution: "csv-parse@npm:5.3.5"
-  checksum: 077e010db2ebbc9db708b719f2f650577c5ec8d176cd4363235d6644c36c642811d05ef1b6907390dd7466bde20a8dbb0f34994bc0e101521eb09e6691a02206
+"csv-parse@npm:*, csv-parse@npm:^5.3.5":
+  version: 5.3.6
+  resolution: "csv-parse@npm:5.3.6"
+  checksum: a6dcb61a0676121e84a29cdee4978a0516d1412fbe8895057d17e1a95a2013e6283b253135465ad562222d095988a74587d92b2fa04192bef15090acce2a0433
  languageName: node
  linkType: hard
Author	SHA1	Message	Date
CrazyMax	8df8cee02f	Merge pull request #68 from crazy-max/fix-driver-opts-parsing Some checks failed publish / publish (push) Has been cancelled Details builder: fix regex to parse driver-opts	2023-03-11 16:47:42 +00:00
CrazyMax	94febd1da7	builder: fix regex to parse driver-opts Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>	2023-03-11 16:48:56 +01:00
CrazyMax	b7cdc617ce	Merge pull request #65 from docker/dependabot/npm_and_yarn/csv-parse-5.3.6 build(deps): bump csv-parse from 5.3.5 to 5.3.6	2023-03-08 18:16:10 +00:00
CrazyMax	75c0c7fac0	Merge pull request #66 from docker/dependabot/npm_and_yarn/actions/http-client-2.1.0 build(deps): bump @actions/http-client from 2.0.1 to 2.1.0	2023-03-08 18:15:51 +00:00
dependabot[bot]	7b50104faa	build(deps): bump @actions/http-client from 2.0.1 to 2.1.0 Bumps [@actions/http-client](https://github.com/actions/toolkit/tree/HEAD/packages/http-client) from 2.0.1 to 2.1.0. - [Release notes](https://github.com/actions/toolkit/releases) - [Changelog](https://github.com/actions/toolkit/blob/main/packages/http-client/RELEASES.md) - [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/http-client) --- updated-dependencies: - dependency-name: "@actions/http-client" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-03-06 23:20:20 +00:00
dependabot[bot]	d7735e9ddf	build(deps): bump csv-parse from 5.3.5 to 5.3.6 Bumps [csv-parse](https://github.com/adaltas/node-csv/tree/HEAD/packages/csv-parse) from 5.3.5 to 5.3.6. - [Release notes](https://github.com/adaltas/node-csv/releases) - [Changelog](https://github.com/adaltas/node-csv/blob/master/packages/csv-parse/CHANGELOG.md) - [Commits](https://github.com/adaltas/node-csv/commits/csv-parse@5.3.6/packages/csv-parse) --- updated-dependencies: - dependency-name: csv-parse dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-03-06 23:18:48 +00:00