Slice bug removing versions even though below the limit (#3)

* feat(service): add the possibility to specify an app engine service to target * fix(service): add missing service_name in the actions declaration * chore(build): add build of new changes * fix(main): fix slice bug where it removed versions even though the length was below the limit * refactor(debug): move core.debug(err) outside of if switch for version deletion * refactor(build): add build of last refactor change for the error debug message
Reviewable · Nov 1, 2021 · 5b4ed00 · 5b4ed00
1 parent 684fdae
commit 5b4ed00
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -1127,8 +1127,8 @@ function run() {
             }
             // Run gcloud versions list cmd
             yield exec.exec(toolCommand, appVersionCmd, options);
-            const versionsToDelete = versions.slice(0, versions.length - limit);
-            if (versionsToDelete.length) {
+            if (versions.length > limit) {
+                const versionsToDelete = versions.slice(0, versions.length - limit);
                 const appDeleteCmd = [
                     'app',
                     'versions',
@@ -1146,13 +1146,15 @@ function run() {
                 core.debug(`Deleting ${versionsToDelete.length}, versions: Version ${versionsToDelete.join(' ')}`);
                 // // Run gcloud cmd.
                 yield exec.exec(toolCommand, appDeleteCmd, options);
+                core.setOutput('versions_deleted', versionsToDelete.join(' '));
+                core.setOutput('total_deleted', versionsToDelete.length);
             }
             else {
                 core.debug('No versions to delete.');
+                core.setOutput('versions_deleted', '');
+                core.setOutput('total_deleted', '0');
             }
             core.debug(err);
-            core.setOutput('versions_deleted', versionsToDelete.join(' '));
-            core.setOutput('total_deleted', versionsToDelete.length);
         }
         catch (error) {
             core.setFailed(error.message);

diff --git a/src/main.ts b/src/main.ts
@@ -101,40 +101,43 @@ async function run(): Promise<void> {
     // Run gcloud versions list cmd
     await exec.exec(toolCommand, appVersionCmd, options);
 
-    const versionsToDelete = versions.slice(0, versions.length - limit);
-
-    if (versionsToDelete.length) {
+    if (versions.length > limit) {
+      const versionsToDelete = versions.slice(0, versions.length - limit);
+
       const appDeleteCmd = [
         'app',
         'versions',
         'delete',
         ...versionsToDelete,
         '--quiet',
       ];
-
+  
       // Add gcloud flags.
       if (projectId !== '') {
         appDeleteCmd.push('--project', projectId);
       }
-
+  
       if (serviceName !== '') {
         appVersionCmd.push('--service', serviceName);
       }
-
+  
       core.debug(
         `Deleting ${
           versionsToDelete.length
         }, versions: Version ${versionsToDelete.join(' ')}`,
       );
-
+      
       // // Run gcloud cmd.
       await exec.exec(toolCommand, appDeleteCmd, options);
+      core.setOutput('versions_deleted', versionsToDelete.join(' '));
+      core.setOutput('total_deleted', versionsToDelete.length);
     } else {
       core.debug('No versions to delete.');
+      core.setOutput('versions_deleted', '');
+      core.setOutput('total_deleted', '0');
     }
+
     core.debug(err);
-    core.setOutput('versions_deleted', versionsToDelete.join(' '));
-    core.setOutput('total_deleted', versionsToDelete.length);
   } catch (error) {
     core.setFailed(error.message);
   }