Skip to content

[Backport] Coerce blank fields to null in ApiKey requests#66315

Merged
tvernum merged 1 commit intoelastic:7.xfrom
tvernum:backport/7.x/66240-Coerce-blank-fields-to
Dec 15, 2020
Merged

[Backport] Coerce blank fields to null in ApiKey requests#66315
tvernum merged 1 commit intoelastic:7.xfrom
tvernum:backport/7.x/66240-Coerce-blank-fields-to

Conversation

@tvernum
Copy link
Copy Markdown
Contributor

@tvernum tvernum commented Dec 15, 2020

API Key request objects (InvalidateApiKeyRequest and
GetApiKeyRequest) support multiple key-selection parameters such as
realm-name, user-name, key-id and key-name.

The specified behaviour is that if any of these are blank then they
act as a wildcard and do not restrict the search criteria.

This change moves the "is blank" logic into the constructor for these
requests so that there is a single consistent way to determine blank
(Strings.hasText(arg) == false) and all usage of these fields can
rely on the getter returning either null or a real value, and
never a non-null blank.

Backport of: #66240

@tvernum
Coerce blank fields to null in ApiKey requests
bbc9b70 
API Key request objects (`InvalidateApiKeyRequest` and
`GetApiKeyRequest`) support multiple key-selection parameters such as
realm-name, user-name, key-id and key-name.

The specified behaviour is that if any of these are _blank_ then they
act as a wildcard and do not restrict the search criteria.

This change moves the "is blank" logic into the constructor for these
requests so that there is a single consistent way to determine blank
(`Strings.hasText(arg) == false`) and all usage of these fields can
rely on the getter returning either `null` or a _real value_, and
never a non-null blank.

Relates: elastic#62916
Backport of: elastic#66240
@tvernum
Copy link
Copy Markdown
Contributor Author

tvernum commented Dec 15, 2020

@elasticmachine run elasticsearch-ci/2

java.lang.AssertionError: transform [continuous-histogram-pivot-test] does not progress, state: INDEXING, reason: null	
Expected: a value greater than <1608007624392L>	
     but: <1608007601541L> was less than <1608007624392L>	
	at __randomizedtesting.SeedInfo.seed([2A594CAE4A2FA811:116F3DB5C0442A47]:0)	
		•••
	at org.elasticsearch.xpack.transform.integration.continuous.TransformContinuousIT.lambda$waitUntilTransformsReachedUpperBound$3(TransformContinuousIT.java:499)	
		•••
	at org.elasticsearch.xpack.transform.integration.continuous.TransformContinuousIT.waitUntilTransformsReachedUpperBound(TransformContinuousIT.java:497)	
	at org.elasticsearch.xpack.transform.integration.continuous.TransformContinuousIT.testContinousEvents(TransformContinuousIT.java:275)

@tvernum tvernum merged commit c294e86 into elastic:7.x Dec 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

backport

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@tvernum