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

Switch from ImmutableOpenMap to Map in AliasExistsMatcher #2725

Merged
merged 7 commits into from
Apr 26, 2023

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Apr 26, 2023

Description

Addresses comments raised here: #2715 (comment)

There is a compilation error in AliasExistsMatcher and this fixes the issue.

  • Category (Enhancement, New feature, Bug fix, Test fix, Refactoring, Maintenance, Documentation)

Maintenance

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.

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

@peternied peternied left a comment

Choose a reason for hiding this comment

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

Looks like there are 3 other places that could use this update, mind making these changes all at once? https://github.com/search?q=repo%3Aopensearch-project%2Fsecurity%20ObjectObjectCursor&type=code

@codecov-commenter
Copy link

codecov-commenter commented Apr 26, 2023

Codecov Report

Merging #2725 (8e05b2c) into main (6ace852) will decrease coverage by 0.06%.
The diff coverage is n/a.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##               main    #2725      +/-   ##
============================================
- Coverage     61.48%   61.43%   -0.06%     
  Complexity     3394     3394              
============================================
  Files           272      272              
  Lines         18743    18743              
  Branches       3285     3285              
============================================
- Hits          11524    11514      -10     
- Misses         5616     5626      +10     
  Partials       1603     1603              

see 2 files with indirect coverage changes

Signed-off-by: Craig Perkins <cwperx@amazon.com>
peternied
peternied previously approved these changes Apr 26, 2023
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
for (String index : expectedIndices) {
if (!indexToSettings.containsKey(index)) {
mismatchDescription
.appendText("Response contains settings of indices: ")
.appendValue(indexToSettings.keySet());
.appendValue(indexToSettings.keys());
Copy link
Member Author

Choose a reason for hiding this comment

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

@scrawfor99 Sorry I had to push a small change and now CI is running again. I had this as keysIt when it really should be the key set here.

@cwperks cwperks merged commit 6997f97 into opensearch-project:main Apr 26, 2023
MaciejMierzwa pushed a commit to MaciejMierzwa/security that referenced this pull request Apr 27, 2023
…-project#2725)

* Remove references to ObjectObjectCursor

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
MaciejMierzwa pushed a commit to MaciejMierzwa/security that referenced this pull request Jun 13, 2023
…-project#2725)

* Remove references to ObjectObjectCursor

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
MaciejMierzwa pushed a commit to MaciejMierzwa/security that referenced this pull request Jun 13, 2023
…-project#2725)

* Remove references to ObjectObjectCursor

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
samuelcostae pushed a commit to samuelcostae/security that referenced this pull request Jun 19, 2023
…-project#2725)

* Remove references to ObjectObjectCursor

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Sam <samuel.costa@eliatra.com>
cwperks added a commit to cwperks/security that referenced this pull request Jun 27, 2023
…-project#2725)

* Remove references to ObjectObjectCursor

Signed-off-by: Craig Perkins <cwperx@amazon.com>
cwperks added a commit to cwperks/security that referenced this pull request Jun 27, 2023
…-project#2725)

* Remove references to ObjectObjectCursor

Signed-off-by: Craig Perkins <cwperx@amazon.com>
cwperks added a commit that referenced this pull request Jun 27, 2023
* Resolve ImmutableOpenMap issue from core refactor (#2715)

* Switch from ImmutableOpenMap to Map in AliasExistsMatcher (#2725)

* Remove references to ObjectObjectCursor

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

* Switch from ImmutableOpenMap to Map in AliasExistsMatcher (#2725)

* Remove references to ObjectObjectCursor

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

* Removes a missed reference for ImmutableOpenMap (#2726)

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

* Update ClusterInfoHolder

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

* Run spotlessApply

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

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Co-authored-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.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
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants