fix tests

Author: inhumantsar

index.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const core = require('@actions/core');
 const { CodeDeploy, waitUntilDeploymentSuccessful } = require('@aws-sdk/client-codedeploy');
-const { ECS, waitUntilServicesStable } = require('@aws-sdk/client-ecs');
+const { ECS, waitUntilServicesStable, waitUntilTasksStopped } = require('@aws-sdk/client-ecs');
 const yaml = require('yaml');
 const fs = require('fs');
 const crypto = require('crypto');
@@ -49,14 +49,18 @@ async function runTask(ecs, clusterName, taskDefArn, waitForMinutes) {
       containerOverrides: containerOverrides
     },
     launchType: launchType,
-    networkConfiguration: awsvpcConfiguration === {} ? {} : { awsvpcConfiguration: awsvpcConfiguration }
+    networkConfiguration: Object.keys(awsvpcConfiguration).length === 0 ? {} : { awsvpcConfiguration: awsvpcConfiguration }
   });
 
   core.debug(`Run task response ${JSON.stringify(runTaskResponse)}`)
 
   const taskArns = runTaskResponse.tasks.map(task => task.taskArn);
   core.setOutput('run-task-arn', taskArns);
-  core.info(`Task running: https://console.aws.amazon.com/ecs/home?region=${aws.config.region}#/clusters/${clusterName}/tasks`);
+
+  const region = await ecs.config.region();
+  const consoleHostname = region.startsWith('cn') ? 'console.amazonaws.cn' : 'console.aws.amazon.com';
+
+  core.info(`Task running: https://${consoleHostname}/ecs/home?region=${region}#/clusters/${clusterName}/tasks`);
 
   if (runTaskResponse.failures && runTaskResponse.failures.length > 0) {
     const failure = runTaskResponse.failures[0];

index.test.js

@@ -1,7 +1,7 @@
 const run = require('.');
 const core = require('@actions/core');
 const { CodeDeploy, waitUntilDeploymentSuccessful } = require('@aws-sdk/client-codedeploy');
-const { ECS, waitUntilServicesStable } = require('@aws-sdk/client-ecs');
+const { ECS, waitUntilServicesStable, waitUntilTasksStopped } = require('@aws-sdk/client-ecs');
 const fs = require('fs');
 const path = require('path');
 
@@ -16,6 +16,8 @@ const mockEcsUpdateService = jest.fn();
 const mockEcsDescribeServices = jest.fn();
 const mockCodeDeployCreateDeployment = jest.fn();
 const mockCodeDeployGetDeploymentGroup = jest.fn();
+const mockRunTask = jest.fn();
+const mockEcsDescribeTasks = jest.fn();
 const config = {
   region: () => Promise.resolve('fake-region'),
 };
@@ -33,7 +35,9 @@ describe('Deploy to ECS', () => {
         config,
         registerTaskDefinition: mockEcsRegisterTaskDef,
         updateService: mockEcsUpdateService,
-        describeServices: mockEcsDescribeServices
+        describeServices: mockEcsDescribeServices,
+        describeTasks: mockEcsDescribeTasks,
+        runTask: mockRunTask,
     };
 
     const mockCodeDeployClient = {
@@ -109,7 +113,6 @@ describe('Deploy to ECS', () => {
             })
         );
 
-
         mockRunTask.mockImplementation(
             () => Promise.resolve({
                 failures: [],
@@ -153,6 +156,8 @@ describe('Deploy to ECS', () => {
 
         ECS.mockImplementation(() => mockEcsClient);
 
+        waitUntilTasksStopped.mockImplementation(() => Promise.resolve({}));
+
         waitUntilServicesStable.mockImplementation(() => Promise.resolve({}));
 
         CodeDeploy.mockImplementation(() => mockCodeDeployClient);
@@ -779,9 +784,8 @@ describe('Deploy to ECS', () => {
         });
 
         expect(mockCodeDeployCreateDeployment).toHaveBeenNthCalledWith(1, {
-            applicationName: 'Custom-Application',
-            deploymentGroupName: 'Custom-Deployment-Group',
-            description: 'Custom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentCustom-DeploymentC…',
+            applicationName: 'MyApplication',
+            deploymentGroupName: 'MyDeploymentGroup',
             revision: {
                 revisionType: 'AppSpecContent',
                 appSpecContent: {
@@ -1108,6 +1112,7 @@ describe('Deploy to ECS', () => {
             .mockReturnValueOnce('')                      // wait-for-service-stability
             .mockReturnValueOnce('')                      // wait-for-minutes
             .mockReturnValueOnce('')                      // force-new-deployment
+            .mockReturnValueOnce('')                      // desired-count
             .mockReturnValueOnce('true');                 // run-task
 
         await run();
@@ -1128,6 +1133,7 @@ describe('Deploy to ECS', () => {
             .mockReturnValueOnce('')                      // wait-for-service-stability
             .mockReturnValueOnce('')                      // wait-for-minutes
             .mockReturnValueOnce('')                      // force-new-deployment
+            .mockReturnValueOnce('')                      // desired-count
             .mockReturnValueOnce('true')                  // run-task
             .mockReturnValueOnce('false')                 // wait-for-task-stopped
             .mockReturnValueOnce('someJoe')               // run-task-started-by
@@ -1161,6 +1167,7 @@ describe('Deploy to ECS', () => {
             .mockReturnValueOnce('')                      // wait-for-service-stability
             .mockReturnValueOnce('')                      // wait-for-minutes
             .mockReturnValueOnce('')                      // force-new-deployment
+            .mockReturnValueOnce('')                      // desired-count
             .mockReturnValueOnce('true')                  // run-task
             .mockReturnValueOnce('true');                 // wait-for-task-stopped
 
@@ -1171,14 +1178,7 @@ describe('Deploy to ECS', () => {
         expect(core.setOutput).toHaveBeenNthCalledWith(1, 'task-definition-arn', 'task:def:arn')
         expect(mockRunTask).toHaveBeenCalledTimes(1);
         expect(core.setOutput).toHaveBeenNthCalledWith(2, 'run-task-arn', ["arn:aws:ecs:fake-region:account_id:task/arn"])
-        expect(mockEcsWaiter).toHaveBeenNthCalledWith(1, 'tasksStopped', {
-            tasks: ['arn:aws:ecs:fake-region:account_id:task/arn'],
-            cluster: 'somecluster',
-            "$waiter": {
-                "delay": 15,
-                "maxAttempts": 120,
-            },
-        });
+        expect(waitUntilTasksStopped).toHaveBeenCalledTimes(1);
     });
 
     test('error caught if AppSpec file is not formatted correctly', async () => {