added oliver's feedback + unit test demonstrating regex glitch and fix

jaiveerk · Dec 12, 2022 · 86aca60 · 86aca60
1 parent f507264
commit 86aca60
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 26 deletions.
diff --git a/src/strategyHelpers/deploymentHelper.ts b/src/strategyHelpers/deploymentHelper.ts
@@ -162,25 +162,20 @@ export async function annotateAndLabelResources(
 
    const deploymentConfig = await getDeploymentConfig()
    const annotationKeyLabel = getWorkflowAnnotationKeyLabel()
-   try {
-      await annotateResources(
-         files,
-         kubectl,
-         resourceTypes,
-         allPods,
-         annotationKeyLabel,
-         workflowFilePath,
-         deploymentConfig
-      )
-   } catch (ex) {
-      core.warning(`Failed to annotate resources: ${ex} `)
-   }
 
-   try {
-      await labelResources(files, kubectl, annotationKeyLabel)
-   } catch (ex) {
-      core.warning(`Failed to label resources: ${ex}`)
-   }
+   await annotateResources(
+      files,
+      kubectl,
+      resourceTypes,
+      allPods,
+      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}`)
+   )
 }
 
 async function annotateResources(

diff --git a/src/types/kubectl.ts b/src/types/kubectl.ts
@@ -73,17 +73,18 @@ export class Kubectl {
          core.debug('stdout from getNewReplicaSet is ' + JSON.stringify(stdout))
          stdout.forEach((line: string) => {
             const newreplicaset = 'newreplicaset'
-            if (line && line.toLowerCase().indexOf(newreplicaset) > -1)
+            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()}`
-            )
-            newReplicaSet = line
-               .substring(newreplicaset.length)
-               .trim()
-               .split(' ')[0]
+               core.debug(
+                  `substring is ${line.substring(newreplicaset.length).trim()}`
+               )
+               newReplicaSet = line
+                  .substring(newreplicaset.length)
+                  .trim()
+                  .split(' ')[0]
+            }
          })
       }
 

diff --git a/src/utilities/workflowAnnotationUtils.test.ts b/src/utilities/workflowAnnotationUtils.test.ts
@@ -16,5 +16,18 @@ 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('')
+
+         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]/
+         const regexResult = regex.exec(removedInvalidChars)
+         expect(regexResult).toBe(null)
+      })
    })
 })