8000 remove uuid package and switch to crypto · docker/setup-buildx-action@d391aad · GitHub
[go: up one dir, main page]
Skip to content

Commit d391aad

Browse files
crazy-maxcrazy-max
committed
remove uuid package and switch to crypto
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
1 parent e5b688e commit d391aad

File tree

5 files changed

+12
-20
lines changed

5 files changed

+12
-20
lines changed

‎__tests__/context.test.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {beforeEach, describe, expect, jest, test} from '@jest/globals';
22
import * as fs from 'fs';
33
import * as path from 'path';
4-
import * as uuid from 'uuid';
54
import {Buildx} from '@docker/actions-toolkit/lib/buildx/buildx';
65
import {Context} from '@docker/actions-toolkit/lib/context';
76
import {Docker} from '@docker/actions-toolkit/lib/docker/docker';
@@ -26,8 +25,12 @@ jest.spyOn(Context, 'tmpName').mockImplementation((): string => {
2625
return tmpName;
2726
});
2827

29-
jest.mock('uuid');
30-
jest.spyOn(uuid, 'v4').mockReturnValue('9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d');
28+
jest.mock('crypto', () => {
29+
return {
30+
...(jest.requireActual('crypto') as object),
31+
randomUUID: jest.fn(() => '9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d')
32+
};
33+
});
3134

3235
jest.spyOn(Docker, 'context').mockImplementation((): Promise<string> => {
3336
return Promise.resolve('default');

‎package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
"dependencies": {
2828
"@actions/core": "^1.11.1",
2929
"@docker/actions-toolkit": "^0.39.0",
30-
"js-yaml": "^4.1.0",
31-
"uuid": "^10.0.0"
30+
"js-yaml": "^4.1.0"
3231
},
3332
"devDependencies": {
3433
"@types/js-yaml": "^4.0.9",

‎src/context.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as uuid from 'uuid';
1+
import * as crypto from 'crypto';
22
import * as core from '@actions/core';
33

44
import {Docker} from '@docker/actions-toolkit/lib/docker/docker';
@@ -47,7 +47,7 @@ export async function getInputs(): Promise<Inputs> {
4747
}
4848

4949
export async function getBuilderName(driver: string): Promise<string> {
50-
return driver == 'docker' ? await Docker.context() : `builder-${uuid.v4()}`;
50+
return driver == 'docker' ? await Docker.context() : `builder-${crypto.randomUUID()}`;
5151
}
5252

5353
export async function getCreateArgs(inputs: Inputs, toolkit: Toolkit): Promise<Array<string>> {
@@ -84,7 +84,7 @@ export async function getAppendArgs(inputs: Inputs, node: Node, toolkit: Toolkit
8484
if (node.name) {
8585
args.push('--node', node.name);
8686
} else if (inputs.driver == 'kubernetes' && (await toolkit.buildx.versionSatisfies('<0.11.0'))) {
87-
args.push('--node', `node-${uuid.v4()}`);
87+
args.push('--node', `node-${crypto.randomUUID()}`);
8888
}
8989
if (node['driver-opts'] && (await toolkit.buildx.versionSatisfies('>=0.3.0'))) {
9090
await Util.asyncForEach(node['driver-opts'], async (driverOpt: string) => {

‎src/main.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import * as crypto from 'crypto';
12
import * as fs from 'fs';
23
import * as yaml from 'js-yaml';
3-
import * as uuid from 'uuid';
44
import * as core from '@actions/core';
55
import * as actionsToolkit from '@docker/actions-toolkit';
66

@@ -98,7 +98,7 @@ actionsToolkit.run(
9898
});
9999
});
100100
if (defaultContextWithTLS) {
101-
const tmpDockerContext = `buildx-${uuid.v4()}`;
101+
const tmpDockerContext = `buildx-${crypto.randomUUID()}`;
102102
await core.group(`Creating temp docker context (TLS data loaded in default one)`, async () => {
103103
await Docker.getExecOutput(['context', 'create', tmpDockerContext], {
104104
ignoreReturnCode: true

‎yarn.lock‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3205,7 +3205,6 @@ __metadata:
32053205
ts-jest: ^29.1.2
32063206
ts-node: ^10.9.2
32073207
typescript: ^5.4.5
3208-
uuid: ^10.0.0
32093208
languageName: unknown
32103209
linkType: soft
32113210

@@ -6690,15 +6689,6 @@ __metadata:
66906689
languageName: node
66916690
linkType: hard
66926691

6693-
"uuid@npm:^10.0.0":
6694-
version: 10.0.0
6695-
resolution: "uuid@npm:10.0.0"
6696-
bin:
6697-
uuid: dist/bin/uuid
6698-
checksum: 4b81611ade2885d2313ddd8dc865d93d8dccc13ddf901745edca8f86d99bc46d7a330d678e7532e7ebf93ce616679fb19b2e3568873ac0c14c999032acb25869
6699-
languageName: node
6700-
linkType: hard
6701-
67026692
"uuid@npm:^3.3.2, uuid@npm:^3.3.3":
67036693
version: 3.4.0
67046694
resolution: "uuid@npm:3.4.0"

0 commit comments

Comments
 (0)
0