diff --git a/__tests__/context.test.ts b/__tests__/context.test.ts index 119a802..ac2a8ce 100644 --- a/__tests__/context.test.ts +++ b/__tests__/context.test.ts @@ -56,7 +56,7 @@ jest.spyOn(Builder.prototype, 'inspect').mockImplementation(async (): Promise => { +jest.spyOn(Bake.prototype, 'getDefinition').mockImplementation(async (): Promise => { return JSON.parse(`{ "group": { "default": { @@ -334,7 +334,23 @@ describe('getArgs', () => { return buildxVersion; }); const inp = await context.getInputs(); - const res = await context.getArgs(inp, toolkit); + const definition = await toolkit.bake.getDefinition( + { + files: inp.files, + load: inp.load, + noCache: inp.noCache, + overrides: inp.set, + provenance: inp.provenance, + push: inp.push, + sbom: inp.sbom, + source: inp.source, + targets: inp.targets + }, + { + cwd: inp.workdir + } + ); + const res = await context.getArgs(inp, definition, toolkit); expect(res).toEqual(expected); } ); diff --git a/src/context.ts b/src/context.ts index 12b3166..4d4e157 100644 --- a/src/context.ts +++ b/src/context.ts @@ -6,6 +6,7 @@ import {Inputs as BuildxInputs} from '@docker/actions-toolkit/lib/buildx/inputs' import {GitHub} from '@docker/actions-toolkit/lib/github'; import {Toolkit} from '@docker/actions-toolkit/lib/toolkit'; import {Util} from '@docker/actions-toolkit/lib/util'; +import {BakeDefinition} from '@docker/actions-toolkit/lib/types/bake'; export interface Inputs { builder: string; @@ -35,29 +36,23 @@ export async function getInputs(): Promise { push: core.getBooleanInput('push'), sbom: core.getInput('sbom'), set: Util.getInputList('set', {ignoreComma: true, quote: false}), - source: core.getInput('source') + source: getSourceInput('source') }; } -export async function getArgs(inputs: Inputs, toolkit: Toolkit): Promise> { +export async function getArgs(inputs: Inputs, definition: BakeDefinition, toolkit: Toolkit): Promise> { // prettier-ignore return [ - ...await getBakeArgs(inputs, toolkit), + ...await getBakeArgs(inputs, definition, toolkit), ...await getCommonArgs(inputs), ...inputs.targets ]; } -async function getBakeArgs(inputs: Inputs, toolkit: Toolkit): Promise> { +async function getBakeArgs(inputs: Inputs, definition: BakeDefinition, toolkit: Toolkit): Promise> { const args: Array = ['bake']; - let source = handlebars.compile(inputs.source)({ - defaultContext: Context.gitContext() - }); - if (source === '.') { - source = ''; - } - if (source) { - args.push(source); + if (inputs.source) { + args.push(inputs.source); } await Util.asyncForEach(inputs.files, async file => { args.push('--file', file); @@ -69,10 +64,9 @@ async function getBakeArgs(inputs: Inputs, toolkit: Toolkit): Promise=0.10.0')) { - const bakedef = await toolkit.bake.parseDefinitions([...inputs.files, source], inputs.targets, inputs.set, inputs.load, inputs.push, inputs.workdir); if (inputs.provenance) { args.push('--provenance', inputs.provenance); - } else if ((await toolkit.buildkit.versionSatisfies(inputs.builder, '>=0.11.0')) && !Bake.hasDockerExporter(bakedef, inputs.load)) { + } else if ((await toolkit.buildkit.versionSatisfies(inputs.builder, '>=0.11.0')) && !Bake.hasDockerExporter(definition, inputs.load)) { // if provenance not specified and BuildKit version compatible for // attestation, set default provenance. Also needs to make sure user // doesn't want to explicitly load the image to docker. @@ -111,3 +105,13 @@ async function getCommonArgs(inputs: Inputs): Promise> { } return args; } + +function getSourceInput(name: string): string { + let source = handlebars.compile(core.getInput(name))({ + defaultContext: Context.gitContext() + }); + if (source === '.') { + source = ''; + } + return source; +} diff --git a/src/main.ts b/src/main.ts index 6de4245..0757333 100644 --- a/src/main.ts +++ b/src/main.ts @@ -8,6 +8,7 @@ import {Docker} from '@docker/actions-toolkit/lib/docker/docker'; import {Exec} from '@docker/actions-toolkit/lib/exec'; import {GitHub} from '@docker/actions-toolkit/lib/github'; import {Toolkit} from '@docker/actions-toolkit/lib/toolkit'; +import {BakeDefinition} from '@docker/actions-toolkit/lib/types/bake'; import {ConfigFile} from '@docker/actions-toolkit/lib/types/docker'; import * as context from './context'; @@ -72,7 +73,30 @@ actionsToolkit.run( await toolkit.buildx.printVersion(); }); - const args: string[] = await context.getArgs(inputs, toolkit); + let definition: BakeDefinition | undefined; + await core.group(`Parsing raw definition`, async () => { + definition = await toolkit.bake.getDefinition( + { + files: inputs.files, + load: inputs.load, + noCache: inputs.noCache, + overrides: inputs.set, + provenance: inputs.provenance, + push: inputs.push, + sbom: inputs.sbom, + source: inputs.source, + targets: inputs.targets + }, + { + cwd: inputs.workdir + } + ); + }); + if (!definition) { + throw new Error('Bake definition not set'); + } + + const args: string[] = await context.getArgs(inputs, definition, toolkit); const buildCmd = await toolkit.buildx.getCommand(args); await core.group(`Bake definition`, async () => {