Skip to content

Commit 93706e7

Browse files
DarshitChanpuraDarshitChanpura
authored
Merge branch 'main' into ism
2 parents a60ba1c + 7de969c commit 93706e7

File tree

68 files changed

+1101
-945
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1101
-945
lines changed

‎.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @cwperks @DarshitChanpura @derek-ho @RyanL1997 @stephen-crawford
1+
* @cwperks @DarshitChanpura @derek-ho @RyanL1997

‎.github/actions/download-plugin/action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ runs:
2525
mvn dependency:get \
2626
-DremoteRepositories=https://aws.oss.sonatype.org/content/repositories/snapshots/ \
2727
-Dartifact=org.opensearch.plugin:${{ inputs.plugin-name }}:${{ inputs.plugin-version }}-SNAPSHOT:zip \
28-
-Dtransitive=false \
29-
-Ddest=${{ inputs.download-location }}.zip
28+
-Dtransitive=false
29+
cp ~/.m2/repository/org/opensearch/plugin/${{ inputs.plugin-name }}/${{ inputs.plugin-version }}-SNAPSHOT/${{ inputs.plugin-name }}-${{ inputs.plugin-version }}-SNAPSHOT.zip ${{ inputs.download-location }}.zip
3030
shell: bash
3131

‎.github/actions/run-cypress-tests/action.yml

+14-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: Run Cypress Tests
22
description: 'Runs Cypress tests for the security-dashboards-plugin with opensearch_dashboards.yml and security configuration provided'
33

4+
env:
5+
OPENSEARCH_VERSION: '3.0.0-alpha1'
6+
47
inputs:
58
security_config_file:
69
description: 'Name of the security plugin config file'
@@ -21,9 +24,7 @@ runs:
2124
steps:
2225
- name: Set env
2326
run: |
24-
opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version")
2527
plugin_version=$(node -p "require('./package.json').version")
26-
echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
2728
echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
2829
shell: bash
2930

@@ -63,6 +64,12 @@ runs:
6364
fi
6465
shell: bash
6566

67+
- name: Compile OpenSearch Dashboards
68+
run: |
69+
cd OpenSearch-Dashboards
70+
node scripts/build_opensearch_dashboards_platform_plugins --no-examples --workers=10 --verbose
71+
shell: bash
72+
6673
- name: Run OpenSearch Dashboards with provided configuration
6774
if: ${{ runner.os == 'Linux' }}
6875
run: |
@@ -80,13 +87,13 @@ runs:
8087
run: |
8188
cd ./OpenSearch-Dashboards
8289
echo "Start checking OpenSearch Dashboards."
83-
for i in {1..60}; do
84-
if grep -q "bundles compiled successfully after" "dashboard.log"; then
85-
echo "OpenSearch Dashboards compiled successfully."
90+
for i in {1..6}; do
91+
if grep -q "http server running" "dashboard.log"; then
92+
echo "OpenSearch Dashboards started successfully."
8693
break
8794
fi
88-
if [ $i -eq 60 ]; then
89-
echo "Timeout for 600 seconds reached. OpenSearch Dashboards did not finish compiling."
95+
if [ $i -eq 6 ]; then
96+
echo "Timeout for 60 seconds reached. OpenSearch Dashboards did not start."
9097
exit 1
9198
fi
9299
sleep 10

‎.github/workflows/cypress-test-multiauth-e2e.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Snapshot based E2E SAML multi-auth tests workflow
33
on: [ push, pull_request ]
44

55
env:
6-
OPENSEARCH_VERSION: '3.0.0'
6+
OPENSEARCH_VERSION: '3.0.0-alpha1'
77
CI: 1
88
# avoid warnings like "tput: No value for $TERM and no -T specified"
99
TERM: xterm
@@ -59,7 +59,7 @@ jobs:
5959
config:
6060
idp:
6161
entity_id: urn:example:idp
62-
metadata_url: http://localhost:7000/metadata
62+
metadata_url: http://[::1]:7000/metadata
6363
sp:
6464
entity_id: https://localhost:9200
6565
kibana_url: http://localhost:5601${{ matrix.basePath }}

‎.github/workflows/cypress-test-multidatasources-disabled-e2e.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: E2E multi datasources disabled workflow
33
on: [ push, pull_request ]
44

55
env:
6-
OPENSEARCH_VERSION: '3.0.0'
6+
OPENSEARCH_VERSION: '3.0.0-alpha1'
77
CI: 1
88
# avoid warnings like "tput: No value for $TERM and no -T specified"
99
TERM: xterm

‎.github/workflows/cypress-test-multidatasources-enabled-e2e.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: E2E multi datasources enabled workflow
33
on: [ push, pull_request ]
44

55
env:
6-
OPENSEARCH_VERSION: '3.0.0'
6+
OPENSEARCH_VERSION: '3.0.0-alpha1'
77
CI: 1
88
# avoid warnings like "tput: No value for $TERM and no -T specified"
99
TERM: xterm
@@ -25,9 +25,7 @@ jobs:
2525

2626
- name: Set env
2727
run: |
28-
opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version")
2928
plugin_version=$(node -p "require('./package.json').version")
30-
echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
3129
echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
3230
shell: bash
3331

‎.github/workflows/cypress-test-oidc-e2e.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Snapshot based E2E OIDC tests workflow
33
on: [ push, pull_request ]
44

55
env:
6-
OPENSEARCH_VERSION: '3.0.0'
6+
OPENSEARCH_VERSION: '3.0.0-alpha1'
77
KEYCLOAK_VERSION: '21.0.1'
88
TEST_KEYCLOAK_CLIENT_SECRET: 'oacHfNaXyy81r2uHq1A9RY4ASryre4rZ'
99
CI: 1

‎.github/workflows/cypress-test-saml-e2e.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Snapshot based E2E SAML tests workflow
33
on: [ push, pull_request ]
44

55
env:
6-
OPENSEARCH_VERSION: '3.0.0'
6+
OPENSEARCH_VERSION: '3.0.0-alpha1'
77
CI: 1
88
# avoid warnings like "tput: No value for $TERM and no -T specified"
99
TERM: xterm
@@ -59,7 +59,7 @@ jobs:
5959
config:
6060
idp:
6161
entity_id: urn:example:idp
62-
metadata_url: http://localhost:7000/metadata
62+
metadata_url: http://[::1]:7000/metadata
6363
sp:
6464
entity_id: https://localhost:9200
6565
kibana_url: http://localhost:5601${{ matrix.basePath }}

‎.github/workflows/cypress-test-tenancy-disabled.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ env:
1111
SPEC: 'cypress/integration/plugins/security-dashboards-plugin/aggregation_view.js,'
1212
PLUGIN_NAME: opensearch-security
1313
OPENSEARCH_INITIAL_ADMIN_PASSWORD: myStrongPassword123!
14+
OPENSEARCH_VERSION: '3.0.0-alpha1'
1415

1516
jobs:
1617
cypress-tests-multitenancy-disabled:
@@ -27,9 +28,7 @@ jobs:
2728

2829
- name: Set env
2930
run: |
30-
opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version")
3131
plugin_version=$(node -p "require('./package.json').version")
32-
echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
3332
echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
3433
shell: bash
3534

‎.github/workflows/cypress-test.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ env:
1212
PLUGIN_NAME: opensearch-security
1313
OPENSEARCH_INITIAL_ADMIN_PASSWORD: myStrongPassword123!
1414
CYPRESS_NO_COMMAND_LOG: 1
15+
OPENSEARCH_VERSION: '3.0.0-alpha1'
1516

1617
jobs:
1718
cypress-tests:
@@ -28,9 +29,7 @@ jobs:
2829

2930
- name: Set env
3031
run: |
31-
opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version")
3232
plugin_version=$(node -p "require('./package.json').version")
33-
echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
3433
echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
3534
shell: bash
3635

‎.github/workflows/integration-test.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ env:
77
CI: 1
88
PLUGIN_NAME: opensearch-security
99
OPENSEARCH_INITIAL_ADMIN_PASSWORD: myStrongPassword123!
10+
OPENSEARCH_VERSION: '3.0.0-alpha1'
1011

1112
jobs:
1213
tests:
@@ -23,9 +24,7 @@ jobs:
2324

2425
- name: Set env
2526
run: |
26-
opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version")
2727
plugin_version=$(node -p "require('./package.json').version")
28-
echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
2928
echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
3029
shell: bash
3130

‎.github/workflows/verify-binary-installation.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: 'Install Dashboards with Plugin via Binary'
22

33
on: [push, pull_request]
44
env:
5-
OPENSEARCH_VERSION: '3.0.0'
5+
OPENSEARCH_VERSION: '3.0.0-alpha1'
66
CI: 1
77
# avoid warnings like "tput: No value for $TERM and no -T specified"
88
TERM: xterm
@@ -24,9 +24,7 @@ jobs:
2424

2525
- name: Set env
2626
run: |
27-
opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version")
2827
plugin_version=$(node -p "require('./package.json').version")
29-
echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
3028
echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
3129
shell: bash
3230

‎MAINTAINERS.md

+10-9
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
99
| Darshit Chanpura | [DarshitChanpura](https://github.com/DarshitChanpura) | Amazon |
1010
| Craig Perkins | [cwperks](https://github.com/cwperks) | Amazon |
1111
| Ryan Liang | [RyanL1997](https://github.com/RyanL1997) | Amazon |
12-
| Stephen Crawford | [scrawfor99](https://github.com/stephen-crawford) | Amazon |
1312
| Derek Ho | [derek-ho](https://github.com/derek-ho) | Amazon |
1413

1514
## Emeritus
1615

17-
| Maintainer | GitHub ID | Affiliation |
18-
| ------------- | --------------------------------------------------- | ----------- |
19-
| Yan Zeng | [zengyan-amazon](https://github.com/zengyan-amazon) | Amazon |
20-
| Bandini Bhopi | [bandinib-amzn](https://github.com/bandinib-amzn) | Amazon |
21-
| Tianle Huang | [tianleh](https://github.com/tianleh) | Amazon |
22-
| Dave Lago | [davidlago](https://github.com/davidlago) | Contributor |
23-
| Peter Nied | [peternied](https://github.com/peternied) | Amazon |
24-
| Chang Liu | [cliu123](https://github.com/cliu123) | Amazon |
16+
| Maintainer | GitHub ID | Affiliation |
17+
| -------------- | --------------------------------------------------- | ----------- |
18+
| Yan Zeng | [zengyan-amazon](https://github.com/zengyan-amazon) | Amazon |
19+
| Bandini Bhopi | [bandinib-amzn](https://github.com/bandinib-amzn) | Amazon |
20+
| Tianle Huang | [tianleh](https://github.com/tianleh) | Amazon |
21+
| Dave Lago | [davidlago](https://github.com/davidlago) | Contributor |
22+
| Peter Nied | [peternied](https://github.com/peternied) | Amazon |
23+
| Chang Liu | [cliu123](https://github.com/cliu123) | Amazon |
24+
| Stephen Crawford | [scrawfor99](https://github.com/stephen-crawford) | Contributor |
25+
2526

‎opensearch_dashboards.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "securityDashboards",
3-
"version": "3.0.0.0",
3+
"version": "3.0.0.0-alpha1",
44
"opensearchDashboardsVersion": "3.0.0",
55
"configPath": [
66
"opensearch_security"

‎package.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "opensearch-security-dashboards",
3-
"version": "3.0.0.0",
3+
"version": "3.0.0.0-alpha1",
44
"main": "target/plugins/opensearch_security_dashboards",
55
"opensearchDashboards": {
66
"version": "3.0.0",
@@ -53,7 +53,10 @@
5353
"glob-parent": "^5.1.2",
5454
"debug": "^4.3.4",
5555
"ejs": "^3.1.10",
56-
"express": "^4.19.2",
57-
"braces": "^3.0.3"
56+
"express": "^4.21.1",
57+
"braces": "^3.0.3",
58+
"body-parser": "^1.20.3",
59+
"micromatch": "^4.0.8",
60+
"cross-spawn": "7.0.5"
5861
}
5962
}

‎public/apps/account/password-reset-panel.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
EuiModalFooter,
2828
EuiOverlayMask,
2929
EuiSpacer,
30-
EuiTitle,
30+
EuiText,
3131
} from '@elastic/eui';
3232
import { CoreStart } from 'opensearch-dashboards/public';
3333
import { FormRow } from '../configuration/utils/form-row';
@@ -104,9 +104,9 @@ export function PasswordResetPanel(props: PasswordResetPanelProps) {
104104
<EuiModal data-test-subj="reset-password-modal" onClose={props.handleClose}>
105105
<EuiSpacer />
106106
<EuiModalBody>
107-
<EuiTitle>
108-
<h4>Reset password for &quot;{props.username}&quot;</h4>
109-
</EuiTitle>
107+
<EuiText size="s">
108+
<h2>Reset password for &quot;{props.username}&quot;</h2>
109+
</EuiText>
110110

111111
<EuiSpacer />
112112

‎public/apps/account/role-info-panel.tsx

+10-11
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import {
1717
EuiModalBody,
1818
EuiOverlayMask,
1919
EuiText,
20-
EuiTitle,
2120
EuiHorizontalRule,
2221
EuiSpacer,
2322
} from '@elastic/eui';
@@ -48,29 +47,29 @@ export function RoleInfoPanel(props: { coreStart: CoreStart; handleClose: () =>
4847
<EuiModal data-test-subj="role-info-modal" onClose={props.handleClose}>
4948
<EuiSpacer />
5049
<EuiModalBody>
51-
<EuiTitle>
52-
<h4>Roles ({roles.length})</h4>
53-
</EuiTitle>
54-
<EuiText color="subdued">
50+
<EuiText size="s">
51+
<h2>Roles ({roles.length})</h2>
52+
</EuiText>
53+
<EuiText color="subdued" size="s">
5554
Roles you are currently mapped to by your administrator.
5655
</EuiText>
5756
<EuiSpacer />
5857
{roles.map((item) => (
59-
<EuiText key={item}>
58+
<EuiText key={item} size="s">
6059
{item}
6160
<br />
6261
</EuiText>
6362
))}
6463
<EuiHorizontalRule />
65-
<EuiTitle>
66-
<h4>Backend roles ({backendRoles.length})</h4>
67-
</EuiTitle>
68-
<EuiText color="subdued">
64+
<EuiText size="s">
65+
<h2>Backend roles ({backendRoles.length})</h2>
66+
</EuiText>
67+
<EuiText color="subdued" size="s">
6968
Backend roles you are currently mapped to by your administrator.
7069
</EuiText>
7170
<EuiSpacer />
7271
{backendRoles.map((item) => (
73-
<EuiText key={item}>
72+
<EuiText key={item} size="s">
7473
{item}
7574
<br />
7675
</EuiText>

‎public/apps/account/tenant-switch-panel.tsx

+3-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import {
2626
EuiCompressedRadioGroup,
2727
EuiSpacer,
2828
EuiText,
29-
EuiTitle,
3029
} from '@elastic/eui';
3130
import { CoreStart } from 'opensearch-dashboards/public';
3231
import { keys } from 'lodash';
@@ -286,9 +285,9 @@ export function TenantSwitchPanel(props: TenantSwitchPanelProps) {
286285
<EuiModal data-test-subj="tenant-switch-modal" onClose={props.handleClose}>
287286
<EuiSpacer />
288287
<EuiModalBody>
289-
<EuiTitle>
290-
<h4>Select your tenant</h4>
291-
</EuiTitle>
288+
<EuiText size="s">
289+
<h2>Select your tenant</h2>
290+
</EuiText>
292291

293292
<EuiSpacer />
294293

0 commit comments

Comments
 (0)