From c0dbd623b5ae5dcf8f7930ec81d341b558f672b6 Mon Sep 17 00:00:00 2001 From: Prudhvi Godithi Date: Thu, 6 Jun 2024 10:00:11 -0700 Subject: [PATCH] Update the release inputs with release versions (#41) Signed-off-by: Prudhvi Godithi --- infrastructure/package-lock.json | 22 +++++++++---------- infrastructure/package.json | 2 +- .../metrics/release/ReleaseInputs.java | 8 ++++--- .../metrics/release/ReleaseInputsTest.java | 19 ++++++++++++---- 4 files changed, 32 insertions(+), 19 deletions(-) diff --git a/infrastructure/package-lock.json b/infrastructure/package-lock.json index f5ae636..2cfd42d 100644 --- a/infrastructure/package-lock.json +++ b/infrastructure/package-lock.json @@ -8,7 +8,7 @@ "name": "infrastructure", "version": "0.1.0", "dependencies": { - "aws-cdk-lib": "2.131.0", + "aws-cdk-lib": "2.144.0", "constructs": "^10.0.0", "source-map-support": "^0.5.21" }, @@ -1250,9 +1250,9 @@ } }, "node_modules/aws-cdk-lib": { - "version": "2.131.0", - "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.131.0.tgz", - "integrity": "sha512-9XLgiTgY+q0S3K93VPeJO0chIN8BZwZ3aSrILvF868Dz+0NTNrD2m5M0xGK5Rw0uoJS+N+DvGaz/2hLAiVqcBw==", + "version": "2.144.0", + "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.144.0.tgz", + "integrity": "sha512-DpyIyTs8NHX6WgAyYM2mGorirIk+eTjWzXGQRfzAe40qkwcqsb5Ax4JEl5gz1OEo9QIJIgWDtmImgWN0tUbILA==", "bundleDependencies": [ "@balena/dockerignore", "case", @@ -1266,10 +1266,11 @@ "yaml", "mime-types" ], + "license": "Apache-2.0", "dependencies": { "@aws-cdk/asset-awscli-v1": "^2.2.202", "@aws-cdk/asset-kubectl-v20": "^2.1.2", - "@aws-cdk/asset-node-proxy-agent-v6": "^2.0.1", + "@aws-cdk/asset-node-proxy-agent-v6": "^2.0.3", "@balena/dockerignore": "^1.0.2", "case": "1.6.3", "fs-extra": "^11.2.0", @@ -1279,7 +1280,7 @@ "minimatch": "^3.1.2", "punycode": "^2.3.1", "semver": "^7.6.0", - "table": "^6.8.1", + "table": "^6.8.2", "yaml": "1.10.2" }, "engines": { @@ -1295,14 +1296,14 @@ "license": "Apache-2.0" }, "node_modules/aws-cdk-lib/node_modules/ajv": { - "version": "8.12.0", + "version": "8.13.0", "inBundle": true, "license": "MIT", "dependencies": { - "fast-deep-equal": "^3.1.1", + "fast-deep-equal": "^3.1.3", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" + "uri-js": "^4.4.1" }, "funding": { "type": "github", @@ -1567,7 +1568,7 @@ } }, "node_modules/aws-cdk-lib/node_modules/table": { - "version": "6.8.1", + "version": "6.8.2", "inBundle": true, "license": "BSD-3-Clause", "dependencies": { @@ -3866,7 +3867,6 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, "engines": { "node": ">=6" } diff --git a/infrastructure/package.json b/infrastructure/package.json index cffa0ad..d68646a 100644 --- a/infrastructure/package.json +++ b/infrastructure/package.json @@ -20,7 +20,7 @@ "typescript": "~3.9.7" }, "dependencies": { - "aws-cdk-lib": "2.131.0", + "aws-cdk-lib": "2.144.0", "constructs": "^10.0.0", "source-map-support": "^0.5.21" } diff --git a/src/main/java/org/opensearchmetrics/metrics/release/ReleaseInputs.java b/src/main/java/org/opensearchmetrics/metrics/release/ReleaseInputs.java index 965b4d2..6875d29 100644 --- a/src/main/java/org/opensearchmetrics/metrics/release/ReleaseInputs.java +++ b/src/main/java/org/opensearchmetrics/metrics/release/ReleaseInputs.java @@ -4,9 +4,11 @@ public enum ReleaseInputs { VERSION_3_0_0("3.0.0", "open", "main"), VERSION_2_12_0("2.12.0", "closed", "2.12"), VERSION_2_13_0("2.13.0", "closed", "2.13"), - - VERSION_2_14_0("2.14.0", "open", "2.x"), - VERSION_1_3_15("1.3.15", "closed", "1.3"); + VERSION_2_14_0("2.14.0", "closed", "2.14"), + VERSION_2_15_0("2.15.0", "open", "2.x"), + VERSION_1_3_15("1.3.15", "closed", "1.3"), + VERSION_1_3_16("1.3.16", "closed", "1.3"), + VERSION_1_3_17("1.3.17", "open", "1.3"); private final String version; private final String state; diff --git a/src/test/java/org/opensearchmetrics/metrics/release/ReleaseInputsTest.java b/src/test/java/org/opensearchmetrics/metrics/release/ReleaseInputsTest.java index 4aaa64e..d4852e6 100644 --- a/src/test/java/org/opensearchmetrics/metrics/release/ReleaseInputsTest.java +++ b/src/test/java/org/opensearchmetrics/metrics/release/ReleaseInputsTest.java @@ -13,16 +13,22 @@ public void testGetVersion() { assertEquals("2.12.0", ReleaseInputs.VERSION_2_12_0.getVersion()); assertEquals("2.13.0", ReleaseInputs.VERSION_2_13_0.getVersion()); assertEquals("2.14.0", ReleaseInputs.VERSION_2_14_0.getVersion()); + assertEquals("2.15.0", ReleaseInputs.VERSION_2_15_0.getVersion()); assertEquals("1.3.15", ReleaseInputs.VERSION_1_3_15.getVersion()); + assertEquals("1.3.16", ReleaseInputs.VERSION_1_3_16.getVersion()); + assertEquals("1.3.17", ReleaseInputs.VERSION_1_3_17.getVersion()); } @Test public void testGetState() { assertEquals("open", ReleaseInputs.VERSION_3_0_0.getState()); assertEquals("closed", ReleaseInputs.VERSION_2_12_0.getState()); - assertEquals("open", ReleaseInputs.VERSION_2_14_0.getState()); assertEquals("closed", ReleaseInputs.VERSION_2_13_0.getState()); + assertEquals("closed", ReleaseInputs.VERSION_2_14_0.getState()); + assertEquals("open", ReleaseInputs.VERSION_2_15_0.getState()); assertEquals("closed", ReleaseInputs.VERSION_1_3_15.getState()); + assertEquals("closed", ReleaseInputs.VERSION_1_3_16.getState()); + assertEquals("open", ReleaseInputs.VERSION_1_3_17.getState()); } @Test @@ -30,18 +36,23 @@ public void testGetBranch() { assertEquals("main", ReleaseInputs.VERSION_3_0_0.getBranch()); assertEquals("2.12", ReleaseInputs.VERSION_2_12_0.getBranch()); assertEquals("2.13", ReleaseInputs.VERSION_2_13_0.getBranch()); - assertEquals("2.x", ReleaseInputs.VERSION_2_14_0.getBranch()); + assertEquals("2.14", ReleaseInputs.VERSION_2_14_0.getBranch()); + assertEquals("2.x", ReleaseInputs.VERSION_2_15_0.getBranch()); assertEquals("1.3", ReleaseInputs.VERSION_1_3_15.getBranch()); + assertEquals("1.3", ReleaseInputs.VERSION_1_3_16.getBranch()); } @Test public void testGetAllReleaseInputs() { ReleaseInputs[] releaseInputs = ReleaseInputs.getAllReleaseInputs(); - assertEquals(5, releaseInputs.length); + assertEquals(8, releaseInputs.length); assertEquals(ReleaseInputs.VERSION_3_0_0, releaseInputs[0]); assertEquals(ReleaseInputs.VERSION_2_12_0, releaseInputs[1]); assertEquals(ReleaseInputs.VERSION_2_13_0, releaseInputs[2]); assertEquals(ReleaseInputs.VERSION_2_14_0, releaseInputs[3]); - assertEquals(ReleaseInputs.VERSION_1_3_15, releaseInputs[4]); + assertEquals(ReleaseInputs.VERSION_2_15_0, releaseInputs[4]); + assertEquals(ReleaseInputs.VERSION_1_3_15, releaseInputs[5]); + assertEquals(ReleaseInputs.VERSION_1_3_16, releaseInputs[6]); + assertEquals(ReleaseInputs.VERSION_1_3_17, releaseInputs[7]); } }