fix: More resistance againts empty json blocks or properties

dodevops · Feb 7, 2024 · 2dddfa7 · 2dddfa7
1 parent 589fce4
commit 2dddfa7
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/src/commands/cleanup.ts b/src/commands/cleanup.ts
@@ -189,7 +189,10 @@ export default class extends Command {
                         }
                     }
                 )
-                output.push(...response.data.items)
+                // do not push empty items
+                if(Object.keys(response.data.items).length) {
+                    output.push(...response.data.items)
+                }
                 this.logger.debug(`page ${i} and token = +++${response.data.continuationToken}+++`)
                 if (response.data.continuationToken != null) {
                     continuationToken = response.data.continuationToken
@@ -208,17 +211,20 @@ export default class extends Command {
         const components: Array<Component> = []
         const paths: Array<string> = []
         for (let item of output) {
-            let trimmedPath : string = item.assets[0].path.split("/").slice(0, pathDepth).join("/")
-            components.push(new Component()
-                .withDate(item.assets[0].lastModified)
-                .withId(item.id)
-                .withVersion(item.version)
-                .withPath(trimmedPath)
-            )
-            if (!paths.includes(trimmedPath)) {
-                paths.push(trimmedPath)
+            // skip if first asset has no path
+            if(item.assets[0].hasOwnProperty('path')) {
+                let trimmedPath: string = item.assets[0].path.split("/").slice(0, pathDepth).join("/")
+                components.push(new Component()
+                    .withDate(item.assets[0].lastModified)
+                    .withId(item.id)
+                    .withVersion(item.version)
+                    .withPath(trimmedPath)
+                )
+                if (!paths.includes(trimmedPath)) {
+                    paths.push(trimmedPath)
+                }
+                this.logger.debug(JSON.stringify(item.version))
             }
-            this.logger.debug(JSON.stringify(item.version))
         }
 
         /**