Revert action.yml

Resolve conflict on autogenerated dist/index.js

Revert src/index.js

Generate src/index.js

revert src/index.js

Generate src/index.js

Author: guikcd

dist/index.js

@@ -39,8 +39,6 @@ async function runTask(ecs, clusterName, taskDefArn, waitForMinutes, enableECSMa
   const assignPublicIP = core.getInput('run-task-assign-public-IP', { required: false }) || 'DISABLED';
   const tags = JSON.parse(core.getInput('run-task-tags', { required: false }) || '[]');
   const capacityProviderStrategy = JSON.parse(core.getInput('run-task-capacity-provider-strategy', { required: false }) || '[]');
-  const runTaskManagedEBSVolumeName = core.getInput('run-task-managed-ebs-volume-name', { required: false }) || '';
-  const runTaskManagedEBSVolume = core.getInput('run-task-managed-ebs-volume', { required: false }) || '{}';
 
   let awsvpcConfiguration = {}
 
@@ -55,20 +53,6 @@ async function runTask(ecs, clusterName, taskDefArn, waitForMinutes, enableECSMa
   if(assignPublicIP != "" && (subnetIds != "" || securityGroupIds != "")){
     awsvpcConfiguration["assignPublicIp"] = assignPublicIP
   }
-  let volumeConfigurations = [];
-  let taskManagedEBSVolumeObject;
-
-  if (runTaskManagedEBSVolumeName != '') {
-    if (runTaskManagedEBSVolume != '{}') {
-      taskManagedEBSVolumeObject = convertToManagedEbsVolumeObject(runTaskManagedEBSVolume);
-      volumeConfigurations = [{
-            name: runTaskManagedEBSVolumeName,
-            managedEBSVolume: taskManagedEBSVolumeObject
-      }];
-    } else {
-      core.warning(`run-task-managed-ebs-volume-name provided without run-task-managed-ebs-volume value. VolumeConfigurations property will not be included in the RunTask API call`);
-    }
-  }
 
   const runTaskResponse = await ecs.runTask({
     startedBy: startedBy,
@@ -81,8 +65,7 @@ async function runTask(ecs, clusterName, taskDefArn, waitForMinutes, enableECSMa
     launchType: capacityProviderStrategy.length === 0 ? launchType : null,
     networkConfiguration: Object.keys(awsvpcConfiguration).length === 0 ? null : { awsvpcConfiguration: awsvpcConfiguration },
     enableECSManagedTags: enableECSManagedTags,
-    tags: tags,
-    volumeConfigurations: volumeConfigurations
+    tags: tags
   });
 
   core.debug(`Run task response ${JSON.stringify(runTaskResponse)}`)
@@ -109,47 +92,6 @@ async function runTask(ecs, clusterName, taskDefArn, waitForMinutes, enableECSMa
   }
 }
 
-function convertToManagedEbsVolumeObject(managedEbsVolume) {
-  managedEbsVolumeObject = {}
-  const ebsVolumeObject = JSON.parse(managedEbsVolume);
-  if ('roleArn' in ebsVolumeObject){ // required property
-    managedEbsVolumeObject.roleArn = ebsVolumeObject.roleArn;
-    core.debug(`Found RoleArn ${ebsVolumeObject['roleArn']}`);
-  } else {
-    throw new Error('managed-ebs-volume must provide "role-arn" to associate with the EBS volume')
-  }
-
-  if ('encrypted' in ebsVolumeObject) {
-    managedEbsVolumeObject.encrypted = ebsVolumeObject.encrypted;
-  }
-  if ('filesystemType' in ebsVolumeObject) {
-    managedEbsVolumeObject.filesystemType = ebsVolumeObject.filesystemType;
-  }
-  if ('iops' in ebsVolumeObject) {
-    managedEbsVolumeObject.iops = ebsVolumeObject.iops;
-  }
-  if ('kmsKeyId' in ebsVolumeObject) {
-    managedEbsVolumeObject.kmsKeyId = ebsVolumeObject.kmsKeyId;
-  }
-  if ('sizeInGiB' in ebsVolumeObject) {
-    managedEbsVolumeObject.sizeInGiB = ebsVolumeObject.sizeInGiB;
-  }
-  if ('snapshotId' in ebsVolumeObject) {
-    managedEbsVolumeObject.snapshotId = ebsVolumeObject.snapshotId;
-  }
-  if ('tagSpecifications' in ebsVolumeObject) {
-    managedEbsVolumeObject.tagSpecifications = ebsVolumeObject.tagSpecifications;
-  }
-  if (('throughput' in ebsVolumeObject) && (('volumeType' in ebsVolumeObject) && (ebsVolumeObject.volumeType == 'gp3'))){
-    managedEbsVolumeObject.throughput = ebsVolumeObject.throughput;
-  }
-  if ('volumeType' in ebsVolumeObject) {
-    managedEbsVolumeObject.volumeType = ebsVolumeObject.volumeType;
-  }
-  core.debug(`Created managedEbsVolumeObject: ${JSON.stringify(managedEbsVolumeObject)}`);
-  return managedEbsVolumeObject;
-}
-
 // Poll tasks until they enter a stopped state
 async function waitForTasksStopped(ecs, clusterName, taskArns, waitForMinutes) {
   if (waitForMinutes > MAX_WAIT_MINUTES) {
@@ -200,32 +142,13 @@ async function tasksExitCode(ecs, clusterName, taskArns) {
 async function updateEcsService(ecs, clusterName, service, taskDefArn, waitForService, waitForMinutes, forceNewDeployment, desiredCount, enableECSManagedTags, propagateTags) {
   core.debug('Updating the service');
 
-  const serviceManagedEBSVolumeName = core.getInput('service-managed-ebs-volume-name', { required: false }) || '';
-  const serviceManagedEBSVolume = core.getInput('service-managed-ebs-volume', { required: false }) || '{}';
-
-  let volumeConfigurations = [];
-  let serviceManagedEbsVolumeObject;
-
-  if (serviceManagedEBSVolumeName != '') {
-    if (serviceManagedEBSVolume != '{}') {
-      serviceManagedEbsVolumeObject = convertToManagedEbsVolumeObject(serviceManagedEBSVolume);
-      volumeConfigurations = [{
-        name: serviceManagedEBSVolumeName,
-        managedEBSVolume: serviceManagedEbsVolumeObject
-      }];
-    } else {
-      core.warning('service-managed-ebs-volume-name provided without service-managed-ebs-volume value. VolumeConfigurations property will not be included in the UpdateService API call');
-    }
-  }
-
   let params = {
     cluster: clusterName,
     service: service,
     taskDefinition: taskDefArn,
     forceNewDeployment: forceNewDeployment,
     enableECSManagedTags: enableECSManagedTags,
-    propagateTags: propagateTags,
-    volumeConfigurations: volumeConfigurations
+    propagateTags: propagateTags
   };
 
   // Add the desiredCount property only if it is defined and a number.
@@ -486,11 +409,7 @@ async function run() {
     if (enableECSManagedTagsInput !== '') {
       enableECSManagedTags = enableECSManagedTagsInput.toLowerCase() === 'true';
     }
-    const propagateTagsInput = core.getInput('propagate-tags', { required: false }) || '';
-    let propagateTags = null;
-    if (propagateTagsInput !== '') {
-      propagateTags = propagateTagsInput;
-    }
+    let propagateTags = core.getInput('propagate-tags', { required: false }) || '';
 
     // Register the task definition
     core.debug('Registering the task definition');
@@ -538,6 +457,11 @@ async function run() {
       if (serviceResponse.status != 'ACTIVE') {
         throw new Error(`Service is ${serviceResponse.status}`);
       }
+      // set propagateTags to the current value if no input provided
+      if (describeResponse.services[0].propagateTags != null && propagateTags === '') {
+        propagateTags = describeResponse.services[0].propagateTags;
+        core.debug(`Current service 'propagateTags' value '${describeResponse.services[0].propagateTags}' will be set to service`);
+      }
 
       if (!serviceResponse.deploymentController || !serviceResponse.deploymentController.type || serviceResponse.deploymentController.type === 'ECS') {
         // Service uses the 'ECS' deployment controller, so we can call UpdateService