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 1.3] Add the tenant into the short URL once the short URL is resolved (#1462) #1516

Conversation

DarshitChanpura
Copy link
Member

Description

Manually backports e9f9576 from #1462.

Category

Bug fix

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.

…nsearch-project#1462)

* More information added

Signed-off-by: leanneeliatra <[email protected]>

* More information added

Signed-off-by: leanneeliatra <[email protected]>

* fixed linting errors

Signed-off-by: leanneeliatra <[email protected]>

* Removing Prerequisite Checks Workflow (opensearch-project#1456)

Signed-off-by: Ryan Liang <[email protected]>
Signed-off-by: leanneeliatra <[email protected]>

* Removing Prerequisite Checks Workflow (opensearch-project#1456)

Signed-off-by: Ryan Liang <[email protected]>
Signed-off-by: leanneeliatra <[email protected]>

* Removing Prerequisite Checks Workflow (opensearch-project#1456)

Signed-off-by: Ryan Liang <[email protected]>
Signed-off-by: Ryan Liang <[email protected]>
Signed-off-by: leanneeliatra <[email protected]>

* Extracting function to tenant_resolver and adding more appropriate comments.

Signed-off-by: leanneeliatra <[email protected]>

* lint errors fixed

Signed-off-by: leanneeliatra <[email protected]>

* Use version from package.json for integration tests (opensearch-project#1463)

* Use version from package.json for integration tests

Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: leanneeliatra <[email protected]>

* Adds 2.8 release notes (opensearch-project#1464)

Signed-off-by: Darshit Chanpura <[email protected]>
Co-authored-by: Ryan Liang <[email protected]>
Signed-off-by: leanneeliatra <[email protected]>

* Cleaning up comments

Signed-off-by: Leanne Lacey-Byrne <[email protected]>
Signed-off-by: leanneeliatra <[email protected]>

* linting issues resolved

Signed-off-by: leanneeliatra <[email protected]>

* Removing Prerequisite Checks Workflow (opensearch-project#1456)

Signed-off-by: Ryan Liang <[email protected]>
Signed-off-by: leanneeliatra <[email protected]>

* Removing Prerequisite Checks Workflow (opensearch-project#1456)

Signed-off-by: Ryan Liang <[email protected]>
Signed-off-by: Ryan Liang <[email protected]>
Signed-off-by: leanneeliatra <[email protected]>

* Update server/multitenancy/tenant_resolver.ts

Co-authored-by: Darshit Chanpura <[email protected]>
Signed-off-by: leanneeliatra <[email protected]>
Signed-off-by: leanneeliatra <[email protected]>

* comments addressed & linting amended

Signed-off-by: leanneeliatra <[email protected]>

* integration test fix following rebase

Signed-off-by: leanneeliatra <[email protected]>
Signed-off-by: leanneeliatra <[email protected]>

---------

Signed-off-by: leanneeliatra <[email protected]>
Signed-off-by: Ryan Liang <[email protected]>
Signed-off-by: Ryan Liang <[email protected]>
Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: Darshit Chanpura <[email protected]>
Signed-off-by: Leanne Lacey-Byrne <[email protected]>
Signed-off-by: leanneeliatra <[email protected]>
Co-authored-by: Ryan Liang <[email protected]>
Co-authored-by: Craig Perkins <[email protected]>
Co-authored-by: Darshit Chanpura <[email protected]>
(cherry picked from commit e9f9576)
@DarshitChanpura DarshitChanpura changed the title Add the tenant into the short URL once the short URL is resolved (#1462) [Backport 1.3] Add the tenant into the short URL once the short URL is resolved (#1462) Jul 18, 2023
Signed-off-by: Darshit Chanpura <[email protected]>
@codecov
Copy link

codecov bot commented Jul 18, 2023

Codecov Report

Merging #1516 (bc89861) into 1.3 (390fd60) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##              1.3    #1516   +/-   ##
=======================================
  Coverage   72.48%   72.48%           
=======================================
  Files          88       88           
  Lines        1926     1926           
  Branches      246      246           
=======================================
  Hits         1396     1396           
  Misses        474      474           
  Partials       56       56           

@@ -31,6 +31,13 @@ export const ERROR_MISSING_ROLE_PATH = '/missing-role';

export const MAX_INTEGER = 2147483647;

export const GLOBAL_TENANT_SYMBOL = '';
Copy link
Member

Choose a reason for hiding this comment

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

This file has some of the changes from #1184 can we include all of them?

Copy link
Member Author

Choose a reason for hiding this comment

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

I've only included the ones that were required. We can backport #1184 to 1.x and 1.3 if required.

@DarshitChanpura DarshitChanpura merged commit cac8e3f into opensearch-project:1.3 Jul 20, 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