From e2bf0d0cc1b3c850720619d9737512ea7907b862 Mon Sep 17 00:00:00 2001 From: Jyotsna Date: Thu, 5 Nov 2020 13:53:15 +0530 Subject: [PATCH] Test failures fixed, added 3 new test cases Signed-off-by: Jyotsna --- __tests__/context.test.ts | 56 +++++++++++++++++++++++++++++++++++++++ dist/index.js | 19 ++++++++----- src/context.ts | 25 ++++++++++------- 3 files changed, 83 insertions(+), 17 deletions(-) diff --git a/__tests__/context.test.ts b/__tests__/context.test.ts index d38a570..f50d6a1 100644 --- a/__tests__/context.test.ts +++ b/__tests__/context.test.ts @@ -10,6 +10,7 @@ jest.spyOn(context, 'tmpDir').mockImplementation((): string => { const tmpDir = path.join('/tmp/.docker-build-push-jest').split(path.sep).join(path.posix.sep); if (!fs.existsSync(tmpDir)) { fs.mkdirSync(tmpDir, {recursive: true}); + 2; } return tmpDir; }); @@ -146,6 +147,8 @@ describe('getArgs', () => { [ 'buildx', 'build', + '--label', 'org.opencontainers.image.source=https://github.com/docker/build-push-action.git', + '--label', 'dockerfile-path=./test/Dockerfile', '--platform', 'linux/amd64,linux/arm64', '--iidfile', '/tmp/.docker-build-push-jest/iidfile', '--secret', 'id=GIT_AUTH_TOKEN,src=/tmp/.docker-build-push-jest/.tmpname-jest', @@ -154,6 +157,59 @@ describe('getArgs', () => { '--push', 'https://github.com/docker/build-push-action.git#heads/master' ] + ], + [ + '0.4.2', + new Map([ + ['context', '.'], + ['labels', 'org.opencontainers.image.source=UserProvidedSourceLabel'], + ['outputs', 'type=image,dest=./release-out'] + ]), + [ + 'buildx', + 'build', + '--label', 'org.opencontainers.image.source=UserProvidedSourceLabel', + '--label', 'dockerfile-path=Dockerfile', + '--output', 'type=image,dest=./release-out', + '--iidfile', '/tmp/.docker-build-push-jest/iidfile', + '--file', 'Dockerfile', + '.' + ] + ], + [ + '0.4.2', + new Map([ + ['context', '.'], + ['outputs', 'type=registry,dest=./release-out'] + ]), + [ + 'buildx', + 'build', + '--label', 'org.opencontainers.image.source=https://github.com/docker/build-push-action.git', + '--label', 'dockerfile-path=Dockerfile', + '--output', 'type=registry,dest=./release-out', + '--iidfile', '/tmp/.docker-build-push-jest/iidfile', + '--file', 'Dockerfile', + '.' + ] + ], + [ + '0.4.2', + new Map([ + ['context', '.'], + ['labels', 'org.opencontainers.image.source=UserProvidedSourceLabel'], + ['load', 'true'] + ]), + [ + 'buildx', + 'build', + '--label', 'org.opencontainers.image.source=UserProvidedSourceLabel', + '--label', 'dockerfile-path=Dockerfile', + '--iidfile', '/tmp/.docker-build-push-jest/iidfile', + '--file', 'Dockerfile', + '--load', + '.' + ] ] ])( 'given %p with %p as inputs, returns %p', diff --git a/dist/index.js b/dist/index.js index 28bb07b..e266279 100644 --- a/dist/index.js +++ b/dist/index.js @@ -12085,14 +12085,19 @@ function getInputs(defaultContext) { githubToken: core.getInput('github-token'), ssh: yield getInputList('ssh') }; - //Add repo as source-label if not already supplied by user - const sourceLabelKey = 'org.opencontainers.image.source'; - if (userInputs.labels.find(val => val.startsWith(sourceLabelKey) == true) == null) { - userInputs.labels.push(`${sourceLabelKey}=https://github.com/${github.context.repo.owner}/${github.context.repo.repo}`); + if (userInputs.load == true || + userInputs.push == true || + userInputs.outputs.find(val => val.indexOf('type=image') > -1 || val.indexOf('type=registry') > -1)) { + //Add repo as source-label if not already supplied by user + const sourceLabelKey = 'org.opencontainers.image.source'; + if (userInputs.labels.find(val => val.startsWith(sourceLabelKey) == true) == null) { + const githubOwnerRepoUrl = defaultContext.split('#')[0]; + userInputs.labels.push(`${sourceLabelKey}=${githubOwnerRepoUrl}`); + } + //Add dockerfile path as label + let dockerfilePath = userInputs.file; + userInputs.labels.push(`dockerfile-path=${dockerfilePath}`); } - //Add dockerfile path as label - let dockerfilePath = userInputs.file; - userInputs.labels.push(`dockerfile-path=${dockerfilePath}`); return userInputs; }); } diff --git a/src/context.ts b/src/context.ts index 13a771d..c626983 100644 --- a/src/context.ts +++ b/src/context.ts @@ -76,17 +76,22 @@ export async function getInputs(defaultContext: string): Promise { ssh: await getInputList('ssh') }; - //Add repo as source-label if not already supplied by user - const sourceLabelKey = 'org.opencontainers.image.source'; - if (userInputs.labels.find(val => val.startsWith(sourceLabelKey) == true) == null) { - userInputs.labels.push( - `${sourceLabelKey}=https://github.com/${github.context.repo.owner}/${github.context.repo.repo}` - ); - } + if ( + userInputs.load == true || + userInputs.push == true || + userInputs.outputs.find(val => val.indexOf('type=image') > -1 || val.indexOf('type=registry') > -1) + ) { + //Add repo as source-label if not already supplied by user + const sourceLabelKey = 'org.opencontainers.image.source'; + if (userInputs.labels.find(val => val.startsWith(sourceLabelKey) == true) == null) { + const githubOwnerRepoUrl = defaultContext.split('#')[0]; + userInputs.labels.push(`${sourceLabelKey}=${githubOwnerRepoUrl}`); + } - //Add dockerfile path as label - let dockerfilePath = userInputs.file; - userInputs.labels.push(`dockerfile-path=${dockerfilePath}`); + //Add dockerfile path as label + let dockerfilePath = userInputs.file; + userInputs.labels.push(`dockerfile-path=${dockerfilePath}`); + } return userInputs; }