test case added

__tests__/run.test.ts

@@ -6,6 +6,8 @@ import * as deployment from '../src/utilities/strategy-helpers/deployment-helper
 import * as fs from 'fs';
 import * as io from '@actions/io';
 import * as toolCache from '@actions/tool-cache';
+import * as utility from '../src/utilities/utility';
+import * as inputParam from '../src/input-parameters';
 
 import { Kubectl, Resource } from '../src/kubectl-object-model';
 
@@ -16,6 +18,8 @@ var path = require('path');
 
 const coreMock = mocked(core, true);
 const ioMock = mocked(io, true);
+const utilityMock = mocked(utility, true);
+const inputParamMock = mocked(inputParam, true);
 
 const toolCacheMock = mocked(toolCache, true);
 const fileUtility = mocked(fs, true);
@@ -194,3 +198,37 @@ test("deployment - deploy() - Invokes with manifestfiles", async () => {
     expect(readFileSpy).toBeCalledWith("manifests/deployment.yaml");
     expect(kubeCtl.getResource).toBeCalledWith("ingress", "AppName");
 });
+
+test("run() - deploy force flag on", async () => {
+    const kubectlVersion = 'v1.18.0'
+    //Mocks
+    coreMock.getInput = jest.fn().mockImplementation((name) => {
+        if (name == 'manifests') {
+            return 'manifests/deployment.yaml';
+        }
+        if (name == 'action') {
+            return 'deploy';
+        }
+        if (name == 'strategy') {
+            return undefined;
+        }
+        if (name == 'force') {
+            return 'true';
+        }
+        return kubectlVersion;
+    });
+
+    inputParamMock.forceDeployment = true;
+    coreMock.setFailed = jest.fn();
+    toolCacheMock.find = jest.fn().mockReturnValue('validPath');
+    toolCacheMock.downloadTool = jest.fn().mockReturnValue('downloadpath');
+    toolCacheMock.cacheFile = jest.fn().mockReturnValue('cachepath');
+    fileUtility.chmodSync = jest.fn();
+    utilityMock.checkForErrors = jest.fn();
+    const deploySpy = jest.spyOn(Kubectl.prototype, 'apply').mockImplementation();
+
+    //Invoke and assert
+    await expect(action.run()).resolves.not.toThrow();
+    expect(deploySpy).toBeCalledWith(expect.anything(), true);
+    deploySpy.mockRestore();
+});

action.yml

@@ -42,7 +42,7 @@ inputs:
     required: true
     default: 'deploy'
   force:
-    description: 'Deploy when a previous deployment already exists'
+    description: 'Deploy when a previous deployment already exists. If true then '--force' argument is added to the apply command'.
     required: false
     default: false
 

lib/input-parameters.js

@@ -11,7 +11,7 @@ exports.deploymentStrategy = core.getInput('strategy');
 exports.trafficSplitMethod = core.getInput('traffic-split-method');
 exports.baselineAndCanaryReplicas = core.getInput('baseline-and-canary-replicas');
 exports.args = core.getInput('arguments');
-exports.forceDeployment = core.getInput('force').toLowerCase() === 'true';
+exports.forceDeployment = core.getInput('force').toLowerCase() == 'true';
 if (!exports.namespace) {
     core.debug('Namespace was not supplied; using "default" namespace instead.');
     exports.namespace = 'default';

lib/kubectl-object-model.js

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Kubectl = void 0;
 const tool_runner_1 = require("./utilities/tool-runner");
-const TaskInputParameters = require("./input-parameters");
 class Kubectl {
     constructor(kubectlPath, namespace, ignoreSSLErrors) {
         this.kubectlPath = kubectlPath;
@@ -23,9 +22,9 @@ class Kubectl {
             this.namespace = 'default';
         }
     }
-    apply(configurationPaths) {
+    apply(configurationPaths, force) {
         let applyArgs = ['apply', '-f', this.createInlineArray(configurationPaths)];
-        if (TaskInputParameters.forceDeployment) {
+        if (!!force) {
             console.log("force flag is on, deployment will continue even if previous deployment already exists");
             applyArgs.push('--force');
         }

lib/utilities/strategy-helpers/deployment-helper.js

@@ -67,10 +67,10 @@ function deployManifests(files, kubectl, isCanaryDeploymentStrategy) {
     else {
         if (canaryDeploymentHelper.isSMICanaryStrategy()) {
             const updatedManifests = appendStableVersionLabelToResource(files, kubectl);
-            result = kubectl.apply(updatedManifests);
+            result = kubectl.apply(updatedManifests, TaskInputParameters.forceDeployment);
         }
         else {
-            result = kubectl.apply(files);
+            result = kubectl.apply(files, TaskInputParameters.forceDeployment);
         }
     }
     utility_1.checkForErrors([result]);

lib/utilities/strategy-helpers/pod-canary-deployment-helper.js

@@ -48,7 +48,7 @@ function deployPodCanary(kubectl, filePaths) {
         });
     });
     const manifestFiles = fileHelper.writeObjectsToFile(newObjectsList);
-    const result = kubectl.apply(manifestFiles);
+    const result = kubectl.apply(manifestFiles, TaskInputParameters.forceDeployment);
     return { 'result': result, 'newFilePaths': manifestFiles };
 }
 exports.deployPodCanary = deployPodCanary;

lib/utilities/strategy-helpers/smi-canary-deployment-helper.js

@@ -56,7 +56,7 @@ function deploySMICanary(kubectl, filePaths) {
         });
     });
     const manifestFiles = fileHelper.writeObjectsToFile(newObjectsList);
-    const result = kubectl.apply(manifestFiles);
+    const result = kubectl.apply(manifestFiles, TaskInputParameters.forceDeployment);
     createCanaryService(kubectl, filePaths);
     return { 'result': result, 'newFilePaths': manifestFiles };
 }
@@ -111,7 +111,7 @@ function createCanaryService(kubectl, filePaths) {
     });
     const manifestFiles = fileHelper.writeObjectsToFile(newObjectsList);
     manifestFiles.push(...trafficObjectsList);
-    const result = kubectl.apply(manifestFiles);
+    const result = kubectl.apply(manifestFiles, TaskInputParameters.forceDeployment);
     utility_1.checkForErrors([result]);
 }
 function redirectTrafficToCanaryDeployment(kubectl, manifestFilePaths) {
@@ -144,7 +144,7 @@ function adjustTraffic(kubectl, manifestFilePaths, stableWeight, canaryWeight) {
     if (trafficSplitManifests.length <= 0) {
         return;
     }
-    const result = kubectl.apply(trafficSplitManifests);
+    const result = kubectl.apply(trafficSplitManifests, TaskInputParameters.forceDeployment);
     core.debug('serviceObjects:' + serviceObjects.join(',') + ' result:' + result);
     utility_1.checkForErrors([result]);
 }

src/input-parameters.ts

@@ -11,7 +11,7 @@ export const deploymentStrategy: string = core.getInput('strategy');
 export const trafficSplitMethod: string = core.getInput('traffic-split-method');
 export const baselineAndCanaryReplicas: string = core.getInput('baseline-and-canary-replicas');
 export const args: string = core.getInput('arguments');
-export const forceDeployment: boolean = core.getInput('force').toLowerCase() === 'true';
+export const forceDeployment: boolean = core.getInput('force').toLowerCase() == 'true';
 
 if (!namespace) {
     core.debug('Namespace was not supplied; using "default" namespace instead.');

src/kubectl-object-model.ts

@@ -1,5 +1,4 @@
 import { ToolRunner, IExecOptions } from "./utilities/tool-runner";
-import * as TaskInputParameters from './input-parameters';
 
 export interface Resource {
     name: string;
@@ -21,10 +20,10 @@ export class Kubectl {
         }
     }
 
-    public apply(configurationPaths: string | string[]) {
+    public apply(configurationPaths: string | string[], force?: boolean) {
         let applyArgs: string[] = ['apply', '-f', this.createInlineArray(configurationPaths)];
 
-        if (TaskInputParameters.forceDeployment) {
+        if (!!force) {
             console.log("force flag is on, deployment will continue even if previous deployment already exists");
             applyArgs.push('--force');
         }

src/utilities/strategy-helpers/deployment-helper.ts

@@ -66,10 +66,10 @@ function deployManifests(files: string[], kubectl: Kubectl, isCanaryDeploymentSt
     } else {
         if (canaryDeploymentHelper.isSMICanaryStrategy()) {
             const updatedManifests = appendStableVersionLabelToResource(files, kubectl);
-            result = kubectl.apply(updatedManifests);
+            result = kubectl.apply(updatedManifests, TaskInputParameters.forceDeployment);
         }
         else {
-            result = kubectl.apply(files);
+            result = kubectl.apply(files, TaskInputParameters.forceDeployment);
         }
     }
     checkForErrors([result]);

src/utilities/strategy-helpers/pod-canary-deployment-helper.ts

@@ -52,7 +52,7 @@ export function deployPodCanary(kubectl: Kubectl, filePaths: string[]) {
     });
 
     const manifestFiles = fileHelper.writeObjectsToFile(newObjectsList);
-    const result = kubectl.apply(manifestFiles);
+    const result = kubectl.apply(manifestFiles, TaskInputParameters.forceDeployment);
     return { 'result': result, 'newFilePaths': manifestFiles };
 }
 

src/utilities/strategy-helpers/smi-canary-deployment-helper.ts

@@ -60,7 +60,7 @@ export function deploySMICanary(kubectl: Kubectl, filePaths: string[]) {
     });
 
     const manifestFiles = fileHelper.writeObjectsToFile(newObjectsList);
-    const result = kubectl.apply(manifestFiles);
+    const result = kubectl.apply(manifestFiles, TaskInputParameters.forceDeployment);
     createCanaryService(kubectl, filePaths);
     return { 'result': result, 'newFilePaths': manifestFiles };
 }
@@ -121,7 +121,7 @@ function createCanaryService(kubectl: Kubectl, filePaths: string[]) {
 
     const manifestFiles = fileHelper.writeObjectsToFile(newObjectsList);
     manifestFiles.push(...trafficObjectsList);
-    const result = kubectl.apply(manifestFiles);
+    const result = kubectl.apply(manifestFiles, TaskInputParameters.forceDeployment);
     checkForErrors([result]);
 }
 
@@ -159,7 +159,7 @@ function adjustTraffic(kubectl: Kubectl, manifestFilePaths: string[], stableWeig
         return;
     }
 
-    const result = kubectl.apply(trafficSplitManifests);
+    const result = kubectl.apply(trafficSplitManifests, TaskInputParameters.forceDeployment);
     core.debug('serviceObjects:' + serviceObjects.join(',') + ' result:' + result);
     checkForErrors([result]);
 }