From 9128f562582082e38db3e7df00558cf64a257417 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Fri, 24 Feb 2023 19:41:10 +0100 Subject: [PATCH] builder: fix breaking change on node fields Signed-off-by: CrazyMax --- __tests__/buildkit/buildkit.test.ts | 6 ++--- __tests__/buildx/builder.test.ts | 34 ++++++++++++++--------------- src/buildkit/buildkit.ts | 6 ++--- src/buildx/builder.ts | 6 ++--- src/types/builder.ts | 15 +++++-------- 5 files changed, 31 insertions(+), 36 deletions(-) diff --git a/__tests__/buildkit/buildkit.test.ts b/__tests__/buildkit/buildkit.test.ts index 8650c2c..1d4f5c0 100644 --- a/__tests__/buildkit/buildkit.test.ts +++ b/__tests__/buildkit/buildkit.test.ts @@ -32,9 +32,9 @@ jest.spyOn(Builder.prototype, 'inspect').mockImplementation(async (): Promise { "name": "builder-5cb467f7-0940-47e1-b94b-d51f54054d620", "endpoint": "unix:///var/run/docker.sock", "status": "running", - "buildkitdFlags": "--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host", - "buildkitVersion": "v0.10.4", + "buildkitd-flags": "--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host", + "buildkit": "v0.10.4", "platforms": "linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/amd64/v4,linux/arm64,linux/riscv64,linux/386,linux/arm/v7,linux/arm/v6" } ] @@ -87,12 +87,12 @@ describe('parseInspect', () => { { "name": "builder-5f449644-ff29-48af-8344-abb0292d06730", "endpoint": "unix:///var/run/docker.sock", - "driverOpts": [ + "driver-opts": [ "image=moby/buildkit:latest" ], "status": "running", - "buildkitdFlags": "--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host", - "buildkitVersion": "v0.10.4", + "buildkitd-flags": "--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host", + "buildkit": "v0.10.4", "platforms": "linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/amd64/v4,linux/386" } ] @@ -107,13 +107,13 @@ describe('parseInspect', () => { { "name": "builder-9929e463-7954-4dc3-89cd-514cca29ff800", "endpoint": "unix:///var/run/docker.sock", - "driverOpts": [ + "driver-opts": [ "image=moby/buildkit:master", "network=host" ], "status": "running", - "buildkitdFlags": "--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host", - "buildkitVersion": "3fab389", + "buildkitd-flags": "--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host", + "buildkit": "3fab389", "platforms": "linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/amd64/v4,linux/386" } ] @@ -129,7 +129,7 @@ describe('parseInspect', () => { "name": "default", "endpoint": "default", "status": "running", - "buildkitVersion": "20.10.17", + "buildkit": "20.10.17", "platforms": "linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6" } ] @@ -144,7 +144,7 @@ describe('parseInspect', () => { { "name": "aws_graviton2", "endpoint": "tcp://1.23.45.67:1234", - "driverOpts": [ + "driver-opts": [ "cert=/home/user/.certs/aws_graviton2/cert.pem", "key=/home/user/.certs/aws_graviton2/key.pem", "cacert=/home/user/.certs/aws_graviton2/ca.pem" @@ -163,7 +163,7 @@ describe('parseInspect', () => { "name": "builder-17cfff01-48d9-4c3d-9332-9992e308a5100", "endpoint": "unix:///var/run/docker.sock", "status": "running", - "buildkitdFlags": "--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host", + "buildkitd-flags": "--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host", "platforms": "linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/386" } ], @@ -179,9 +179,9 @@ describe('parseInspect', () => { "lastActivity": new Date("2023-01-16T09:45:23.000Z"), "nodes": [ { - "buildkitVersion": "v0.11.0", - "buildkitdFlags": "--debug --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host", - "driverOpts": [ + "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", diff --git a/src/buildkit/buildkit.ts b/src/buildkit/buildkit.ts index 9abbe78..95624d5 100644 --- a/src/buildkit/buildkit.ts +++ b/src/buildkit/buildkit.ts @@ -39,14 +39,14 @@ export class BuildKit { } public async getVersion(node: NodeInfo): Promise { - if (!node.buildkitVersion && node.name) { + if (!node.buildkit && node.name) { try { return await this.getVersionWithinImage(node.name); } catch (e) { core.warning(e); } } - return node.buildkitVersion; + return node.buildkit; } private async getVersionWithinImage(nodeName: string): Promise { @@ -80,7 +80,7 @@ export class BuildKit { builderInfo = await new Builder({buildx: this.buildx}).inspect(builderName); } for (const node of builderInfo.nodes) { - let bkversion = node.buildkitVersion; + let bkversion = node.buildkit; core.debug(`BuildKit.versionSatisfies ${bkversion}: ${range}`); if (!bkversion) { try { diff --git a/src/buildx/builder.ts b/src/buildx/builder.ts index eab4159..fab1930 100644 --- a/src/buildx/builder.ts +++ b/src/buildx/builder.ts @@ -80,7 +80,7 @@ export class Builder { break; } case 'driver options': { - node.driverOpts = (value.match(/(\w+)="([^"]*)"/g) || []).map(v => v.replace(/^(.*)="(.*)"$/g, '$1=$2')); + node['driver-opts'] = (value.match(/(\w+)="([^"]*)"/g) || []).map(v => v.replace(/^(.*)="(.*)"$/g, '$1=$2')); break; } case 'status': { @@ -88,11 +88,11 @@ export class Builder { break; } case 'flags': { - node.buildkitdFlags = value; + node['buildkitd-flags'] = value; break; } case 'buildkit': { - node.buildkitVersion = value; + node.buildkit = value; break; } case 'platforms': { diff --git a/src/types/builder.ts b/src/types/builder.ts index c798edc..da8d4e6 100644 --- a/src/types/builder.ts +++ b/src/types/builder.ts @@ -21,16 +21,6 @@ export interface BuilderInfo { nodes: NodeInfo[]; } -export interface NodeInfo { - name?: string; - endpoint?: string; - driverOpts?: Array; - status?: string; - buildkitdFlags?: string; - buildkitVersion?: string; - platforms?: string; -} - export interface Node { name?: string; endpoint?: string; @@ -38,3 +28,8 @@ export interface Node { 'buildkitd-flags'?: string; platforms?: string; } + +export interface NodeInfo extends Node { + status?: string; + buildkit?: string; +}