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

Updates references to security demo configuration #480

Merged
merged 8 commits into from
Jan 18, 2024

Conversation

DarshitChanpura
Copy link
Member

Description

Describe what this change achieves.

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
Copy link
Member Author

DarshitChanpura commented Dec 14, 2023

@Xtansia @VachaShah I would need your help to ensure that this instance where the demo script is being called:

cluster.Writer?.WriteDiagnostic($"{{{nameof(InitialConfiguration)}}} going to run [{securityInstallDemoConfigSubPath}]");

After doing some research I was able to move up chain of calls and it starts here: https://github.com/opensearch-project/opensearch-net/blob/main/abstractions/src/OpenSearch.OpenSearch.Managed/ClusterBase.cs#L127

@DarshitChanpura
Copy link
Member Author

If I'm interpreting the github actions correctly, the integration tests do not run with security correct?

@derek-ho
Copy link

@derek-ho
Copy link

We can merge this once it's out of draft

@DarshitChanpura
Copy link
Member Author

@Xtansia would you help bring this across finish line?

@dblock
Copy link
Member

dblock commented Jan 2, 2024

@DarshitChanpura what remains to be done? Mark it as ready if you're ready.

@Xtansia
Copy link
Collaborator

Xtansia commented Jan 2, 2024

@DarshitChanpura @dblock I have been working on this, but I'm currently still on leave until the 8th atm. This shouldn't block the 2.12 release as we don't automatically pick up the new version here and the client is not in sync with core versioning/releasing anyways

@Xtansia
Copy link
Collaborator

Xtansia commented Jan 14, 2024

@DarshitChanpura @dblock This is now ready for review and passing tests against unreleased 2.x & main.

DarshitChanpura and others added 6 commits January 16, 2024 16:40
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Copy link
Member Author

@DarshitChanpura DarshitChanpura left a comment

Choose a reason for hiding this comment

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

Thank you @Xtansia for taking this over.

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Copy link
Member Author

@DarshitChanpura DarshitChanpura left a comment

Choose a reason for hiding this comment

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

LGTM. Thank you once again @Xtansia.

@Xtansia
Copy link
Collaborator

Xtansia commented Jan 18, 2024

@dblock Could we please get your review on this?

@dblock
Copy link
Member

dblock commented Jan 18, 2024

@dblock Could we please get your review on this?

This isn't needed until 2.12 and should not be passing until then, shouldn't it?

@Xtansia
Copy link
Collaborator

Xtansia commented Jan 18, 2024

@dblock We do actually already hit the code paths in this PR because we test against 2.x and main with the security plugin installed. It's just that the tests against unreleased OpenSearch had been disabled due to breakage, which is now fixed and re-enabled in this PR. So all that's left for follow up is adding 2.12 to the released versions matrix when it's released. And all the changes are behind version checks

@dblock dblock merged commit dd2e674 into opensearch-project:main Jan 18, 2024
36 checks passed
@Xtansia Xtansia added the backport 1.x Backport to 1.x branch label Jan 18, 2024
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-480-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 dd2e674aa8ba85676ad621b8ef7932fb131a960c
# Push it to GitHub
git push --set-upstream origin backport/backport-480-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-480-to-1.x.

Xtansia pushed a commit to Xtansia/opensearch-net that referenced this pull request Jan 18, 2024
…#480)

* Updates github action reference to secruity demo configuration

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

* Updates abstractions README to reflect changes with demo configuration

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

* Updates references to admin password

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

* Wider test range

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Set initial admin password

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Fix disabling SSL

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Improve demo config condition

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Use random password on >=2.12

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

---------

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Co-authored-by: Thomas Farr <tsfarr@amazon.com>
(cherry picked from commit dd2e674)
Xtansia pushed a commit to Xtansia/opensearch-net that referenced this pull request Jan 18, 2024
…#480)

* Updates github action reference to secruity demo configuration

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

* Updates abstractions README to reflect changes with demo configuration

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

* Updates references to admin password

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

* Wider test range

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Set initial admin password

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Fix disabling SSL

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Improve demo config condition

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Use random password on >=2.12

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

---------

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Co-authored-by: Thomas Farr <tsfarr@amazon.com>
(cherry picked from commit dd2e674)
Xtansia pushed a commit to Xtansia/opensearch-net that referenced this pull request Jan 21, 2024
…#480)

* Updates github action reference to secruity demo configuration

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

* Updates abstractions README to reflect changes with demo configuration

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

* Updates references to admin password

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

* Wider test range

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Set initial admin password

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Fix disabling SSL

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Improve demo config condition

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Use random password on >=2.12

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

---------

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Co-authored-by: Thomas Farr <tsfarr@amazon.com>
(cherry picked from commit dd2e674)
dblock pushed a commit that referenced this pull request Jan 22, 2024
… (#521)

* Run rest-api-spec / YAML tests in CI (#303)

* Run yaml-test

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Fixes

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Separate workflow

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

---------

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
(cherry picked from commit dcf543f)

* Updates references to security demo configuration (#480)

* Updates github action reference to secruity demo configuration

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

* Updates abstractions README to reflect changes with demo configuration

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

* Updates references to admin password

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

* Wider test range

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Set initial admin password

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Fix disabling SSL

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Improve demo config condition

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Use random password on >=2.12

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

---------

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Co-authored-by: Thomas Farr <tsfarr@amazon.com>
(cherry picked from commit dd2e674)

* Fix deprecated function

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

---------

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x Backport to 1.x branch skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants