Bumped version to 1.3.0.0 (#884)

* Bumped version to 1.3.0.0 Signed-off-by: Dave Lago <davelago@amazon.com>
opensearch-project · Jan 6, 2022 · 415c95b · 415c95b
1 parent 394ad26
commit 415c95b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 38 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -28,7 +28,7 @@ module.exports = {
         '@osd/eslint/require-license-header': [
           'error',
           {
-            license: LICENSE_HEADER,
+            licenses: [LICENSE_HEADER],
           },
         ],
         "no-console": 0

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -13,36 +13,15 @@ jobs:
     name: Run integration tests
     runs-on: ubuntu-latest
     steps:
-      # build backend plugin
-      - name: Set up JDK 14
-        uses: actions/setup-java@v1
-        with:
-          java-version: 14.0.x
-
-      - name: Cache Maven packages
-        uses: actions/cache@v1
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-
-      - name: Checkout security plugin
-        uses: actions/checkout@v2
-        with:
-          repository: 'opensearch-project/security'
-          path: security
-          ref: 'main'
-
-      - name: Build security plugin
-        working-directory: ./security
-        run: mvn -B clean package -Padvanced -DskipTests
-
       - name: Download OpenSearch Core
         run: |
-          wget https://artifacts.opensearch.org/snapshots/core/opensearch/1.2.0-SNAPSHOT/opensearch-min-1.2.0-SNAPSHOT-linux-x64-latest.tar.gz
+          wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.0/488/linux/x64/builds/opensearch/dist/opensearch-min-1.3.0-linux-x64.tar.gz
           tar -xzf opensearch-*.tar.gz
           rm -f opensearch-*.tar.gz
 
+      - name: Download OpenSearch Security Plugin
+        run: wget -O opensearch-security.zip https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.0/488/linux/x64/builds/opensearch/plugins/opensearch-security-1.3.0.0.zip
+
       - name: Run OpenSearch with plugin
         run: |
           cat > os-ep.sh <<EOF
@@ -56,7 +35,7 @@ jobs:
           docker build -t opensearch-test:latest -f- . <<EOF
           FROM ubuntu:latest
           COPY --chown=1001:1001 os-ep.sh /docker-host/
-          COPY --chown=1001:1001 security/target/releases/opensearch-security-1.2.0.0-SNAPSHOT.zip /docker-host/security-plugin.zip
+          COPY --chown=1001:1001 opensearch-security.zip /docker-host/security-plugin.zip
           COPY --chown=1001:1001 opensearch* /opensearch/
           RUN chmod +x /docker-host/os-ep.sh
           RUN useradd -u 1001 -s /sbin/nologin opensearch

diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json
@@ -1,7 +1,7 @@
 {
   "id": "securityDashboards",
-  "version": "1.2.0.0",
-  "opensearchDashboardsVersion": "1.2.0",
+  "version": "1.3.0.0",
+  "opensearchDashboardsVersion": "1.3.0",
   "configPath": ["opensearch_security"],
   "requiredPlugins": ["navigation"],
   "server": true,

diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "opensearch-security-dashboards",
-  "version": "1.2.0.0",
+  "version": "1.3.0.0",
   "main": "target/plugins/opensearch_security_dashboards",
   "opensearchDashboards": {
-    "version": "1.2.0",
-    "templateVersion": "1.2.0"
+    "version": "1.3.0",
+    "templateVersion": "1.3.0"
   },
   "license": "Apache-2.0",
   "homepage": "https://github.com/opensearch-project/security-dashboards-plugin",

diff --git a/server/auth/types/saml/routes.ts b/server/auth/types/saml/routes.ts
@@ -130,9 +130,7 @@ export class SamlAuthRoutes {
           if (!payloadEncoded) {
             context.security_plugin.logger.error('JWT token payload not found');
           }
-          const tokenPayload = JSON.parse(
-            Buffer.from(payloadEncoded, 'base64').toString()
-          );
+          const tokenPayload = JSON.parse(Buffer.from(payloadEncoded, 'base64').toString());
           if (tokenPayload.exp) {
             expiryTime = parseInt(tokenPayload.exp, 10) * 1000;
           }
@@ -189,9 +187,7 @@ export class SamlAuthRoutes {
           if (!payloadEncoded) {
             context.security_plugin.logger.error('JWT token payload not found');
           }
-          const tokenPayload = JSON.parse(
-            Buffer.from(payloadEncoded, 'base64').toString()
-          );
+          const tokenPayload = JSON.parse(Buffer.from(payloadEncoded, 'base64').toString());
           if (tokenPayload.exp) {
             expiryTime = parseInt(tokenPayload.exp, 10) * 1000;
           }