Merge pull request #838 from docker/dependabot/npm_and_yarn/docker/actions-toolkit-0.1.0-beta.19
chore(deps): Bump @docker/actions-toolkit from 0.1.0-beta.14 to 0.1.0-beta.19
This commit is contained in:
		
						commit
						f2a1d5e99d
					
				| @ -4,7 +4,7 @@ import * as path from 'path'; | |||||||
| import {Builder} from '@docker/actions-toolkit/lib/buildx/builder'; | import {Builder} from '@docker/actions-toolkit/lib/buildx/builder'; | ||||||
| import {Buildx} from '@docker/actions-toolkit/lib/buildx/buildx'; | import {Buildx} from '@docker/actions-toolkit/lib/buildx/buildx'; | ||||||
| import {Context} from '@docker/actions-toolkit/lib/context'; | import {Context} from '@docker/actions-toolkit/lib/context'; | ||||||
| import {Docker} from '@docker/actions-toolkit/lib/docker'; | import {Docker} from '@docker/actions-toolkit/lib/docker/docker'; | ||||||
| import {GitHub} from '@docker/actions-toolkit/lib/github'; | import {GitHub} from '@docker/actions-toolkit/lib/github'; | ||||||
| import {Toolkit} from '@docker/actions-toolkit/lib/toolkit'; | import {Toolkit} from '@docker/actions-toolkit/lib/toolkit'; | ||||||
| import {BuilderInfo} from '@docker/actions-toolkit/lib/types/builder'; | import {BuilderInfo} from '@docker/actions-toolkit/lib/types/builder'; | ||||||
| @ -42,9 +42,9 @@ jest.spyOn(Builder.prototype, 'inspect').mockImplementation(async (): Promise<Bu | |||||||
|     lastActivity: new Date('2023-01-16 09:45:23 +0000 UTC'), |     lastActivity: new Date('2023-01-16 09:45:23 +0000 UTC'), | ||||||
|     nodes: [ |     nodes: [ | ||||||
|       { |       { | ||||||
|         buildkitVersion: 'v0.11.0', |         buildkit: 'v0.11.0', | ||||||
|         buildkitdFlags: '--debug --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host', |         'buildkitd-flags': '--debug --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host', | ||||||
|         driverOpts: ['BUILDKIT_STEP_LOG_MAX_SIZE=10485760', 'BUILDKIT_STEP_LOG_MAX_SPEED=10485760', 'JAEGER_TRACE=localhost:6831', 'image=moby/buildkit:latest', 'network=host'], |         'driver-opts': ['BUILDKIT_STEP_LOG_MAX_SIZE=10485760', 'BUILDKIT_STEP_LOG_MAX_SPEED=10485760', 'JAEGER_TRACE=localhost:6831', 'image=moby/buildkit:latest', 'network=host'], | ||||||
|         endpoint: 'unix:///var/run/docker.sock', |         endpoint: 'unix:///var/run/docker.sock', | ||||||
|         name: 'builder20', |         name: 'builder20', | ||||||
|         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', |         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', | ||||||
| @ -609,7 +609,7 @@ nproc=3`], | |||||||
|       jest.spyOn(Buildx.prototype, 'version').mockImplementation(async (): Promise<string> => { |       jest.spyOn(Buildx.prototype, 'version').mockImplementation(async (): Promise<string> => { | ||||||
|         return buildxVersion; |         return buildxVersion; | ||||||
|       }); |       }); | ||||||
|       const inp = await context.getInputs(); |       const inp = await context.getInputs(toolkit); | ||||||
|       const res = await context.getArgs(inp, toolkit); |       const res = await context.getArgs(inp, toolkit); | ||||||
|       expect(res).toEqual(expected); |       expect(res).toEqual(expected); | ||||||
|     } |     } | ||||||
|  | |||||||
							
								
								
									
										8
									
								
								dist/index.js
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								dist/index.js
									
									
									
										generated
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										2
									
								
								dist/index.js.map
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/index.js.map
									
									
									
										generated
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @ -29,8 +29,7 @@ | |||||||
|   "license": "Apache-2.0", |   "license": "Apache-2.0", | ||||||
|   "dependencies": { |   "dependencies": { | ||||||
|     "@actions/core": "^1.10.0", |     "@actions/core": "^1.10.0", | ||||||
|     "@docker/actions-toolkit": "^0.1.0-beta.14", |     "@docker/actions-toolkit": "^0.1.0-beta.19", | ||||||
|     "csv-parse": "^5.3.5", |  | ||||||
|     "handlebars": "^4.7.7" |     "handlebars": "^4.7.7" | ||||||
|   }, |   }, | ||||||
|   "devDependencies": { |   "devDependencies": { | ||||||
|  | |||||||
| @ -1,5 +1,4 @@ | |||||||
| import * as core from '@actions/core'; | import * as core from '@actions/core'; | ||||||
| import {parse} from 'csv-parse/sync'; |  | ||||||
| import * as handlebars from 'handlebars'; | import * as handlebars from 'handlebars'; | ||||||
| import {Context} from '@docker/actions-toolkit/lib/context'; | import {Context} from '@docker/actions-toolkit/lib/context'; | ||||||
| import {GitHub} from '@docker/actions-toolkit/lib/github'; | import {GitHub} from '@docker/actions-toolkit/lib/github'; | ||||||
| @ -40,7 +39,7 @@ export interface Inputs { | |||||||
|   githubToken: string; |   githubToken: string; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| export async function getInputs(): Promise<Inputs> { | export async function getInputs(toolkit: Toolkit): Promise<Inputs> { | ||||||
|   return { |   return { | ||||||
|     addHosts: Util.getInputList('add-hosts'), |     addHosts: Util.getInputList('add-hosts'), | ||||||
|     allow: Util.getInputList('allow'), |     allow: Util.getInputList('allow'), | ||||||
| @ -60,7 +59,7 @@ export async function getInputs(): Promise<Inputs> { | |||||||
|     noCacheFilters: Util.getInputList('no-cache-filters'), |     noCacheFilters: Util.getInputList('no-cache-filters'), | ||||||
|     outputs: Util.getInputList('outputs', {ignoreComma: true}), |     outputs: Util.getInputList('outputs', {ignoreComma: true}), | ||||||
|     platforms: Util.getInputList('platforms'), |     platforms: Util.getInputList('platforms'), | ||||||
|     provenance: getProvenanceInput('provenance'), |     provenance: toolkit.buildx.inputs.getProvenanceInput('provenance'), | ||||||
|     pull: core.getBooleanInput('pull'), |     pull: core.getBooleanInput('pull'), | ||||||
|     push: core.getBooleanInput('push'), |     push: core.getBooleanInput('push'), | ||||||
|     sbom: core.getInput('sbom'), |     sbom: core.getInput('sbom'), | ||||||
| @ -145,10 +144,10 @@ async function getBuildArgs(inputs: Inputs, context: string, toolkit: Toolkit): | |||||||
|       if (GitHub.context.payload.repository?.private ?? false) { |       if (GitHub.context.payload.repository?.private ?? false) { | ||||||
|         // if this is a private repository, we set the default provenance
 |         // if this is a private repository, we set the default provenance
 | ||||||
|         // attributes being set in buildx: https://github.com/docker/buildx/blob/fb27e3f919dcbf614d7126b10c2bc2d0b1927eb6/build/build.go#L603
 |         // attributes being set in buildx: https://github.com/docker/buildx/blob/fb27e3f919dcbf614d7126b10c2bc2d0b1927eb6/build/build.go#L603
 | ||||||
|         args.push('--provenance', getProvenanceAttrs(`mode=min,inline-only=true`)); |         args.push('--provenance', toolkit.buildx.inputs.resolveProvenanceAttrs(`mode=min,inline-only=true`)); | ||||||
|       } else { |       } else { | ||||||
|         // for a public repository, we set max provenance mode.
 |         // for a public repository, we set max provenance mode.
 | ||||||
|         args.push('--provenance', getProvenanceAttrs(`mode=max`)); |         args.push('--provenance', toolkit.buildx.inputs.resolveProvenanceAttrs(`mode=max`)); | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|     if (inputs.sbom) { |     if (inputs.sbom) { | ||||||
| @ -215,37 +214,3 @@ async function getCommonArgs(inputs: Inputs, toolkit: Toolkit): Promise<Array<st | |||||||
|   } |   } | ||||||
|   return args; |   return args; | ||||||
| } | } | ||||||
| 
 |  | ||||||
| function getProvenanceInput(name: string): string { |  | ||||||
|   const input = core.getInput(name); |  | ||||||
|   if (!input) { |  | ||||||
|     // if input is not set, default values will be set later.
 |  | ||||||
|     return input; |  | ||||||
|   } |  | ||||||
|   try { |  | ||||||
|     return core.getBooleanInput(name) ? `builder-id=${Context.provenanceBuilderID()}` : 'false'; |  | ||||||
|   } catch (err) { |  | ||||||
|     // not a valid boolean, so we assume it's a string
 |  | ||||||
|     return getProvenanceAttrs(input); |  | ||||||
|   } |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| function getProvenanceAttrs(input: string): string { |  | ||||||
|   // parse attributes from input
 |  | ||||||
|   const fields = parse(input, { |  | ||||||
|     relaxColumnCount: true, |  | ||||||
|     skipEmptyLines: true |  | ||||||
|   })[0]; |  | ||||||
|   // check if builder-id attribute exists in the input
 |  | ||||||
|   for (const field of fields) { |  | ||||||
|     const parts = field |  | ||||||
|       .toString() |  | ||||||
|       .split(/(?<=^[^=]+?)=/) |  | ||||||
|       .map(item => item.trim()); |  | ||||||
|     if (parts[0] == 'builder-id') { |  | ||||||
|       return input; |  | ||||||
|     } |  | ||||||
|   } |  | ||||||
|   // if not add builder-id attribute
 |  | ||||||
|   return `${input},builder-id=${Context.provenanceBuilderID()}`; |  | ||||||
| } |  | ||||||
|  | |||||||
| @ -3,7 +3,7 @@ import * as stateHelper from './state-helper'; | |||||||
| 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 {Context} from '@docker/actions-toolkit/lib/context'; | import {Context} from '@docker/actions-toolkit/lib/context'; | ||||||
| import {Docker} from '@docker/actions-toolkit/lib/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'; | ||||||
| import {GitHub} from '@docker/actions-toolkit/lib/github'; | import {GitHub} from '@docker/actions-toolkit/lib/github'; | ||||||
| import {Toolkit} from '@docker/actions-toolkit/lib/toolkit'; | import {Toolkit} from '@docker/actions-toolkit/lib/toolkit'; | ||||||
| @ -13,8 +13,8 @@ import * as context from './context'; | |||||||
| actionsToolkit.run( | actionsToolkit.run( | ||||||
|   // main
 |   // main
 | ||||||
|   async () => { |   async () => { | ||||||
|     const inputs: context.Inputs = await context.getInputs(); |  | ||||||
|     const toolkit = new Toolkit(); |     const toolkit = new Toolkit(); | ||||||
|  |     const inputs: context.Inputs = await context.getInputs(toolkit); | ||||||
| 
 | 
 | ||||||
|     await core.group(`GitHub Actions runtime token ACs`, async () => { |     await core.group(`GitHub Actions runtime token ACs`, async () => { | ||||||
|       try { |       try { | ||||||
|  | |||||||
							
								
								
									
										44
									
								
								yarn.lock
									
									
									
									
									
								
							
							
						
						
									
										44
									
								
								yarn.lock
									
									
									
									
									
								
							| @ -34,12 +34,7 @@ | |||||||
|   dependencies: |   dependencies: | ||||||
|     tunnel "^0.0.6" |     tunnel "^0.0.6" | ||||||
| 
 | 
 | ||||||
| "@actions/io@^1.0.1": | "@actions/io@^1.0.1", "@actions/io@^1.1.1", "@actions/io@^1.1.2": | ||||||
|   version "1.0.2" |  | ||||||
|   resolved "https://registry.yarnpkg.com/@actions/io/-/io-1.0.2.tgz#2f614b6e69ce14d191180451eb38e6576a6e6b27" |  | ||||||
|   integrity sha512-J8KuFqVPr3p6U8W93DOXlXW6zFvrQAJANdS+vw0YhusLIq+bszW8zmK2Fh1C2kDPX8FMvwIl1OUcFgvJoXLbAg== |  | ||||||
| 
 |  | ||||||
| "@actions/io@^1.1.1", "@actions/io@^1.1.2": |  | ||||||
|   version "1.1.2" |   version "1.1.2" | ||||||
|   resolved "https://registry.yarnpkg.com/@actions/io/-/io-1.1.2.tgz#766ac09674a289ce0f1550ffe0a6eac9261a8ea9" |   resolved "https://registry.yarnpkg.com/@actions/io/-/io-1.1.2.tgz#766ac09674a289ce0f1550ffe0a6eac9261a8ea9" | ||||||
|   integrity sha512-d+RwPlMp+2qmBfeLYPLXuSRykDIFEwdTA0MMxzS9kh4kvP1ftrc/9fzy6pX6qAjthdXruHQ6/6kjT/DNo5ALuw== |   integrity sha512-d+RwPlMp+2qmBfeLYPLXuSRykDIFEwdTA0MMxzS9kh4kvP1ftrc/9fzy6pX6qAjthdXruHQ6/6kjT/DNo5ALuw== | ||||||
| @ -563,10 +558,10 @@ | |||||||
|   dependencies: |   dependencies: | ||||||
|     "@cspotcode/source-map-consumer" "0.8.0" |     "@cspotcode/source-map-consumer" "0.8.0" | ||||||
| 
 | 
 | ||||||
| "@docker/actions-toolkit@^0.1.0-beta.14": | "@docker/actions-toolkit@^0.1.0-beta.19": | ||||||
|   version "0.1.0-beta.14" |   version "0.1.0-beta.19" | ||||||
|   resolved "https://registry.yarnpkg.com/@docker/actions-toolkit/-/actions-toolkit-0.1.0-beta.14.tgz#82fa8a6b9802a7f770fde3ddcef1cf591739a80b" |   resolved "https://registry.yarnpkg.com/@docker/actions-toolkit/-/actions-toolkit-0.1.0-beta.19.tgz#d4e6f56dec13d00b772d5d6b1b10c71164568820" | ||||||
|   integrity sha512-N+aqiO0E2ygoaBORN8fx4K7j/CzJ2nCSgOewtDm0gdzrch8qZmTU14e3oNAbZlP8Q34Lk45KKefm5wDfLipRqg== |   integrity sha512-HeJ7tsFPsq7otV7KFNiWccW+rJeXFboqJ59rBAa2lTncq9cybCtNs+Z5ug++sIju0FN+zmSFAY77sBS9FhH9jQ== | ||||||
|   dependencies: |   dependencies: | ||||||
|     "@actions/core" "^1.10.0" |     "@actions/core" "^1.10.0" | ||||||
|     "@actions/exec" "^1.1.1" |     "@actions/exec" "^1.1.1" | ||||||
| @ -574,7 +569,9 @@ | |||||||
|     "@actions/http-client" "^2.0.1" |     "@actions/http-client" "^2.0.1" | ||||||
|     "@actions/io" "^1.1.2" |     "@actions/io" "^1.1.2" | ||||||
|     "@actions/tool-cache" "^2.0.1" |     "@actions/tool-cache" "^2.0.1" | ||||||
|  |     async-retry "^1.3.3" | ||||||
|     csv-parse "^5.3.5" |     csv-parse "^5.3.5" | ||||||
|  |     handlebars "^4.7.7" | ||||||
|     jwt-decode "^3.1.2" |     jwt-decode "^3.1.2" | ||||||
|     semver "^7.3.8" |     semver "^7.3.8" | ||||||
|     tmp "^0.2.1" |     tmp "^0.2.1" | ||||||
| @ -1333,6 +1330,13 @@ array-union@^2.1.0: | |||||||
|   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" |   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" | ||||||
|   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== |   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== | ||||||
| 
 | 
 | ||||||
|  | async-retry@^1.3.3: | ||||||
|  |   version "1.3.3" | ||||||
|  |   resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.3.tgz#0e7f36c04d8478e7a58bdbed80cedf977785f280" | ||||||
|  |   integrity sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw== | ||||||
|  |   dependencies: | ||||||
|  |     retry "0.13.1" | ||||||
|  | 
 | ||||||
| asynckit@^0.4.0: | asynckit@^0.4.0: | ||||||
|   version "0.4.0" |   version "0.4.0" | ||||||
|   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" |   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" | ||||||
| @ -3257,6 +3261,11 @@ resolve@^1.20.0: | |||||||
|     path-parse "^1.0.7" |     path-parse "^1.0.7" | ||||||
|     supports-preserve-symlinks-flag "^1.0.0" |     supports-preserve-symlinks-flag "^1.0.0" | ||||||
| 
 | 
 | ||||||
|  | retry@0.13.1: | ||||||
|  |   version "0.13.1" | ||||||
|  |   resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" | ||||||
|  |   integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== | ||||||
|  | 
 | ||||||
| reusify@^1.0.4: | reusify@^1.0.4: | ||||||
|   version "1.0.4" |   version "1.0.4" | ||||||
|   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" |   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" | ||||||
| @ -3293,10 +3302,10 @@ saxes@^5.0.1: | |||||||
|   dependencies: |   dependencies: | ||||||
|     xmlchars "^2.2.0" |     xmlchars "^2.2.0" | ||||||
| 
 | 
 | ||||||
| semver@7.x, semver@^7.3.2, semver@^7.3.5: | semver@7.x, semver@^7.3.2, semver@^7.3.5, semver@^7.3.8: | ||||||
|   version "7.3.7" |   version "7.3.8" | ||||||
|   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" |   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" | ||||||
|   integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== |   integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== | ||||||
|   dependencies: |   dependencies: | ||||||
|     lru-cache "^6.0.0" |     lru-cache "^6.0.0" | ||||||
| 
 | 
 | ||||||
| @ -3305,13 +3314,6 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.3.0: | |||||||
|   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" |   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" | ||||||
|   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== |   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== | ||||||
| 
 | 
 | ||||||
| semver@^7.3.8: |  | ||||||
|   version "7.3.8" |  | ||||||
|   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" |  | ||||||
|   integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== |  | ||||||
|   dependencies: |  | ||||||
|     lru-cache "^6.0.0" |  | ||||||
| 
 |  | ||||||
| shebang-command@^2.0.0: | shebang-command@^2.0.0: | ||||||
|   version "2.0.0" |   version "2.0.0" | ||||||
|   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" |   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user