Add validation for empty container image

Author: ericsciple

workflow-parser/src/model/converter/container.ts

@@ -21,6 +21,10 @@ export function convertToJobContainer(context: TemplateContext, container: Templ
   if (isString(container)) {
     // Workflow uses shorthand syntax `container: image-name`
     image = container.assertString("container item");
+    if (!image || image.value.length === 0) {
+      context.error(container, "Container image cannot be empty");
+      return;
+    }
     return {image: image};
   }
 
@@ -63,7 +67,7 @@ export function convertToJobContainer(context: TemplateContext, container: Templ
       }
     }
 
-  if (!image) {
+  if (!image || image.value.length === 0) {
     context.error(container, "Container image cannot be empty");
   } else {
     return {image, env, ports, volumes, options};

workflow-parser/src/model/converter/job.ts

@@ -50,7 +50,7 @@ export function convertJob(context: TemplateContext, jobKey: StringToken, token:
         break;
 
       case "container":
-        convertToJobContainer(context, item.value);
+        handleTemplateTokenErrors(item.value, context, undefined, () => convertToJobContainer(context, item.value));
         container = item.value;
         break;
 
@@ -103,7 +103,7 @@ export function convertJob(context: TemplateContext, jobKey: StringToken, token:
         break;
 
       case "services":
-        convertToJobServices(context, item.value);
+        handleTemplateTokenErrors(item.value, context, undefined, () => convertToJobServices(context, item.value));
         services = item.value;
         break;
 

workflow-parser/src/workflow-v1.0.json

@@ -2345,7 +2345,7 @@
       "mapping": {
         "properties": {
           "image": {
-            "type": "non-empty-string",
+            "type": "string",
             "description": "Use `jobs.<job_id>.container.image` to define the Docker image to use as the container to run the action. The value can be the Docker Hub image or a registry name."
           },
           "options": {
@@ -2390,7 +2390,7 @@
         "matrix"
       ],
       "one-of": [
-        "non-empty-string",
+        "string",
         "container-mapping"
       ]
     },

workflow-parser/testdata/reader/job-container-empty-image.yml

@@ -0,0 +1,62 @@
+include-source: false # Drop file/line/col from output
+---
+on: push
+jobs:
+  build1:
+    runs-on: linux
+    container: ""
+    steps:
+      - run: echo hi
+  build2:
+    runs-on: linux
+    container:
+      image: ""
+    steps:
+      - run: echo hi
+  build3:
+    runs-on: linux
+    services:
+      svc: ""
+    steps:
+      - run: echo hi
+  build4:
+    runs-on: linux
+    services:
+      svc:
+        image: ""
+    steps:
+      - run: echo hi
+  build5:
+    runs-on: linux
+    container:
+    steps:
+      - run: echo hi
+  build6:
+    runs-on: linux
+    services:
+      svc:
+    steps:
+      - run: echo hi
+---
+{
+  "errors": [
+    {
+      "Message": ".github/workflows/job-container-empty-image.yml (Line: 5, Col: 16): Container image cannot be empty"
+    },
+    {
+      "Message": ".github/workflows/job-container-empty-image.yml (Line: 11, Col: 7): Container image cannot be empty"
+    },
+    {
+      "Message": ".github/workflows/job-container-empty-image.yml (Line: 17, Col: 12): Container image cannot be empty"
+    },
+    {
+      "Message": ".github/workflows/job-container-empty-image.yml (Line: 24, Col: 9): Container image cannot be empty"
+    },
+    {
+      "Message": ".github/workflows/job-container-empty-image.yml (Line: 29, Col: 15): Container image cannot be empty"
+    },
+    {
+      "Message": ".github/workflows/job-container-empty-image.yml (Line: 35, Col: 11): Container image cannot be empty"
+    }
+  ]
+}

workflow-parser/testdata/reader/job-container-invalid.yml

@@ -36,14 +36,8 @@ jobs:
     {
       "Message": ".github/workflows/job-container-invalid.yml (Line: 8, Col: 9): Unexpected value 'badkey'"
     },
-    {
-      "Message": ".github/workflows/job-container-invalid.yml (Line: 14, Col: 13): Unexpected value ''"
-    },
     {
       "Message": ".github/workflows/job-container-invalid.yml (Line: 21, Col: 9): Unexpected value 'badkey'"
-    },
-    {
-      "Message": ".github/workflows/job-container-invalid.yml (Line: 28, Col: 15): Unexpected value ''"
     }
   ]
 }