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

Download certs from security repo #650

Merged

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Nov 2, 2024

Description

Download certs from security repo instead of having a local copy in this repo.

Testing out this same pattern that the sql plugin uses to reduce copies of the demo certs across plugin repos.

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

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.

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Copy link
Member Author

cwperks commented Nov 4, 2024

It doesn't look like the CI check is working as expected:

1s
0s
Run plugin=opensearch-asynchronous-search-3.0.0.0-SNAPSHOT.zip
plugin version plugin_version qualifier docker_version
(opensearch-asynchronous-search-3.0.0.0-SNAPSHOT.zip) (search) (search) (-3) (search-3)
/home/runner/work/asynchronous-search/asynchronous-search
-rw-r--r-- 1 runner docker 986033 Nov 4 19:53 ./opensearch-asynchronous-search-3.0.0.0-SNAPSHOT.zip
Error response from daemon: manifest for opensearchstaging/opensearch:search-3 not found: manifest unknown: manifest unknown

https://github.com/opensearch-project/asynchronous-search/actions/runs/11671545303/job/32498455303?pr=650

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks cwperks marked this pull request as draft November 4, 2024 21:45
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks cwperks marked this pull request as ready for review November 5, 2024 17:41
@cwperks
Copy link
Member Author

cwperks commented Nov 6, 2024

@finnegancarroll @mch2 This is ready for review.

@finnegancarroll
Copy link
Collaborator

Testing locally the integTestRemote task passes but integTest does not. integTestRemote filters only for rest tests so there is maybe a silent failure here?

Regardless changes LGTM.

@finnegancarroll finnegancarroll merged commit 63fa8d2 into opensearch-project:main Nov 6, 2024
8 checks passed
@cwperks cwperks added the backport 2.x backport to 2.x label Nov 7, 2024
@opensearch-trigger-bot
Copy link

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/asynchronous-search/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/asynchronous-search/backport-2.x
# Create a new branch
git switch --create backport/backport-650-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 63fa8d268a65b3fcfb2634b455696383dd61b2fb
# Push it to GitHub
git push --set-upstream origin backport/backport-650-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/asynchronous-search/backport-2.x

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

cwperks added a commit to cwperks/asynchronous-search that referenced this pull request Nov 7, 2024
* Download certs from security repo

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove unused import

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix ci check

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Include setup-java step

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* getParent

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove markAsSystemContext

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Configure basic auth header

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove unused imports

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update link to security repo

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit 63fa8d2)
finnegancarroll pushed a commit that referenced this pull request Nov 13, 2024
* Download certs from security repo (#650)

* Download certs from security repo

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove unused import

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix ci check

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Include setup-java step

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* getParent

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove markAsSystemContext

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Configure basic auth header

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove unused imports

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update link to security repo

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit 63fa8d2)

* Remove unused imports

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants