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

do not trim whitespace for sep-tags and sep-labels inputs
docker · Oct 7, 2022 · 8671a4f · 8671a4f
2 parents f7c31b1 + 3862a1b
commit 8671a4f
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -322,3 +322,31 @@ jobs:
             ${{ steps.docker_meta.outputs.bake-file }}
           targets: |
             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 }}`);
diff --git a/__tests__/meta.test.ts b/__tests__/meta.test.ts
@@ -65,6 +65,7 @@ const tagsLabelsTest = async (name: string, envFile: string, inputs: Inputs, exV
 
 describe('null', () => {
   // prettier-ignore
+  // eslint-disable-next-line jest/expect-expect
   test.each([
     [
       'null01',
@@ -121,6 +122,7 @@ describe('null', () => {
 
 describe('push', () => {
   // prettier-ignore
+  // eslint-disable-next-line jest/expect-expect
   test.each([
     [
       'push01',
@@ -732,6 +734,7 @@ describe('push', () => {
 
 describe('tag', () => {
   // prettier-ignore
+  // eslint-disable-next-line jest/expect-expect
   test.each([
     [
       'tag01',
@@ -1777,6 +1780,7 @@ describe('tag', () => {
 
 describe('latest', () => {
   // prettier-ignore
+  // eslint-disable-next-line jest/expect-expect
   test.each([
     [
       'latest01',
@@ -2064,6 +2068,7 @@ describe('latest', () => {
 
 describe('pr', () => {
   // prettier-ignore
+  // eslint-disable-next-line jest/expect-expect
   test.each([
     [
       'pr01',
@@ -2411,6 +2416,7 @@ describe('pr', () => {
 
 describe('schedule', () => {
   // prettier-ignore
+  // eslint-disable-next-line jest/expect-expect
   test.each([
     [
       'schedule01',
@@ -2630,6 +2636,7 @@ describe('schedule', () => {
 
 describe('release', () => {
   // prettier-ignore
+  // eslint-disable-next-line jest/expect-expect
   test.each([
     [
       'release01',
@@ -2696,6 +2703,7 @@ describe('release', () => {
 
 describe('raw', () => {
   // prettier-ignore
+  // eslint-disable-next-line jest/expect-expect
   test.each([
     [
       'raw01',
@@ -3065,6 +3073,7 @@ describe('raw', () => {
 
 describe('json', () => {
   // prettier-ignore
+  // eslint-disable-next-line jest/expect-expect
   test.each([
     [
       'json01',
@@ -3315,6 +3324,7 @@ describe('json', () => {
 
 describe('bake', () => {
   // prettier-ignore
+  // eslint-disable-next-line jest/expect-expect
   test.each([
     [
       'bake01',
@@ -3617,3 +3627,48 @@ describe('bake', () => {
     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);
+  });
+});
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/context.ts b/src/context.ts
@@ -31,8 +31,8 @@ export function getInputs(): Inputs {
     tags: getInputList('tags', true),
     flavor: getInputList('flavor', true),
     labels: getInputList('labels', true),
-    sepTags: core.getInput('sep-tags') || `\n`,
-    sepLabels: core.getInput('sep-labels') || `\n`,
+    sepTags: core.getInput('sep-tags', {trimWhitespace: false}) || `\n`,
+    sepLabels: core.getInput('sep-labels', {trimWhitespace: false}) || `\n`,
     bakeTarget: core.getInput('bake-target') || `docker-metadata-action`,
     githubToken: core.getInput('github-token')
   };