Merge pull request #42 from crazy-max/buildkit-fix-version

buildkit: use node info to retrieve version

__tests__/buildkit/buildkit.test.ts

@@ -15,7 +15,6 @@
  */
 
 import {beforeEach, describe, expect, it, jest, test} from '@jest/globals';
-import * as semver from 'semver';
 
 import {BuildKit} from '../../src/buildkit/buildkit';
 import {Builder} from '../../src/buildx/builder';
@@ -48,11 +47,15 @@ jest.spyOn(Builder.prototype, 'inspect').mockImplementation(async (): Promise<Bu
 
 describe('getVersion', () => {
   it('valid', async () => {
+    const builder = new Builder({
+      context: new Context()
+    });
+    const builderInfo = await builder.inspect('builder2');
     const buildkit = new BuildKit({
       context: new Context()
     });
-    const version = await buildkit.getVersion('builder2');
+    const version = await buildkit.getVersion(builderInfo.nodes[0]);
-    expect(semver.valid(version)).not.toBeNull();
+    expect(version).toBe('v0.11.0');
   });
 });
 

src/buildkit/buildkit.ts

@@ -23,7 +23,7 @@ import {Buildx} from '../buildx/buildx';
 import {Builder} from '../buildx/builder';
 import {Config} from './config';
 
-import {BuilderInfo} from '../types/builder';
+import {BuilderInfo, NodeInfo} from '../types/builder';
 
 export interface BuildKitOpts {
   context: Context;
@@ -46,14 +46,7 @@ export class BuildKit {
       });
   }
 
-  public async getVersion(builderName: string): Promise<string | undefined> {
+  public async getVersion(node: NodeInfo): Promise<string | undefined> {
-    const builderInfo = await this.getBuilderInfo(builderName);
-    if (builderInfo.nodes.length == 0) {
-      // a builder always have on node, should not happen.
-      return undefined;
-    }
-    // TODO: get version for all nodes
-    const node = builderInfo.nodes[0];
     if (!node.buildkitVersion && node.name) {
       try {
         return await this.getVersionWithinImage(node.name);
@@ -92,8 +85,13 @@ export class BuildKit {
       });
   }
 
-  public async versionSatisfies(builderName: string, range: string): Promise<boolean> {
+  public async versionSatisfies(builderName: string, range: string, builderInfo?: BuilderInfo): Promise<boolean> {
-    const builderInfo = await this.getBuilderInfo(builderName);
+    if (!builderInfo) {
+      builderInfo = await new Builder({
+        context: this.context,
+        buildx: this.buildx
+      }).inspect(builderName);
+    }
     for (const node of builderInfo.nodes) {
       let bkversion = node.buildkitVersion;
       if (!bkversion) {
@@ -113,12 +111,4 @@ export class BuildKit {
     }
     return true;
   }
-
-  private async getBuilderInfo(name: string): Promise<BuilderInfo> {
-    const builder = new Builder({
-      context: this.context,
-      buildx: this.buildx
-    });
-    return builder.inspect(name);
-  }
 }