build

.github/workflows/codeql.yml

@@ -16,7 +16,7 @@ jobs:
 
       steps:
          - name: Checkout repository
-           uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+           uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
            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@45775bd8235c68ba998cffa5171334d58593da47 #v3.28.15
+           uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd #v3.27.0
            # 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@45775bd8235c68ba998cffa5171334d58593da47 #v3.28.15
+           uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd #v3.27.0
 
          # ℹ️ 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@45775bd8235c68ba998cffa5171334d58593da47 #v3.28.15
+           uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd #v3.27.0

.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@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
+         - uses: actions/stale@v9
            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@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
+         - uses: actions/stale@v9
            name: Setting PR as idle
            with:
               repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/prettify-code.yml

@@ -10,7 +10,7 @@ jobs:
       runs-on: ubuntu-latest
       steps:
          - name: Checkout Repository
-           uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+           uses: actions/checkout@v4
          - name: install deps
            run: npm install
 

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

@@ -13,12 +13,12 @@ on:
 jobs:
    run-integration-test:
       name: Run Minikube Integration Tests
-      runs-on: ubuntu-22.04
+      runs-on: ubuntu-latest
       env:
          KUBECONFIG: /home/runner/.kube/config
          NAMESPACE: test-${{ github.run_id }}
       steps:
-         - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+         - uses: actions/checkout@v4
 
          - name: Install dependencies
            run: |
@@ -31,22 +31,22 @@ jobs:
          - name: Build
            run: ncc build src/run.ts -o lib
 
-         - uses: Azure/setup-kubectl@3e0aec4d80787158d308d7b364cb1b702e7feb7f # v4.0.0
+         - uses: Azure/setup-kubectl@v4
            name: Install Kubectl
 
          - id: setup-minikube
            name: Setup Minikube
-           uses: medyagh/setup-minikube@cea33675329b799adccc9526aa5daccc26cd5052 # v0.0.19
+           uses: medyagh/setup-minikube@latest
            with:
-              minikube-version: 1.34.0
+              minikube-version: 1.24.0
-              kubernetes-version: 1.31.0
+              kubernetes-version: 1.22.3
               driver: 'none'
            timeout-minutes: 3
 
          - name: Create namespace to run tests
            run: kubectl create ns ${{ env.NAMESPACE }}
 
-         - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # 5.5.0
+         - uses: actions/setup-python@v5
            name: Install Python
            with:
               python-version: '3.x'

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

@@ -13,12 +13,12 @@ on:
 jobs:
    run-integration-test:
       name: Run Minikube Integration Tests
-      runs-on: ubuntu-22.04
+      runs-on: ubuntu-latest
       env:
          KUBECONFIG: /home/runner/.kube/config
          NAMESPACE: test-${{ github.run_id }}
       steps:
-         - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+         - uses: actions/checkout@v4
 
          - name: Install dependencies
            run: |
@@ -31,22 +31,22 @@ jobs:
          - name: Build
            run: ncc build src/run.ts -o lib
 
-         - uses: Azure/setup-kubectl@3e0aec4d80787158d308d7b364cb1b702e7feb7f # v4.0.0
+         - uses: Azure/setup-kubectl@v4
            name: Install Kubectl
 
          - id: setup-minikube
            name: Setup Minikube
-           uses: medyagh/setup-minikube@cea33675329b799adccc9526aa5daccc26cd5052 # v0.0.19
+           uses: medyagh/setup-minikube@latest
            with:
-              minikube-version: 1.34.0
+              minikube-version: 1.31.2
-              kubernetes-version: 1.31.0
+              kubernetes-version: 1.22.3
               driver: 'none'
            timeout-minutes: 3
 
          - name: Create namespace to run tests
            run: kubectl create ns ${{ env.NAMESPACE }}
 
-         - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # 5.5.0
+         - uses: actions/setup-python@v5
            name: Install Python
            with:
               python-version: '3.x'

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

@@ -13,12 +13,12 @@ on:
 jobs:
    run-integration-test:
       name: Run Minikube Integration Tests
-      runs-on: ubuntu-22.04
+      runs-on: ubuntu-latest
       env:
          KUBECONFIG: /home/runner/.kube/config
          NAMESPACE: test-${{ github.run_id }}
       steps:
-         - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+         - uses: actions/checkout@v4
 
          - name: Install dependencies
            run: |
@@ -31,22 +31,22 @@ jobs:
          - name: Build
            run: ncc build src/run.ts -o lib
 
-         - uses: Azure/setup-kubectl@3e0aec4d80787158d308d7b364cb1b702e7feb7f # v4.0.0
+         - uses: Azure/setup-kubectl@v4
            name: Install Kubectl
 
          - id: setup-minikube
            name: Setup Minikube
-           uses: medyagh/setup-minikube@cea33675329b799adccc9526aa5daccc26cd5052 # v0.0.19
+           uses: medyagh/setup-minikube@latest
            with:
-              minikube-version: 1.34.0
+              minikube-version: 1.31.2
-              kubernetes-version: 1.31.0
+              kubernetes-version: 1.22.3
               driver: 'none'
            timeout-minutes: 3
 
          - name: Create namespace to run tests
            run: kubectl create ns ${{ env.NAMESPACE }}
 
-         - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # 5.5.0
+         - uses: actions/setup-python@v5
            name: Install Python
            with:
               python-version: '3.x'

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

@@ -13,12 +13,12 @@ on:
 jobs:
    run-integration-test:
       name: Run Minikube Integration Tests
-      runs-on: ubuntu-22.04
+      runs-on: ubuntu-latest
       env:
          KUBECONFIG: /home/runner/.kube/config
          NAMESPACE: test-${{ github.run_id }}
       steps:
-         - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+         - uses: actions/checkout@v4
 
          - name: Install dependencies
            run: |
@@ -31,24 +31,23 @@ jobs:
          - name: Build
            run: ncc build src/run.ts -o lib
 
-         - uses: Azure/setup-kubectl@3e0aec4d80787158d308d7b364cb1b702e7feb7f # v4.0.0
+         - uses: Azure/setup-kubectl@v4
            name: Install Kubectl
 
          - id: setup-minikube
            name: Setup Minikube
-           uses: medyagh/setup-minikube@cea33675329b799adccc9526aa5daccc26cd5052 # v0.0.19
+           uses: medyagh/setup-minikube@latest
            with:
-              minikube-version: 1.34.0
+              minikube-version: 1.24.0
-              kubernetes-version: 1.31.0
+              kubernetes-version: 1.22.3
               driver: 'none'
            timeout-minutes: 3
 
          - name: Install linkerd and add controlplane to cluster
            run: |
-              curl --proto '=https' --tlsv1.2 -sSfL https://run.linkerd.io/install-edge | sh
+              curl --proto '=https' --tlsv1.2 -sSfL https://run.linkerd.io/install | sh
-              export PATH=$PATH:/home/runner/.linkerd2/bin
               curl -sL https://linkerd.github.io/linkerd-smi/install | sh
-              kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.2.0/standard-install.yaml
+              export PATH=$PATH:/home/runner/.linkerd2/bin
 
               linkerd install --crds | kubectl apply -f -
               linkerd install --set proxyInit.runAsRoot=true | kubectl apply -f -
@@ -57,7 +56,7 @@ jobs:
          - name: Create namespace to run tests
            run: kubectl create ns ${{ env.NAMESPACE }}
 
-         - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # 5.5.0
+         - uses: actions/setup-python@v5
            name: Install Python
            with:
               python-version: '3.x'

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

@@ -13,12 +13,12 @@ on:
 jobs:
    run-integration-test:
       name: Run Minikube Integration Tests
-      runs-on: ubuntu-22.04
+      runs-on: ubuntu-latest
       env:
          KUBECONFIG: /home/runner/.kube/config
          NAMESPACE: test-${{ github.run_id }}
       steps:
-         - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+         - uses: actions/checkout@v4
 
          - name: Install dependencies
            run: |
@@ -31,22 +31,22 @@ jobs:
          - name: Build
            run: ncc build src/run.ts -o lib
 
-         - uses: Azure/setup-kubectl@3e0aec4d80787158d308d7b364cb1b702e7feb7f # v4.0.0
+         - uses: Azure/setup-kubectl@v4
            name: Install Kubectl
 
          - id: setup-minikube
            name: Setup Minikube
-           uses: medyagh/setup-minikube@cea33675329b799adccc9526aa5daccc26cd5052 # v0.0.19
+           uses: medyagh/setup-minikube@latest
            with:
-              minikube-version: 1.34.0
+              minikube-version: 1.24.0
-              kubernetes-version: 1.31.0
+              kubernetes-version: 1.22.3
               driver: 'none'
            timeout-minutes: 3
 
          - name: Create namespace to run tests
            run: kubectl create ns ${{ env.NAMESPACE }}
 
-         - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # 5.5.0
+         - uses: actions/setup-python@v5
            name: Install Python
            with:
               python-version: '3.x'

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

@@ -13,12 +13,12 @@ on:
 jobs:
    run-integration-test:
       name: Run Minikube Integration Tests
-      runs-on: ubuntu-22.04
+      runs-on: ubuntu-latest
       env:
          KUBECONFIG: /home/runner/.kube/config
          NAMESPACE: test-${{ github.run_id }}
       steps:
-         - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+         - uses: actions/checkout@v4
 
          - name: Install dependencies
            run: |
@@ -31,21 +31,23 @@ jobs:
          - name: Build
            run: ncc build src/run.ts -o lib
 
-         - uses: Azure/setup-kubectl@3e0aec4d80787158d308d7b364cb1b702e7feb7f # v4.0.0
+         - uses: Azure/setup-kubectl@v4
            name: Install Kubectl
 
          - id: setup-minikube
            name: Setup Minikube
-           uses: medyagh/setup-minikube@cea33675329b799adccc9526aa5daccc26cd5052 # v0.0.19
+           uses: medyagh/setup-minikube@latest
            with:
-              minikube-version: 1.34.0
+              minikube-version: 1.24.0
-              kubernetes-version: 1.31.0
+              kubernetes-version: 1.22.3
               driver: 'none'
            timeout-minutes: 3
-              curl --proto '=https' --tlsv1.2 -sSfL https://run.linkerd.io/install-edge | sh
+
-              export PATH=$PATH:/home/runner/.linkerd2/bin
+         - name: Install linkerd and add controlplane to cluster
+           run: |
+              curl --proto '=https' --tlsv1.2 -sSfL https://run.linkerd.io/install | sh
               curl -sL https://linkerd.github.io/linkerd-smi/install | sh
-              kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.2.0/standard-install.yaml
+              export PATH=$PATH:/home/runner/.linkerd2/bin
 
               linkerd install --crds | kubectl apply -f -
               linkerd install --set proxyInit.runAsRoot=true | kubectl apply -f -
@@ -54,7 +56,7 @@ jobs:
          - name: Create namespace to run tests
            run: kubectl create ns ${{ env.NAMESPACE }}
 
-         - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # 5.5.0
+         - uses: actions/setup-python@v5
            name: Install Python
            with:
               python-version: '3.x'

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

@@ -11,7 +11,7 @@ on:
 jobs:
    run-integration-test:
       name: Run Minikube Integration Tests
-      runs-on: ubuntu-22.04
+      runs-on: ubuntu-latest
       env:
          KUBECONFIG: /home/runner/.kube/config
          NAMESPACE: test-${{ github.run_id }}
@@ -19,7 +19,7 @@ jobs:
          contents: read
          id-token: write
       steps:
-         - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+         - uses: actions/checkout@v4
 
          - name: Install dependencies
            run: |
@@ -30,13 +30,13 @@ jobs:
          - name: Build
            run: ncc build src/run.ts -o lib
          - name: Azure login
-           uses: azure/login@v2.3.0
+           uses: azure/login@v2.2.0
            with:
               client-id: ${{ secrets.AZURE_CLIENT_ID }}
               tenant-id: ${{ secrets.AZURE_TENANT_ID }}
               subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
-         - uses: Azure/setup-kubectl@3e0aec4d80787158d308d7b364cb1b702e7feb7f # v4.0.0
+         - uses: Azure/setup-kubectl@v4
            name: Install Kubectl
 
          - name: Create private AKS cluster and set context
@@ -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@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # 5.5.0
+         - uses: actions/setup-python@v5
            name: Install Python
            with:
               python-version: '3.x'

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

@@ -13,12 +13,12 @@ on:
 jobs:
    run-integration-test:
       name: Run Minikube Integration Tests
-      runs-on: ubuntu-22.04
+      runs-on: ubuntu-latest
       env:
          KUBECONFIG: /home/runner/.kube/config
          NAMESPACE: test-${{ github.run_id }}
       steps:
-         - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+         - uses: actions/checkout@v4
 
          - name: Install dependencies
            run: |
@@ -31,22 +31,22 @@ jobs:
          - name: Build
            run: ncc build src/run.ts -o lib
 
-         - uses: Azure/setup-kubectl@3e0aec4d80787158d308d7b364cb1b702e7feb7f # v4.0.0
+         - uses: Azure/setup-kubectl@v4
            name: Install Kubectl
 
          - id: setup-minikube
            name: Setup Minikube
-           uses: medyagh/setup-minikube@cea33675329b799adccc9526aa5daccc26cd5052 # v0.0.19
+           uses: medyagh/setup-minikube@latest
            with:
-              minikube-version: 1.34.0
+              minikube-version: 1.24.0
-              kubernetes-version: 1.31.0
+              kubernetes-version: 1.22.3
               driver: 'none'
            timeout-minutes: 3
 
          - name: Create namespace to run tests
            run: kubectl create ns ${{ env.NAMESPACE }}
 
-         - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # 5.5.0
+         - uses: actions/setup-python@v5
            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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+         - uses: actions/checkout@v4
          - run: |
               npm install
               npm test

CHANGELOG.md

@@ -1,17 +1,5 @@
 # Changelog
 
-## [5.0.3] - 2025-04-16
-
-### Added
-
-- #398 case-insensitive resource type
-
-## [5.0.2] - 2025-04-15
-
-### Added
-
-- #396 Update new resource-type input for action
-
 ## [5.0.1] - 2024-03-12
 
 ### Added

action.yml

@@ -80,10 +80,6 @@ inputs:
    skip-tls-verify:
       description: True if the insecure-skip-tls-verify option should be used. Input should be 'true' or 'false'.
       default: false
-   resource-type:
-      description: Either Microsoft.ContainerService/managedClusters or Microsoft.ContainerService/fleets'.
-      required: false
-      default: 'Microsoft.ContainerService/managedClusters'
 
 branding:
    color: 'green'

package.json

@@ -15,11 +15,11 @@
       "@actions/core": "^1.11.1",
       "@actions/exec": "^1.0.0",
       "@actions/io": "^1.1.3",
-      "@actions/tool-cache": "2.0.2",
+      "@actions/tool-cache": "2.0.1",
-      "@babel/preset-env": "^7.26.9",
+      "@babel/preset-env": "^7.26.0",
-      "@babel/preset-typescript": "^7.27.0",
+      "@babel/preset-typescript": "^7.26.0",
-      "@octokit/core": "^6.1.4",
+      "@octokit/core": "^6.1.2",
-      "@octokit/plugin-retry": "^7.2.0",
+      "@octokit/plugin-retry": "^7.1.2",
       "@types/minipass": "^3.3.5",
       "js-yaml": "4.1.0",
       "minimist": "^1.2.8"
@@ -28,11 +28,11 @@
       "@types/jest": "^29.5.14",
       "@types/js-yaml": "^4.0.9",
       "@types/minimist": "^1.2.5",
-      "@types/node": "^22.14.0",
+      "@types/node": "^22.8.7",
       "@vercel/ncc": "^0.38.3",
       "jest": "^29.7.0",
-      "prettier": "^3.5.3",
+      "prettier": "^3.3.3",
-      "ts-jest": "^29.3.1",
+      "ts-jest": "^29.2.5",
-      "typescript": "5.8.3"
+      "typescript": "5.6.3"
    }
 }

src/actions/deploy.ts

@@ -13,15 +13,17 @@ import {
 } from '../strategyHelpers/deploymentHelper'
 import {DeploymentStrategy} from '../types/deploymentStrategy'
 import {parseTrafficSplitMethod} from '../types/trafficSplitMethod'
-import {ClusterType} from '../inputUtils'
 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,
    manifestFilePaths: string[],
-   deploymentStrategy: DeploymentStrategy,
+   deploymentStrategy: DeploymentStrategy
-   resourceType: ClusterType
 ) {
    // update manifests
    const inputManifestFiles: string[] = updateManifestFiles(manifestFilePaths)
@@ -43,6 +45,8 @@ 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([
@@ -50,7 +54,16 @@ export async function deploy(
       ])
    )
 
-   await checkManifestStability(kubectl, resourceTypes, resourceType)
+   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,20 +38,19 @@ import {
    TrafficSplitMethod
 } from '../types/trafficSplitMethod'
 import {parseRouteStrategy, RouteStrategy} from '../types/routeStrategy'
-import {ClusterType} from '../inputUtils'
+import {ResourceTypeFleet, ResourceTypeManagedCluster} from './deploy'
 
 export async function promote(
    kubectl: Kubectl,
    manifests: string[],
-   deploymentStrategy: DeploymentStrategy,
+   deploymentStrategy: DeploymentStrategy
-   resourceType: ClusterType
 ) {
    switch (deploymentStrategy) {
       case DeploymentStrategy.CANARY:
          await promoteCanary(kubectl, manifests)
          break
       case DeploymentStrategy.BLUE_GREEN:
-         await promoteBlueGreen(kubectl, manifests, resourceType)
+         await promoteBlueGreen(kubectl, manifests)
          break
       default:
          throw Error('Invalid promote deployment strategy')
@@ -141,11 +140,7 @@ async function promoteCanary(kubectl: Kubectl, manifests: string[]) {
    core.endGroup()
 }
 
-async function promoteBlueGreen(
+async function promoteBlueGreen(kubectl: Kubectl, manifests: string[]) {
-   kubectl: Kubectl,
-   manifests: string[],
-   resourceType: ClusterType
-) {
    // update container images and pull secrets
    const inputManifestFiles: string[] = updateManifestFiles(manifests)
    const manifestObjects: BlueGreenManifests =
@@ -172,6 +167,8 @@ async function promoteBlueGreen(
 
    // 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,
@@ -179,6 +176,14 @@ async function promoteBlueGreen(
          models.DiscoveryAndLoadBalancerResource.SERVICE
       ])
    )
+   if (
+      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,

src/inputUtils.test.ts

@@ -1,34 +0,0 @@
-import {parseResourceTypeInput} from './inputUtils'
-import {
-   ClusterType,
-   ResourceTypeFleet,
-   ResourceTypeManagedCluster
-} from './actions/deploy'
-
-describe('InputUtils', () => {
-   describe('parseResourceTypeInput', () => {
-      it('should extract fleet exact match resource type', () => {
-         expect(
-            parseResourceTypeInput('Microsoft.ContainerService/fleets')
-         ).toEqual(ResourceTypeFleet)
-      })
-      it('should match fleet case-insensitively', () => {
-         expect(
-            parseResourceTypeInput('Microsoft.containerservice/fleets')
-         ).toEqual(ResourceTypeFleet)
-      })
-      it('should match managed cluster case-insensitively', () => {
-         expect(
-            parseResourceTypeInput('Microsoft.containerservice/MAnaGedClusterS')
-         ).toEqual(ResourceTypeManagedCluster)
-      })
-      it('should error on unexpected values', () => {
-         expect(() => {
-            parseResourceTypeInput('icrosoft.ContainerService/ManagedCluster')
-         }).toThrow()
-         expect(() => {
-            parseResourceTypeInput('wrong-value')
-         }).toThrow()
-      })
-   })
-})

src/inputUtils.ts

@@ -1,6 +1,5 @@
 import * as core from '@actions/core'
 import {parseAnnotations} from './types/annotations'
-import {ResourceTypeFleet, ResourceTypeManagedCluster} from './actions/deploy'
 
 export const inputAnnotations = parseAnnotations(
    core.getInput('annotations', {required: false})
@@ -15,18 +14,3 @@ export function getBufferTime(): number {
 
    return inputBufferTime
 }
-
-export function parseResourceTypeInput(rawInput: string): ClusterType {
-   switch (rawInput.toLowerCase()) {
-      case ResourceTypeFleet.toLowerCase():
-         return ResourceTypeFleet
-      case ResourceTypeManagedCluster.toLowerCase():
-         return ResourceTypeManagedCluster
-   }
-   throw new Error(
-      `Invalid resource type: ${rawInput}. Supported resource types are: ${ResourceTypeManagedCluster} (default), ${ResourceTypeFleet}`
-   )
-}
-export type ClusterType =
-   | typeof ResourceTypeManagedCluster
-   | typeof ResourceTypeFleet

src/run.ts

@@ -1,18 +1,12 @@
 import * as core from '@actions/core'
 import {getKubectlPath, Kubectl} from './types/kubectl'
-import {
+import {deploy} from './actions/deploy'
-   deploy,
-   ResourceTypeFleet,
-   ResourceTypeManagedCluster
-} from './actions/deploy'
-import {ClusterType} from './inputUtils'
 import {promote} from './actions/promote'
 import {reject} from './actions/reject'
 import {Action, parseAction} from './types/action'
 import {parseDeploymentStrategy} from './types/deploymentStrategy'
 import {getFilesFromDirectoriesAndURLs} from './utilities/fileUtils'
 import {PrivateKubectl} from './types/privatekubectl'
-import {parseResourceTypeInput} from './inputUtils'
 
 export async function run() {
    // verify kubeconfig is set
@@ -42,16 +36,6 @@ export async function run() {
    const resourceName = core.getInput('name') || ''
    const skipTlsVerify = core.getBooleanInput('skip-tls-verify')
 
-   let resourceType: ClusterType
-   try {
-      // included in the trycatch to allow raw input to go out of scope after parsing
-      const resourceTypeInput = core.getInput('resource-type')
-      resourceType = parseResourceTypeInput(resourceTypeInput)
-   } catch (e) {
-      core.setFailed(e)
-      return
-   }
-
    const kubectl = isPrivateCluster
       ? new PrivateKubectl(
            kubectlPath,
@@ -65,11 +49,11 @@ export async function run() {
    // run action
    switch (action) {
       case Action.DEPLOY: {
-         await deploy(kubectl, fullManifestFilePaths, strategy, resourceType)
+         await deploy(kubectl, fullManifestFilePaths, strategy)
          break
       }
       case Action.PROMOTE: {
-         await promote(kubectl, fullManifestFilePaths, strategy, resourceType)
+         await promote(kubectl, fullManifestFilePaths, strategy)
          break
       }
       case Action.REJECT: {

src/strategyHelpers/deploymentHelper.ts

@@ -35,7 +35,7 @@ import {
 } from '../utilities/githubUtils'
 import {getDeploymentConfig} from '../utilities/dockerUtils'
 import {DeployResult} from '../types/deployResult'
-import {ClusterType} from '../inputUtils'
+import {ClusterType} from '../actions/deploy'
 
 export async function deployManifests(
    files: string[],

src/utilities/manifestStabilityUtils.ts

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