Merge pull request #4 from crazy-max/buildx-version

buildx: do not set version in constructor
This commit is contained in:
CrazyMax
2023-01-30 20:11:23 +01:00
committed by GitHub
2 changed files with 25 additions and 17 deletions

View File

@@ -107,12 +107,12 @@ describe('printVersion', () => {
}); });
}); });
describe('getVersion', () => { describe('version', () => {
it('valid', async () => { it('valid', async () => {
const buildx = new Buildx({ const buildx = new Buildx({
context: new Context() context: new Context()
}); });
expect(semver.valid(await buildx.version)).not.toBeNull(); expect(semver.valid(await buildx.version)).not.toBeUndefined();
}); });
}); });

View File

@@ -15,13 +15,13 @@ export interface BuildxOpts {
export class Buildx { export class Buildx {
private readonly context: Context; private readonly context: Context;
private _version: string | undefined;
public standalone: boolean; public standalone: boolean;
public version: Promise<string>;
constructor(opts: BuildxOpts) { constructor(opts: BuildxOpts) {
this.context = opts.context; this.context = opts.context;
this.standalone = opts?.standalone ?? !Docker.isAvailable(); this.standalone = opts?.standalone ?? !Docker.isAvailable();
this.version = this.getVersion();
} }
public getCommand(args: Array<string>) { public getCommand(args: Array<string>) {
@@ -57,19 +57,24 @@ export class Buildx {
}); });
} }
private async getVersion(): Promise<string> { get version() {
const cmd = this.getCommand(['version']); return (async () => {
return await exec if (!this._version) {
.getExecOutput(cmd.command, cmd.args, { const cmd = this.getCommand(['version']);
ignoreReturnCode: true, this._version = await exec
silent: true .getExecOutput(cmd.command, cmd.args, {
}) ignoreReturnCode: true,
.then(res => { silent: true
if (res.stderr.length > 0 && res.exitCode != 0) { })
throw new Error(res.stderr.trim()); .then(res => {
} if (res.stderr.length > 0 && res.exitCode != 0) {
return Buildx.parseVersion(res.stdout.trim()); throw new Error(res.stderr.trim());
}); }
return Buildx.parseVersion(res.stdout.trim());
});
}
return this._version;
})();
} }
public async printVersion() { public async printVersion() {
@@ -89,6 +94,9 @@ export class Buildx {
public async versionSatisfies(range: string, version?: string): Promise<boolean> { public async versionSatisfies(range: string, version?: string): Promise<boolean> {
const ver = version ?? (await this.version); const ver = version ?? (await this.version);
if (!ver) {
return false;
}
return semver.satisfies(ver, range) || /^[0-9a-f]{7}$/.exec(ver) !== null; return semver.satisfies(ver, range) || /^[0-9a-f]{7}$/.exec(ver) !== null;
} }