Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
9c047e3
Add new template field to SearchApplication
ioanatia Mar 13, 2023
9b6abce
Script should not be nullable
ioanatia Mar 20, 2023
7e77e3c
Add tests
ioanatia Mar 21, 2023
3dd4f22
Rename to SearchApplicationTemplate
ioanatia Mar 21, 2023
afb0bc5
Use mustache templates
ioanatia Mar 21, 2023
499f22a
No need to modify the system index mapping and store the search templ…
ioanatia Mar 21, 2023
825db42
Add rest api tests
ioanatia Mar 21, 2023
dcd5a89
More renames from SearchTemplate to SearchApplicationTemplates
ioanatia Mar 21, 2023
39c8a17
Initial API
ioanatia Mar 14, 2023
916324a
simple template execution
jimczi Mar 22, 2023
bf864cc
Use SearchApplicationQueryParams to include query parameters, merge t…
carlosdelest Mar 28, 2023
c1119f5
Make the query work with GET and POST, and assume default params when…
carlosdelest Mar 28, 2023
c53acb4
Add serialization tests
carlosdelest Mar 28, 2023
a7d1c66
Add YAML tests
carlosdelest Mar 29, 2023
026d5e6
Refactor TransportAction for legibility
carlosdelest Mar 29, 2023
066d15e
Additional tests for Search Application Query
carlosdelest Mar 29, 2023
9ad8327
Fix rebasing
carlosdelest Mar 29, 2023
c09d6ff
Added javadoc, minor formatting changes
carlosdelest Mar 29, 2023
aa28795
Remove SearchApplicationQueryParams and included them directly in Req…
carlosdelest Mar 31, 2023
5f745b4
Fix imports
carlosdelest Mar 31, 2023
b674aed
Change search_application.query to search_application.search for API …
carlosdelest Mar 31, 2023
9d76f5e
Add mustache template validation
carlosdelest Mar 31, 2023
d918ef0
Add mustache template validation
carlosdelest Mar 31, 2023
a50f651
Update module dependencies
kderusso Apr 4, 2023
2c7f3df
Update search application REST spec to reflect beta, no feature flag
kderusso Apr 4, 2023
ae3c4a3
Apply some PR suggestions from previous PR
kderusso Apr 4, 2023
ae6a714
Store and retrieve JSON Schema
carlosdelest Mar 30, 2023
e4410cc
Add equals and hashcode
carlosdelest Mar 30, 2023
e6a0169
Formatting
carlosdelest Mar 30, 2023
0ed6363
Refactored dependencies
carlosdelest Mar 30, 2023
563d3a7
Add license information for dependencies
carlosdelest Mar 30, 2023
64ac92c
Fix tests and equals / hashcode
carlosdelest Mar 30, 2023
4bc2a43
Remove nested param_validator / source and replace by dictionary
carlosdelest Mar 30, 2023
fdba153
Remove need for "properties" and use "dictionary" directly
carlosdelest Mar 30, 2023
b580c3c
Fix dictionary content in tests
carlosdelest Mar 30, 2023
6033fc2
Constant refactoring and javadoc
carlosdelest Mar 30, 2023
5d5a90f
Add initial template validation
carlosdelest Mar 30, 2023
3bfbd2c
Add validation for query parameters
carlosdelest Mar 31, 2023
f9f3665
Catch possible failures on Search App deserialization, to avoid ES dy…
carlosdelest Mar 31, 2023
b8ec850
Add param validation test
carlosdelest Mar 31, 2023
09f5a50
Variable rename
kderusso Apr 4, 2023
3ee1d5a
Update module dependencies
kderusso Apr 5, 2023
a124eaf
Fix some compile errors
kderusso Apr 5, 2023
310b148
Merge branch 'kderusso/carlos_add_template_schema' into kderusso/carl…
kderusso Apr 5, 2023
b1f4e97
Merge pull request #5 from kderusso/kderusso/carlos_template_validation
kderusso Apr 5, 2023
30553f6
Fix compile errors after merge
kderusso Apr 5, 2023
e21cdfe
Fix some more build errors
kderusso Apr 5, 2023
b55e00c
cleanup
kderusso Apr 5, 2023
c534ab5
Fix imports
kderusso Apr 5, 2023
0fb9c4f
Merge branch 'main' into kderusso/carlos_add_template_schema
carlosdelest Apr 27, 2023
1e8656a
Fix merge
carlosdelest Apr 28, 2023
7a0bee0
Use complete JSON schema instead of just properties
carlosdelest Apr 28, 2023
4ee3871
Fix potential flaky test
carlosdelest Apr 28, 2023
6183308
Merge branch 'main' into kderusso/carlos_add_template_schema
carlosdelest Apr 28, 2023
7c8887d
Merge branch 'main' into carlosdelest/add-params-schema-validation
carlosdelest Apr 28, 2023
5f9c89e
PR review comments
carlosdelest Apr 28, 2023
8c2eb54
Update docs/changelog/95674.yaml
carlosdelest Apr 28, 2023
65b06de
Fix duplicate security
carlosdelest May 3, 2023
12adeb6
Merge remote-tracking branch 'carlosdelest/carlosdelest/add-params-sc…
carlosdelest May 3, 2023
2ed00d1
Remove useless match
carlosdelest May 3, 2023
faa68aa
Merge remote-tracking branch 'origin/main' into carlosdelest/add-para…
carlosdelest May 10, 2023
8b7dda9
Fix merge
carlosdelest May 10, 2023
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/95674.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 95674
summary: Add template parameters to Search Applications
area: Application
type: enhancement
issues: []
19 changes: 16 additions & 3 deletions x-pack/plugin/ent-search/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,15 @@ archivesBaseName = 'x-pack-ent-search'
dependencies {
compileOnly project(path: xpackModule('core'))
api project(':modules:lang-mustache')
api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"

// JSON Schema dependencies
implementation "org.apache.commons:commons-lang3:${versions.commons_lang3}"
Copy link
Member Author

Choose a reason for hiding this comment

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

Added dependencies, which were OK according to core-infra team (Slack conversation)

implementation "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
implementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
implementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
implementation "org.slf4j:slf4j-api:${versions.slf4j}"
implementation "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
implementation "com.networknt:json-schema-validator:${versions.networknt_json_schema_validator}"

testImplementation(testArtifact(project(xpackModule('core'))))
testImplementation(project(':modules:lang-mustache'))
Expand All @@ -30,5 +36,12 @@ tasks.named("dependencyLicenses").configure {
mapping from: /jackson.*/, to: 'jackson'
}

tasks.named("thirdPartyAudit").configure {
ignoreMissingClasses(
// [missing classes] SLF4j includes an optional class that depends on an extension class (!)
'org.slf4j.ext.EventData'
)
}

addQaCheckDependencies(project)

202 changes: 202 additions & 0 deletions x-pack/plugin/ent-search/licenses/commons-lang3-LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
5 changes: 5 additions & 0 deletions x-pack/plugin/ent-search/licenses/commons-lang3-NOTICE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Apache Commons Lang
Copyright 2001-2019 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Loading