Fix tagging. Add test for multiple tags.

Author: belon

dist/index.js

@@ -1607,7 +1607,7 @@ const processBuildArgsInput = buildArgsInput => {
 };
 
 const splitTags = stringTags =>
-  stringTags === null || stringTags === undefined ? undefined : tags.split(',').map(tag => tag.trim());
+  stringTags === null || stringTags === undefined ? undefined : stringTags.split(',').map(tag => tag.trim());
 
 // Get GitHub Action inputs
 const processInputs = () => {
@@ -1646,7 +1646,7 @@ const run = () => {
     core.info(`Docker image ${imageFullName}:${firstTag} pushed to registry`);
 
     tagsCopy.forEach(tag => {
-      docker.tag(imageFullName, tag, buildArgs);
+      docker.tag(imageFullName, firstTag, tag);
       docker.push(imageFullName, tag);
       core.info(`Docker image ${imageFullName}:${firstTag} pushed to registry`);
     });

src/docker-build-push.js

@@ -20,7 +20,7 @@ const processBuildArgsInput = buildArgsInput => {
 };
 
 const splitTags = stringTags =>
-  stringTags === null || stringTags === undefined ? undefined : tags.split(',').map(tag => tag.trim());
+  stringTags === null || stringTags === undefined ? undefined : stringTags.split(',').map(tag => tag.trim());
 
 // Get GitHub Action inputs
 const processInputs = () => {
@@ -59,7 +59,7 @@ const run = () => {
     core.info(`Docker image ${imageFullName}:${firstTag} pushed to registry`);
 
     tagsCopy.forEach(tag => {
-      docker.tag(imageFullName, tag, buildArgs);
+      docker.tag(imageFullName, firstTag, tag);
       docker.push(imageFullName, tag);
       core.info(`Docker image ${imageFullName}:${firstTag} pushed to registry`);
     });

tests/docker-build-push.test.js

@@ -42,20 +42,22 @@ const convertBuildArgs = buildArgs => {
 };
 
 const runAssertions = (imageFullName, image, tags, dockerfile, buildArgs) => {
-  expect(docker.createTag).toHaveBeenCalledTimes(1);
   expect(core.getInput).toHaveBeenCalledTimes(7);
   expect(core.setOutput).toHaveBeenCalledTimes(3);
   expect(core.setOutput).toHaveBeenCalledWith('imageFullName', imageFullName);
   expect(core.setOutput).toHaveBeenCalledWith('imageName', image);
-  expect(core.setOutput).toHaveBeenCalledWith('tags', tags);
+  expect(core.setOutput).toHaveBeenCalledWith('tags', tags.join(','));
 
   if (buildArgs) {
     expect(cp.execSync).toHaveBeenCalledWith(
-      `docker build -f ${dockerfile} -t ${imageFullName}:${tags} ${convertBuildArgs(buildArgs)} .`,
+      `docker build -f ${dockerfile} -t ${imageFullName}:${tags[0]} ${convertBuildArgs(buildArgs)} .`,
       cpOptions
     );
   } else {
-    expect(cp.execSync).toHaveBeenCalledWith(`docker build -f ${dockerfile} -t ${imageFullName}:${tags} .`, cpOptions);
+    expect(cp.execSync).toHaveBeenCalledWith(
+      `docker build -f ${dockerfile} -t ${imageFullName}:${tags[0]} .`,
+      cpOptions
+    );
   }
 };
 
@@ -85,7 +87,9 @@ describe('Create & push Docker image to GitHub Registry', () => {
 
     run();
 
-    runAssertions(imageFullName, image, tag, dockerfile);
+    runAssertions(imageFullName, image, [tag], dockerfile);
+
+    expect(docker.createTag).toHaveBeenCalledTimes(1);
   });
 
   test('Keep default GitHub organization', () => {
@@ -104,7 +108,9 @@ describe('Create & push Docker image to GitHub Registry', () => {
 
     run();
 
-    runAssertions(imageFullName, image, tag, dockerfile);
+    runAssertions(imageFullName, image, [tag], dockerfile);
+
+    expect(docker.createTag).toHaveBeenCalledTimes(1);
   });
 
   test('Converts owner name to lowercase', () => {
@@ -125,7 +131,9 @@ describe('Create & push Docker image to GitHub Registry', () => {
 
     run();
 
-    runAssertions(imageFullName, image, tag, dockerfile);
+    runAssertions(imageFullName, image, [tag], dockerfile);
+
+    expect(docker.createTag).toHaveBeenCalledTimes(1);
   });
 });
 
@@ -146,7 +154,41 @@ describe('Create & push Docker image to GCR', () => {
 
     run();
 
-    runAssertions(imageFullName, image, tag, dockerfile);
+    runAssertions(imageFullName, image, [tag], dockerfile);
+
+    expect(docker.createTag).toHaveBeenCalledTimes(1);
+  });
+});
+
+describe('Create & push Docker image with many tags', () => {
+  test('Valid Docker inputs with two tags', () => {
+    const image = 'gcp-project/image';
+    const registry = 'gcr.io';
+    const tag1 = 'latest';
+    const tag2 = 'v1';
+    const inputTags = ` ${tag1},   ${tag2} `;
+    const outputTags = `${tag1},${tag2}`;
+    const buildArgs = '';
+    const dockerfile = 'Dockerfile';
+    const imageFullName = createFullImageName(registry, image);
+
+    docker.login = jest.fn();
+    docker.createTag = jest.fn().mockReturnValueOnce(tag1);
+    mockInputs(image, registry, inputTags, buildArgs, dockerfile);
+    mockOutputs(imageFullName, image, outputTags);
+    cp.execSync = jest.fn();
+
+    run();
+
+    expect(docker.createTag).toHaveBeenCalledTimes(0);
+    expect(core.getInput).toHaveBeenCalledTimes(7);
+    expect(core.setOutput).toHaveBeenCalledTimes(3);
+    expect(core.setOutput).toHaveBeenCalledWith('imageFullName', imageFullName);
+    expect(core.setOutput).toHaveBeenCalledWith('imageName', image);
+    expect(core.setOutput).toHaveBeenCalledWith('tags', outputTags);
+
+    expect(cp.execSync).toHaveBeenCalledWith(`docker build -f ${dockerfile} -t ${imageFullName}:${tag1} .`, cpOptions);
+    expect(cp.execSync).toHaveBeenCalledWith(`docker tag ${imageFullName}:${tag1} ${imageFullName}:${tag2}`, cpOptions);
   });
 });
 
@@ -167,7 +209,7 @@ describe('Create & push Docker image with build args', () => {
 
     run();
 
-    runAssertions(imageFullName, image, tag, dockerfile, buildArgs);
+    runAssertions(imageFullName, image, [tag], dockerfile, buildArgs);
 
     expect(docker.createTag).toHaveBeenCalledTimes(1);
     expect(core.getInput).toHaveBeenCalledTimes(7);