Skip to content

Commit 38de522

Browse files
tonistiigitonistiigi
authored
Merge pull request #1453 from docker/dependabot/npm_and_yarn/docker/actions-toolkit-0.76.0
chore(deps): Bump @docker/actions-toolkit from 0.62.1 to 0.77.0
2 parents 8913706 + 5bc2aa1 commit 38de522

File tree

12 files changed

+1068
-5021
lines changed

12 files changed

+1068
-5021
lines changed

‎__tests__/context.test.ts‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import {afterEach, beforeEach, describe, expect, test, vi} from 'vitest';
22
import * as fs from 'fs';
33
import * as os from 'os';
44
import * as path from 'path';
5-
import {fileURLToPath} from 'node:url';
65

76
import {Builder} from '@docker/actions-toolkit/lib/buildx/builder.js';
87
import {Buildx} from '@docker/actions-toolkit/lib/buildx/buildx.js';
@@ -17,7 +16,7 @@ import * as context from '../src/context.js';
1716

1817
const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'context-'));
1918
const tmpName = path.join(tmpDir, '.tmpname-vi');
20-
const testDir = path.dirname(fileURLToPath(import.meta.url));
19+
const fixturesDir = path.join(__dirname, 'fixtures');
2120

2221
vi.spyOn(Context, 'tmpDir').mockImplementation((): string => {
2322
if (!fs.existsSync(tmpDir)) {
@@ -44,22 +43,12 @@ vi.spyOn(Build.prototype, 'getImageIDFilePath').mockImplementation((): string =>
4443
return imageIDFilePath;
4544
});
4645

46+
type BuilderInfoFixture = Omit<BuilderInfo, 'lastActivity'> & {lastActivity: string};
47+
const builderInfoFixture = <BuilderInfoFixture>JSON.parse(fs.readFileSync(path.join(fixturesDir, 'builder-info.json'), {encoding: 'utf-8'}).trim());
4748
vi.spyOn(Builder.prototype, 'inspect').mockImplementation(async (): Promise<BuilderInfo> => {
4849
return {
49-
name: 'builder2',
50-
driver: 'docker-container',
51-
lastActivity: new Date('2023-01-16 09:45:23 +0000 UTC'),
52-
nodes: [
53-
{
54-
buildkit: 'v0.11.0',
55-
'buildkitd-flags': '--debug --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host',
56-
'driver-opts': ['BUILDKIT_STEP_LOG_MAX_SIZE=10485760', 'BUILDKIT_STEP_LOG_MAX_SPEED=10485760', 'JAEGER_TRACE=localhost:6831', 'image=moby/buildkit:latest', 'network=host'],
57-
endpoint: 'unix:///var/run/docker.sock',
58-
name: 'builder20',
59-
platforms: 'linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6',
60-
status: 'running'
61-
}
62-
]
50+
...builderInfoFixture,
51+
lastActivity: new Date(builderInfoFixture.lastActivity)
6352
};
6453
});
6554

@@ -342,7 +331,7 @@ ccc`],
342331
new Map<string, string>([
343332
['context', 'https://github.com/docker/build-push-action.git#refs/heads/master'],
344333
['tag', 'localhost:5000/name/app:latest'],
345-
['secret-files', `MY_SECRET=${path.join(testDir, 'fixtures', 'secret.txt')}`],
334+
['secret-files', `MY_SECRET=${path.join(fixturesDir, 'secret.txt')}`],
346335
['file', './test/Dockerfile'],
347336
['builder', 'builder-git-context-2'],
348337
['network', 'host'],

‎__tests__/fixtures/builder-info.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"name": "builder2",
3+
"driver": "docker-container",
4+
"lastActivity": "2023-01-16 09:45:23 +0000 UTC",
5+
"nodes": [
6+
{
7+
"buildkit": "v0.11.0",
8+
"buildkitd-flags": "--debug --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host",
9+
"driver-opts": [
10+
"BUILDKIT_STEP_LOG_MAX_SIZE=10485760",
11+
"BUILDKIT_STEP_LOG_MAX_SPEED=10485760",
12+
"JAEGER_TRACE=localhost:6831",
13+
"image=moby/buildkit:latest",
14+
"network=host"
15+
],
16+
"endpoint": "unix:///var/run/docker.sock",
17+
"name": "builder20",
18+
"platforms": "linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6",
19+
"status": "running"
20+
}
21+
]
22+
}

‎__tests__/setup.unit.ts‎

Lines changed: 16 additions & 220 deletions
Original file line numberDiff line numberDiff line change
@@ -1,243 +1,39 @@
11
import fs from 'node:fs';
2-
import {createRequire} from 'node:module';
32
import os from 'node:os';
43
import path from 'node:path';
54
import {vi} from 'vitest';
65

76
const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'docker-build-push-action-'));
87

8+
const githubPayload = {
9+
repository: {
10+
private: true
11+
}
12+
};
13+
14+
const githubEventPath = path.join(tmpDir, 'github-event.json');
15+
fs.writeFileSync(githubEventPath, JSON.stringify(githubPayload));
16+
917
process.env = Object.assign({}, process.env, {
1018
TEMP: tmpDir,
1119
GITHUB_REPOSITORY: 'docker/build-push-action',
20+
GITHUB_REF: 'refs/heads/master',
21+
GITHUB_RUN_ID: '123456789',
22+
GITHUB_RUN_ATTEMPT: '1',
23+
GITHUB_EVENT_PATH: githubEventPath,
1224
RUNNER_TEMP: path.join(tmpDir, 'runner-temp'),
1325
RUNNER_TOOL_CACHE: path.join(tmpDir, 'runner-tool-cache')
1426
});
1527

16-
const require = createRequire(import.meta.url);
17-
type RequireCacheEntry = NonNullable<(typeof require.cache)[string]>;
18-
19-
const githubMock = {
28+
vi.mock('@actions/github', () => ({
2029
context: {
2130
repo: {
2231
owner: 'docker',
2332
repo: 'build-push-action'
2433
},
2534
ref: 'refs/heads/master',
2635
runId: 123456789,
27-
payload: {
28-
after: '860c1904a1ce19322e91ac35af1ab07466440c37',
29-
base_ref: null,
30-
before: '5f3331d7f7044c18ca9f12c77d961c4d7cf3276a',
31-
commits: [
32-
{
33-
author: {
34-
email: 'crazy-max@users.noreply.github.com',
35-
name: 'CrazyMax',
36-
username: 'crazy-max'
37-
},
38-
committer: {
39-
email: 'crazy-max@users.noreply.github.com',
40-
name: 'CrazyMax',
41-
username: 'crazy-max'
42-
},
43-
distinct: true,
44-
id: '860c1904a1ce19322e91ac35af1ab07466440c37',
45-
message: 'hello dev',
46-
timestamp: '2022-04-19T11:27:24+02:00',
47-
tree_id: 'd2c60af597e863787d2d27f569e30495b0b92820',
48-
url: 'https://github.com/docker/test-docker-action/commit/860c1904a1ce19322e91ac35af1ab07466440c37'
49-
}
50-
],
51-
compare: 'https://github.com/docker/test-docker-action/compare/5f3331d7f704...860c1904a1ce',
52-
created: false,
53-
deleted: false,
54-
forced: false,
55-
head_commit: {
56-
author: {
57-
email: 'crazy-max@users.noreply.github.com',
58-
name: 'CrazyMax',
59-
username: 'crazy-max'
60-
},
61-
committer: {
62-
email: 'crazy-max@users.noreply.github.com',
63-
name: 'CrazyMax',
64-
username: 'crazy-max'
65-
},
66-
distinct: true,
67-
id: '860c1904a1ce19322e91ac35af1ab07466440c37',
68-
message: 'hello dev',
69-
timestamp: '2022-04-19T11:27:24+02:00',
70-
tree_id: 'd2c60af597e863787d2d27f569e30495b0b92820',
71-
url: 'https://github.com/docker/test-docker-action/commit/860c1904a1ce19322e91ac35af1ab07466440c37'
72-
},
73-
organization: {
74-
avatar_url: 'https://avatars.githubusercontent.com/u/5429470?v=4',
75-
description: 'Docker helps developers bring their ideas to life by conquering the complexity of app development.',
76-
events_url: 'https://api.github.com/orgs/docker/events',
77-
hooks_url: 'https://api.github.com/orgs/docker/hooks',
78-
id: 5429470,
79-
issues_url: 'https://api.github.com/orgs/docker/issues',
80-
login: 'docker',
81-
members_url: 'https://api.github.com/orgs/docker/members{/member}',
82-
node_id: 'MDEyOk9yZ2FuaXphdGlvbjU0Mjk0NzA=',
83-
public_members_url: 'https://api.github.com/orgs/docker/public_members{/member}',
84-
repos_url: 'https://api.github.com/orgs/docker/repos',
85-
url: 'https://api.github.com/orgs/docker'
86-
},
87-
pusher: {
88-
email: 'github@crazymax.dev',
89-
name: 'crazy-max'
90-
},
91-
ref: 'refs/heads/dev',
92-
repository: {
93-
allow_forking: true,
94-
archive_url: 'https://api.github.com/repos/docker/test-docker-action/{archive_format}{/ref}',
95-
archived: false,
96-
assignees_url: 'https://api.github.com/repos/docker/test-docker-action/assignees{/user}',
97-
blobs_url: 'https://api.github.com/repos/docker/test-docker-action/git/blobs{/sha}',
98-
branches_url: 'https://api.github.com/repos/docker/test-docker-action/branches{/branch}',
99-
clone_url: 'https://github.com/docker/test-docker-action.git',
100-
collaborators_url: 'https://api.github.com/repos/docker/test-docker-action/collaborators{/collaborator}',
101-
comments_url: 'https://api.github.com/repos/docker/test-docker-action/comments{/number}',
102-
commits_url: 'https://api.github.com/repos/docker/test-docker-action/commits{/sha}',
103-
compare_url: 'https://api.github.com/repos/docker/test-docker-action/compare/{base}...{head}',
104-
contents_url: 'https://api.github.com/repos/docker/test-docker-action/contents/{+path}',
105-
contributors_url: 'https://api.github.com/repos/docker/test-docker-action/contributors',
106-
created_at: 1596792180,
107-
default_branch: 'master',
108-
deployments_url: 'https://api.github.com/repos/docker/test-docker-action/deployments',
109-
description: 'Test "Docker" Actions',
110-
disabled: false,
111-
downloads_url: 'https://api.github.com/repos/docker/test-docker-action/downloads',
112-
events_url: 'https://api.github.com/repos/docker/test-docker-action/events',
113-
fork: false,
114-
forks: 1,
115-
forks_count: 1,
116-
forks_url: 'https://api.github.com/repos/docker/test-docker-action/forks',
117-
full_name: 'docker/test-docker-action',
118-
git_commits_url: 'https://api.github.com/repos/docker/test-docker-action/git/commits{/sha}',
119-
git_refs_url: 'https://api.github.com/repos/docker/test-docker-action/git/refs{/sha}',
120-
git_tags_url: 'https://api.github.com/repos/docker/test-docker-action/git/tags{/sha}',
121-
git_url: 'git://github.com/docker/test-docker-action.git',
122-
has_downloads: true,
123-
has_issues: true,
124-
has_pages: false,
125-
has_projects: true,
126-
has_wiki: true,
127-
homepage: '',
128-
hooks_url: 'https://api.github.com/repos/docker/test-docker-action/hooks',
129-
html_url: 'https://github.com/docker/test-docker-action',
130-
id: 285789493,
131-
is_template: false,
132-
issue_comment_url: 'https://api.github.com/repos/docker/test-docker-action/issues/comments{/number}',
133-
issue_events_url: 'https://api.github.com/repos/docker/test-docker-action/issues/events{/number}',
134-
issues_url: 'https://api.github.com/repos/docker/test-docker-action/issues{/number}',
135-
keys_url: 'https://api.github.com/repos/docker/test-docker-action/keys{/key_id}',
136-
labels_url: 'https://api.github.com/repos/docker/test-docker-action/labels{/name}',
137-
language: 'JavaScript',
138-
languages_url: 'https://api.github.com/repos/docker/test-docker-action/languages',
139-
license: {
140-
key: 'mit',
141-
name: 'MIT License',
142-
node_id: 'MDc6TGljZW5zZTEz',
143-
spdx_id: 'MIT',
144-
url: 'https://api.github.com/licenses/mit'
145-
},
146-
master_branch: 'master',
147-
merges_url: 'https://api.github.com/repos/docker/test-docker-action/merges',
148-
milestones_url: 'https://api.github.com/repos/docker/test-docker-action/milestones{/number}',
149-
mirror_url: null,
150-
name: 'test-docker-action',
151-
node_id: 'MDEwOlJlcG9zaXRvcnkyODU3ODk0OTM=',
152-
notifications_url: 'https://api.github.com/repos/docker/test-docker-action/notifications{?since,all,participating}',
153-
open_issues: 6,
154-
open_issues_count: 6,
155-
organization: 'docker',
156-
owner: {
157-
avatar_url: 'https://avatars.githubusercontent.com/u/5429470?v=4',
158-
email: 'info@docker.com',
159-
events_url: 'https://api.github.com/users/docker/events{/privacy}',
160-
followers_url: 'https://api.github.com/users/docker/followers',
161-
following_url: 'https://api.github.com/users/docker/following{/other_user}',
162-
gists_url: 'https://api.github.com/users/docker/gists{/gist_id}',
163-
gravatar_id: '',
164-
html_url: 'https://github.com/docker',
165-
id: 5429470,
166-
login: 'docker',
167-
name: 'docker',
168-
node_id: 'MDEyOk9yZ2FuaXphdGlvbjU0Mjk0NzA=',
169-
organizations_url: 'https://api.github.com/users/docker/orgs',
170-
received_events_url: 'https://api.github.com/users/docker/received_events',
171-
repos_url: 'https://api.github.com/users/docker/repos',
172-
site_admin: false,
173-
starred_url: 'https://api.github.com/users/docker/starred{/owner}{/repo}',
174-
subscriptions_url: 'https://api.github.com/users/docker/subscriptions',
175-
type: 'Organization',
176-
url: 'https://api.github.com/users/docker'
177-
},
178-
private: true,
179-
pulls_url: 'https://api.github.com/repos/docker/test-docker-action/pulls{/number}',
180-
pushed_at: 1650360446,
181-
releases_url: 'https://api.github.com/repos/docker/test-docker-action/releases{/id}',
182-
size: 796,
183-
ssh_url: 'git@github.com:docker/test-docker-action.git',
184-
stargazers: 0,
185-
stargazers_count: 0,
186-
stargazers_url: 'https://api.github.com/repos/docker/test-docker-action/stargazers',
187-
statuses_url: 'https://api.github.com/repos/docker/test-docker-action/statuses/{sha}',
188-
subscribers_url: 'https://api.github.com/repos/docker/test-docker-action/subscribers',
189-
subscription_url: 'https://api.github.com/repos/docker/test-docker-action/subscription',
190-
svn_url: 'https://github.com/docker/test-docker-action',
191-
tags_url: 'https://api.github.com/repos/docker/test-docker-action/tags',
192-
teams_url: 'https://api.github.com/repos/docker/test-docker-action/teams',
193-
topics: [],
194-
trees_url: 'https://api.github.com/repos/docker/test-docker-action/git/trees{/sha}',
195-
updated_at: '2022-04-19T09:05:09Z',
196-
url: 'https://github.com/docker/test-docker-action',
197-
visibility: 'private',
198-
watchers: 0,
199-
watchers_count: 0
200-
},
201-
sender: {
202-
avatar_url: 'https://avatars.githubusercontent.com/u/1951866?v=4',
203-
events_url: 'https://api.github.com/users/crazy-max/events{/privacy}',
204-
followers_url: 'https://api.github.com/users/crazy-max/followers',
205-
following_url: 'https://api.github.com/users/crazy-max/following{/other_user}',
206-
gists_url: 'https://api.github.com/users/crazy-max/gists{/gist_id}',
207-
gravatar_id: '',
208-
html_url: 'https://github.com/crazy-max',
209-
id: 1951866,
210-
login: 'crazy-max',
211-
node_id: 'MDQ6VXNlcjE5NTE4NjY=',
212-
organizations_url: 'https://api.github.com/users/crazy-max/orgs',
213-
received_events_url: 'https://api.github.com/users/crazy-max/received_events',
214-
repos_url: 'https://api.github.com/users/crazy-max/repos',
215-
site_admin: false,
216-
starred_url: 'https://api.github.com/users/crazy-max/starred{/owner}{/repo}',
217-
subscriptions_url: 'https://api.github.com/users/crazy-max/subscriptions',
218-
type: 'User',
219-
url: 'https://api.github.com/users/crazy-max'
220-
}
221-
}
36+
payload: githubPayload
22237
},
22338
getOctokit: vi.fn()
224-
};
225-
226-
vi.mock('@actions/github', () => githubMock);
227-
vi.doMock(require.resolve('@docker/actions-toolkit/node_modules/@actions/github'), () => githubMock);
228-
229-
for (const mod of ['@docker/actions-toolkit/node_modules/@actions/github']) {
230-
try {
231-
const resolved = require.resolve(mod);
232-
require.cache[resolved] = {
233-
id: resolved,
234-
filename: resolved,
235-
loaded: true,
236-
exports: githubMock,
237-
children: [],
238-
paths: []
239-
} as RequireCacheEntry;
240-
} catch {
241-
// Ignore unresolved optional paths; vi.mock handles module-level mocking.
242-
}
243-
}
39+
}));

0 commit comments

Comments
 (0)