docker/bake-action
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #207 from docker/dependabot/npm_and_yarn/docker/actions-toolkit-0.23.0

Browse Source 
chore(deps): Bump @docker/actions-toolkit from 0.22.0 to 0.23.0
This commit is contained in:
CrazyMax
2024-05-14 14:06:24 +02:00
committed by GitHub
parent ea5f9ae401 fc16f00415
commit b38d33d426
8 changed files with 47 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
__tests__/context.test.ts
View File

@@ -39,6 +39,11 @@ jest.spyOn(Docker, 'isAvailable').mockImplementation(async (): Promise<boolean>
return true; return true;
}); });
const metadataJson = path.join(tmpDir, 'metadata.json');
jest.spyOn(Bake.prototype, 'getMetadataFilePath').mockImplementation((): string => {
return metadataJson;
});
jest.spyOn(Builder.prototype, 'inspect').mockImplementation(async (): Promise<BuilderInfo> => { jest.spyOn(Builder.prototype, 'inspect').mockImplementation(async (): Promise<BuilderInfo> => {
return { return {
name: 'builder2', name: 'builder2',
@@ -152,7 +157,7 @@ describe('getArgs', () => {
]), ]),
[ [
'bake', 'bake',
'--metadata-file', path.join(tmpDir, 'metadata-file') '--metadata-file', metadataJson
] ]
], ],
[ [
@@ -167,7 +172,7 @@ describe('getArgs', () => {
]), ]),
[ [
'bake', 'bake',
'--metadata-file', path.join(tmpDir, 'metadata-file'), '--metadata-file', metadataJson,
'webapp', 'validate' 'webapp', 'validate'
] ]
], ],
@@ -185,7 +190,7 @@ describe('getArgs', () => {
'bake', 'bake',
'--set', '*.cache-from=type=gha', '--set', '*.cache-from=type=gha',
'--set', '*.cache-to=type=gha', '--set', '*.cache-to=type=gha',
'--metadata-file', path.join(tmpDir, 'metadata-file') '--metadata-file', metadataJson
] ]
], ],
[ [
@@ -199,7 +204,7 @@ describe('getArgs', () => {
]), ]),
[ [
'bake', 'bake',
'--metadata-file', path.join(tmpDir, 'metadata-file'), '--metadata-file', metadataJson,
"--provenance", `mode=min,inline-only=true,builder-id=https://github.com/docker/build-push-action/actions/runs/123456789`, "--provenance", `mode=min,inline-only=true,builder-id=https://github.com/docker/build-push-action/actions/runs/123456789`,
] ]
], ],
@@ -215,7 +220,7 @@ describe('getArgs', () => {
]), ]),
[ [
'bake', 'bake',
'--metadata-file', path.join(tmpDir, 'metadata-file'), '--metadata-file', metadataJson,
"--provenance", `builder-id=https://github.com/docker/build-push-action/actions/runs/123456789` "--provenance", `builder-id=https://github.com/docker/build-push-action/actions/runs/123456789`
] ]
], ],
@@ -231,7 +236,7 @@ describe('getArgs', () => {
]), ]),
[ [
'bake', 'bake',
'--metadata-file', path.join(tmpDir, 'metadata-file'), '--metadata-file', metadataJson,
"--provenance", `mode=max,builder-id=https://github.com/docker/build-push-action/actions/runs/123456789` "--provenance", `mode=max,builder-id=https://github.com/docker/build-push-action/actions/runs/123456789`
] ]
], ],
@@ -247,7 +252,7 @@ describe('getArgs', () => {
]), ]),
[ [
'bake', 'bake',
'--metadata-file', path.join(tmpDir, 'metadata-file'), '--metadata-file', metadataJson,
"--provenance", 'false' "--provenance", 'false'
] ]
], ],
@@ -263,7 +268,7 @@ describe('getArgs', () => {
]), ]),
[ [
'bake', 'bake',
'--metadata-file', path.join(tmpDir, 'metadata-file'), '--metadata-file', metadataJson,
"--provenance", 'builder-id=foo' "--provenance", 'builder-id=foo'
] ]
], ],
@@ -282,7 +287,7 @@ describe('getArgs', () => {
'bake', 'bake',
'--set', '*.platform=linux/amd64,linux/ppc64le,linux/s390x', '--set', '*.platform=linux/amd64,linux/ppc64le,linux/s390x',
'--set', `*.output=type=image,"name=moby/buildkit:v0.11.0,moby/buildkit:latest",push=true`, '--set', `*.output=type=image,"name=moby/buildkit:v0.11.0,moby/buildkit:latest",push=true`,
'--metadata-file', path.join(tmpDir, 'metadata-file'), '--metadata-file', metadataJson,
'--provenance', `mode=min,inline-only=true,builder-id=https://github.com/docker/build-push-action/actions/runs/123456789`, '--provenance', `mode=min,inline-only=true,builder-id=https://github.com/docker/build-push-action/actions/runs/123456789`,
'image-all' 'image-all'
] ]
@@ -301,7 +306,7 @@ describe('getArgs', () => {
[ [
'bake', 'bake',
'--set', `*.labels.foo=bar=#baz`, '--set', `*.labels.foo=bar=#baz`,
'--metadata-file', path.join(tmpDir, 'metadata-file'), '--metadata-file', metadataJson,
'--provenance', `mode=min,inline-only=true,builder-id=https://github.com/docker/build-push-action/actions/runs/123456789`, '--provenance', `mode=min,inline-only=true,builder-id=https://github.com/docker/build-push-action/actions/runs/123456789`,
'image-all' 'image-all'
] ]
@@ -321,7 +326,7 @@ describe('getArgs', () => {
'bake', 'bake',
'https://github.com/docker/build-push-action.git#refs/heads/master', 'https://github.com/docker/build-push-action.git#refs/heads/master',
'--file', './foo.hcl', '--file', './foo.hcl',
'--metadata-file', path.join(tmpDir, 'metadata-file'), '--metadata-file', metadataJson,
'--provenance', `mode=min,inline-only=true,builder-id=https://github.com/docker/build-push-action/actions/runs/123456789`, '--provenance', `mode=min,inline-only=true,builder-id=https://github.com/docker/build-push-action/actions/runs/123456789`,
] ]
], ],
@@ -336,7 +341,7 @@ describe('getArgs', () => {
return buildxVersion; return buildxVersion;
}); });
const inp = await context.getInputs(); const inp = await context.getInputs();
const definition = await toolkit.bake.getDefinition( const definition = await toolkit.buildxBake.getDefinition(
{ {
files: inp.files, files: inp.files,
load: inp.load, load: inp.load,

8
dist/index.js generated vendored
View File

File diff suppressed because one or more lines are too long

2
dist/index.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

19
dist/licenses.txt generated vendored
View File

@@ -3855,25 +3855,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
yallist
ISC
The ISC License
Copyright (c) Isaac Z. Schlueter and Contributors
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
zip-stream zip-stream
MIT MIT
Copyright (c) 2014 Chris Talkington, contributors. Copyright (c) 2014 Chris Talkington, contributors.

2
package.json
View File

@@ -27,7 +27,7 @@
"packageManager": "yarn@3.6.3", "packageManager": "yarn@3.6.3",
"dependencies": { "dependencies": {
"@actions/core": "^1.10.1", "@actions/core": "^1.10.1",
"@docker/actions-toolkit": "^0.22.0", "@docker/actions-toolkit": "^0.23.0",
"handlebars": "^4.7.8" "handlebars": "^4.7.8"
}, },
"devDependencies": { "devDependencies": {

2
src/context.ts
View File

@@ -65,7 +65,7 @@ async function getBakeArgs(inputs: Inputs, definition: BakeDefinition, toolkit:
args.push('--set', set); args.push('--set', set);
}); });
if (await toolkit.buildx.versionSatisfies('>=0.6.0')) { if (await toolkit.buildx.versionSatisfies('>=0.6.0')) {
args.push('--metadata-file', Bake.getMetadataFilePath()); args.push('--metadata-file', toolkit.buildxBake.getMetadataFilePath());
} }
if (await toolkit.buildx.versionSatisfies('>=0.10.0')) { if (await toolkit.buildx.versionSatisfies('>=0.10.0')) {
if (inputs.provenance) { if (inputs.provenance) {

5
src/main.ts
View File

@@ -3,7 +3,6 @@ import * as path from 'path';
import * as core from '@actions/core'; import * as core from '@actions/core';
import * as actionsToolkit from '@docker/actions-toolkit'; import * as actionsToolkit from '@docker/actions-toolkit';
import {Bake} from '@docker/actions-toolkit/lib/buildx/bake';
import {Context} from '@docker/actions-toolkit/lib/context'; import {Context} from '@docker/actions-toolkit/lib/context';
import {Docker} from '@docker/actions-toolkit/lib/docker/docker'; import {Docker} from '@docker/actions-toolkit/lib/docker/docker';
import {Exec} from '@docker/actions-toolkit/lib/exec'; import {Exec} from '@docker/actions-toolkit/lib/exec';
@@ -78,7 +77,7 @@ actionsToolkit.run(
let definition: BakeDefinition | undefined; let definition: BakeDefinition | undefined;
await core.group(`Parsing raw definition`, async () => { await core.group(`Parsing raw definition`, async () => {
definition = await toolkit.bake.getDefinition( definition = await toolkit.buildxBake.getDefinition(
{ {
files: inputs.files, files: inputs.files,
load: inputs.load, load: inputs.load,
@@ -125,7 +124,7 @@ actionsToolkit.run(
} }
}); });
const metadata = Bake.resolveMetadata(); const metadata = toolkit.buildxBake.resolveMetadata();
if (metadata) { if (metadata) {
await core.group(`Metadata`, async () => { await core.group(`Metadata`, async () => {
const metadatadt = JSON.stringify(metadata, null, 2); const metadatadt = JSON.stringify(metadata, null, 2);

33
yarn.lock
View File

@@ -1048,9 +1048,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@docker/actions-toolkit@npm:^0.22.0": "@docker/actions-toolkit@npm:^0.23.0":
version: 0.22.0 version: 0.23.0
resolution: "@docker/actions-toolkit@npm:0.22.0" resolution: "@docker/actions-toolkit@npm:0.23.0"
dependencies: dependencies:
"@actions/artifact": ^2.1.7 "@actions/artifact": ^2.1.7
"@actions/cache": ^3.2.4 "@actions/cache": ^3.2.4
@@ -1064,12 +1064,12 @@ __metadata:
"@octokit/core": ^5.1.0 "@octokit/core": ^5.1.0
"@octokit/plugin-rest-endpoint-methods": ^10.4.0 "@octokit/plugin-rest-endpoint-methods": ^10.4.0
async-retry: ^1.3.3 async-retry: ^1.3.3
csv-parse: ^5.5.5 csv-parse: ^5.5.6
handlebars: ^4.7.8 handlebars: ^4.7.8
jwt-decode: ^4.0.0 jwt-decode: ^4.0.0
semver: ^7.6.0 semver: ^7.6.2
tmp: ^0.2.3 tmp: ^0.2.3
checksum: 860bfe0f4b161181ffae47a9f82612b5d812b0197f582f5308fc80e8e3c55a47595134619cc7805df71a79a891fd10b6b1c4fb95c498423df1ea82a5fd84b44e checksum: 7bac57e9d1af6214a16509051d7ac1f276880f332d44a0d52a3d9d3601204c0cbf9a23933772c5a0974e705d4295b32d036c4d37afe8965330d8f116df07faac
languageName: node languageName: node
linkType: hard linkType: hard
@@ -3123,10 +3123,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"csv-parse@npm:^5.5.5": "csv-parse@npm:^5.5.6":
version: 5.5.5 version: 5.5.6
resolution: "csv-parse@npm:5.5.5" resolution: "csv-parse@npm:5.5.6"
checksum: 9e76b3dc3dbbf0a9b1c3529843e3891f0da23d094bdb0540a3d8f4083d00110dd545399f9cf510498def6c1fc7012cc6bc00046d281f16d705add64099467973 checksum: ee06f97f674487dc1d001b360de8ea510a41b9d971abf43bcf9c3be22c83a3634df0d3ebfbe52fd49d145077066be7ff9f25de3fc6b71aefb973099b04147a25
languageName: node languageName: node
linkType: hard linkType: hard
@@ -3258,7 +3258,7 @@ __metadata:
resolution: "docker-buildx-bake@workspace:." resolution: "docker-buildx-bake@workspace:."
dependencies: dependencies:
"@actions/core": ^1.10.1 "@actions/core": ^1.10.1
"@docker/actions-toolkit": ^0.22.0 "@docker/actions-toolkit": ^0.23.0
"@types/node": ^20.5.9 "@types/node": ^20.5.9
"@typescript-eslint/eslint-plugin": ^6.6.0 "@typescript-eslint/eslint-plugin": ^6.6.0
"@typescript-eslint/parser": ^6.6.0 "@typescript-eslint/parser": ^6.6.0
@@ -6000,7 +6000,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0": "semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.3, semver@npm:^7.5.4":
version: 7.6.0 version: 7.6.0
resolution: "semver@npm:7.6.0" resolution: "semver@npm:7.6.0"
dependencies: dependencies:
@@ -6011,6 +6011,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"semver@npm:^7.6.2":
version: 7.6.2
resolution: "semver@npm:7.6.2"
bin:
semver: bin/semver.js
checksum: 40f6a95101e8d854357a644da1b8dd9d93ce786d5c6a77227bc69dbb17bea83d0d1d1d7c4cd5920a6df909f48e8bd8a5909869535007f90278289f2451d0292d
languageName: node
linkType: hard
"shebang-command@npm:^2.0.0": "shebang-command@npm:^2.0.0":
version: 2.0.0 version: 2.0.0
resolution: "shebang-command@npm:2.0.0" resolution: "shebang-command@npm:2.0.0"