Merge remote-tracking branch 'origin/1.3' into 1.x by peternied · Pull Request #1521 · opensearch-project/security-dashboards-plugin

peternied · 2023-07-19T12:12:32Z

Description

Makes sure all changes that have been merged into 1.3 are also present in 1.x. Note; this change should be manually merged, not squashed.

Issues Resolved

Resolves [BUG] 1.x should contain changes from 1.3 #1520

Check List

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

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

…rkflows (opensearch-project#930) Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

…ject#972) * Remove redundant DCO check in favor of the github app Signed-off-by: Peter Nied <petern@amazon.com> * 1.3.2 binaries are not ready yet, so pointing tto dashboards 1.3.1 for the tests Signed-off-by: Peter Nied <petern@amazon.com>

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

…search-project#959) Signed-off-by: Peter Nied <petern@amazon.com>

) Signed-off-by: Peter Nied <petern@amazon.com> (cherry picked from commit 59247fb) Co-authored-by: Peter Nied <petern@amazon.com>

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

Signed-off-by: cliu123 <lc12251109@gmail.com>

…roject#1005) * Version bump 1.3.3 Signed-off-by: pgodithi <pgodithi@amazon.com> * Version bump 1.3.3 Signed-off-by: pgodithi <pgodithi@amazon.com> * Updated integration-test.yml ref to 1.3 Signed-off-by: pgodithi <pgodithi@amazon.com> Co-authored-by: Peter Nied <petern@amazon.com>

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

Signed-off-by: Rutuja Surve <rutuja@amazon.com>

Signed-off-by: Ryan Liang <jiallian@amazon.com>

…roject#1080) Signed-off-by: Ryan Liang <jiallian@amazon.com> Co-authored-by: Chang Liu <lc12251109@gmail.com> (cherry picked from commit 7299822) Co-authored-by: Ryan Liang <109499885+RyanL1997@users.noreply.github.com>

…arch-project#965) (opensearch-project#1095) The current behavoir is that all users will see a message to switch tenants and if multi-tenancy is disabled, that message will be prompting the user to ask the admin to enable the feature. This is causing users pain that are not interested in using the tenancy features. Signed-off-by: Peter Nied <petern@amazon.com> (cherry picked from commit ec59de0) Co-authored-by: Peter Nied <petern@amazon.com>

…pensearch-project#1102) Signed-off-by: Ryan Liang <jiallian@amazon.com> (cherry picked from commit 5d018b0) Co-authored-by: Ryan Liang <109499885+RyanL1997@users.noreply.github.com>

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

…Authentication flow (opensearch-project#1058) (opensearch-project#1125) * Fix for picking up tenancy from local storage in SAML AuthN flow Signed-off-by: Aniketh Jain <anijainc@amazon.com> (cherry picked from commit 05649d6)

Signed-off-by: Vinayak Kothari <vkothar@amazon.com> (cherry picked from commit 8315614) Co-authored-by: Vinayak Kothari <vkothar@amazon.com>

Signed-off-by: Rishabh Singh <sngri@amazon.com> Signed-off-by: Rishabh Singh <sngri@amazon.com>

…ject#1226) * SAML Integration Tests (opensearch-project#1088) * Preserve URL Hash for SAML based login (opensearch-project#1039) * Preserve URL HASH after user logs via SAML IDP Signed-off-by: Deepak Devarakonda <devardee@amazon.com> Signed-off-by: Aniketh Jain <anijainc@amazon.com> Signed-off-by: Craig Perkins <cwperx@amazon.com> Co-authored-by: anijain-Amazon <110471048+anijain-Amazon@users.noreply.github.com> Co-authored-by: Deepak Devarakonda <devardee@amazon.com> Co-authored-by: Deepak Devarakonda <80896069+devardee@users.noreply.github.com> Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>

… by custom templates (opensearch-project#1247) (opensearch-project#1254) Signed-off-by: Chang Liu <lc12251109@gmail.com> (cherry picked from commit dcf75c4) Co-authored-by: Chang Liu <lc12251109@gmail.com>

…roject#1265) Signed-off-by: Craig Perkins <cwperx@amazon.com> (cherry picked from commit 37b21e0)

* Increment version to 1.3.8 Signed-off-by: Craig Perkins <cwperx@amazon.com>

Signed-off-by: Ryan Liang <109499885+RyanL1997@users.noreply.github.com> Signed-off-by: Ryan Liang <jiallian@amazon.com> Co-authored-by: Craig Perkins <cwperx@amazon.com>

…ect#1313) * Add release note for 1.3.8 Signed-off-by: Ryan Liang <jiallian@amazon.com> (cherry picked from commit 541fc2d)

…1321) * Backport Windows CI support to 1.3 branch Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Increment version to 1.3.9 Signed-off-by: Ryan Liang <jiallian@amazon.com>

…ct#1355) Signed-off-by: Craig Perkins <cwperx@amazon.com> Co-authored-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com> (cherry picked from commit 6b7f6c1) Co-authored-by: Craig Perkins <cwperx@amazon.com>

…opensearch-project#1360) Signed-off-by: Chang Liu <lc12251109@gmail.com> (cherry picked from commit b69a364)

…ject#1380) Signed-off-by: Ryan Liang <jiallian@amazon.com> (cherry picked from commit b3b3120)

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com> Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>

…ct#1466) Signed-off-by: Craig Perkins <cwperx@amazon.com>

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com> Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>

* Add 1.3.11 notes Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Update Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Update release-notes/opensearch-security-dashboards-plugin.release-notes-1.3.11.0.md Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com> --------- Signed-off-by: Stephen Crawford <steecraw@amazon.com> Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>

- Resolves opensearch-project#1520 Signed-off-by: Peter Nied <peternied@hotmail.com>

codecov · 2023-07-19T12:22:03Z

Codecov Report

❗ No coverage uploaded for pull request base (1.x@80a273e). Click here to learn what that means.
The diff coverage is n/a.

@@          Coverage Diff           @@
##             1.x    #1521   +/-   ##
======================================
  Coverage       ?   72.33%           
======================================
  Files          ?       88           
  Lines          ?     1916           
  Branches       ?      245           
======================================
  Hits           ?     1386           
  Misses         ?      474           
  Partials       ?       56

peternied · 2023-07-19T12:38:46Z

Marking as draft to prevent accidental squash merge

package.json

peternied · 2023-07-19T14:42:02Z

Manually pushed merge commit into 1.x directly

% git push origin HEAD:1.x
Enumerating objects: 1, done.
Counting objects: 100% (1/1), done.
Writing objects: 100% (1/1), 278 bytes | 278.00 KiB/s, done.
Total 1 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Bypassed rule violations for refs/heads/1.x:
remote: 
remote: - Changes must be made through a pull request.
remote: 
To github.com:opensearch-project/security-dashboards-plugin.git
   80a273e..cbe06da  HEAD -> 1.x

DarshitChanpura and others added 30 commits March 23, 2022 11:19

Bumps version to 1.3.1.0 (opensearch-project#925)

0ac0cdb

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

Removes test workflow branch filter from unit and integration test wo…

f797354

…rkflows (opensearch-project#930) Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

Incremented version to 1.3.2. (opensearch-project#978)

3c4f6fe

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

Fix 'openserach' typo in constants.tsx (opensearch-project#953) (open…

2488aa2

…search-project#959) Signed-off-by: Peter Nied <petern@amazon.com>

Release notes for 1.3.2 (opensearch-project#979) (opensearch-project#981

3e1ba11

) Signed-off-by: Peter Nied <petern@amazon.com> (cherry picked from commit 59247fb) Co-authored-by: Peter Nied <petern@amazon.com>

Adds 1.3.1.0 release notes (opensearch-project#980)

bc185c7

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

Run integration tests on PRs and Pushes (opensearch-project#1006)

c4a830c

Signed-off-by: cliu123 <lc12251109@gmail.com>

Incremented version to 1.3.4. (opensearch-project#1028)

6e0a97d

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

backport tenant resolver (opensearch-project#1043)

bbe43c1

Signed-off-by: Rutuja Surve <rutuja@amazon.com>

Increment-version-to-1.3.5 (opensearch-project#1071)

baed4b0

Signed-off-by: Ryan Liang <jiallian@amazon.com>

Fixed the tenant switching after timeout (opensearch-project#1090) (o…

3fda7a4

…pensearch-project#1102) Signed-off-by: Ryan Liang <jiallian@amazon.com> (cherry picked from commit 5d018b0) Co-authored-by: Ryan Liang <109499885+RyanL1997@users.noreply.github.com>

Version bump to 1.3.6 (opensearch-project#1113)

ae56599

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

Release notes 1.3.6 (opensearch-project#1114) (opensearch-project#1115)

7679573

Release note 1.3.6 (opensearch-project#1136) (opensearch-project#1137)

4ea6df2

Signed-off-by: Vinayak Kothari <vkothar@amazon.com> (cherry picked from commit 8315614) Co-authored-by: Vinayak Kothari <vkothar@amazon.com>

Version bump to 1.3.7 (opensearch-project#1233)

d948c78

Signed-off-by: Rishabh Singh <sngri@amazon.com> Signed-off-by: Rishabh Singh <sngri@amazon.com>

Set order of tenant_template to the highest to avoid being overridden…

87c9b2b

… by custom templates (opensearch-project#1247) (opensearch-project#1254) Signed-off-by: Chang Liu <lc12251109@gmail.com> (cherry picked from commit dcf75c4) Co-authored-by: Chang Liu <lc12251109@gmail.com>

Add release notes for 1.3.7.0 (opensearch-project#1263) (opensearch-p…

5f608b8

…roject#1265) Signed-off-by: Craig Perkins <cwperx@amazon.com> (cherry picked from commit 37b21e0)

[1.3] Increment version to 1.3.8 (opensearch-project#1309)

25d60ce

* Increment version to 1.3.8 Signed-off-by: Craig Perkins <cwperx@amazon.com>

Fix CVE dependencies (opensearch-project#1308)

8e10167

Signed-off-by: Ryan Liang <109499885+RyanL1997@users.noreply.github.com> Signed-off-by: Ryan Liang <jiallian@amazon.com> Co-authored-by: Craig Perkins <cwperx@amazon.com>

Add release note for 1.3.8 (opensearch-project#1312) (opensearch-proj…

ca11a1a

…ect#1313) * Add release note for 1.3.8 Signed-off-by: Ryan Liang <jiallian@amazon.com> (cherry picked from commit 541fc2d)

[Backport 1.3] Windows CI support for 1.3 branch (opensearch-project#…

0a2b86f

…1321) * Backport Windows CI support to 1.3 branch Signed-off-by: Ryan Liang <jiallian@amazon.com>

Increment version to 1.3.9 (opensearch-project#1322)

e8d87fd

* Increment version to 1.3.9 Signed-off-by: Ryan Liang <jiallian@amazon.com>

Replace legacy template with index template (opensearch-project#1359) (…

37748d7

…opensearch-project#1360) Signed-off-by: Chang Liu <lc12251109@gmail.com> (cherry picked from commit b69a364)

opensearch-trigger-bot bot and others added 6 commits March 10, 2023 12:41

Add release notes for 1.3.9 (opensearch-project#1379) (opensearch-pro…

713ccb7

…ject#1380) Signed-off-by: Ryan Liang <jiallian@amazon.com> (cherry picked from commit b3b3120)

Increment version to 1.3.10.0 (opensearch-project#1416)

c1fc06d

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com> Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>

Use version from package.json for integration tests (opensearch-proje…

7dece6b

…ct#1466) Signed-off-by: Craig Perkins <cwperx@amazon.com>

Increment version to 1.3.11.0 (opensearch-project#1478)

fce0fa8

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com> Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>

Merge remote-tracking branch 'origin/1.3' into 1.x

cbe06da

- Resolves opensearch-project#1520 Signed-off-by: Peter Nied <peternied@hotmail.com>

peternied mentioned this pull request Jul 19, 2023

[Backport 1.x] Add the tenant into the short URL once the short URL is resolved (#1462) #1514

Merged

1 task

peternied mentioned this pull request Jul 19, 2023

[Backport 1.x] Switch to new tenant after loading a copied long URL (#1450) #1515

Merged

3 tasks

peternied marked this pull request as draft July 19, 2023 12:38

cwperks reviewed Jul 19, 2023

View reviewed changes

package.json Show resolved Hide resolved

cwperks approved these changes Jul 19, 2023

View reviewed changes

peternied merged commit cbe06da into opensearch-project:1.x Jul 19, 2023

peternied deleted the 1.x branch July 19, 2023 14:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge remote-tracking branch 'origin/1.3' into 1.x#1521

Merge remote-tracking branch 'origin/1.3' into 1.x#1521
peternied merged 36 commits intoopensearch-project:1.xfrom
peternied:1.x

peternied commented Jul 19, 2023

Uh oh!

codecov bot commented Jul 19, 2023

Uh oh!

peternied commented Jul 19, 2023

Uh oh!

Uh oh!

peternied commented Jul 19, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

Conversation

peternied commented Jul 19, 2023

Description

Issues Resolved

Check List

Uh oh!

codecov bot commented Jul 19, 2023

Codecov Report

Uh oh!

peternied commented Jul 19, 2023

Uh oh!

Uh oh!

peternied commented Jul 19, 2023

Manually pushed merge commit into 1.x directly

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants