bosesuneha
diff --git a/‎package-lock.json‎
Lines changed: 305 additions & 1028 deletions b/‎package-lock.json‎
Lines changed: 305 additions & 1028 deletions
diff --git a/‎package.json‎
Lines changed: 11 additions & 11 deletions b/‎package.json‎
Lines changed: 11 additions & 11 deletions
diff --git a/‎src/strategyHelpers/blueGreen/blueGreenHelper.ts‎
Lines changed: 19 additions & 15 deletions b/‎src/strategyHelpers/blueGreen/blueGreenHelper.ts‎
Lines changed: 19 additions & 15 deletions
diff --git a/‎src/strategyHelpers/canary/canaryHelper.ts‎
Lines changed: 24 additions & 18 deletions b/‎src/strategyHelpers/canary/canaryHelper.ts‎
Lines changed: 24 additions & 18 deletions
diff --git a/‎src/strategyHelpers/canary/podCanaryHelper.ts‎
Lines changed: 63 additions & 39 deletions b/‎src/strategyHelpers/canary/podCanaryHelper.ts‎
Lines changed: 63 additions & 39 deletions
@@ -12,24 +12,24 @@
       "format-check": "prettier --check ."
    },
    "dependencies": {
-      "@actions/core": "^1.10.0",
+      "@actions/core": "^1.10.1",
       "@actions/exec": "^1.0.0",
-      "@actions/io": "^1.0.0",
-      "@actions/tool-cache": "1.1.2",
+      "@actions/io": "^1.1.3",
+      "@actions/tool-cache": "2.0.1",
       "@octokit/core": "^3.5.1",
       "@octokit/plugin-retry": "^3.0.9",
-      "@types/minipass": "^3.1.2",
-      "js-yaml": "3.13.1",
+      "@types/minipass": "^3.3.5",
+      "js-yaml": "4.1.0",
       "minimist": "^1.2.8"
    },
    "devDependencies": {
-      "@types/jest": "^26.0.0",
-      "@types/js-yaml": "^3.12.7",
-      "@types/node": "^12.20.41",
-      "@vercel/ncc": "^0.36.1",
+      "@types/jest": "^29.5.13",
+      "@types/js-yaml": "^4.0.9",
+      "@types/node": "^22.7.4",
+      "@vercel/ncc": "^0.38.2",
       "jest": "^29.7.0",
       "prettier": "^2.8.8",
-      "ts-jest": "^29.2.3",
-      "typescript": "5.5.4"
+      "ts-jest": "^29.2.5",
+      "typescript": "5.6.2"
    }
 }
@@ -77,22 +77,26 @@ export function getManifestObjects(filePaths: string[]): BlueGreenManifests {
    // Manifest objects per type. All resources should be parsed and
    // organized before we can check if services are “routed” or not.
    filePaths.forEach((filePath: string) => {
-      const fileContents = fs.readFileSync(filePath).toString()
-      yaml.safeLoadAll(fileContents, (inputObject) => {
-         if (!!inputObject) {
-            const kind = inputObject.kind
-
-            if (isDeploymentEntity(kind)) {
-               deploymentEntityList.push(inputObject)
-            } else if (isServiceEntity(kind)) {
-               serviceEntityList.push(inputObject)
-            } else if (isIngressEntity(kind)) {
-               ingressEntityList.push(inputObject)
-            } else {
-               otherEntitiesList.push(inputObject)
+      try {
+         const fileContents = fs.readFileSync(filePath).toString()
+         yaml.loadAll(fileContents, (inputObject: any) => {
+            if (!!inputObject) {
+               const kind = inputObject.kind
+               if (isDeploymentEntity(kind)) {
+                  deploymentEntityList.push(inputObject)
+               } else if (isServiceEntity(kind)) {
+                  serviceEntityList.push(inputObject)
+               } else if (isIngressEntity(kind)) {
+                  ingressEntityList.push(inputObject)
+               } else {
+                  otherEntitiesList.push(inputObject)
+               }
             }
-         }
-      })
+         })
+      } catch (error) {
+         core.error(`Error processing file ${filePath}: ${error.message}`)
+         throw error
+      }
    })
 
    serviceEntityList.forEach((inputObject: any) => {
 
@@ -211,25 +211,31 @@ async function cleanUpCanary(
    const deletedFiles: string[] = []
 
    for (const filePath of files) {
-      const fileContents = fs.readFileSync(filePath).toString()
-
-      const parsedYaml = yaml.safeLoadAll(fileContents)
-      for (const inputObject of parsedYaml) {
-         const name = inputObject.metadata.name
-         const kind = inputObject.kind
-         const namespace: string | undefined = inputObject?.metadata?.namespace
-
-         if (
-            isDeploymentEntity(kind) ||
-            (includeServices && isServiceEntity(kind))
-         ) {
-            deletedFiles.push(filePath)
-            const canaryObjectName = getCanaryResourceName(name)
-            const baselineObjectName = getBaselineResourceName(name)
-
-            await deleteObject(kind, canaryObjectName, namespace)
-            await deleteObject(kind, baselineObjectName, namespace)
+      try {
+         const fileContents = fs.readFileSync(filePath).toString()
+
+         const parsedYaml: any[] = yaml.loadAll(fileContents)
+         for (const inputObject of parsedYaml) {
+            const name = inputObject.metadata.name
+            const kind = inputObject.kind
+            const namespace: string | undefined =
+               inputObject?.metadata?.namespace
+
+            if (
+               isDeploymentEntity(kind) ||
+               (includeServices && isServiceEntity(kind))
+            ) {
+               deletedFiles.push(filePath)
+               const canaryObjectName = getCanaryResourceName(name)
+               const baselineObjectName = getBaselineResourceName(name)
+
+               await deleteObject(kind, canaryObjectName, namespace)
+               await deleteObject(kind, baselineObjectName, namespace)
+            }
          }
+      } catch (error) {
+         core.error(`Failed to process file ${filePath}: ${error.message}`)
+         throw error
       }
    }
 
 
@@ -8,6 +8,7 @@ import * as canaryDeploymentHelper from './canaryHelper'
 import {isDeploymentEntity} from '../../types/kubernetesTypes'
 import {getReplicaCount} from '../../utilities/manifestUpdateUtils'
 import {DeployResult} from '../../types/deployResult'
+import {K8sObject} from '../../types/k8sObject'
 
 export async function deployPodCanary(
    filePaths: string[],
@@ -21,50 +22,73 @@ export async function deployPodCanary(
       throw Error('Percentage must be between 0 and 100')
 
    for (const filePath of filePaths) {
-      const fileContents = fs.readFileSync(filePath).toString()
-      const parsedYaml = yaml.safeLoadAll(fileContents)
-      for (const inputObject of parsedYaml) {
-         const name = inputObject.metadata.name
-         const kind = inputObject.kind
+      try {
+         const fileContents = fs.readFileSync(filePath, 'utf8')
+         const parsedYaml = yaml.loadAll(fileContents)
+         for (const inputObject of parsedYaml) {
+            if (
+               inputObject &&
+               typeof inputObject === 'object' &&
+               'metadata' in inputObject &&
+               'kind' in inputObject &&
+               'spec' in inputObject &&
+               typeof inputObject.metadata === 'object' &&
+               'name' in inputObject.metadata &&
+               typeof inputObject.metadata.name === 'string' &&
+               typeof inputObject.kind === 'string'
+            ) {
+               const obj = inputObject as K8sObject
+               const name = obj.metadata.name
+               const kind = obj.kind
 
-         if (!onlyDeployStable && isDeploymentEntity(kind)) {
-            core.debug('Calculating replica count for canary')
-            const canaryReplicaCount = calculateReplicaCountForCanary(
-               inputObject,
-               percentage
-            )
-            core.debug('Replica count is ' + canaryReplicaCount)
+               if (!onlyDeployStable && isDeploymentEntity(kind)) {
+                  core.debug('Calculating replica count for canary')
+                  const canaryReplicaCount = calculateReplicaCountForCanary(
+                     obj,
+                     percentage
+                  )
+                  core.debug('Replica count is ' + canaryReplicaCount)
 
-            const newCanaryObject = canaryDeploymentHelper.getNewCanaryResource(
-               inputObject,
-               canaryReplicaCount
-            )
-            newObjectsList.push(newCanaryObject)
+                  const newCanaryObject =
+                     canaryDeploymentHelper.getNewCanaryResource(
+                        obj,
+                        canaryReplicaCount
+                     )
+                  newObjectsList.push(newCanaryObject)
 
-            // if there's already a stable object, deploy baseline as well
-            const stableObject = await canaryDeploymentHelper.fetchResource(
-               kubectl,
-               kind,
-               name
-            )
-            if (stableObject) {
-               core.debug(
-                  `Stable object found for ${kind} ${name}. Creating baseline objects`
-               )
-               const newBaselineObject =
-                  canaryDeploymentHelper.getNewBaselineResource(
-                     stableObject,
-                     canaryReplicaCount
-                  )
-               core.debug(
-                  'New baseline object: ' + JSON.stringify(newBaselineObject)
-               )
-               newObjectsList.push(newBaselineObject)
+                  // if there's already a stable object, deploy baseline as well
+                  const stableObject =
+                     await canaryDeploymentHelper.fetchResource(
+                        kubectl,
+                        kind,
+                        name
+                     )
+                  if (stableObject) {
+                     core.debug(
+                        `Stable object found for ${kind} ${name}. Creating baseline objects`
+                     )
+                     const newBaselineObject =
+                        canaryDeploymentHelper.getNewBaselineResource(
+                           stableObject,
+                           canaryReplicaCount
+                        )
+                     core.debug(
+                        'New baseline object: ' +
+                           JSON.stringify(newBaselineObject)
+                     )
+                     newObjectsList.push(newBaselineObject)
+                  }
+               } else {
+                  // deploy non deployment entity or regular deployments for promote as they are
+                  newObjectsList.push(obj)
+               }
             }
-         } else {
-            // deploy non deployment entity or regular deployments for promote as they are
-            newObjectsList.push(inputObject)
          }
+      } catch (error) {
+         core.error(
+            `Failed to parse YAML file at ${filePath}: ${error.message}`
+         )
+         throw error
       }
    }