From 8fe290b35f9e449655b4636a9e55f5475590cf9d Mon Sep 17 00:00:00 2001 From: Ryan Liang <109499885+RyanL1997@users.noreply.github.com> Date: Thu, 25 May 2023 11:28:34 -0700 Subject: [PATCH] Manual backport 2.x with password validation related fixes and version bump to 2.8.0 (#1437) * Change the testuser's password in some integration test cases into a stronger password (#1428) * Change the testuser's password into a stronger password Signed-off-by: Ryan Liang * Bump the version to 2.8.0 Signed-off-by: Ryan Liang --------- Signed-off-by: Ryan Liang --- .github/workflows/cypress-test.yml | 4 ++-- .github/workflows/integration-test.yml | 4 ++-- .github/workflows/prerequisite-test.yml | 4 ++-- opensearch_dashboards.json | 4 ++-- package.json | 6 +++--- test/jest_integration/multi_tenancy.test.ts | 2 +- test/jest_integration/security_entity_api.test.ts | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/cypress-test.yml b/.github/workflows/cypress-test.yml index e4f1f40d83..f19c1b9f9f 100644 --- a/.github/workflows/cypress-test.yml +++ b/.github/workflows/cypress-test.yml @@ -9,9 +9,9 @@ env: START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --opensearch_security.multitenancy.enable_aggregation_view=true' OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot' SPEC: 'cypress/integration/plugins/security-dashboards-plugin/aggregation_view.js,' - OPENSEARCH_VERSION: 2.7.0 + OPENSEARCH_VERSION: 2.8.0 PLUGIN_NAME: opensearch-security - PLUGIN_VERSION: 2.7.0.0 + PLUGIN_VERSION: 2.8.0.0 jobs: tests: diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 3ef55878ec..8d04880334 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -5,9 +5,9 @@ on: [push, pull_request] env: TEST_BROWSER_HEADLESS: 1 CI: 1 - OPENSEARCH_VERSION: 2.7.0 + OPENSEARCH_VERSION: 2.8.0 PLUGIN_NAME: opensearch-security - PLUGIN_VERSION: 2.7.0.0 + PLUGIN_VERSION: 2.8.0.0 jobs: tests: diff --git a/.github/workflows/prerequisite-test.yml b/.github/workflows/prerequisite-test.yml index c3caa1501c..ec47f9075a 100644 --- a/.github/workflows/prerequisite-test.yml +++ b/.github/workflows/prerequisite-test.yml @@ -9,6 +9,6 @@ jobs: steps: - name: Check for the existence of the OpenSearch Security Plugin artifact env: - opensearch_version: 2.5.0 - opensearch_security_plugin_version: 2.5.0.0 + opensearch_version: 2.8.0 + opensearch_security_plugin_version: 2.8.0.0 run: wget -S --spider https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/${opensearch_version}/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-security-${opensearch_security_plugin_version}.zip || (echo "Please make sure security plugin has been bumped to the same version and added to manifest." && exit 1) diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index 8300a0accd..3b7a74603e 100644 --- a/opensearch_dashboards.json +++ b/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "securityDashboards", - "version": "2.7.0.0", - "opensearchDashboardsVersion": "2.7.0", + "version": "2.8.0.0", + "opensearchDashboardsVersion": "2.8.0", "configPath": ["opensearch_security"], "requiredPlugins": ["navigation", "savedObjectsManagement"], "server": true, diff --git a/package.json b/package.json index 8b9de443d9..df4f037149 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "opensearch-security-dashboards", - "version": "2.7.0.0", + "version": "2.8.0.0", "main": "target/plugins/opensearch_security_dashboards", "opensearchDashboards": { - "version": "2.7.0", - "templateVersion": "2.7.0" + "version": "2.8.0", + "templateVersion": "2.8.0" }, "license": "Apache-2.0", "homepage": "https://github.com/opensearch-project/security-dashboards-plugin", diff --git a/test/jest_integration/multi_tenancy.test.ts b/test/jest_integration/multi_tenancy.test.ts index adeccda15b..684d552944 100644 --- a/test/jest_integration/multi_tenancy.test.ts +++ b/test/jest_integration/multi_tenancy.test.ts @@ -67,7 +67,7 @@ describe('start OpenSearch Dashboards server', () => { async function createTestUser(username: string = undefined, password: string = undefined) { const testUserName = username || `test_user_${Date.now()}`; - const testUserPassword = password || 'Test_123'; + const testUserPassword = password || 'testUserPassword123'; await createOrUpdateEntityAsAdmin(root, 'internalusers', testUserName, { password: testUserPassword, diff --git a/test/jest_integration/security_entity_api.test.ts b/test/jest_integration/security_entity_api.test.ts index 6b89d081c7..f28817798f 100644 --- a/test/jest_integration/security_entity_api.test.ts +++ b/test/jest_integration/security_entity_api.test.ts @@ -68,7 +68,7 @@ describe('start OpenSearch Dashboards server', () => { it('create/get/update/list/delete internal user', async () => { const testUsername = `test_user_${Date.now()}`; - const testUserPassword = 'Test_123'; + const testUserPassword = 'testUserPassword123'; const createUserResponse = await createOrUpdateEntityAsAdmin( root, @@ -270,7 +270,7 @@ describe('start OpenSearch Dashboards server', () => { it('get account info', async () => { const testUsername = `test_user_${Date.now()}`; - const testUserPassword = 'Test_123'; + const testUserPassword = 'testUserPassword123'; await createOrUpdateEntityAsAdmin(root, 'internalusers', testUsername, { description: 'test user description', @@ -297,7 +297,7 @@ describe('start OpenSearch Dashboards server', () => { it('self reset password as non-admin', async () => { const testUsername = `test_user_${Date.now()}`; - const testUserPassword = 'Test_123'; + const testUserPassword = 'testUserPassword123'; const readAllRole = 'read_all'; // use predefined "read_all" role await createOrUpdateEntityAsAdmin(root, 'internalusers', testUsername, {