Add node modules and compiled JavaScript from main

* changed ubuntu runner

* changed minikube action

* Version formatting

* nonedriveR

* update kube version

* installing conntrack'

* updated other actions

* update bg ingress api version

* prettify

* updated ingress backend for new api version

* Added path type

* prettify

README.md

@@ -128,7 +128,7 @@ Following are the key capabilities of this action:
 ### Basic deployment (without any deployment strategy)
 
 ```yaml
-- uses: Azure/k8s-deploy@v4
+- uses: Azure/k8s-deploy@v3.1
   with:
      namespace: 'myapp'
      manifests: |
@@ -162,7 +162,7 @@ Following are the key capabilities of this action:
 ### Canary deployment without service mesh
 
 ```yaml
-- uses: Azure/k8s-deploy@v4
+- uses: Azure/k8s-deploy@v3.1
   with:
      namespace: 'myapp'
      images: 'contoso.azurecr.io/myapp:${{ event.run_id }}'
@@ -181,7 +181,7 @@ Following are the key capabilities of this action:
 To promote/reject the canary created by the above snippet, the following YAML snippet could be used:
 
 ```yaml
-- uses: Azure/k8s-deploy@v4
+- uses: Azure/k8s-deploy@v3.1
   with:
      namespace: 'myapp'
      images: 'contoso.azurecr.io/myapp:${{ event.run_id }}'
@@ -199,7 +199,7 @@ To promote/reject the canary created by the above snippet, the following YAML sn
 ### Canary deployment based on Service Mesh Interface
 
 ```yaml
-- uses: Azure/k8s-deploy@v4
+- uses: Azure/k8s-deploy@v3.1
   with:
      namespace: 'myapp'
      images: 'contoso.azurecr.io/myapp:${{ event.run_id }}'
@@ -220,7 +220,7 @@ To promote/reject the canary created by the above snippet, the following YAML sn
 To promote/reject the canary created by the above snippet, the following YAML snippet could be used:
 
 ```yaml
-- uses: Azure/k8s-deploy@v4
+- uses: Azure/k8s-deploy@v3.1
   with:
      namespace: 'myapp'
      images: 'contoso.azurecr.io/myapp:${{ event.run_id }} '
@@ -239,7 +239,7 @@ To promote/reject the canary created by the above snippet, the following YAML sn
 ### Blue-Green deployment with different route methods
 
 ```yaml
-- uses: Azure/k8s-deploy@v4
+- uses: Azure/k8s-deploy@v3.1
   with:
      namespace: 'myapp'
      images: 'contoso.azurecr.io/myapp:${{ event.run_id }}'
@@ -259,7 +259,7 @@ To promote/reject the canary created by the above snippet, the following YAML sn
 To promote/reject the green workload created by the above snippet, the following YAML snippet could be used:
 
 ```yaml
-- uses: Azure/k8s-deploy@v4
+- uses: Azure/k8s-deploy@v3.1
   with:
      namespace: 'myapp'
      images: 'contoso.azurecr.io/myapp:${{ event.run_id }}'
@@ -316,7 +316,7 @@ jobs:
               container-registry-password: ${{ secrets.REGISTRY_PASSWORD }}
               secret-name: demo-k8s-secret
 
-         - uses: Azure/k8s-deploy@v4
+         - uses: Azure/k8s-deploy@v3.1
            with:
               action: deploy
               manifests: |
@@ -362,7 +362,7 @@ jobs:
               container-registry-password: ${{ secrets.REGISTRY_PASSWORD }}
               secret-name: demo-k8s-secret
 
-         - uses: Azure/k8s-deploy@v4
+         - uses: Azure/k8s-deploy@v3.1
            with:
               action: deploy
               manifests: |

lib/index.js

@@ -140,6 +140,7 @@ const file_command_1 = __nccwpck_require__(8466);
 const utils_1 = __nccwpck_require__(7369);
 const os = __importStar(__nccwpck_require__(2037));
 const path = __importStar(__nccwpck_require__(1017));
+const uuid_1 = __nccwpck_require__(487);
 const oidc_utils_1 = __nccwpck_require__(7557);
 /**
  * The code to exit an action
@@ -169,9 +170,20 @@ function exportVariable(name, val) {
     process.env[name] = convertedVal;
     const filePath = process.env['GITHUB_ENV'] || '';
     if (filePath) {
-        return file_command_1.issueFileCommand('ENV', file_command_1.prepareKeyValueMessage(name, val));
+        const delimiter = `ghadelimiter_${uuid_1.v4()}`;
+        // These should realistically never happen, but just in case someone finds a way to exploit uuid generation let's not allow keys or values that contain the delimiter.
+        if (name.includes(delimiter)) {
+            throw new Error(`Unexpected input: name should not contain the delimiter "${delimiter}"`);
+        }
+        if (convertedVal.includes(delimiter)) {
+            throw new Error(`Unexpected input: value should not contain the delimiter "${delimiter}"`);
+        }
+        const commandValue = `${name}<<${delimiter}${os.EOL}${convertedVal}${os.EOL}${delimiter}`;
+        file_command_1.issueCommand('ENV', commandValue);
+    }
+    else {
+        command_1.issueCommand('set-env', { name }, convertedVal);
     }
-    command_1.issueCommand('set-env', { name }, convertedVal);
 }
 exports.exportVariable = exportVariable;
 /**
@@ -189,7 +201,7 @@ exports.setSecret = setSecret;
 function addPath(inputPath) {
     const filePath = process.env['GITHUB_PATH'] || '';
     if (filePath) {
-        file_command_1.issueFileCommand('PATH', inputPath);
+        file_command_1.issueCommand('PATH', inputPath);
     }
     else {
         command_1.issueCommand('add-path', {}, inputPath);
@@ -229,10 +241,7 @@ function getMultilineInput(name, options) {
     const inputs = getInput(name, options)
         .split('\n')
         .filter(x => x !== '');
-    if (options && options.trimWhitespace === false) {
-        return inputs;
-    }
-    return inputs.map(input => input.trim());
+    return inputs;
 }
 exports.getMultilineInput = getMultilineInput;
 /**
@@ -265,12 +274,8 @@ exports.getBooleanInput = getBooleanInput;
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function setOutput(name, value) {
-    const filePath = process.env['GITHUB_OUTPUT'] || '';
-    if (filePath) {
-        return file_command_1.issueFileCommand('OUTPUT', file_command_1.prepareKeyValueMessage(name, value));
-    }
     process.stdout.write(os.EOL);
-    command_1.issueCommand('set-output', { name }, utils_1.toCommandValue(value));
+    command_1.issueCommand('set-output', { name }, value);
 }
 exports.setOutput = setOutput;
 /**
@@ -399,11 +404,7 @@ exports.group = group;
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function saveState(name, value) {
-    const filePath = process.env['GITHUB_STATE'] || '';
-    if (filePath) {
-        return file_command_1.issueFileCommand('STATE', file_command_1.prepareKeyValueMessage(name, value));
-    }
-    command_1.issueCommand('save-state', { name }, utils_1.toCommandValue(value));
+    command_1.issueCommand('save-state', { name }, value);
 }
 exports.saveState = saveState;
 /**
@@ -469,14 +470,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.prepareKeyValueMessage = exports.issueFileCommand = void 0;
+exports.issueCommand = void 0;
 // We use any as a valid input type
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const fs = __importStar(__nccwpck_require__(7147));
 const os = __importStar(__nccwpck_require__(2037));
-const uuid_1 = __nccwpck_require__(487);
 const utils_1 = __nccwpck_require__(7369);
-function issueFileCommand(command, message) {
+function issueCommand(command, message) {
     const filePath = process.env[`GITHUB_${command}`];
     if (!filePath) {
         throw new Error(`Unable to find environment variable for file command ${command}`);
@@ -488,22 +488,7 @@ function issueFileCommand(command, message) {
         encoding: 'utf8'
     });
 }
-exports.issueFileCommand = issueFileCommand;
-function prepareKeyValueMessage(key, value) {
-    const delimiter = `ghadelimiter_${uuid_1.v4()}`;
-    const convertedValue = utils_1.toCommandValue(value);
-    // These should realistically never happen, but just in case someone finds a
-    // way to exploit uuid generation let's not allow keys or values that contain
-    // the delimiter.
-    if (key.includes(delimiter)) {
-        throw new Error(`Unexpected input: name should not contain the delimiter "${delimiter}"`);
-    }
-    if (convertedValue.includes(delimiter)) {
-        throw new Error(`Unexpected input: value should not contain the delimiter "${delimiter}"`);
-    }
-    return `${key}<<${delimiter}${os.EOL}${convertedValue}${os.EOL}${delimiter}`;
-}
-exports.prepareKeyValueMessage = prepareKeyValueMessage;
+exports.issueCommand = issueCommand;
 //# sourceMappingURL=file-command.js.map
 
 /***/ }),
@@ -22017,20 +22002,12 @@ function checkManifestStability(kubectl, resources) {
 exports.checkManifestStability = checkManifestStability;
 function annotateAndLabelResources(files, kubectl, resourceTypes, allPods) {
     return __awaiter(this, void 0, void 0, function* () {
-        const defaultWorkflowFileName = 'k8s-deploy-failed-workflow-annotation';
         const githubToken = core.getInput('token');
-        let workflowFilePath;
-        try {
-            workflowFilePath = yield githubUtils_1.getWorkflowFilePath(githubToken);
-        }
-        catch (ex) {
-            core.warning(`Failed to extract workflow file name: ${ex}`);
-            workflowFilePath = defaultWorkflowFileName;
-        }
+        const workflowFilePath = yield githubUtils_1.getWorkflowFilePath(githubToken);
         const deploymentConfig = yield dockerUtils_1.getDeploymentConfig();
         const annotationKeyLabel = workflowAnnotationUtils_1.getWorkflowAnnotationKeyLabel();
-        yield annotateResources(files, kubectl, resourceTypes, allPods, annotationKeyLabel, workflowFilePath, deploymentConfig).catch((err) => core.warning(`Failed to annotate resources: ${err} `));
-        yield labelResources(files, kubectl, annotationKeyLabel).catch((err) => core.warning(`Failed to label resources: ${err}`));
+        yield annotateResources(files, kubectl, resourceTypes, allPods, annotationKeyLabel, workflowFilePath, deploymentConfig);
+        yield labelResources(files, kubectl, annotationKeyLabel);
     });
 }
 exports.annotateAndLabelResources = annotateAndLabelResources;
@@ -22083,7 +22060,7 @@ function labelResources(files, kubectl, label) {
         const labelResults = [];
         for (const file of files) {
             try {
-                const labelResult = yield kubectl.labelFiles(file, labels);
+                const labelResult = yield kubectl.labelFiles(files, labels);
                 labelResults.push(labelResult);
             }
             catch (e) {
@@ -22368,17 +22345,13 @@ class Kubectl {
             let newReplicaSet = '';
             if (result === null || result === void 0 ? void 0 : result.stdout) {
                 const stdout = result.stdout.split('\n');
-                core.debug('stdout from getNewReplicaSet is ' + JSON.stringify(stdout));
                 stdout.forEach((line) => {
                     const newreplicaset = 'newreplicaset';
-                    if (line && line.toLowerCase().indexOf(newreplicaset) > -1) {
-                        core.debug(`found string of interest for replicaset, line is ${line}`);
-                        core.debug(`substring is ${line.substring(newreplicaset.length).trim()}`);
+                    if (line && line.toLowerCase().indexOf(newreplicaset) > -1)
                         newReplicaSet = line
                             .substring(newreplicaset.length)
                             .trim()
                             .split(' ')[0];
-                    }
                 });
             }
             return newReplicaSet;
@@ -23815,9 +23788,8 @@ exports.getTrafficSplitAPIVersion = getTrafficSplitAPIVersion;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.removeInvalidLabelCharacters = exports.cleanLabel = exports.getWorkflowAnnotationKeyLabel = exports.getWorkflowAnnotations = exports.VALID_LABEL_REGEX = void 0;
+exports.cleanLabel = exports.getWorkflowAnnotationKeyLabel = exports.getWorkflowAnnotations = void 0;
 const ANNOTATION_PREFIX = 'actions.github.com';
-exports.VALID_LABEL_REGEX = /([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9]/;
 function getWorkflowAnnotations(lastSuccessRunSha, workflowFilePath, deploymentConfig) {
     const annotationObject = {
         run: process.env.GITHUB_RUN_ID,
@@ -23849,20 +23821,14 @@ exports.getWorkflowAnnotationKeyLabel = getWorkflowAnnotationKeyLabel;
  * @returns cleaned label
  */
 function cleanLabel(label) {
-    let removedInvalidChars = removeInvalidLabelCharacters(label);
-    const regexResult = exports.VALID_LABEL_REGEX.exec(removedInvalidChars) || [
-        'github-workflow-file'
-    ];
-    return regexResult[0];
-}
-exports.cleanLabel = cleanLabel;
-function removeInvalidLabelCharacters(label) {
-    return label
+    let removedInvalidChars = label
         .replace(/\s/gi, '_')
         .replace(/[\/\\\|]/gi, '-')
         .replace(/[^-A-Za-z0-9_.]/gi, '');
+    const regex = /([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9]/;
+    return regex.exec(removedInvalidChars)[0] || '';
 }
-exports.removeInvalidLabelCharacters = removeInvalidLabelCharacters;
+exports.cleanLabel = cleanLabel;
 
 
 /***/ }),

package-lock.json

@@ -9,7 +9,7 @@
          "version": "0.0.0",
          "license": "MIT",
          "dependencies": {
-            "@actions/core": "^1.10.0",
+            "@actions/core": "^1.9.1",
             "@actions/exec": "^1.0.0",
             "@actions/io": "^1.0.0",
             "@actions/tool-cache": "1.1.2",
@@ -30,9 +30,9 @@
          }
       },
       "node_modules/@actions/core": {
-         "version": "1.10.0",
-         "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
-         "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
+         "version": "1.9.1",
+         "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
+         "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
          "dependencies": {
             "@actions/http-client": "^2.0.1",
             "uuid": "^8.3.2"
@@ -6529,9 +6529,9 @@
    },
    "dependencies": {
       "@actions/core": {
-         "version": "1.10.0",
-         "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
-         "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
+         "version": "1.9.1",
+         "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
+         "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
          "requires": {
             "@actions/http-client": "^2.0.1",
             "uuid": "^8.3.2"

package.json

@@ -11,7 +11,7 @@
       "format-check": "prettier --check ."
    },
    "dependencies": {
-      "@actions/core": "^1.10.0",
+      "@actions/core": "^1.9.1",
       "@actions/exec": "^1.0.0",
       "@actions/io": "^1.0.0",
       "@actions/tool-cache": "1.1.2",

src/strategyHelpers/deploymentHelper.ts

@@ -150,15 +150,8 @@ export async function annotateAndLabelResources(
    resourceTypes: Resource[],
    allPods: any
 ) {
-   const defaultWorkflowFileName = 'k8s-deploy-failed-workflow-annotation'
    const githubToken = core.getInput('token')
-   let workflowFilePath
-   try {
-      workflowFilePath = await getWorkflowFilePath(githubToken)
-   } catch (ex) {
-      core.warning(`Failed to extract workflow file name: ${ex}`)
-      workflowFilePath = defaultWorkflowFileName
-   }
+   const workflowFilePath = await getWorkflowFilePath(githubToken)
 
    const deploymentConfig = await getDeploymentConfig()
    const annotationKeyLabel = getWorkflowAnnotationKeyLabel()
@@ -171,11 +164,8 @@ export async function annotateAndLabelResources(
       annotationKeyLabel,
       workflowFilePath,
       deploymentConfig
-   ).catch((err) => core.warning(`Failed to annotate resources: ${err} `))
-
-   await labelResources(files, kubectl, annotationKeyLabel).catch((err) =>
-      core.warning(`Failed to label resources: ${err}`)
    )
+   await labelResources(files, kubectl, annotationKeyLabel)
 }
 
 async function annotateResources(
@@ -268,7 +258,7 @@ async function labelResources(
    const labelResults = []
    for (const file of files) {
       try {
-         const labelResult = await kubectl.labelFiles(file, labels)
+         const labelResult = await kubectl.labelFiles(files, labels)
          labelResults.push(labelResult)
       } catch (e) {
          core.warning(`failed to annotate resource: ${e}`)

src/types/kubectl.ts

@@ -70,21 +70,13 @@ export class Kubectl {
       let newReplicaSet = ''
       if (result?.stdout) {
          const stdout = result.stdout.split('\n')
-         core.debug('stdout from getNewReplicaSet is ' + JSON.stringify(stdout))
          stdout.forEach((line: string) => {
             const newreplicaset = 'newreplicaset'
-            if (line && line.toLowerCase().indexOf(newreplicaset) > -1) {
-               core.debug(
-                  `found string of interest for replicaset, line is ${line}`
-               )
-               core.debug(
-                  `substring is ${line.substring(newreplicaset.length).trim()}`
-               )
+            if (line && line.toLowerCase().indexOf(newreplicaset) > -1)
                newReplicaSet = line
                   .substring(newreplicaset.length)
                   .trim()
                   .split(' ')[0]
-            }
          })
       }
 

src/utilities/workflowAnnotationUtils.test.ts

@@ -1,8 +1,4 @@
-import {
-   cleanLabel,
-   removeInvalidLabelCharacters,
-   VALID_LABEL_REGEX
-} from '../utilities/workflowAnnotationUtils'
+import {cleanLabel} from '../utilities/workflowAnnotationUtils'
 
 describe('WorkflowAnnotationUtils', () => {
    describe('cleanLabel', () => {
@@ -20,14 +16,5 @@ describe('WorkflowAnnotationUtils', () => {
             cleanLabel('Workflow Name / With Slashes / And Spaces')
          ).toEqual('Workflow_Name_-_With_Slashes_-_And_Spaces')
       })
-      it('should return a blank string when regex fails (https://github.com/Azure/k8s-deploy/issues/266)', () => {
-         const label = '持续部署'
-         expect(cleanLabel(label)).toEqual('github-workflow-file')
-
-         let removedInvalidChars = removeInvalidLabelCharacters(label)
-
-         const regexResult = VALID_LABEL_REGEX.exec(removedInvalidChars)
-         expect(regexResult).toBe(null)
-      })
    })
 })

src/utilities/workflowAnnotationUtils.ts

@@ -2,8 +2,6 @@ import {DeploymentConfig} from '../types/deploymentConfig'
 
 const ANNOTATION_PREFIX = 'actions.github.com'
 
-export const VALID_LABEL_REGEX = /([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9]/
-
 export function getWorkflowAnnotations(
    lastSuccessRunSha: string,
    workflowFilePath: string,
@@ -39,17 +37,11 @@ export function getWorkflowAnnotationKeyLabel(): string {
  * @returns cleaned label
  */
 export function cleanLabel(label: string): string {
-   let removedInvalidChars = removeInvalidLabelCharacters(label)
-
-   const regexResult = VALID_LABEL_REGEX.exec(removedInvalidChars) || [
-      'github-workflow-file'
-   ]
-   return regexResult[0]
-}
-
-export function removeInvalidLabelCharacters(label: string): string {
-   return label
+   let removedInvalidChars = label
       .replace(/\s/gi, '_')
       .replace(/[\/\\\|]/gi, '-')
       .replace(/[^-A-Za-z0-9_.]/gi, '')
+
+   const regex = /([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9]/
+   return regex.exec(removedInvalidChars)[0] || ''
 }