Use csv-parse lib to parse outputs

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
docker · Oct 20, 2020 · bf051e6 · bf051e6
1 parent 695ef9e
commit bf051e6
Show file tree

Hide file tree

Showing 7 changed files with 1,350 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -261,6 +261,7 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v1
         with:
+          # TODO: Remove image=moby/buildkit:buildx-stable-1 when moby/buildkit#1727 fixed
           driver-opts: |
             network=host
             image=moby/buildkit:buildx-stable-1
@@ -348,6 +349,7 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v1
         with:
+          # TODO: Remove image=moby/buildkit:buildx-stable-1 when moby/buildkit#1727 fixed
           driver-opts: |
             network=host
             image=moby/buildkit:buildx-stable-1
@@ -412,6 +414,7 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v1
         with:
+          # TODO: Remove image=moby/buildkit:buildx-stable-1 when moby/buildkit#1727 fixed
           driver-opts: |
             network=host
             image=moby/buildkit:buildx-stable-1

diff --git a/__tests__/buildx.test.ts b/__tests__/buildx.test.ts
@@ -30,6 +30,66 @@ describe('getImageID', () => {
   });
 });
 
+describe('isLocalOrTarExporter', () => {
+  // prettier-ignore
+  test.each([
+    [
+      [
+        'type=registry,ref=user/app',
+      ],
+      false
+    ],
+    [
+      [
+        'type=docker',
+      ],
+      false
+    ],
+    [
+      [
+        'type=local,dest=./release-out'
+      ],
+      true
+    ],
+    [
+      [
+        'type=tar,dest=/tmp/image.tar'
+      ],
+      true
+    ],
+    [
+      [
+        'type=docker',
+        'type=tar,dest=/tmp/image.tar'
+      ],
+      true
+    ],
+    [
+      [
+        '"type=tar","dest=/tmp/image.tar"'
+      ],
+      true
+    ],
+    [
+      [
+        '" type= local" , dest=./release-out'
+      ],
+      true
+    ],
+    [
+      [
+        '.'
+      ],
+      false
+    ],
+  ])(
+    'given %p returns %p',
+    async (outputs: Array<string>, expected: boolean) => {
+      expect(buildx.isLocalOrTarExporter(outputs)).toEqual(expected);
+    }
+  );
+});
+
 describe('getVersion', () => {
   it('valid', async () => {
     await exec.exec('docker', ['buildx', 'version']);

diff --git a/__tests__/context.test.ts b/__tests__/context.test.ts
@@ -39,10 +39,8 @@ describe('getArgs', () => {
       [
         'buildx',
         'build',
-        '--iidfile',
-        '/tmp/.docker-build-push-jest/iidfile',
-        '--file',
-        'Dockerfile',
+        '--iidfile', '/tmp/.docker-build-push-jest/iidfile',
+        '--file', 'Dockerfile',
         'https://github.com/docker/build-push-action.git#test-jest'
       ]
     ],
@@ -81,26 +79,24 @@ describe('getArgs', () => {
       [
         'buildx',
         'build',
-        '--iidfile',
-        '/tmp/.docker-build-push-jest/iidfile',
-        '--secret',
-        'id=GIT_AUTH_TOKEN,src=/tmp/.docker-build-push-jest/.tmpname-jest',
+        '--iidfile', '/tmp/.docker-build-push-jest/iidfile',
+        '--secret', 'id=GIT_AUTH_TOKEN,src=/tmp/.docker-build-push-jest/.tmpname-jest',
         '--file', 'Dockerfile',
         '.'
       ]
     ],
     [
       '0.4.2',
       new Map<string, string>([
-        ['github-token', 'abcdefghijklmno0123456789']
+        ['github-token', 'abcdefghijklmno0123456789'],
+        ['outputs', '.']
       ]),
       [
         'buildx',
         'build',
-        '--iidfile',
-        '/tmp/.docker-build-push-jest/iidfile',
-        '--secret',
-        'id=GIT_AUTH_TOKEN,src=/tmp/.docker-build-push-jest/.tmpname-jest',
+        '--output', '.',
+        '--iidfile', '/tmp/.docker-build-push-jest/iidfile',
+        '--secret', 'id=GIT_AUTH_TOKEN,src=/tmp/.docker-build-push-jest/.tmpname-jest',
         '--file', 'Dockerfile',
         'https://github.com/docker/build-push-action.git#test-jest'
       ]