Skip to content
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.

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

[Backport 2.x] Fixing dynamic tenancy changes for issues 1412 (#1419) #1458

Merged

Conversation

DarshitChanpura
Copy link
Member

@DarshitChanpura DarshitChanpura commented May 31, 2023

Backports #1419

Check List

  • New functionality includes testing
  • New functionality has been documented
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@DarshitChanpura DarshitChanpura force-pushed the backport/backport-1419-to-2.x branch from fb88245 to e3a3112 Compare May 31, 2023 21:04
@codecov
Copy link

codecov bot commented May 31, 2023

Codecov Report

Merging #1458 (a025b00) into 2.x (b4c30c8) will decrease coverage by 0.05%.
The diff coverage is 85.71%.

@@            Coverage Diff             @@
##              2.x    #1458      +/-   ##
==========================================
- Coverage   65.51%   65.47%   -0.05%     
==========================================
  Files          93       93              
  Lines        2294     2297       +3     
  Branches      312      308       -4     
==========================================
+ Hits         1503     1504       +1     
- Misses        723      725       +2     
  Partials       68       68              
Impacted Files Coverage Δ
...s/configuration/panels/tenant-list/tenant-list.tsx 3.44% <50.00%> (+3.44%) ⬆️
public/plugin.ts 12.69% <50.00%> (-0.21%) ⬇️
public/apps/account/account-nav-button.tsx 63.88% <100.00%> (ø)
...ps/configuration/panels/tenant-list/manage_tab.tsx 69.12% <100.00%> (ø)

... and 1 file with indirect coverage changes

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: 3.0.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These versions need to match the version in package.json.

SPEC: 'cypress/integration/plugins/security-dashboards-plugin/aggregation_view.js,'
OPENSEARCH_VERSION: 3.0.0
PLUGIN_NAME: opensearch-security
PLUGIN_VERSION: 3.0.0.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This too.

@cwperks
Copy link
Member

cwperks commented Jun 1, 2023

@DarshitChanpura Please include the changes from this PR in the cypress workflow introduced in this PR.

* Fixing dynamic tenancy changes for opensearchdasbhoard.yaml

Signed-off-by: Abhi Kalra <[email protected]>
Co-authored-by: Abhi Kalra <[email protected]>
Co-authored-by: Stephen Crawford <[email protected]>
(cherry picked from commit c4e6c37)
Signed-off-by: Darshit Chanpura <[email protected]>
@DarshitChanpura DarshitChanpura force-pushed the backport/backport-1419-to-2.x branch from e3a3112 to eb62c99 Compare June 1, 2023 18:20
@DarshitChanpura
Copy link
Member Author

Done.

@cwperks
Copy link
Member

cwperks commented Jun 16, 2023

Why are the cypress tests failing to find package.json?

echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
shell: bash

- name: Checkout Branch
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this needs to be before Set env.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Signed-off-by: Darshit Chanpura <[email protected]>
@cwperks cwperks merged commit 7c94046 into opensearch-project:2.x Jun 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants