buildx(inputs): rename some methods

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax
2023-02-03 03:33:09 +01:00
parent 7d5ed416da
commit 40e9a15129
2 changed files with 22 additions and 22 deletions

View File

@@ -50,7 +50,7 @@ afterEach(() => {
rimraf.sync(tmpDir);
});
describe('getBuildImageID', () => {
describe('resolveBuildImageID', () => {
it('matches', async () => {
const buildx = new Buildx({
context: new Context()
@@ -58,31 +58,31 @@ describe('getBuildImageID', () => {
const imageID = 'sha256:bfb45ab72e46908183546477a08f8867fc40cebadd00af54b071b097aed127a9';
const imageIDFile = buildx.inputs.getBuildImageIDFilePath();
await fs.writeFileSync(imageIDFile, imageID);
const expected = buildx.inputs.getBuildImageID();
const expected = buildx.inputs.resolveBuildImageID();
expect(expected).toEqual(imageID);
});
});
describe('getBuildMetadata', () => {
describe('resolveBuildMetadata', () => {
it('matches', async () => {
const buildx = new Buildx({
context: new Context()
});
const metadataFile = buildx.inputs.getBuildMetadataFilePath();
await fs.writeFileSync(metadataFile, metadata);
const expected = buildx.inputs.getBuildMetadata();
const expected = buildx.inputs.resolveBuildMetadata();
expect(expected).toEqual(metadata);
});
});
describe('getDigest', () => {
describe('resolveDigest', () => {
it('matches', async () => {
const buildx = new Buildx({
context: new Context()
});
const metadataFile = buildx.inputs.getBuildMetadataFilePath();
await fs.writeFileSync(metadataFile, metadata);
const expected = buildx.inputs.getDigest();
const expected = buildx.inputs.resolveDigest();
expect(expected).toEqual('sha256:b09b9482c72371486bb2c1d2c2a2633ed1d0b8389e12c8d52b9e052725c0c83c');
});
});
@@ -136,7 +136,7 @@ describe('getProvenanceInput', () => {
});
});
describe('getProvenanceAttrs', () => {
describe('resolveProvenanceAttrs', () => {
// prettier-ignore
test.each([
[
@@ -163,11 +163,11 @@ describe('getProvenanceAttrs', () => {
const buildx = new Buildx({
context: new Context()
});
expect(buildx.inputs.getProvenanceAttrs(input)).toEqual(expected);
expect(buildx.inputs.resolveProvenanceAttrs(input)).toEqual(expected);
});
});
describe('generateBuildSecret', () => {
describe('resolveBuildSecret', () => {
test.each([
['A_SECRET=abcdef0123456789', false, 'A_SECRET', 'abcdef0123456789', null],
['GIT_AUTH_TOKEN=abcdefghijklmno=0123456789', false, 'GIT_AUTH_TOKEN', 'abcdefghijklmno=0123456789', null],
@@ -184,9 +184,9 @@ describe('generateBuildSecret', () => {
});
let secret: string;
if (file) {
secret = buildx.inputs.generateBuildSecretFile(kvp);
secret = buildx.inputs.resolveBuildSecretFile(kvp);
} else {
secret = buildx.inputs.generateBuildSecretString(kvp);
secret = buildx.inputs.resolveBuildSecretString(kvp);
}
expect(secret).toEqual(`id=${exKey},src=${tmpName}`);
expect(fs.readFileSync(tmpName, 'utf-8')).toEqual(exValue);

View File

@@ -36,7 +36,7 @@ export class Inputs {
return path.join(this.context.tmpDir(), 'metadata-file').split(path.sep).join(path.posix.sep);
}
public getBuildImageID(): string | undefined {
public resolveBuildImageID(): string | undefined {
const iidFile = this.getBuildImageIDFilePath();
if (!fs.existsSync(iidFile)) {
return undefined;
@@ -44,7 +44,7 @@ export class Inputs {
return fs.readFileSync(iidFile, {encoding: 'utf-8'}).trim();
}
public getBuildMetadata(): string | undefined {
public resolveBuildMetadata(): string | undefined {
const metadataFile = this.getBuildMetadataFilePath();
if (!fs.existsSync(metadataFile)) {
return undefined;
@@ -56,8 +56,8 @@ export class Inputs {
return content;
}
public getDigest(): string | undefined {
const metadata = this.getBuildMetadata();
public resolveDigest(): string | undefined {
const metadata = this.resolveBuildMetadata();
if (metadata === undefined) {
return undefined;
}
@@ -68,15 +68,15 @@ export class Inputs {
return undefined;
}
public generateBuildSecretString(kvp: string): string {
return this.generateBuildSecret(kvp, false);
public resolveBuildSecretString(kvp: string): string {
return this.resolveBuildSecret(kvp, false);
}
public generateBuildSecretFile(kvp: string): string {
return this.generateBuildSecret(kvp, true);
public resolveBuildSecretFile(kvp: string): string {
return this.resolveBuildSecret(kvp, true);
}
public generateBuildSecret(kvp: string, file: boolean): string {
public resolveBuildSecret(kvp: string, file: boolean): string {
const delimiterIndex = kvp.indexOf('=');
const key = kvp.substring(0, delimiterIndex);
let value = kvp.substring(delimiterIndex + 1);
@@ -105,11 +105,11 @@ export class Inputs {
return core.getBooleanInput(name) ? `builder-id=${builderID}` : 'false';
} catch (err) {
// not a valid boolean, so we assume it's a string
return this.getProvenanceAttrs(input);
return this.resolveProvenanceAttrs(input);
}
}
public getProvenanceAttrs(input: string): string {
public resolveProvenanceAttrs(input: string): string {
if (!input) {
return `builder-id=${this.context.provenanceBuilderID}`;
}