Skip to content

Manual backport 2.x with password validation related fixes and version bump to 2.8.0 #1437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyanL1997 merged 2 commits into from
May 25, 2023
Merged

Manual backport 2.x with password validation related fixes and version bump to 2.8.0 #1437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ca86f4
Change the testuser's password in some integration test cases into a …
RyanL1997 May 18, 2023
e95ccf4
Bunp the version to 2.8.0
RyanL1997 May 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/cypress-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prerequisite-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions opensearch_dashboards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/jest_integration/multi_tenancy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions test/jest_integration/security_entity_api.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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',
Expand All @@ -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, {
Expand Down