make Context static

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax
2023-02-20 07:19:57 +01:00
parent 580aee99c0
commit a0e8f0bf18
14 changed files with 80 additions and 145 deletions

View File

@@ -18,7 +18,6 @@ import * as core from '@actions/core';
import * as exec from '@actions/exec';
import * as semver from 'semver';
import {Context} from '../context';
import {Buildx} from '../buildx/buildx';
import {Builder} from '../buildx/builder';
import {Config} from './config';
@@ -26,24 +25,17 @@ import {Config} from './config';
import {BuilderInfo, NodeInfo} from '../types/builder';
export interface BuildKitOpts {
context: Context;
buildx?: Buildx;
}
export class BuildKit {
private readonly context: Context;
private readonly buildx: Buildx;
public readonly config: Config;
constructor(opts: BuildKitOpts) {
this.context = opts.context;
this.config = new Config(this.context);
this.buildx =
opts?.buildx ||
new Buildx({
context: this.context
});
constructor(opts?: BuildKitOpts) {
this.config = new Config();
this.buildx = opts?.buildx || new Buildx();
}
public async getVersion(node: NodeInfo): Promise<string | undefined> {
@@ -89,10 +81,7 @@ export class BuildKit {
public async versionSatisfies(builderName: string, range: string, builderInfo?: BuilderInfo): Promise<boolean> {
if (!builderInfo) {
builderInfo = await new Builder({
context: this.context,
buildx: this.buildx
}).inspect(builderName);
builderInfo = await new Builder({buildx: this.buildx}).inspect(builderName);
}
for (const node of builderInfo.nodes) {
core.debug(`BuildKit.versionSatisfies ${node}: ${range}`);

View File

@@ -19,12 +19,6 @@ import fs from 'fs';
import {Context} from '../context';
export class Config {
private readonly context: Context;
constructor(context: Context) {
this.context = context;
}
public resolveFromString(s: string): string {
return this.resolve(s, false);
}
@@ -40,7 +34,7 @@ export class Config {
}
s = fs.readFileSync(s, {encoding: 'utf-8'});
}
const configFile = this.context.tmpName({tmpdir: this.context.tmpDir()});
const configFile = Context.tmpName({tmpdir: Context.tmpDir()});
fs.writeFileSync(configFile, s);
return configFile;
}