Skip to content

[Backport 2.x] Change password security message (#3057)#3203

Merged
peternied merged 5 commits intoopensearch-project:2.xfrom
derek-ho:backport/backport-3057-to-2.x
Aug 22, 2023
Merged

[Backport 2.x] Change password security message (#3057)#3203
peternied merged 5 commits intoopensearch-project:2.xfrom
derek-ho:backport/backport-3057-to-2.x

Conversation

@derek-ho
Copy link
Copy Markdown
Collaborator

@derek-ho derek-ho commented Aug 17, 2023

Backports 847f911 from #3057

Returns the error message instead of the validation message because validation message should already have been shown in above case statements.

Signed-off-by: Craig Perkins cwperx@amazon.com
Signed-off-by: Derek Ho dxho@amazon.com
Co-authored-by: Craig Perkins cwperx@amazon.com
(cherry picked from commit 847f911)

Returns the error message instead of the validation message because
validation message should already have been shown in above case
statements.

Fix: opensearch-project#3055

Is this a backport? If so, please add backport PR # and/or commits #

[Please provide details of testing done: unit testing, integration
testing and manual testing]

- [ ] 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](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Co-authored-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit 847f911)
Fix merge conflicts

Signed-off-by: Derek Ho <dxho@amazon.com>
Fix merge conflicts

Signed-off-by: Derek Ho <dxho@amazon.com>
@peternied peternied changed the title Change password security message (#3057) [Backport 2.x] Change password security message (#3057) Aug 18, 2023
@peternied
Copy link
Copy Markdown
Member

@derek-ho I've updated the description and the title of the issue to capture its 'backportness' Looks like there are still CI failures, can you look into them?

Fix final merge conflict

Signed-off-by: Derek Ho <dxho@amazon.com>
@peternied
Copy link
Copy Markdown
Member

@derek-ho Still looks broken, happy to take another look after CI is passing. Let us know if you need a hand.

Signed-off-by: Derek Ho <dxho@amazon.com>
@codecov
Copy link
Copy Markdown

codecov bot commented Aug 22, 2023

Codecov Report

Merging #3203 (a4e7547) into 2.x (1bb6df5) will decrease coverage by 0.02%.
The diff coverage is 85.71%.

Impacted file tree graph

@@             Coverage Diff              @@
##                2.x    #3203      +/-   ##
============================================
- Coverage     62.35%   62.34%   -0.02%     
+ Complexity     3296     3294       -2     
============================================
  Files           252      252              
  Lines         19469    19467       -2     
  Branches       3308     3308              
============================================
- Hits          12140    12136       -4     
+ Misses         5711     5710       -1     
- Partials       1618     1621       +3     
Files Changed Coverage Δ
...curity/dlic/rest/validation/PasswordValidator.java 82.53% <66.66%> (ø)
.../dlic/rest/validation/RequestContentValidator.java 91.61% <100.00%> (-0.10%) ⬇️

... and 3 files with indirect coverage changes

@derek-ho
Copy link
Copy Markdown
Collaborator Author

@peternied should be fixed now, sorry. It was blocked on backported API changes, should have called that out to avoid any confusion.

@peternied peternied merged commit 709fef0 into opensearch-project:2.x Aug 22, 2023
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.

3 participants