add wildcard support for ServiceSkipDomains #2267
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…omains Signed-off-by: Toshiaki Aoike <taoike@yahoo-corp.jp>
ricordanza
force-pushed
the
add-domain-prefix-check-for-service-skip-domain
branch
from
ba012e8
to
124c3d2
Compare
havetisyan
requested changes
Aug 7, 2023
| if (domainName.startsWith(serviceSkipDomainPrefix)) { | ||
| return; | ||
| } | ||
| } else if (validateServiceSkipDomains.contains(domainName)) { |
There was a problem hiding this comment.
wrong check here to verify against the whole list every time. The correct line would be
} else if (skipDomain.equals(domainName)) {
There was a problem hiding this comment.
Thank you. I've fixed it.
…list. Signed-off-by: Toshiaki Aoike <taoike@yahoo-corp.jp>
havetisyan
requested changes
Aug 8, 2023
| @@ -3526,8 +3526,19 @@ void validateInstanceServiceIdentity(DomainData domainData, final String service | |||
| // need to check anything | |||
|
|
|||
| final String domainName = domainData.getName(); | |||
| if (validateServiceSkipDomains.contains(domainName)) { | |||
| return; | |||
| if (domainName != null) { | |||
There was a problem hiding this comment.
one more comment - looking at the server code, this can never be null so we should remove It, otherwise it's missing unit tests.
There was a problem hiding this comment.
Thank you.
Since it has been determined that domainName will not be null, I have removed the branching.
Additionally, I've made modifications to the test code to specify the domainName.
…ching and modified the test code to specify the domainName. Signed-off-by: Toshiaki Aoike <taoike@yahoo-corp.jp>
havetisyan
approved these changes
Aug 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
description
We have enabled the use of wildcards in the ServiceSkipDomains.
reference
I implemented it based on the reference from #2202.