Skip to content

[Backport 1.3] Add the tenant into the short URL once the short URL is resolved (#1462)#1516

Merged
DarshitChanpura merged 3 commits intoopensearch-project:1.3from
DarshitChanpura:backport/backport-1462-to-1.3
Jul 20, 2023
Merged

[Backport 1.3] Add the tenant into the short URL once the short URL is resolved (#1462)#1516
DarshitChanpura merged 3 commits intoopensearch-project:1.3from
DarshitChanpura:backport/backport-1462-to-1.3

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 <leanne.laceybyrne@eliatra.com>

* More information added

Signed-off-by: leanneeliatra <leanne.laceybyrne@eliatra.com>

* fixed linting errors

Signed-off-by: leanneeliatra <leanne.laceybyrne@eliatra.com>

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

Signed-off-by: Ryan Liang <jiallian@amazon.com>
Signed-off-by: leanneeliatra <leanne.laceybyrne@eliatra.com>

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

Signed-off-by: Ryan Liang <jiallian@amazon.com>
Signed-off-by: leanneeliatra <leanne.laceybyrne@eliatra.com>

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

Signed-off-by: Ryan Liang <jiallian@amazon.com>
Signed-off-by: Ryan Liang <109499885+RyanL1997@users.noreply.github.com>
Signed-off-by: leanneeliatra <leanne.laceybyrne@eliatra.com>

* Extracting function to tenant_resolver and adding more appropriate comments.

Signed-off-by: leanneeliatra <leanne.laceybyrne@eliatra.com>

* lint errors fixed

Signed-off-by: leanneeliatra <leanne.laceybyrne@eliatra.com>

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

* Use version from package.json for integration tests

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: leanneeliatra <leanne.laceybyrne@eliatra.com>

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

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Co-authored-by: Ryan Liang <109499885+RyanL1997@users.noreply.github.com>
Signed-off-by: leanneeliatra <leanne.laceybyrne@eliatra.com>

* Cleaning up comments

Signed-off-by: Leanne Lacey-Byrne <leanne.laceybyrne@eliatra.com>
Signed-off-by: leanneeliatra <leanne.laceybyrne@eliatra.com>

* linting issues resolved

Signed-off-by: leanneeliatra <leanne.laceybyrne@eliatra.com>

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

Signed-off-by: Ryan Liang <jiallian@amazon.com>
Signed-off-by: leanneeliatra <leanne.laceybyrne@eliatra.com>

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

Signed-off-by: Ryan Liang <jiallian@amazon.com>
Signed-off-by: Ryan Liang <109499885+RyanL1997@users.noreply.github.com>
Signed-off-by: leanneeliatra <leanne.laceybyrne@eliatra.com>

* Update server/multitenancy/tenant_resolver.ts

Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Signed-off-by: leanneeliatra <131779422+leanneeliatra@users.noreply.github.com>
Signed-off-by: leanneeliatra <leanne.laceybyrne@eliatra.com>

* comments addressed & linting amended

Signed-off-by: leanneeliatra <leanne.laceybyrne@eliatra.com>

* integration test fix following rebase

Signed-off-by: leanneeliatra <131779422+leanneeliatra@users.noreply.github.com>
Signed-off-by: leanneeliatra <leanne.laceybyrne@eliatra.com>

---------

Signed-off-by: leanneeliatra <leanne.laceybyrne@eliatra.com>
Signed-off-by: Ryan Liang <jiallian@amazon.com>
Signed-off-by: Ryan Liang <109499885+RyanL1997@users.noreply.github.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Leanne Lacey-Byrne <leanne.laceybyrne@eliatra.com>
Signed-off-by: leanneeliatra <131779422+leanneeliatra@users.noreply.github.com>
Co-authored-by: Ryan Liang <109499885+RyanL1997@users.noreply.github.com>
Co-authored-by: Craig Perkins <cwperx@amazon.com>
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
(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 <dchanp@amazon.com>
@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           


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