Update codeql.yml

.github/dependabot.yml

@@ -1,18 +0,0 @@
-version: 2
-updates:
-   - package-ecosystem: npm
-     directory: /
-     schedule:
-        interval: weekly
-     groups:
-        actions:
-           patterns:
-              - '*'
-   - package-ecosystem: github-actions
-     directory: .github/workflows
-     schedule:
-        interval: weekly
-     groups:
-        actions:
-           patterns:
-              - '*'

.github/workflows/codeql.yml

@@ -16,7 +16,7 @@ jobs:
 
       steps:
          - name: Checkout repository
-           uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
+           uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
            with:
               # We must fetch at least the immediate parents so that if this is
               # a pull request then we can checkout the head.
@@ -24,7 +24,7 @@ jobs:
 
          # Initializes the CodeQL tools for scanning.
          - name: Initialize CodeQL
-           uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd #v3.27.0
+           uses: github/codeql-action/init@05963f47d870e2cb19a537396c1f668a348c7d8f #v3.24.8
            # Override language selection by uncommenting this and choosing your languages
            # with:
            #   languages: go, javascript, csharp, python, cpp, java
@@ -32,7 +32,7 @@ jobs:
          # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
          # If this step fails, then you should remove it and run the build manually (see below)
          - name: Autobuild
-           uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd #v3.27.0
+           uses: github/codeql-action/autobuild@05963f47d870e2cb19a537396c1f668a348c7d8f #v3.24.8
 
          # ℹ️ Command-line programs to run using the OS shell.
          # 📚 https://git.io/JvXDl
@@ -46,4 +46,4 @@ jobs:
          #   make release
 
          - name: Perform CodeQL Analysis
-           uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd #v3.27.0
+           uses: github/codeql-action/analyze@05963f47d870e2cb19a537396c1f668a348c7d8f #v3.24.8

.github/workflows/defaultLabels.yml

@@ -13,7 +13,7 @@ jobs:
 
       # Steps represent a sequence of tasks that will be executed as part of the job
       steps:
-         - uses: actions/stale@v9
+         - uses: actions/stale@v3
            name: Setting issue as idle
            with:
               repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -24,7 +24,7 @@ jobs:
               operations-per-run: 100
               exempt-issue-labels: 'backlog'
 
-         - uses: actions/stale@v9
+         - uses: actions/stale@v3
            name: Setting PR as idle
            with:
               repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/prettify-code.yml

@@ -10,9 +10,9 @@ jobs:
       runs-on: ubuntu-latest
       steps:
          - name: Checkout Repository
-           uses: actions/checkout@v4
+           uses: actions/checkout@v2
-         - name: install deps
-           run: npm install
 
          - name: Enforce Prettier
-           run: npm run format-check
+           uses: actionsx/prettier@v2
+           with:
+              args: --check .

.github/workflows/run-integration-tests-basic.yml

@@ -18,7 +18,7 @@ jobs:
          KUBECONFIG: /home/runner/.kube/config
          NAMESPACE: test-${{ github.run_id }}
       steps:
-         - uses: actions/checkout@v4
+         - uses: actions/checkout@v3
 
          - name: Install dependencies
            run: |
@@ -31,7 +31,7 @@ jobs:
          - name: Build
            run: ncc build src/run.ts -o lib
 
-         - uses: Azure/setup-kubectl@v4
+         - uses: Azure/setup-kubectl@v3
            name: Install Kubectl
 
          - id: setup-minikube
@@ -46,7 +46,7 @@ jobs:
          - name: Create namespace to run tests
            run: kubectl create ns ${{ env.NAMESPACE }}
 
-         - uses: actions/setup-python@v5
+         - uses: actions/setup-python@v2
            name: Install Python
            with:
               python-version: '3.x'
@@ -64,13 +64,9 @@ jobs:
               images: nginx:1.14.2
               manifests: |
                  test/integration/manifests/test.yml
-                 test/integration/manifests/manifest_test_dir/test.yml
               action: deploy
 
          - name: Checking if deployments and services were created
            run: |
               python test/integration/k8s-deploy-test.py namespace=${{ env.NAMESPACE }} kind=Deployment name=nginx-deployment containerName=nginx:1.14.2 labels=app:nginx,workflow:actions.github.com-k8s-deploy,workflowFriendlyName:Minikube_Integration_Tests_-_basic selectorLabels=app:nginx
               python test/integration/k8s-deploy-test.py namespace=${{ env.NAMESPACE }} kind=Service name=nginx-service labels=workflow:actions.github.com-k8s-deploy,workflowFriendlyName:Minikube_Integration_Tests_-_basic selectorLabels=app:nginx
-
-              python test/integration/k8s-deploy-test.py namespace=${{ env.NAMESPACE }} kind=Deployment name=nginx-deployment3 containerName=nginx:1.14.2 labels=app:nginx3,workflow:actions.github.com-k8s-deploy,workflowFriendlyName:Minikube_Integration_Tests_-_basic selectorLabels=app:nginx3
-              python test/integration/k8s-deploy-test.py namespace=${{ env.NAMESPACE }} kind=Service name=nginx-service3 labels=workflow:actions.github.com-k8s-deploy,workflowFriendlyName:Minikube_Integration_Tests_-_basic selectorLabels=app:nginx3

.github/workflows/run-integration-tests-bluegreen-ingress.yml

@@ -18,7 +18,7 @@ jobs:
          KUBECONFIG: /home/runner/.kube/config
          NAMESPACE: test-${{ github.run_id }}
       steps:
-         - uses: actions/checkout@v4
+         - uses: actions/checkout@v3
 
          - name: Install dependencies
            run: |
@@ -31,7 +31,7 @@ jobs:
          - name: Build
            run: ncc build src/run.ts -o lib
 
-         - uses: Azure/setup-kubectl@v4
+         - uses: Azure/setup-kubectl@v3
            name: Install Kubectl
 
          - id: setup-minikube
@@ -46,7 +46,7 @@ jobs:
          - name: Create namespace to run tests
            run: kubectl create ns ${{ env.NAMESPACE }}
 
-         - uses: actions/setup-python@v5
+         - uses: actions/setup-python@v2
            name: Install Python
            with:
               python-version: '3.x'

.github/workflows/run-integration-tests-bluegreen-service.yml

@@ -18,7 +18,7 @@ jobs:
          KUBECONFIG: /home/runner/.kube/config
          NAMESPACE: test-${{ github.run_id }}
       steps:
-         - uses: actions/checkout@v4
+         - uses: actions/checkout@v3
 
          - name: Install dependencies
            run: |
@@ -31,7 +31,7 @@ jobs:
          - name: Build
            run: ncc build src/run.ts -o lib
 
-         - uses: Azure/setup-kubectl@v4
+         - uses: Azure/setup-kubectl@v3
            name: Install Kubectl
 
          - id: setup-minikube
@@ -46,7 +46,7 @@ jobs:
          - name: Create namespace to run tests
            run: kubectl create ns ${{ env.NAMESPACE }}
 
-         - uses: actions/setup-python@v5
+         - uses: actions/setup-python@v2
            name: Install Python
            with:
               python-version: '3.x'

.github/workflows/run-integration-tests-bluegreen-smi.yml

@@ -18,7 +18,7 @@ jobs:
          KUBECONFIG: /home/runner/.kube/config
          NAMESPACE: test-${{ github.run_id }}
       steps:
-         - uses: actions/checkout@v4
+         - uses: actions/checkout@v3
 
          - name: Install dependencies
            run: |
@@ -31,7 +31,7 @@ jobs:
          - name: Build
            run: ncc build src/run.ts -o lib
 
-         - uses: Azure/setup-kubectl@v4
+         - uses: Azure/setup-kubectl@v3
            name: Install Kubectl
 
          - id: setup-minikube
@@ -56,7 +56,7 @@ jobs:
          - name: Create namespace to run tests
            run: kubectl create ns ${{ env.NAMESPACE }}
 
-         - uses: actions/setup-python@v5
+         - uses: actions/setup-python@v2
            name: Install Python
            with:
               python-version: '3.x'

.github/workflows/run-integration-tests-canary-pod.yml

@@ -18,7 +18,7 @@ jobs:
          KUBECONFIG: /home/runner/.kube/config
          NAMESPACE: test-${{ github.run_id }}
       steps:
-         - uses: actions/checkout@v4
+         - uses: actions/checkout@v3
 
          - name: Install dependencies
            run: |
@@ -31,7 +31,7 @@ jobs:
          - name: Build
            run: ncc build src/run.ts -o lib
 
-         - uses: Azure/setup-kubectl@v4
+         - uses: Azure/setup-kubectl@v3
            name: Install Kubectl
 
          - id: setup-minikube
@@ -46,7 +46,7 @@ jobs:
          - name: Create namespace to run tests
            run: kubectl create ns ${{ env.NAMESPACE }}
 
-         - uses: actions/setup-python@v5
+         - uses: actions/setup-python@v2
            name: Install Python
            with:
               python-version: '3.x'

.github/workflows/run-integration-tests-canary-smi.yml

@@ -18,7 +18,7 @@ jobs:
          KUBECONFIG: /home/runner/.kube/config
          NAMESPACE: test-${{ github.run_id }}
       steps:
-         - uses: actions/checkout@v4
+         - uses: actions/checkout@v3
 
          - name: Install dependencies
            run: |
@@ -31,7 +31,7 @@ jobs:
          - name: Build
            run: ncc build src/run.ts -o lib
 
-         - uses: Azure/setup-kubectl@v4
+         - uses: Azure/setup-kubectl@v3
            name: Install Kubectl
 
          - id: setup-minikube
@@ -56,7 +56,7 @@ jobs:
          - name: Create namespace to run tests
            run: kubectl create ns ${{ env.NAMESPACE }}
 
-         - uses: actions/setup-python@v5
+         - uses: actions/setup-python@v2
            name: Install Python
            with:
               python-version: '3.x'

.github/workflows/run-integration-tests-private.yml

@@ -19,7 +19,7 @@ jobs:
          contents: read
          id-token: write
       steps:
-         - uses: actions/checkout@v4
+         - uses: actions/checkout@v3
 
          - name: Install dependencies
            run: |
@@ -30,20 +30,20 @@ jobs:
          - name: Build
            run: ncc build src/run.ts -o lib
          - name: Azure login
-           uses: azure/login@v2.2.0
+           uses: azure/login@v1.4.3
            with:
               client-id: ${{ secrets.AZURE_CLIENT_ID }}
               tenant-id: ${{ secrets.AZURE_TENANT_ID }}
               subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
-         - uses: Azure/setup-kubectl@v4
+         - uses: Azure/setup-kubectl@v3
            name: Install Kubectl
 
          - name: Create private AKS cluster and set context
            run: |
               set +x
               # create cluster
-              az group create --location eastus2 --name ${{ env.NAMESPACE }}
+              az group create --location eastus --name ${{ env.NAMESPACE }}
               az aks create --name ${{ env.NAMESPACE }} --resource-group ${{ env.NAMESPACE }} --enable-private-cluster --generate-ssh-keys
               az aks get-credentials --resource-group ${{ env.NAMESPACE }} --name ${{ env.NAMESPACE }}
 
@@ -51,7 +51,7 @@ jobs:
            run: |
               az aks command invoke --resource-group ${{ env.NAMESPACE }} --name ${{ env.NAMESPACE }} --command "kubectl create ns ${{ env.NAMESPACE }}"
 
-         - uses: actions/setup-python@v5
+         - uses: actions/setup-python@v2
            name: Install Python
            with:
               python-version: '3.x'
@@ -63,7 +63,6 @@ jobs:
               images: nginx:1.14.2
               manifests: |
                  test/integration/manifests/test.yml
-                 test/integration/manifests/test2.yml
               action: deploy
               private-cluster: true
               resource-group: ${{ env.NAMESPACE }}
@@ -74,9 +73,6 @@ jobs:
               python test/integration/k8s-deploy-test.py private=${{ env.NAMESPACE }} namespace=${{ env.NAMESPACE }} kind=Deployment name=nginx-deployment containerName=nginx:1.14.2 labels=app:nginx,workflow:actions.github.com-k8s-deploy,workflowFriendlyName:Cluster_Integration_Tests_-_private_cluster selectorLabels=app:nginx
               python test/integration/k8s-deploy-test.py private=${{ env.NAMESPACE }} namespace=${{ env.NAMESPACE }} kind=Service name=nginx-service labels=workflow:actions.github.com-k8s-deploy,workflowFriendlyName:Cluster_Integration_Tests_-_private_cluster selectorLabels=app:nginx
 
-              python test/integration/k8s-deploy-test.py private=${{ env.NAMESPACE }} namespace=${{ env.NAMESPACE }} kind=Deployment name=nginx-deployment2 containerName=nginx:1.14.2 labels=app:nginx2,workflow:actions.github.com-k8s-deploy,workflowFriendlyName:Cluster_Integration_Tests_-_private_cluster selectorLabels=app:nginx2
-              python test/integration/k8s-deploy-test.py private=${{ env.NAMESPACE }} namespace=${{ env.NAMESPACE }} kind=Service name=nginx-service2 labels=workflow:actions.github.com-k8s-deploy,workflowFriendlyName:Cluster_Integration_Tests_-_private_cluster selectorLabels=app:nginx2
-
          - name: Clean up AKS cluster
            if: ${{ always() }}
            run: |

.github/workflows/run-integration-tests-resource-annotation.yml

@@ -18,7 +18,7 @@ jobs:
          KUBECONFIG: /home/runner/.kube/config
          NAMESPACE: test-${{ github.run_id }}
       steps:
-         - uses: actions/checkout@v4
+         - uses: actions/checkout@v3
 
          - name: Install dependencies
            run: |
@@ -31,7 +31,7 @@ jobs:
          - name: Build
            run: ncc build src/run.ts -o lib
 
-         - uses: Azure/setup-kubectl@v4
+         - uses: Azure/setup-kubectl@v3
            name: Install Kubectl
 
          - id: setup-minikube
@@ -46,7 +46,7 @@ jobs:
          - name: Create namespace to run tests
            run: kubectl create ns ${{ env.NAMESPACE }}
 
-         - uses: actions/setup-python@v5
+         - uses: actions/setup-python@v2
            name: Install Python
            with:
               python-version: '3.x'

.github/workflows/unit-tests.yml

@@ -14,7 +14,7 @@ jobs:
       name: Run Unit Tests
       runs-on: ubuntu-latest
       steps:
-         - uses: actions/checkout@v4
+         - uses: actions/checkout@v3
          - run: |
               npm install
               npm test

.gitignore

@@ -2,5 +2,6 @@ node_modules
 
 .DS_Store
 .idea
+lib/
 
 coverage/

CHANGELOG.md

@@ -1,11 +1,5 @@
 # Changelog
 
-## [5.0.1] - 2024-03-12
-
-### Added
-
--  #356 Add fleet support
-
 ## [5.0.0] - 2024-03-12
 
 ### Changed

README.md

@@ -125,10 +125,6 @@ Following are the key capabilities of this action:
     <td>skip-tls-verify</br></br>(Optional)</td>
     <td>Acceptable values: true/false</br>Default value: false</br>True if the insecure-skip-tls-verify option should be used</td>
   </tr>
-  <tr>
-    <td>resource-type (Optional)</td>
-    <td>Acceptable values: `Microsoft.ContainerService/managedClusters` (default), 'Microsoft.ContainerService/fleets'</td>
-  </tr>
 </table>
 
 ## Usage Examples

babel.config.js

@@ -1,6 +0,0 @@
-module.exports = {
-   presets: [
-      ['@babel/preset-env', {targets: {node: 'current'}}],
-      '@babel/preset-typescript'
-   ]
-}

jest.config.js

@@ -1,20 +1,11 @@
 module.exports = {
+   clearMocks: true,
    moduleFileExtensions: ['js', 'ts'],
    testEnvironment: 'node',
    testMatch: ['**/*.test.ts'],
    transform: {
-      '\\.[jt]sx?$': 'babel-jest'
+      '^.+\\.ts$': 'ts-jest'
    },
-   transformIgnorePatterns: [
-      'node_modules/(?!' +
-         [
-            '@octokit',
-            'universal-user-agent',
-            'before-after-hook',
-            'minimist'
-         ].join('|') +
-         ')'
-   ],
    verbose: true,
    testTimeout: 9000
 }

package.json

@@ -4,7 +4,7 @@
    "author": "Deepak Sattiraju",
    "license": "MIT",
    "scripts": {
-      "prebuild": "npm i @vercel/ncc",
+      "prebuild": "npm i @ncc/vercel",
       "build": "ncc build src/run.ts -o lib",
       "test": "jest",
       "coverage": "jest --coverage=true",
@@ -12,27 +12,23 @@
       "format-check": "prettier --check ."
    },
    "dependencies": {
-      "@actions/core": "^1.11.1",
+      "@actions/core": "^1.10.0",
       "@actions/exec": "^1.0.0",
-      "@actions/io": "^1.1.3",
+      "@actions/io": "^1.0.0",
-      "@actions/tool-cache": "2.0.1",
+      "@actions/tool-cache": "1.1.2",
-      "@babel/preset-env": "^7.26.0",
+      "@octokit/core": "^3.5.1",
-      "@babel/preset-typescript": "^7.26.0",
+      "@octokit/plugin-retry": "^3.0.9",
-      "@octokit/core": "^6.1.2",
+      "@types/minipass": "^3.1.2",
-      "@octokit/plugin-retry": "^7.1.2",
+      "js-yaml": "3.13.1"
-      "@types/minipass": "^3.3.5",
-      "js-yaml": "4.1.0",
-      "minimist": "^1.2.8"
    },
    "devDependencies": {
-      "@types/jest": "^29.5.14",
+      "@types/jest": "^26.0.0",
-      "@types/js-yaml": "^4.0.9",
+      "@types/js-yaml": "^3.12.7",
-      "@types/minimist": "^1.2.5",
+      "@types/node": "^12.20.41",
-      "@types/node": "^22.8.7",
+      "@vercel/ncc": "^0.36.1",
-      "@vercel/ncc": "^0.38.3",
+      "jest": "^26.0.0",
-      "jest": "^29.7.0",
+      "prettier": "^2.7.1",
-      "prettier": "^3.3.3",
+      "ts-jest": "^26.0.0",
-      "ts-jest": "^29.2.5",
+      "typescript": "3.9.5"
-      "typescript": "5.6.3"
    }
 }

src/actions/deploy.ts

@@ -13,12 +13,6 @@ import {
 } from '../strategyHelpers/deploymentHelper'
 import {DeploymentStrategy} from '../types/deploymentStrategy'
 import {parseTrafficSplitMethod} from '../types/trafficSplitMethod'
-export const ResourceTypeManagedCluster =
-   'Microsoft.ContainerService/managedClusters'
-export const ResourceTypeFleet = 'Microsoft.ContainerService/fleets'
-export type ClusterType =
-   | typeof ResourceTypeManagedCluster
-   | typeof ResourceTypeFleet
 
 export async function deploy(
    kubectl: Kubectl,
@@ -45,25 +39,13 @@ export async function deploy(
 
    // check manifest stability
    core.startGroup('Checking manifest stability')
-   const resourceTypeInput =
-      core.getInput('resource-type') || ResourceTypeManagedCluster
    const resourceTypes: Resource[] = getResources(
       deployedManifestFiles,
       models.DEPLOYMENT_TYPES.concat([
          KubernetesConstants.DiscoveryAndLoadBalancerResource.SERVICE
       ])
    )
-
+   await checkManifestStability(kubectl, resourceTypes)
-   if (
-      resourceTypeInput !== ResourceTypeManagedCluster &&
-      resourceTypeInput !== ResourceTypeFleet
-   ) {
-      let errMsg = `Invalid resource type: ${resourceTypeInput}. Supported resource types are: ${ResourceTypeManagedCluster} (default), ${ResourceTypeFleet}`
-      core.setFailed(errMsg)
-      throw new Error(errMsg)
-   }
-
-   await checkManifestStability(kubectl, resourceTypes, resourceTypeInput)
    core.endGroup()
 
    // print ingresses

src/actions/promote.ts

@@ -38,7 +38,6 @@ import {
    TrafficSplitMethod
 } from '../types/trafficSplitMethod'
 import {parseRouteStrategy, RouteStrategy} from '../types/routeStrategy'
-import {ResourceTypeFleet, ResourceTypeManagedCluster} from './deploy'
 
 export async function promote(
    kubectl: Kubectl,
@@ -167,8 +166,6 @@ async function promoteBlueGreen(kubectl: Kubectl, manifests: string[]) {
 
    // checking stability of newly created deployments
    core.startGroup('Checking manifest stability')
-   const resourceType =
-      core.getInput('resource-type') || ResourceTypeManagedCluster
    const deployedManifestFiles = deployResult.manifestFiles
    const resources: Resource[] = getResources(
       deployedManifestFiles,
@@ -176,19 +173,7 @@ async function promoteBlueGreen(kubectl: Kubectl, manifests: string[]) {
          models.DiscoveryAndLoadBalancerResource.SERVICE
       ])
    )
-   if (
+   await KubernetesManifestUtility.checkManifestStability(kubectl, resources)
-      resourceType !== ResourceTypeManagedCluster &&
-      resourceType !== ResourceTypeFleet
-   ) {
-      const errMsg = `Invalid resource type: ${resourceType}. Supported resource types are: ${ResourceTypeManagedCluster} (default), fleet`
-      core.setFailed(errMsg)
-      throw new Error(errMsg)
-   }
-   await KubernetesManifestUtility.checkManifestStability(
-      kubectl,
-      resources,
-      resourceType
-   )
    core.endGroup()
 
    core.startGroup(

src/run.ts

@@ -26,8 +26,9 @@ export async function run() {
       .map((manifest) => manifest.trim()) // remove surrounding whitespace
       .filter((manifest) => manifest.length > 0) // remove any blanks
 
-   const fullManifestFilePaths =
+   const fullManifestFilePaths = await getFilesFromDirectoriesAndURLs(
-      await getFilesFromDirectoriesAndURLs(manifestFilePaths)
+      manifestFilePaths
+   )
    const kubectlPath = await getKubectlPath()
    const namespace = core.getInput('namespace') || 'default'
    const isPrivateCluster =

src/strategyHelpers/blueGreen/blueGreenHelper.ts

@@ -77,26 +77,22 @@ 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) => {
-      try {
+      const fileContents = fs.readFileSync(filePath).toString()
-         const fileContents = fs.readFileSync(filePath).toString()
+      yaml.safeLoadAll(fileContents, (inputObject) => {
-         yaml.loadAll(fileContents, (inputObject: any) => {
+         if (!!inputObject) {
-            if (!!inputObject) {
+            const kind = inputObject.kind
-               const kind = inputObject.kind
+
-               if (isDeploymentEntity(kind)) {
+            if (isDeploymentEntity(kind)) {
-                  deploymentEntityList.push(inputObject)
+               deploymentEntityList.push(inputObject)
-               } else if (isServiceEntity(kind)) {
+            } else if (isServiceEntity(kind)) {
-                  serviceEntityList.push(inputObject)
+               serviceEntityList.push(inputObject)
-               } else if (isIngressEntity(kind)) {
+            } else if (isIngressEntity(kind)) {
-                  ingressEntityList.push(inputObject)
+               ingressEntityList.push(inputObject)
-               } else {
+            } else {
-                  otherEntitiesList.push(inputObject)
+               otherEntitiesList.push(inputObject)
-               }
             }
-         })
+         }
-      } catch (error) {
+      })
-         core.error(`Error processing file ${filePath}: ${error.message}`)
-         throw error
-      }
    })
 
    serviceEntityList.forEach((inputObject: any) => {

src/strategyHelpers/blueGreen/smiBlueGreenHelper.ts

@@ -77,8 +77,9 @@ export async function createTrafficSplitObject(
 ): Promise<TrafficSplitObject> {
    // cache traffic split api version
    if (!trafficSplitAPIVersion)
-      trafficSplitAPIVersion =
+      trafficSplitAPIVersion = await kubectlUtils.getTrafficSplitAPIVersion(
-         await kubectlUtils.getTrafficSplitAPIVersion(kubectl)
+         kubectl
+      )
 
    // retrieve annotations for TS object
    const annotations = inputAnnotations

src/strategyHelpers/canary/canaryHelper.ts

@@ -211,31 +211,25 @@ async function cleanUpCanary(
    const deletedFiles: string[] = []
 
    for (const filePath of files) {
-      try {
+      const fileContents = fs.readFileSync(filePath).toString()
-         const fileContents = fs.readFileSync(filePath).toString()
 
-         const parsedYaml: any[] = yaml.loadAll(fileContents)
+      const parsedYaml = yaml.safeLoadAll(fileContents)
-         for (const inputObject of parsedYaml) {
+      for (const inputObject of parsedYaml) {
-            const name = inputObject.metadata.name
+         const name = inputObject.metadata.name
-            const kind = inputObject.kind
+         const kind = inputObject.kind
-            const namespace: string | undefined =
+         const namespace: string | undefined = inputObject?.metadata?.namespace
-               inputObject?.metadata?.namespace
 
-            if (
+         if (
-               isDeploymentEntity(kind) ||
+            isDeploymentEntity(kind) ||
-               (includeServices && isServiceEntity(kind))
+            (includeServices && isServiceEntity(kind))
-            ) {
+         ) {
-               deletedFiles.push(filePath)
+            deletedFiles.push(filePath)
-               const canaryObjectName = getCanaryResourceName(name)
+            const canaryObjectName = getCanaryResourceName(name)
-               const baselineObjectName = getBaselineResourceName(name)
+            const baselineObjectName = getBaselineResourceName(name)
 
-               await deleteObject(kind, canaryObjectName, namespace)
+            await deleteObject(kind, canaryObjectName, namespace)
-               await deleteObject(kind, baselineObjectName, namespace)
+            await deleteObject(kind, baselineObjectName, namespace)
-            }
          }
-      } catch (error) {
-         core.error(`Failed to process file ${filePath}: ${error.message}`)
-         throw error
       }
    }
 

src/strategyHelpers/canary/podCanaryHelper.ts

@@ -8,7 +8,6 @@ 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[],
@@ -22,73 +21,50 @@ export async function deployPodCanary(
       throw Error('Percentage must be between 0 and 100')
 
    for (const filePath of filePaths) {
-      try {
+      const fileContents = fs.readFileSync(filePath).toString()
-         const fileContents = fs.readFileSync(filePath, 'utf8')
+      const parsedYaml = yaml.safeLoadAll(fileContents)
-         const parsedYaml = yaml.loadAll(fileContents)
+      for (const inputObject of parsedYaml) {
-         for (const inputObject of parsedYaml) {
+         const name = inputObject.metadata.name
-            if (
+         const kind = inputObject.kind
-               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)) {
+         if (!onlyDeployStable && isDeploymentEntity(kind)) {
-                  core.debug('Calculating replica count for canary')
+            core.debug('Calculating replica count for canary')
-                  const canaryReplicaCount = calculateReplicaCountForCanary(
+            const canaryReplicaCount = calculateReplicaCountForCanary(
-                     obj,
+               inputObject,
-                     percentage
+               percentage
+            )
+            core.debug('Replica count is ' + canaryReplicaCount)
+
+            const newCanaryObject = canaryDeploymentHelper.getNewCanaryResource(
+               inputObject,
+               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('Replica count is ' + canaryReplicaCount)
+               core.debug(
-
+                  'New baseline object: ' + JSON.stringify(newBaselineObject)
-                  const newCanaryObject =
+               )
-                     canaryDeploymentHelper.getNewCanaryResource(
+               newObjectsList.push(newBaselineObject)
-                        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)
-                  }
-               } 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
       }
    }
 

src/strategyHelpers/canary/smiCanaryHelper.ts

@@ -11,7 +11,6 @@ import {isDeploymentEntity, isServiceEntity} from '../../types/kubernetesTypes'
 import {checkForErrors} from '../../utilities/kubectlUtils'
 import {inputAnnotations} from '../../inputUtils'
 import {DeployResult} from '../../types/deployResult'
-import {K8sObject} from '../../types/k8sObject'
 
 const TRAFFIC_SPLIT_OBJECT_NAME_SUFFIX = '-workflow-rollout'
 const TRAFFIC_SPLIT_OBJECT = 'TrafficSplit'
@@ -37,68 +36,60 @@ export async function deploySMICanary(
 
    const newObjectsList = []
    for await (const filePath of filePaths) {
-      try {
+      const fileContents = fs.readFileSync(filePath).toString()
-         const fileContents = fs.readFileSync(filePath).toString()
+      const inputObjects = yaml.safeLoadAll(fileContents)
-         const inputObjects: K8sObject[] = yaml.loadAll(
+      for (const inputObject of inputObjects) {
-            fileContents
+         const name = inputObject.metadata.name
-         ) as K8sObject[]
+         const kind = inputObject.kind
-         for (const inputObject of inputObjects) {
-            const name = inputObject.metadata.name
-            const kind = inputObject.kind
 
-            if (!onlyDeployStable && isDeploymentEntity(kind)) {
+         if (!onlyDeployStable && isDeploymentEntity(kind)) {
-               if (calculateReplicas) {
+            if (calculateReplicas) {
-                  // calculate for each object
+               // calculate for each object
-                  const percentage = parseInt(
+               const percentage = parseInt(
-                     core.getInput('percentage', {required: true})
+                  core.getInput('percentage', {required: true})
-                  )
+               )
-                  canaryReplicaCount =
+               canaryReplicaCount =
-                     podCanaryHelper.calculateReplicaCountForCanary(
+                  podCanaryHelper.calculateReplicaCountForCanary(
-                        inputObject,
-                        percentage
-                     )
-                  core.debug(`calculated replica count ${canaryReplicaCount}`)
-               }
-
-               core.debug('Creating canary object')
-               const newCanaryObject =
-                  canaryDeploymentHelper.getNewCanaryResource(
                      inputObject,
+                     percentage
+                  )
+               core.debug(`calculated replica count ${canaryReplicaCount}`)
+            }
+
+            core.debug('Creating canary object')
+            const newCanaryObject = canaryDeploymentHelper.getNewCanaryResource(
+               inputObject,
+               canaryReplicaCount
+            )
+            newObjectsList.push(newCanaryObject)
+
+            const stableObject = await canaryDeploymentHelper.fetchResource(
+               kubectl,
+               kind,
+               canaryDeploymentHelper.getStableResourceName(name)
+            )
+            if (stableObject) {
+               core.debug(
+                  `Stable object found for ${kind} ${name}. Creating baseline objects`
+               )
+               const newBaselineObject =
+                  canaryDeploymentHelper.getBaselineDeploymentFromStableDeployment(
+                     stableObject,
                      canaryReplicaCount
                   )
-               newObjectsList.push(newCanaryObject)
+               newObjectsList.push(newBaselineObject)
-
-               const stableObject = await canaryDeploymentHelper.fetchResource(
-                  kubectl,
-                  kind,
-                  canaryDeploymentHelper.getStableResourceName(name)
-               )
-               if (stableObject) {
-                  core.debug(
-                     `Stable object found for ${kind} ${name}. Creating baseline objects`
-                  )
-                  const newBaselineObject =
-                     canaryDeploymentHelper.getBaselineDeploymentFromStableDeployment(
-                        stableObject,
-                        canaryReplicaCount
-                     )
-                  newObjectsList.push(newBaselineObject)
-               }
-            } else if (isDeploymentEntity(kind)) {
-               core.debug(
-                  `creating stable deployment with ${inputObject.spec.replicas} replicas`
-               )
-               const stableDeployment =
-                  canaryDeploymentHelper.getStableResource(inputObject)
-               newObjectsList.push(stableDeployment)
-            } else {
-               // Update non deployment entity or stable deployment as it is
-               newObjectsList.push(inputObject)
             }
+         } else if (isDeploymentEntity(kind)) {
+            core.debug(
+               `creating stable deployment with ${inputObject.spec.replicas} replicas`
+            )
+            const stableDeployment =
+               canaryDeploymentHelper.getStableResource(inputObject)
+            newObjectsList.push(stableDeployment)
+         } else {
+            // Update non deployment entity or stable deployment as it is
+            newObjectsList.push(inputObject)
          }
-      } catch (error) {
-         core.error(`Failed to process file at ${filePath}: ${error.message}`)
-         throw error
       }
    }
    core.debug(
@@ -120,90 +111,81 @@ async function createCanaryService(
    const trafficObjectsList: string[] = []
 
    for (const filePath of filePaths) {
-      try {
+      const fileContents = fs.readFileSync(filePath).toString()
-         const fileContents = fs.readFileSync(filePath).toString()
+      const parsedYaml = yaml.safeLoadAll(fileContents)
-         const parsedYaml: K8sObject[] = yaml.loadAll(
+      for (const inputObject of parsedYaml) {
-            fileContents
+         const name = inputObject.metadata.name
-         ) as K8sObject[]
+         const kind = inputObject.kind
 
-         for (const inputObject of parsedYaml) {
+         if (isServiceEntity(kind)) {
-            const name = inputObject.metadata.name
+            core.debug(`Creating services for ${kind} ${name}`)
-            const kind = inputObject.kind
+            const newCanaryServiceObject =
+               canaryDeploymentHelper.getNewCanaryResource(inputObject)
+            newObjectsList.push(newCanaryServiceObject)
 
-            if (isServiceEntity(kind)) {
+            const newBaselineServiceObject =
-               core.debug(`Creating services for ${kind} ${name}`)
+               canaryDeploymentHelper.getNewBaselineResource(inputObject)
-               const newCanaryServiceObject =
+            newObjectsList.push(newBaselineServiceObject)
-                  canaryDeploymentHelper.getNewCanaryResource(inputObject)
-               newObjectsList.push(newCanaryServiceObject)
 
-               const newBaselineServiceObject =
+            const stableObject = await canaryDeploymentHelper.fetchResource(
-                  canaryDeploymentHelper.getNewBaselineResource(inputObject)
+               kubectl,
-               newObjectsList.push(newBaselineServiceObject)
+               kind,
+               canaryDeploymentHelper.getStableResourceName(name)
+            )
+            if (!stableObject) {
+               const newStableServiceObject =
+                  canaryDeploymentHelper.getStableResource(inputObject)
+               newObjectsList.push(newStableServiceObject)
 
-               const stableObject = await canaryDeploymentHelper.fetchResource(
+               core.debug('Creating the traffic object for service: ' + name)
+               const trafficObject = await createTrafficSplitManifestFile(
                   kubectl,
-                  kind,
+                  name,
-                  canaryDeploymentHelper.getStableResourceName(name)
+                  0,
+                  0,
+                  1000
                )
-               if (!stableObject) {
-                  const newStableServiceObject =
-                     canaryDeploymentHelper.getStableResource(inputObject)
-                  newObjectsList.push(newStableServiceObject)
 
-                  core.debug('Creating the traffic object for service: ' + name)
+               trafficObjectsList.push(trafficObject)
-                  const trafficObject = await createTrafficSplitManifestFile(
+            } else {
-                     kubectl,
+               let updateTrafficObject = true
-                     name,
+               const trafficObject = await canaryDeploymentHelper.fetchResource(
-                     0,
+                  kubectl,
-                     0,
+                  TRAFFIC_SPLIT_OBJECT,
-                     1000
+                  getTrafficSplitResourceName(name)
+               )
+
+               if (trafficObject) {
+                  const trafficJObject = JSON.parse(
+                     JSON.stringify(trafficObject)
                   )
-
+                  if (trafficJObject?.spec?.backends) {
-                  trafficObjectsList.push(trafficObject)
+                     trafficJObject.spec.backends.forEach((s) => {
-               } else {
+                        if (
-                  let updateTrafficObject = true
+                           s.service ===
-                  const trafficObject =
+                              canaryDeploymentHelper.getCanaryResourceName(
-                     await canaryDeploymentHelper.fetchResource(
+                                 name
-                        kubectl,
+                              ) &&
-                        TRAFFIC_SPLIT_OBJECT,
+                           s.weight === '1000m'
-                        getTrafficSplitResourceName(name)
+                        ) {
-                     )
+                           core.debug('Update traffic objcet not required')
-
+                           updateTrafficObject = false
-                  if (trafficObject) {
+                        }
-                     const trafficJObject = JSON.parse(
+                     })
-                        JSON.stringify(trafficObject)
-                     )
-                     if (trafficJObject?.spec?.backends) {
-                        trafficJObject.spec.backends.forEach((s) => {
-                           if (
-                              s.service ===
-                                 canaryDeploymentHelper.getCanaryResourceName(
-                                    name
-                                 ) &&
-                              s.weight === '1000m'
-                           ) {
-                              core.debug('Update traffic objcet not required')
-                              updateTrafficObject = false
-                           }
-                        })
-                     }
                   }
+               }
 
-                  if (updateTrafficObject) {
+               if (updateTrafficObject) {
-                     core.debug(
+                  core.debug(
-                        'Stable service object present so updating the traffic object for service: ' +
+                     'Stable service object present so updating the traffic object for service: ' +
-                           name
+                        name
-                     )
+                  )
-                     trafficObjectsList.push(
+                  trafficObjectsList.push(
-                        await updateTrafficSplitObject(kubectl, name)
+                     await updateTrafficSplitObject(kubectl, name)
-                     )
+                  )
-                  }
                }
             }
          }
-      } catch (error) {
-         core.error(`Failed to process file at ${filePath}: ${error.message}`)
-         throw error
       }
    }
 
@@ -242,31 +224,23 @@ async function adjustTraffic(
 
    const trafficSplitManifests = []
    for (const filePath of manifestFilePaths) {
-      try {
+      const fileContents = fs.readFileSync(filePath).toString()
-         const fileContents = fs.readFileSync(filePath).toString()
+      const parsedYaml = yaml.safeLoadAll(fileContents)
-         const parsedYaml: K8sObject[] = yaml.loadAll(
+      for (const inputObject of parsedYaml) {
-            fileContents
+         const name = inputObject.metadata.name
-         ) as K8sObject[]
+         const kind = inputObject.kind
 
-         for (const inputObject of parsedYaml) {
+         if (isServiceEntity(kind)) {
-            const name = inputObject.metadata.name
+            trafficSplitManifests.push(
-            const kind = inputObject.kind
+               await createTrafficSplitManifestFile(
-
+                  kubectl,
-            if (isServiceEntity(kind)) {
+                  name,
-               trafficSplitManifests.push(
+                  stableWeight,
-                  await createTrafficSplitManifestFile(
+                  0,
-                     kubectl,
+                  canaryWeight
-                     name,
-                     stableWeight,
-                     0,
-                     canaryWeight
-                  )
                )
-            }
+            )
          }
-      } catch (error) {
-         core.error(`Failed to process file at ${filePath}: ${error.message}`)
-         throw error
       }
    }
 
@@ -347,8 +321,9 @@ async function getTrafficSplitObject(
 ): Promise<string> {
    // cached version
    if (!trafficSplitAPIVersion) {
-      trafficSplitAPIVersion =
+      trafficSplitAPIVersion = await kubectlUtils.getTrafficSplitAPIVersion(
-         await kubectlUtils.getTrafficSplitAPIVersion(kubectl)
+         kubectl
+      )
    }
 
    return JSON.stringify({

src/strategyHelpers/deploymentHelper.ts

@@ -10,7 +10,12 @@ import {Kubectl, Resource} from '../types/kubectl'
 import {deployPodCanary} from './canary/podCanaryHelper'
 import {deploySMICanary} from './canary/smiCanaryHelper'
 import {DeploymentConfig} from '../types/deploymentConfig'
-import {deployBlueGreen} from './blueGreen/deploy'
+import {
+   deployBlueGreen,
+   deployBlueGreenIngress,
+   deployBlueGreenService
+} from './blueGreen/deploy'
+import {deployBlueGreenSMI} from './blueGreen/deploy'
 import {DeploymentStrategy} from '../types/deploymentStrategy'
 import * as core from '@actions/core'
 import {
@@ -34,8 +39,8 @@ import {
    normalizeWorkflowStrLabel
 } from '../utilities/githubUtils'
 import {getDeploymentConfig} from '../utilities/dockerUtils'
+import {deploy} from '../actions/deploy'
 import {DeployResult} from '../types/deployResult'
-import {ClusterType} from '../actions/deploy'
 
 export async function deployManifests(
    files: string[],
@@ -111,24 +116,19 @@ function appendStableVersionLabelToResource(files: string[]): string[] {
    const newObjectsList = []
 
    files.forEach((filePath: string) => {
-      try {
+      const fileContents = fs.readFileSync(filePath).toString()
-         const fileContents = fs.readFileSync(filePath).toString()
 
-         yaml.loadAll(fileContents, function (inputObject) {
+      yaml.safeLoadAll(fileContents, function (inputObject) {
-            const kind = (inputObject as {kind: string}).kind
+         const {kind} = inputObject
 
-            if (isDeploymentEntity(kind)) {
+         if (isDeploymentEntity(kind)) {
-               const updatedObject =
+            const updatedObject =
-                  canaryDeploymentHelper.markResourceAsStable(inputObject)
+               canaryDeploymentHelper.markResourceAsStable(inputObject)
-               newObjectsList.push(updatedObject)
+            newObjectsList.push(updatedObject)
-            } else {
+         } else {
-               manifestFiles.push(filePath)
+            manifestFiles.push(filePath)
-            }
+         }
-         })
+      })
-      } catch (error) {
-         core.error(`Failed to parse file at ${filePath}: ${error.message}`)
-         throw error
-      }
    })
 
    const updatedManifestFiles = fileHelper.writeObjectsToFile(newObjectsList)
@@ -139,14 +139,9 @@ function appendStableVersionLabelToResource(files: string[]): string[] {
 
 export async function checkManifestStability(
    kubectl: Kubectl,
-   resources: Resource[],
+   resources: Resource[]
-   resourceType: ClusterType
 ): Promise<void> {
-   await KubernetesManifestUtility.checkManifestStability(
+   await KubernetesManifestUtility.checkManifestStability(kubectl, resources)
-      kubectl,
-      resources,
-      resourceType
-   )
 }
 
 export async function annotateAndLabelResources(
@@ -204,19 +199,14 @@ async function annotateResources(
    )
 
    if (core.isDebug()) {
-      try {
+      core.debug(`files getting annotated are ${JSON.stringify(files)}`)
-         core.debug(`files getting annotated are ${JSON.stringify(files)}`)
+      for (const filePath of files) {
-         for (const filePath of files) {
+         core.debug('printing objects getting annotated...')
-            core.debug('printing objects getting annotated...')
+         const fileContents = fs.readFileSync(filePath).toString()
-            const fileContents = fs.readFileSync(filePath).toString()
+         const inputObjects = yaml.safeLoadAll(fileContents)
-            const inputObjects = yaml.loadAll(fileContents)
+         for (const inputObject of inputObjects) {
-            for (const inputObject of inputObjects) {
+            core.debug(`object: ${JSON.stringify(inputObject)}`)
-               core.debug(`object: ${JSON.stringify(inputObject)}`)
-            }
          }
-      } catch (error) {
-         core.error(`Failed to load and parse files: ${error.message}`)
-         throw error
       }
    }
 

src/types/kubectl.test.ts

@@ -39,6 +39,17 @@ const testNamespace = 'testNamespace'
 const defaultNamespace = 'default'
 const otherNamespace = 'otherns'
 describe('Kubectl class', () => {
+   describe('default namespace behavior', () => {
+      const kubectl = new Kubectl(kubectlPath, defaultNamespace)
+      const execReturn = {exitCode: 0, stdout: 'Output', stderr: ''}
+
+      beforeEach(() => {
+         jest.spyOn(exec, 'getExecOutput').mockImplementation(async () => {
+            return execReturn
+         })
+      })
+   })
+
    describe('with a success exec return in testNamespace', () => {
       const kubectl = new Kubectl(kubectlPath, testNamespace)
       const execReturn = {exitCode: 0, stdout: 'Output', stderr: ''}

src/types/privatekubectl.test.ts

@@ -1,14 +1,8 @@
-import * as fileUtils from '../utilities/fileUtils'
+import {PrivateKubectl} from './privatekubectl'
-import fs from 'node:fs'
-import {
-   PrivateKubectl,
-   extractFileNames,
-   replaceFileNamesWithShallowNamesRelativeToTemp
-} from './privatekubectl'
 import * as exec from '@actions/exec'
 
 describe('Private kubectl', () => {
-   const testString = `kubectl annotate -f /tmp/testdir/test.yml,/tmp/test2.yml,/tmp/testdir/subdir/test3.yml -f /tmp/test4.yml --filename /tmp/test5.yml actions.github.com/k8s-deploy={"run":"3498366832","repository":"jaiveerk/k8s-deploy","workflow":"Minikube Integration Tests - private cluster","workflowFileName":"run-integration-tests-private.yml","jobName":"run-integration-test","createdBy":"jaiveerk","runUri":"https://github.com/jaiveerk/k8s-deploy/actions/runs/3498366832","commit":"c63b323186ea1320a31290de6dcc094c06385e75","lastSuccessRunCommit":"NA","branch":"refs/heads/main","deployTimestamp":1668787848577,"dockerfilePaths":{"nginx:1.14.2":""},"manifestsPaths":["https://github.com/jaiveerk/k8s-deploy/blob/c63b323186ea1320a31290de6dcc094c06385e75/test/integration/test.yml"],"helmChartPaths":[],"provider":"GitHub"} --overwrite --namespace test-3498366832`
+   const testString = `kubectl annotate -f test.yml,test2.yml,test3.yml -f test4.yml --filename test5.yml actions.github.com/k8s-deploy={"run":"3498366832","repository":"jaiveerk/k8s-deploy","workflow":"Minikube Integration Tests - private cluster","workflowFileName":"run-integration-tests-private.yml","jobName":"run-integration-test","createdBy":"jaiveerk","runUri":"https://github.com/jaiveerk/k8s-deploy/actions/runs/3498366832","commit":"c63b323186ea1320a31290de6dcc094c06385e75","lastSuccessRunCommit":"NA","branch":"refs/heads/main","deployTimestamp":1668787848577,"dockerfilePaths":{"nginx:1.14.2":""},"manifestsPaths":["https://github.com/jaiveerk/k8s-deploy/blob/c63b323186ea1320a31290de6dcc094c06385e75/test/integration/manifests/test.yml"],"helmChartPaths":[],"provider":"GitHub"} --overwrite --namespace test-3498366832`
    const mockKube = new PrivateKubectl(
       'kubectlPath',
       'namespace',
@@ -17,32 +11,9 @@ describe('Private kubectl', () => {
       'resourceName'
    )
 
-   const spy = jest
-      .spyOn(fileUtils, 'getTempDirectory')
-      .mockImplementation(() => {
-         return '/tmp'
-      })
-
-   jest.spyOn(fs, 'writeFileSync').mockImplementation(() => {})
-   jest.spyOn(fs, 'readFileSync').mockImplementation((filename) => {
-      return 'test contents'
-   })
-
    it('should extract filenames correctly', () => {
-      expect(extractFileNames(testString)).toEqual([
+      expect(mockKube.extractFilesnames(testString)).toEqual(
-         '/tmp/testdir/test.yml',
+         'test.yml test2.yml test3.yml test4.yml test5.yml'
-         '/tmp/test2.yml',
-         '/tmp/testdir/subdir/test3.yml',
-         '/tmp/test4.yml',
-         '/tmp/test5.yml'
-      ])
-   })
-
-   it('should replace filenames with shallow names for relative locations in tmp correctly', () => {
-      expect(
-         replaceFileNamesWithShallowNamesRelativeToTemp(testString)
-      ).toEqual(
-         `kubectl annotate -f testdir-test.yml,test2.yml,testdir-subdir-test3.yml -f test4.yml --filename test5.yml actions.github.com/k8s-deploy={"run":"3498366832","repository":"jaiveerk/k8s-deploy","workflow":"Minikube Integration Tests - private cluster","workflowFileName":"run-integration-tests-private.yml","jobName":"run-integration-test","createdBy":"jaiveerk","runUri":"https://github.com/jaiveerk/k8s-deploy/actions/runs/3498366832","commit":"c63b323186ea1320a31290de6dcc094c06385e75","lastSuccessRunCommit":"NA","branch":"refs/heads/main","deployTimestamp":1668787848577,"dockerfilePaths":{"nginx:1.14.2":""},"manifestsPaths":["https://github.com/jaiveerk/k8s-deploy/blob/c63b323186ea1320a31290de6dcc094c06385e75/test/integration/test.yml"],"helmChartPaths":[],"provider":"GitHub"} --overwrite --namespace test-3498366832`
       )
    })
 

src/types/privatekubectl.ts

@@ -1,10 +1,10 @@
 import {Kubectl} from './kubectl'
-import minimist from 'minimist'
+import * as minimist from 'minimist'
 import {ExecOptions, ExecOutput, getExecOutput} from '@actions/exec'
 import * as core from '@actions/core'
-import fs from 'node:fs'
+import * as os from 'os'
+import * as fs from 'fs'
 import * as path from 'path'
-import {getTempDirectory} from '../utilities/fileUtils'
 
 export class PrivateKubectl extends Kubectl {
    protected async execute(args: string[], silent: boolean = false) {
@@ -18,7 +18,8 @@ export class PrivateKubectl extends Kubectl {
       }
 
       if (this.containsFilenames(kubectlCmd)) {
-         kubectlCmd = replaceFileNamesWithShallowNamesRelativeToTemp(kubectlCmd)
+         // For private clusters, files will referenced solely by their basename
+         kubectlCmd = this.replaceFilnamesWithBasenames(kubectlCmd)
          addFileFlag = true
       }
 
@@ -42,9 +43,22 @@ export class PrivateKubectl extends Kubectl {
       ]
 
       if (addFileFlag) {
-         const tempDirectory = getTempDirectory()
+         const filenames = this.extractFilesnames(kubectlCmd).split(' ')
-         eo.cwd = path.join(tempDirectory, 'manifests')
+
+         const tempDirectory =
+            process.env['runner.tempDirectory'] || os.tmpdir() + '/manifests'
+         eo.cwd = tempDirectory
          privateClusterArgs.push(...['--file', '.'])
+
+         let filenamesArr = filenames[0].split(',')
+         for (let index = 0; index < filenamesArr.length; index++) {
+            const file = filenamesArr[index]
+
+            if (!file) {
+               continue
+            }
+            this.moveFileToTempManifestDir(file)
+         }
       }
 
       core.debug(
@@ -81,89 +95,89 @@ export class PrivateKubectl extends Kubectl {
       } as ExecOutput
    }
 
+   private replaceFilnamesWithBasenames(kubectlCmd: string) {
+      let exFilenames = this.extractFilesnames(kubectlCmd)
+      let filenames = exFilenames.split(' ')
+      let filenamesArr = filenames[0].split(',')
+
+      for (let index = 0; index < filenamesArr.length; index++) {
+         filenamesArr[index] = path.basename(filenamesArr[index])
+      }
+
+      let baseFilenames = filenamesArr.join()
+
+      let result = kubectlCmd.replace(exFilenames, baseFilenames)
+      return result
+   }
+
+   public extractFilesnames(strToParse: string) {
+      const fileNames: string[] = []
+      const argv = minimist(strToParse.split(' '))
+      const fArg = 'f'
+      const filenameArg = 'filename'
+
+      fileNames.push(...this.extractFilesFromMinimist(argv, fArg))
+      fileNames.push(...this.extractFilesFromMinimist(argv, filenameArg))
+
+      return fileNames.join(' ')
+   }
+
+   private extractFilesFromMinimist(argv, arg: string): string[] {
+      if (!argv[arg]) {
+         return []
+      }
+      const toReturn: string[] = []
+      if (typeof argv[arg] === 'string') {
+         toReturn.push(...argv[arg].split(','))
+      } else {
+         for (const value of argv[arg] as string[]) {
+            toReturn.push(...value.split(','))
+         }
+      }
+
+      return toReturn
+   }
+
    private containsFilenames(str: string) {
       return str.includes('-f ') || str.includes('filename ')
    }
-}
 
-function createTempManifestsDirectory(): string {
+   private createTempManifestsDirectory() {
-   const manifestsDirPath = path.join(getTempDirectory(), 'manifests')
+      const manifestsDir = '/tmp/manifests'
-   if (!fs.existsSync(manifestsDirPath)) {
+      if (!fs.existsSync('/tmp/manifests')) {
-      fs.mkdirSync(manifestsDirPath, {recursive: true})
+         fs.mkdirSync('/tmp/manifests', {recursive: true})
-   }
-
-   return manifestsDirPath
-}
-
-export function replaceFileNamesWithShallowNamesRelativeToTemp(
-   kubectlCmd: string
-) {
-   let filenames = extractFileNames(kubectlCmd)
-   core.debug(`filenames originally provided in kubectl command: ${filenames}`)
-   let relativeShallowNames = filenames.map((filename) => {
-      const relativeName = path.relative(getTempDirectory(), filename)
-
-      const relativePathElements = relativeName.split(path.sep)
-
-      const shallowName = relativePathElements.join('-')
-
-      // make manifests dir in temp if it doesn't already exist
-      const manifestsTempDir = createTempManifestsDirectory()
-
-      const shallowPath = path.join(manifestsTempDir, shallowName)
-      core.debug(
-         `moving contents from ${filename} to shallow location at ${shallowPath}`
-      )
-
-      core.debug(`reading contents from ${filename}`)
-      const contents = fs.readFileSync(filename).toString()
-
-      core.debug(`writing contents to new path ${shallowPath}`)
-      fs.writeFileSync(shallowPath, contents)
-
-      return shallowName
-   })
-
-   let result = kubectlCmd
-   if (filenames.length != relativeShallowNames.length) {
-      throw Error(
-         'replacing filenames with relative path from temp dir, ' +
-            filenames.length +
-            ' filenames != ' +
-            relativeShallowNames.length +
-            'basenames'
-      )
-   }
-   for (let index = 0; index < filenames.length; index++) {
-      result = result.replace(filenames[index], relativeShallowNames[index])
-   }
-   return result
-}
-
-export function extractFileNames(strToParse: string) {
-   const fileNames: string[] = []
-   const argv = minimist(strToParse.split(' '))
-   const fArg = 'f'
-   const filenameArg = 'filename'
-
-   fileNames.push(...extractFilesFromMinimist(argv, fArg))
-   fileNames.push(...extractFilesFromMinimist(argv, filenameArg))
-
-   return fileNames
-}
-
-export function extractFilesFromMinimist(argv, arg: string): string[] {
-   if (!argv[arg]) {
-      return []
-   }
-   const toReturn: string[] = []
-   if (typeof argv[arg] === 'string') {
-      toReturn.push(...argv[arg].split(','))
-   } else {
-      for (const value of argv[arg] as string[]) {
-         toReturn.push(...value.split(','))
       }
    }
 
-   return toReturn
+   private moveFileToTempManifestDir(file: string) {
+      this.createTempManifestsDirectory()
+      if (!fs.existsSync('/tmp/' + file)) {
+         core.debug(
+            '/tmp/' +
+               file +
+               ' does not exist, and therefore cannot be moved to the manifest directory'
+         )
+      }
+
+      fs.copyFile('/tmp/' + file, '/tmp/manifests/' + file, function (err) {
+         if (err) {
+            core.debug(
+               'Could not rename ' +
+                  '/tmp/' +
+                  file +
+                  ' to  ' +
+                  '/tmp/manifests/' +
+                  file +
+                  ' ERROR: ' +
+                  err
+            )
+            return
+         }
+         core.debug(
+            "Successfully moved file '" +
+               file +
+               "' from /tmp to /tmp/manifest directory"
+         )
+      })
+   }
 }

src/utilities/fileUtils.test.ts

@@ -1,19 +1,22 @@
-import * as fileUtils from './fileUtils'
+import {
+   getFilesFromDirectoriesAndURLs,
+   getTempDirectory,
+   urlFileKind,
+   writeYamlFromURLToFile
+} from './fileUtils'
 
 import * as yaml from 'js-yaml'
-import fs from 'node:fs'
+import * as fs from 'fs'
 import * as path from 'path'
-import {K8sObject} from '../types/k8sObject'
+import {succeeded} from '../types/errorable'
 
 const sampleYamlUrl =
    'https://raw.githubusercontent.com/kubernetes/website/main/content/en/examples/controllers/nginx-deployment.yaml'
 describe('File utils', () => {
    test('correctly parses a yaml file from a URL', async () => {
-      const tempFile = await fileUtils.writeYamlFromURLToFile(sampleYamlUrl, 0)
+      const tempFile = await writeYamlFromURLToFile(sampleYamlUrl, 0)
       const fileContents = fs.readFileSync(tempFile).toString()
-      const inputObjects: K8sObject[] = yaml.loadAll(
+      const inputObjects = yaml.safeLoadAll(fileContents)
-         fileContents
-      ) as K8sObject[]
       expect(inputObjects).toHaveLength(1)
 
       for (const obj of inputObjects) {
@@ -27,34 +30,34 @@ describe('File utils', () => {
 
       const testPath = path.join('test', 'unit', 'manifests')
       await expect(
-         fileUtils.getFilesFromDirectoriesAndURLs([testPath, badUrl])
+         getFilesFromDirectoriesAndURLs([testPath, badUrl])
       ).rejects.toThrow()
    })
 
-   it('detects files in nested directories with the same name and ignores non-manifest files and empty dirs', async () => {
+   it('detects files in nested directories and ignores non-manifest files and empty dirs', async () => {
       const testPath = path.join('test', 'unit', 'manifests')
-      const testSearch: string[] =
+      const testSearch: string[] = await getFilesFromDirectoriesAndURLs([
-         await fileUtils.getFilesFromDirectoriesAndURLs([
+         testPath,
-            testPath,
+         sampleYamlUrl
-            sampleYamlUrl
+      ])
-         ])
 
       const expectedManifests = [
-         'test/unit/manifests/manifest_test_dir/another_layer/test-ingress.yaml',
+         'test/unit/manifests/manifest_test_dir/another_layer/deep-ingress.yaml',
-         'test/unit/manifests/manifest_test_dir/another_layer/nested-test-service.yaml',
+         'test/unit/manifests/manifest_test_dir/another_layer/deep-service.yaml',
          'test/unit/manifests/manifest_test_dir/nested-test-service.yaml',
          'test/unit/manifests/test-ingress.yml',
          'test/unit/manifests/test-ingress-new.yml',
          'test/unit/manifests/test-service.yml'
       ]
 
+      // is there a more efficient way to test equality w random order?
       expect(testSearch).toHaveLength(8)
       expectedManifests.forEach((fileName) => {
          if (fileName.startsWith('test/unit')) {
             expect(testSearch).toContain(fileName)
          } else {
-            expect(fileName.includes(fileUtils.urlFileKind)).toBe(true)
+            expect(fileName.includes(urlFileKind)).toBe(true)
-            expect(fileName.startsWith(fileUtils.getTempDirectory()))
+            expect(fileName.startsWith(getTempDirectory()))
          }
       })
    })
@@ -69,7 +72,7 @@ describe('File utils', () => {
       )
 
       expect(
-         fileUtils.getFilesFromDirectoriesAndURLs([badPath, goodPath])
+         getFilesFromDirectoriesAndURLs([badPath, goodPath])
       ).rejects.toThrowError()
    })
 
@@ -89,7 +92,7 @@ describe('File utils', () => {
       )
 
       expect(
-         await fileUtils.getFilesFromDirectoriesAndURLs([
+         await getFilesFromDirectoriesAndURLs([
             outerPath,
             fileAtOuter,
             innerPath
@@ -99,24 +102,6 @@ describe('File utils', () => {
 
    it('throws an error for an invalid URL', async () => {
       const badUrl = 'https://www.github.com'
-      await expect(
+      await expect(writeYamlFromURLToFile(badUrl, 0)).rejects.toBeTruthy()
-         fileUtils.writeYamlFromURLToFile(badUrl, 0)
-      ).rejects.toBeTruthy()
-   })
-})
-
-describe('moving files to temp', () => {
-   it('correctly moves the contents of a file to the temporary directory', () => {
-      jest.spyOn(fs, 'writeFileSync').mockImplementation(() => {})
-      jest.spyOn(fs, 'readFileSync').mockImplementation((filename) => {
-         return 'test contents'
-      })
-      const originalFilePath = path.join('path', 'in', 'repo')
-
-      const output = fileUtils.moveFileToTmpDir(originalFilePath)
-
-      expect(output).toEqual(
-         path.join(fileUtils.getTempDirectory(), '/path/in/repo')
-      )
    })
 })

src/utilities/fileUtils.ts

@@ -1,4 +1,4 @@
-import fs from 'node:fs'
+import * as fs from 'fs'
 import * as https from 'https'
 import * as path from 'path'
 import * as core from '@actions/core'
@@ -23,7 +23,7 @@ export function writeObjectsToFile(inputObjects: any[]): string[] {
          const inputObjectString = JSON.stringify(inputObject)
 
          if (inputObject?.metadata?.name) {
-            const fileName = getNewTempManifestFileName(
+            const fileName = getManifestFileName(
                inputObject.kind,
                inputObject.metadata.name
             )
@@ -52,7 +52,7 @@ export function writeManifestToFile(
 ): string {
    if (inputObjectString) {
       try {
-         const fileName = getNewTempManifestFileName(kind, name)
+         const fileName = getManifestFileName(kind, name)
          fs.writeFileSync(path.join(fileName), inputObjectString)
          return fileName
       } catch (ex) {
@@ -63,27 +63,7 @@ export function writeManifestToFile(
    }
 }
 
-export function moveFileToTmpDir(originalFilepath: string) {
+function getManifestFileName(kind: string, name: string) {
-   const tempDirectory = getTempDirectory()
-   const newPath = path.join(tempDirectory, originalFilepath)
-
-   core.debug(`reading original contents from path: ${originalFilepath}`)
-   const contents = fs.readFileSync(originalFilepath).toString()
-
-   const dirName = path.dirname(newPath)
-   if (!fs.existsSync(dirName)) {
-      core.debug(`path ${dirName} doesn't exist yet, making new dir...`)
-      fs.mkdirSync(dirName, {recursive: true})
-   }
-   core.debug(`writing contents to new path ${newPath}`)
-   fs.writeFileSync(path.join(newPath), contents)
-
-   core.debug(`moved contents from ${originalFilepath} to ${newPath}`)
-
-   return newPath
-}
-
-function getNewTempManifestFileName(kind: string, name: string) {
    const filePath = `${kind}_${name}_${getCurrentTime().toString()}`
    const tempDirectory = getTempDirectory()
    return path.join(tempDirectory, path.basename(filePath))
@@ -150,7 +130,7 @@ export async function writeYamlFromURLToFile(
                )
             }
 
-            const targetPath = getNewTempManifestFileName(
+            const targetPath = getManifestFileName(
                urlFileKind,
                fileNumber.toString()
             )
@@ -183,7 +163,7 @@ function verifyYaml(filepath: string, url: string): Errorable<K8sObject[]> {
    const fileContents = fs.readFileSync(filepath).toString()
    let inputObjects
    try {
-      inputObjects = yaml.loadAll(fileContents)
+      inputObjects = yaml.safeLoadAll(fileContents)
    } catch (e) {
       return {
          succeeded: false,

src/utilities/manifestStabilityUtils.test.ts

@@ -1,52 +0,0 @@
-import * as manifestStabilityUtils from './manifestStabilityUtils'
-import {Kubectl} from '../types/kubectl'
-import {ResourceTypeFleet, ResourceTypeManagedCluster} from '../actions/deploy'
-import {ExecOutput} from '@actions/exec'
-import {exitCode, stdout} from 'process'
-
-describe('manifestStabilityUtils', () => {
-   const kc = new Kubectl('')
-   const resources = [
-      {
-         type: 'deployment',
-         name: 'test',
-         namespace: 'default'
-      }
-   ]
-
-   it('should return immediately if the resource type is fleet', async () => {
-      const spy = jest.spyOn(manifestStabilityUtils, 'checkManifestStability')
-      const checkRolloutStatusSpy = jest.spyOn(kc, 'checkRolloutStatus')
-      await manifestStabilityUtils.checkManifestStability(
-         kc,
-         resources,
-         ResourceTypeFleet
-      )
-
-      expect(checkRolloutStatusSpy).not.toHaveBeenCalled()
-      expect(spy).toHaveReturned()
-   })
-
-   it('should run fully if the resource type is managedCluster', async () => {
-      const spy = jest.spyOn(manifestStabilityUtils, 'checkManifestStability')
-      const checkRolloutStatusSpy = jest
-         .spyOn(kc, 'checkRolloutStatus')
-         .mockImplementation(() => {
-            return new Promise<ExecOutput>((resolve, reject) => {
-               resolve({
-                  exitCode: 0,
-                  stderr: '',
-                  stdout: ''
-               })
-            })
-         })
-      await manifestStabilityUtils.checkManifestStability(
-         kc,
-         resources,
-         ResourceTypeManagedCluster
-      )
-
-      expect(checkRolloutStatusSpy).toHaveBeenCalled()
-      expect(spy).toHaveReturned()
-   })
-})

src/utilities/manifestStabilityUtils.ts

@@ -3,21 +3,14 @@ import * as KubernetesConstants from '../types/kubernetesTypes'
 import {Kubectl, Resource} from '../types/kubectl'
 import {checkForErrors} from './kubectlUtils'
 import {sleep} from './timeUtils'
-import {ClusterType, ResourceTypeFleet} from '../actions/deploy'
 
 const IS_SILENT = false
 const POD = 'pod'
 
 export async function checkManifestStability(
    kubectl: Kubectl,
-   resources: Resource[],
+   resources: Resource[]
-   clusterTyper: ClusterType
 ): Promise<void> {
-   // Skip if resource type is microsoft.containerservice/fleets
-   if (clusterTyper === ResourceTypeFleet) {
-      core.info(`Skipping checkManifestStability for ${ResourceTypeFleet}`)
-      return
-   }
    let rolloutStatusHasErrors = false
    for (let i = 0; i < resources.length; i++) {
       const resource = resources[i]

src/utilities/manifestUpdateUtils.test.ts

@@ -1,28 +0,0 @@
-import * as fileUtils from './fileUtils'
-import * as manifestUpdateUtils from './manifestUpdateUtils'
-import * as path from 'path'
-import * as fs from 'fs'
-
-describe('manifestUpdateUtils', () => {
-   jest.spyOn(fileUtils, 'moveFileToTmpDir').mockImplementation((filename) => {
-      return path.join('/tmp', filename)
-   })
-   jest.spyOn(fs, 'writeFileSync').mockImplementation(() => {})
-   jest.spyOn(fs, 'readFileSync').mockImplementation((filename) => {
-      return 'test contents'
-   })
-
-   it('should place all files within the temp dir with the same path that they have in the repo', () => {
-      const originalFilePaths: string[] = [
-         'path/in/repo/test.txt',
-         'path/deeper/in/repo/test.txt'
-      ]
-      const expected: string[] = [
-         '/tmp/path/in/repo/test.txt',
-         '/tmp/path/deeper/in/repo/test.txt'
-      ]
-      const newFilePaths =
-         manifestUpdateUtils.moveFilesToTmpDir(originalFilePaths)
-      expect(newFilePaths).toEqual(expected)
-   })
-})

src/utilities/manifestUpdateUtils.ts

@@ -3,7 +3,7 @@ import * as fs from 'fs'
 import * as yaml from 'js-yaml'
 import * as path from 'path'
 import * as fileHelper from './fileUtils'
-import {moveFileToTmpDir} from './fileUtils'
+import {getTempDirectory} from './fileUtils'
 import {
    InputObjectKindNotDefinedError,
    InputObjectMetadataNotDefinedError,
@@ -20,21 +20,16 @@ import {
    setImagePullSecrets
 } from './manifestPullSecretUtils'
 import {Resource} from '../types/kubectl'
-import {K8sObject} from '../types/k8sObject'
 
 export function updateManifestFiles(manifestFilePaths: string[]) {
    if (manifestFilePaths?.length === 0) {
       throw new Error('Manifest files not provided')
    }
 
-   // move original set of input files to tmp dir
-   const manifestFilesInTempDir = moveFilesToTmpDir(manifestFilePaths)
-
    // update container images
    const containers: string[] = core.getInput('images').split('\n')
-
    const manifestFiles = updateContainerImagesInManifestFiles(
-      manifestFilesInTempDir,
+      manifestFilePaths,
       containers
    )
 
@@ -46,12 +41,6 @@ export function updateManifestFiles(manifestFilePaths: string[]) {
    return updateImagePullSecretsInManifestFiles(manifestFiles, imagePullSecrets)
 }
 
-export function moveFilesToTmpDir(filepaths: string[]): string[] {
-   return filepaths.map((filename) => {
-      return moveFileToTmpDir(filename)
-   })
-}
-
 export function UnsetClusterSpecificDetails(resource: any) {
    if (!resource) {
       return
@@ -81,9 +70,12 @@ function updateContainerImagesInManifestFiles(
 ): string[] {
    if (filePaths?.length <= 0) return filePaths
 
+   const newFilePaths = []
+
    // update container images
    filePaths.forEach((filePath: string) => {
       let contents = fs.readFileSync(filePath).toString()
+
       containers.forEach((container: string) => {
          let [imageName] = container.split(':')
          if (imageName.indexOf('@') > 0) {
@@ -99,10 +91,13 @@ function updateContainerImagesInManifestFiles(
       })
 
       // write updated files
-      fs.writeFileSync(path.join(filePath), contents)
+      const tempDirectory = getTempDirectory()
+      const fileName = path.join(tempDirectory, path.basename(filePath))
+      fs.writeFileSync(path.join(fileName), contents)
+      newFilePaths.push(fileName)
    })
 
-   return filePaths
+   return newFilePaths
 }
 
 /*
@@ -275,29 +270,21 @@ export function getResources(
 
    const resources: Resource[] = []
    filePaths.forEach((filePath: string) => {
-      try {
+      const fileContents = fs.readFileSync(filePath).toString()
-         const fileContents = fs.readFileSync(filePath).toString()
+      yaml.safeLoadAll(fileContents, (inputObject) => {
-         const inputObjects: K8sObject[] = yaml.loadAll(
+         const inputObjectKind = inputObject?.kind || ''
-            fileContents
+         if (
-         ) as K8sObject[]
+            filterResourceTypes.filter(
-         inputObjects.forEach((inputObject) => {
+               (type) => inputObjectKind.toLowerCase() === type.toLowerCase()
-            const inputObjectKind = inputObject?.kind || ''
+            ).length > 0
-            if (
+         ) {
-               filterResourceTypes.filter(
+            resources.push({
-                  (type) => inputObjectKind.toLowerCase() === type.toLowerCase()
+               type: inputObject.kind,
-               ).length > 0
+               name: inputObject.metadata.name,
-            ) {
+               namespace: inputObject?.metadata?.namespace
-               resources.push({
+            })
-                  type: inputObject.kind,
+         }
-                  name: inputObject.metadata.name,
+      })
-                  namespace: inputObject?.metadata?.namespace
-               })
-            }
-         })
-      } catch (error) {
-         core.error(`Failed to process file at ${filePath}: ${error.message}`)
-         throw error
-      }
    })
 
    return resources
@@ -311,21 +298,16 @@ function updateImagePullSecretsInManifestFiles(
 
    const newObjectsList = []
    filePaths.forEach((filePath: string) => {
-      try {
+      const fileContents = fs.readFileSync(filePath).toString()
-         const fileContents = fs.readFileSync(filePath).toString()
+      yaml.safeLoadAll(fileContents, (inputObject: any) => {
-         yaml.loadAll(fileContents, (inputObject: any) => {
+         if (inputObject?.kind) {
-            if (inputObject?.kind) {
+            const {kind} = inputObject
-               const {kind} = inputObject
+            if (isWorkloadEntity(kind)) {
-               if (isWorkloadEntity(kind)) {
+               updateImagePullSecrets(inputObject, imagePullSecrets)
-                  updateImagePullSecrets(inputObject, imagePullSecrets)
-               }
-               newObjectsList.push(inputObject)
             }
-         })
+            newObjectsList.push(inputObject)
-      } catch (error) {
+         }
-         core.error(`Failed to process file at ${filePath}: ${error.message}`)
+      })
-         throw error
-      }
    })
 
    return fileHelper.writeObjectsToFile(newObjectsList)

test/integration/k8s-deploy-test.py

@@ -232,7 +232,8 @@ def main():
         getAllObjectsCmd = azPrefix + 'kubectl get '+kind+' -n '+namespace
         if not azPrefix == "":
             getAllObjectsCmd = azPrefix + "'{getAllObjectsCmd}'" # add extra set of quotes
-        foundObjects = os.popen(getAllObjectsCmd).read()
+        cmd =  + "'" + cmd + "'"
+        foundObjects = os.popen().read()
         suffix = f"resources of type {kind}: {foundObjects}"
         sys.exit(msg + " " + suffix)
 

test/integration/manifests/manifest_test_dir/test.yml

@@ -1,33 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-   name: nginx-deployment3
-   labels:
-      app: nginx3
-spec:
-   replicas: 1
-   selector:
-      matchLabels:
-         app: nginx3
-   template:
-      metadata:
-         labels:
-            app: nginx3
-      spec:
-         containers:
-            - name: nginx
-              image: nginx
-              ports:
-                 - containerPort: 80
----
-apiVersion: v1
-kind: Service
-metadata:
-   name: nginx-service3
-spec:
-   selector:
-      app: nginx3
-   ports:
-      - protocol: TCP
-        port: 80
-        targetPort: 80

test/integration/manifests/test2.yml

@@ -1,33 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-   name: nginx-deployment2
-   labels:
-      app: nginx2
-spec:
-   replicas: 1
-   selector:
-      matchLabels:
-         app: nginx2
-   template:
-      metadata:
-         labels:
-            app: nginx2
-      spec:
-         containers:
-            - name: nginx
-              image: nginx
-              ports:
-                 - containerPort: 80
----
-apiVersion: v1
-kind: Service
-metadata:
-   name: nginx-service2
-spec:
-   selector:
-      app: nginx2
-   ports:
-      - protocol: TCP
-        port: 80
-        targetPort: 80

tsconfig.json

@@ -1,8 +1,7 @@
 {
    "compilerOptions": {
       "target": "ES6",
-      "module": "commonjs",
+      "module": "commonjs"
-      "esModuleInterop": true
    },
    "exclude": ["node_modules", "test", "src/**/*.test.ts"]
 }