fix broken tests and slightly increase test coverage

Signed-off-by: John Seekins <[email protected]>
aws-actions · Oct 13, 2023 · 27cdedf · 27cdedf
1 parent 6faf656
commit 27cdedf
Showing 1 changed file with 43 additions and 55 deletions.
diff --git a/index.test.js b/index.test.js
@@ -224,24 +224,16 @@ describe('Render task definition', () => {
         expect(core.setFailed).toBeCalledWith('Task definition file does not exist: does-not-exist-task-definition.json');
     });
 
-    test('renders a task definition at an absolute path, and with initial docker labels empty', async () => {
+    test('renders a task definition with docker labels', async () => {
         core.getInput = jest
             .fn()
-            .mockReturnValueOnce('/hello/task-definition.json') // task-definition
-            .mockReturnValueOnce('web')                  // container-name
-            .mockReturnValueOnce('nginx:latest')         // image
-            .mockReturnValueOnce('EXAMPLE=here')       // environment-variables
-            .mockReturnValueOnce('key1=value1\nkey2=value2');        // docker-labels
-
-        jest.mock('/hello/task-definition.json', () => ({
-            family: 'task-def-family',
-            containerDefinitions: [
-                {
-                    name: "web",
-                    image: "some-other-image"
-                }
-            ]
-        }), { virtual: true });
+            .mockReturnValueOnce('task-definition.json')
+            .mockReturnValueOnce('web')
+            .mockReturnValueOnce('nginx:latest')
+            .mockReturnValueOnce('EXAMPLE=here')
+            .mockReturnValueOnce('awslogs')
+            .mockReturnValueOnce('awslogs-create-group=true\nawslogs-group=/ecs/web\nawslogs-region=us-east-1\nawslogs-stream-prefix=ecs')
+            .mockReturnValueOnce('key1=value1\nkey2=value2');
 
         await run();
 
@@ -251,7 +243,7 @@ describe('Render task definition', () => {
             postfix: '.json',
             keep: true,
             discardDescriptor: true
-          });
+        });
 
         expect(fs.writeFileSync).toHaveBeenNthCalledWith(1, 'new-task-def-file-name',
             JSON.stringify({
@@ -261,30 +253,56 @@ describe('Render task definition', () => {
                         name: "web",
                         image: "nginx:latest",
                         environment: [
+                            {
+                                name: "FOO",
+                                value: "bar"
+                            },
+                            {
+                                name: "DONT-TOUCH",
+                                value: "me"
+                            },
+                            {
+                                name: "HELLO",
+                                value: "world"
+                            },
                             {
                                 name: "EXAMPLE",
                                 value: "here"
                             }
                         ],
+                        logConfiguration: {
+                            logDriver: "awslogs",
+                            options: {
+                                "awslogs-create-group": "true",
+                                "awslogs-group": "/ecs/web",
+                                "awslogs-region": "us-east-1",
+                                "awslogs-stream-prefix": "ecs"
+                            }
+                        },
                         dockerLabels : {
                             "key1":"value1",
                             "key2":"value2"
                         }
+                    },
+                    {
+                        name: "sidecar",
+                        image: "hello"
                     }
                 ]
             }, null, 2)
         );
-        expect(core.setOutput).toHaveBeenNthCalledWith(1, 'task-definition', 'new-task-def-file-name');
     });
 
-    test('renders a task definition at an absolute path, and change existed docker labels empty', async () => {
+    test('renders a task definition at an absolute path with bad docker labels', async () => {
         core.getInput = jest
             .fn()
-            .mockReturnValueOnce('/hello/task-definition.json') // task-definition
-            .mockReturnValueOnce('web')                  // container-name
-            .mockReturnValueOnce('nginx:latest')         // image
-            .mockReturnValueOnce('EXAMPLE=here')       // environment-variables
-            .mockReturnValueOnce('key1=update_value1\nkey2=update_value2\nkey3=value3');        // docker-labels
+            .mockReturnValueOnce('/hello/task-definition.json')
+            .mockReturnValueOnce('web')
+            .mockReturnValueOnce('nginx:latest')
+            .mockReturnValueOnce('EXAMPLE=here')
+            .mockReturnValueOnce('awslogs')
+            .mockReturnValueOnce('awslogs-create-group=true\nawslogs-group=/ecs/web\nawslogs-region=us-east-1\nawslogs-stream-prefix=ecs')
+            .mockReturnValueOnce('key1=update_value1\nkey2\nkey3=value3');
 
         jest.mock('/hello/task-definition.json', () => ({
             family: 'task-def-family',
@@ -302,37 +320,7 @@ describe('Render task definition', () => {
 
         await run();
 
-        expect(tmp.fileSync).toHaveBeenNthCalledWith(1, {
-            tmpdir: '/home/runner/work/_temp',
-            prefix: 'task-definition-',
-            postfix: '.json',
-            keep: true,
-            discardDescriptor: true
-          });
-
-        expect(fs.writeFileSync).toHaveBeenNthCalledWith(1, 'new-task-def-file-name',
-            JSON.stringify({
-                family: 'task-def-family',
-                containerDefinitions: [
-                    {
-                        name: "web",
-                        image: "nginx:latest",
-                        environment: [
-                            {
-                                name: "EXAMPLE",
-                                value: "here"
-                            }
-                        ],
-                        dockerLabels : {
-                            "key1":"update_value1",
-                            "key2":"update_value2",
-                            "key3":"value3"
-                        }
-                    }
-                ]
-            }, null, 2)
-        );
-        expect(core.setOutput).toHaveBeenNthCalledWith(1, 'task-definition', 'new-task-def-file-name');
+        expect(core.setFailed).toBeCalledWith('Can\'t parse logConfiguration option key2. Must be in key=value format, one per line');
     });
 
     test('error returned for non-JSON task definition contents', async () => {