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.

Sign up for GitHub

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 cookie splitter #1662

Closed
wants to merge 9 commits into from
+1,072 −33
Closed

Backport cookie splitter #1662

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
01931ad
Backport cookie compression
jochen-kressin Oct 25, 2023
21e7a42
The cookie splitter should be able to use cookie values that have bee…
jochen-kressin Sep 11, 2023
f6f7a89
adding config as per 1x branch and craig p instructions
leanneeliatra Dec 6, 2023
9c3a8f6
Merge branch '1.x' into backport-cookie-splitter
DarshitChanpura Dec 7, 2023
85db227
Mocking for the tests
jochen-kressin Dec 27, 2023
9330781
Checkout 1.3.14 tag
cwperks Dec 18, 2023
38bb292
Lint fixes
jochen-kressin Dec 27, 2023
a870d54
Stabilize SAML integ test on 1.3
cwperks Dec 11, 2023
2022b66
removing unneeded version from action.yml. Reverting to dynamic versi…
leanneeliatra Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Checkout 1.3.14 tag 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
  • Loading branch information
@cwperks @jochen-kressin
cwperks authored and jochen-kressin committed Dec 27, 2023
commit 933078162e489dd2a1547bf8c39580a512ff4346
2 changes: 1 addition & 1 deletion .github/actions/install-dashboards/action.yml
View file
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ runs:
- id: branch-switch-if-possible
continue-on-error: true # Defaults onto main if the branch switch doesn't work
if: ${{ steps.osd-version.outputs.osd-version }}
run: git checkout ${{ steps.osd-version.outputs.osd-version }} || git checkout ${{ steps.osd-version.outputs.osd-x-version }}x
run: git checkout 1.3.14 || git checkout ${{ steps.osd-version.outputs.osd-version }} || git checkout ${{ steps.osd-version.outputs.osd-x-version }}x
Copy link
Member

Choose a reason for hiding this comment

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

why hardcode: git checkout 1.3.14?

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure, and maybe that one should go. I cherry picked that commit from Craig's PR, but maybe that was more of a PoC? Without it, the tests would not run, although I can't remember what the error was.
@cwperks Do you know if this was a temporary fix, and what the alternative should be?

Copy link
Member

Choose a reason for hiding this comment

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

If I remember correctly, this was added temporarily because the 1.x branch was stale and #1688 was not merged yet. Since the branch was stale, it was trying to check out an older patch release of OSD core so I added this line in.

Copy link
Contributor

Choose a reason for hiding this comment

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

Hi @DarshitChanpura is the comment you were awaiting addressed above please, just checking? Thank you.

Copy link
Member

Choose a reason for hiding this comment

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

This line should be removed then I think since the branch is not longer stale.

working-directory: ./OpenSearch-Dashboards
shell: bash