mirror of
				https://github.com/docker/setup-buildx-action.git
				synced 2025-10-31 01:20:09 +08:00 
			
		
		
		
	remove uuid package and switch to crypto
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
This commit is contained in:
		
							parent
							
								
									e5b688ea46
								
							
						
					
					
						commit
						d391aad55c
					
				| @ -1,7 +1,6 @@ | ||||
| import {beforeEach, describe, expect, jest, test} from '@jest/globals'; | ||||
| import * as fs from 'fs'; | ||||
| import * as path from 'path'; | ||||
| import * as uuid from 'uuid'; | ||||
| import {Buildx} from '@docker/actions-toolkit/lib/buildx/buildx'; | ||||
| import {Context} from '@docker/actions-toolkit/lib/context'; | ||||
| import {Docker} from '@docker/actions-toolkit/lib/docker/docker'; | ||||
| @ -26,8 +25,12 @@ jest.spyOn(Context, 'tmpName').mockImplementation((): string => { | ||||
|   return tmpName; | ||||
| }); | ||||
| 
 | ||||
| jest.mock('uuid'); | ||||
| jest.spyOn(uuid, 'v4').mockReturnValue('9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d'); | ||||
| jest.mock('crypto', () => { | ||||
|   return { | ||||
|     ...(jest.requireActual('crypto') as object), | ||||
|     randomUUID: jest.fn(() => '9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d') | ||||
|   }; | ||||
| }); | ||||
| 
 | ||||
| jest.spyOn(Docker, 'context').mockImplementation((): Promise<string> => { | ||||
|   return Promise.resolve('default'); | ||||
|  | ||||
| @ -27,8 +27,7 @@ | ||||
|   "dependencies": { | ||||
|     "@actions/core": "^1.11.1", | ||||
|     "@docker/actions-toolkit": "^0.39.0", | ||||
|     "js-yaml": "^4.1.0", | ||||
|     "uuid": "^10.0.0" | ||||
|     "js-yaml": "^4.1.0" | ||||
|   }, | ||||
|   "devDependencies": { | ||||
|     "@types/js-yaml": "^4.0.9", | ||||
|  | ||||
| @ -1,4 +1,4 @@ | ||||
| import * as uuid from 'uuid'; | ||||
| import * as crypto from 'crypto'; | ||||
| import * as core from '@actions/core'; | ||||
| 
 | ||||
| import {Docker} from '@docker/actions-toolkit/lib/docker/docker'; | ||||
| @ -47,7 +47,7 @@ export async function getInputs(): Promise<Inputs> { | ||||
| } | ||||
| 
 | ||||
| export async function getBuilderName(driver: string): Promise<string> { | ||||
|   return driver == 'docker' ? await Docker.context() : `builder-${uuid.v4()}`; | ||||
|   return driver == 'docker' ? await Docker.context() : `builder-${crypto.randomUUID()}`; | ||||
| } | ||||
| 
 | ||||
| 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 | ||||
|   if (node.name) { | ||||
|     args.push('--node', node.name); | ||||
|   } else if (inputs.driver == 'kubernetes' && (await toolkit.buildx.versionSatisfies('<0.11.0'))) { | ||||
|     args.push('--node', `node-${uuid.v4()}`); | ||||
|     args.push('--node', `node-${crypto.randomUUID()}`); | ||||
|   } | ||||
|   if (node['driver-opts'] && (await toolkit.buildx.versionSatisfies('>=0.3.0'))) { | ||||
|     await Util.asyncForEach(node['driver-opts'], async (driverOpt: string) => { | ||||
|  | ||||
| @ -1,6 +1,6 @@ | ||||
| import * as crypto from 'crypto'; | ||||
| import * as fs from 'fs'; | ||||
| import * as yaml from 'js-yaml'; | ||||
| import * as uuid from 'uuid'; | ||||
| import * as core from '@actions/core'; | ||||
| import * as actionsToolkit from '@docker/actions-toolkit'; | ||||
| 
 | ||||
| @ -98,7 +98,7 @@ actionsToolkit.run( | ||||
|         }); | ||||
|       }); | ||||
|       if (defaultContextWithTLS) { | ||||
|         const tmpDockerContext = `buildx-${uuid.v4()}`; | ||||
|         const tmpDockerContext = `buildx-${crypto.randomUUID()}`; | ||||
|         await core.group(`Creating temp docker context (TLS data loaded in default one)`, async () => { | ||||
|           await Docker.getExecOutput(['context', 'create', tmpDockerContext], { | ||||
|             ignoreReturnCode: true | ||||
|  | ||||
							
								
								
									
										10
									
								
								yarn.lock
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								yarn.lock
									
									
									
									
									
								
							| @ -3205,7 +3205,6 @@ __metadata: | ||||
|     ts-jest: ^29.1.2 | ||||
|     ts-node: ^10.9.2 | ||||
|     typescript: ^5.4.5 | ||||
|     uuid: ^10.0.0 | ||||
|   languageName: unknown | ||||
|   linkType: soft | ||||
| 
 | ||||
| @ -6690,15 +6689,6 @@ __metadata: | ||||
|   languageName: node | ||||
|   linkType: hard | ||||
| 
 | ||||
| "uuid@npm:^10.0.0": | ||||
|   version: 10.0.0 | ||||
|   resolution: "uuid@npm:10.0.0" | ||||
|   bin: | ||||
|     uuid: dist/bin/uuid | ||||
|   checksum: 4b81611ade2885d2313ddd8dc865d93d8dccc13ddf901745edca8f86d99bc46d7a330d678e7532e7ebf93ce616679fb19b2e3568873ac0c14c999032acb25869 | ||||
|   languageName: node | ||||
|   linkType: hard | ||||
| 
 | ||||
| "uuid@npm:^3.3.2, uuid@npm:^3.3.3": | ||||
|   version: 3.4.0 | ||||
|   resolution: "uuid@npm:3.4.0" | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 CrazyMax
						CrazyMax