Merge branch 'w/2.8/bugfix/ZENKO-4869' into w/2.9/bugfix/ZENKO-4869

.github/scripts/get-previous-tag.js

@@ -12,7 +12,11 @@ function getPreviousTag(version, allReleases) {
         // Find the latest release with the same prefix
         previous_tags = allReleases.filter(r => r.tag_name.startsWith(version));
         if (previous_tags.length > 0) {
-            return previous_tags.sort().reverse()[0].tag_name;
+            // Use a custom sort function, to ensure 'natural' sort of numeric parts
+            const compare = new Intl.Collator(undefined, { numeric: true }).compare;
+            return previous_tags.sort(
+                (a, b) => compare(a.tag_name, b.tag_name)
+            ).reverse()[0].tag_name;
         }
     }
 }

solution/kafka-connect/kafka-connect.yaml

@@ -21,7 +21,7 @@ rules:
 
   #kafka.producer:type=producer-topic-metrics,client-id="{clientid}",topic="{topic}"", partition="{partition}"
   #kafka.consumer:type=consumer-fetch-manager-metrics,client-id="{clientid}",topic="{topic}"", partition="{partition}"
-  - pattern: kafka.(.+)<type=(.+)-metrics, client-id=(.+), topic=(.+), partition=(.+)><>(.+-total|.+-rate|.+-avg|.+-replica|.+-lag|.+-lead)
+  - pattern: kafka.(.+)<type=(.+)-metrics, client-id=(.+), topic=(.+), partition=(.+)><>(.+-total|.+-rate|.+-avg|.+-max|.+-min|.+-replica|.+-lag|.+-lead)
     name: kafka_$2_$6
     labels:
       clientId: "$3"

tests/workflows/getPreviousTag.spec.js

@@ -13,6 +13,25 @@ it('should return the previous tag', async () => {
   expect(tag).toBe("1.2.0");
 });
 
+it('should return the previous tag out of order', async () => {
+  const tag = getPreviousTag("1.2.1", [
+    { tag_name: "1.1.2" }, { tag_name: "1.2.0" }, { tag_name: "1.1.1" },
+    { tag_name: "1.1.0" }, { tag_name: "1.3.0" }
+  ]);
+  expect(tag).toBe("1.2.0");
+});
+
+it('should return previous tag when > 10', async () => {
+  const tag = getPreviousTag("1.1.12", [
+    { tag_name: "1.1.0" }, { tag_name: "1.1.1" }, { tag_name: "1.1.2" },
+    { tag_name: "1.1.3" }, { tag_name: "1.1.4" }, { tag_name: "1.1.5" },
+    { tag_name: "1.1.6" }, { tag_name: "1.1.7" }, { tag_name: "1.1.8" },
+    { tag_name: "1.1.9" }, { tag_name: "1.1.10" }, { tag_name: "1.1.11" }, 
+    { tag_name: "1.2.0" }, { tag_name: "1.3.0" }
+  ]);
+  expect(tag).toBe("1.1.11");
+});
+
 it('should return the previous rc tag', async () => {
   const tag = getPreviousTag("1.2.1-rc.2", [
     { tag_name: "1.1.0" }, { tag_name: "1.1.1" }, { tag_name: "1.1.2-rc.1" },

tests/workflows/release.spec.ts

@@ -146,6 +146,7 @@ test.each([
 
     const result = await act.runEvent("workflow_dispatch", {
         logFile: process.env.ACT_LOG ? "act-release-"+expect.getState().currentTestName+".log" : undefined,
+        verbose: process.env.ACT_VERBOSE ? true : false,
         mockApi: [
             // Mock artifact promotion: copy, retrieve workflow run and set index
             mockapi.mock.artifacts.root