Merge pull request #233 from crazy-max/test-septags

do not trim whitespace for sep-tags and sep-labels inputs
This commit is contained in:
CrazyMax 2022-10-07 23:14:46 +02:00 committed by GitHub
commit 8671a4f8ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 87 additions and 4 deletions

View File

@ -322,3 +322,31 @@ jobs:
${{ steps.docker_meta.outputs.bake-file }} ${{ steps.docker_meta.outputs.bake-file }}
targets: | targets: |
release release
sep-tags:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
sep:
- " "
- ","
steps:
-
name: Checkout
uses: actions/checkout@v3
-
name: Docker meta
id: meta
uses: ./
with:
images: |
${{ env.DOCKER_IMAGE }}
ghcr.io/name/app
sep-tags: ${{ matrix.sep }}
-
name: Tags
uses: actions/github-script@v6
with:
script: |
console.log(`${{ steps.meta.outputs.tags }}`);

View File

@ -65,6 +65,7 @@ const tagsLabelsTest = async (name: string, envFile: string, inputs: Inputs, exV
describe('null', () => { describe('null', () => {
// prettier-ignore // prettier-ignore
// eslint-disable-next-line jest/expect-expect
test.each([ test.each([
[ [
'null01', 'null01',
@ -121,6 +122,7 @@ describe('null', () => {
describe('push', () => { describe('push', () => {
// prettier-ignore // prettier-ignore
// eslint-disable-next-line jest/expect-expect
test.each([ test.each([
[ [
'push01', 'push01',
@ -732,6 +734,7 @@ describe('push', () => {
describe('tag', () => { describe('tag', () => {
// prettier-ignore // prettier-ignore
// eslint-disable-next-line jest/expect-expect
test.each([ test.each([
[ [
'tag01', 'tag01',
@ -1777,6 +1780,7 @@ describe('tag', () => {
describe('latest', () => { describe('latest', () => {
// prettier-ignore // prettier-ignore
// eslint-disable-next-line jest/expect-expect
test.each([ test.each([
[ [
'latest01', 'latest01',
@ -2064,6 +2068,7 @@ describe('latest', () => {
describe('pr', () => { describe('pr', () => {
// prettier-ignore // prettier-ignore
// eslint-disable-next-line jest/expect-expect
test.each([ test.each([
[ [
'pr01', 'pr01',
@ -2411,6 +2416,7 @@ describe('pr', () => {
describe('schedule', () => { describe('schedule', () => {
// prettier-ignore // prettier-ignore
// eslint-disable-next-line jest/expect-expect
test.each([ test.each([
[ [
'schedule01', 'schedule01',
@ -2630,6 +2636,7 @@ describe('schedule', () => {
describe('release', () => { describe('release', () => {
// prettier-ignore // prettier-ignore
// eslint-disable-next-line jest/expect-expect
test.each([ test.each([
[ [
'release01', 'release01',
@ -2696,6 +2703,7 @@ describe('release', () => {
describe('raw', () => { describe('raw', () => {
// prettier-ignore // prettier-ignore
// eslint-disable-next-line jest/expect-expect
test.each([ test.each([
[ [
'raw01', 'raw01',
@ -3065,6 +3073,7 @@ describe('raw', () => {
describe('json', () => { describe('json', () => {
// prettier-ignore // prettier-ignore
// eslint-disable-next-line jest/expect-expect
test.each([ test.each([
[ [
'json01', 'json01',
@ -3315,6 +3324,7 @@ describe('json', () => {
describe('bake', () => { describe('bake', () => {
// prettier-ignore // prettier-ignore
// eslint-disable-next-line jest/expect-expect
test.each([ test.each([
[ [
'bake01', 'bake01',
@ -3617,3 +3627,48 @@ describe('bake', () => {
expect(JSON.parse(fs.readFileSync(bakeFile, 'utf8'))).toEqual(exBakeDefinition); expect(JSON.parse(fs.readFileSync(bakeFile, 'utf8'))).toEqual(exBakeDefinition);
}); });
}); });
describe('sepTags', () => {
// prettier-ignore
// eslint-disable-next-line jest/expect-expect
test.each([
[
'sepTags01',
'event_push_dev.env',
{
images: ['user/app'],
tags: [
`type=ref,event=branch`,
`type=raw,my`,
`type=raw,custom`,
`type=raw,tags`
],
sepTags: " "
} as Inputs,
"user/app:dev user/app:my user/app:custom user/app:tags"
],
[
'sepTags02',
'event_push_dev.env',
{
images: ['user/app'],
tags: [
`type=ref,event=branch`,
`type=raw,my`,
`type=raw,custom`,
`type=raw,tags`
],
sepTags: ","
} as Inputs,
"user/app:dev,user/app:my,user/app:custom,user/app:tags"
]
])('given %p with %p event', async (name: string, envFile: string, inputs: Inputs, expTags: string) => {
process.env = dotenv.parse(fs.readFileSync(path.join(__dirname, 'fixtures', envFile)));
const context = github.context();
const repo = await github.repo(process.env.GITHUB_TOKEN || '');
const meta = new Meta({...getInputs(), ...inputs}, context, repo);
expect(meta.getTags().join(inputs.sepTags)).toEqual(expTags);
});
});

2
dist/index.js generated vendored

File diff suppressed because one or more lines are too long

2
dist/index.js.map generated vendored

File diff suppressed because one or more lines are too long

View File

@ -31,8 +31,8 @@ export function getInputs(): Inputs {
tags: getInputList('tags', true), tags: getInputList('tags', true),
flavor: getInputList('flavor', true), flavor: getInputList('flavor', true),
labels: getInputList('labels', true), labels: getInputList('labels', true),
sepTags: core.getInput('sep-tags') || `\n`, sepTags: core.getInput('sep-tags', {trimWhitespace: false}) || `\n`,
sepLabels: core.getInput('sep-labels') || `\n`, sepLabels: core.getInput('sep-labels', {trimWhitespace: false}) || `\n`,
bakeTarget: core.getInput('bake-target') || `docker-metadata-action`, bakeTarget: core.getInput('bake-target') || `docker-metadata-action`,
githubToken: core.getInput('github-token') githubToken: core.getInput('github-token')
}; };