-
Notifications
You must be signed in to change notification settings - Fork 63
[Backport 1.x] Register new routes via SDK as named routes (#827) and Makes route prefix setting routeNamePrefix optional #868 #866
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
Conversation
* WIP on Handler naming and SSL Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add concept of extension shortname via settings Signed-off-by: Craig Perkins <cwperx@amazon.com> * WIP on extension ssl Signed-off-by: Craig Perkins <cwperx@amazon.com> * Get registry from runner Signed-off-by: Craig Perkins <cwperx@amazon.com> * Read settings from extension config file Signed-off-by: Craig Perkins <cwperx@amazon.com> * Update license headers Signed-off-by: Craig Perkins <cwperx@amazon.com> * Run spotlessApply Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove authz changes and only keep TLS Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove authz changes and only keep TLS Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove authz changes and only keep TLS Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove authz changes and only keep TLS Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove authz changes and only keep TLS Signed-off-by: Craig Perkins <cwperx@amazon.com> * Update cert generation documents Signed-off-by: Craig Perkins <cwperx@amazon.com> * Re-add authz changes for sample Hello world extension Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add ssl.transport.enabled in ExtensionsRunner Signed-off-by: Craig Perkins <cwperx@amazon.com> * Name all HelloWorld extension routes Signed-off-by: Craig Perkins <cwperx@amazon.com> * Run spotlessApply Signed-off-by: Craig Perkins <cwperx@amazon.com> * Merge main into branch Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add instructions for running in SSL only mode Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add all SSL settings to extension settings Signed-off-by: Craig Perkins <cwperx@amazon.com> * Update TestExtensionsRunner Signed-off-by: Craig Perkins <cwperx@amazon.com> * Set default enforce_hostname_verification Signed-off-by: Craig Perkins <cwperx@amazon.com> * Run spotlessApply Signed-off-by: Craig Perkins <cwperx@amazon.com> * Respond to code review feedback Signed-off-by: Craig Perkins <cwperx@amazon.com> * fix merge conflicts Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix typos in debug messages Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add docstrings Signed-off-by: Craig Perkins <cwperx@amazon.com> * Address code review feedback Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove duplicate Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove duplicate Signed-off-by: Craig Perkins <cwperx@amazon.com> * Create ExtensionRouteHandlerFactory Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove extension: from action naming Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add javadoc Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix test compilation errors Signed-off-by: Craig Perkins <cwperx@amazon.com> * Consolidate registerHandler Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix missed registerHandler usage Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix javadoc Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add method to check if class is initialized Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix failing tests Signed-off-by: Craig Perkins <cwperx@amazon.com> * Update helloworld-settings Signed-off-by: Craig Perkins <cwperx@amazon.com> * Run spotlessApply Signed-off-by: Craig Perkins <cwperx@amazon.com> * Run spotlessApply Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add shortExtensionName to BaseExtensionRouteHandler Signed-off-by: Craig Perkins <cwperx@amazon.com> * Adds support for legacy action names while registering extension routes on extension start up Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Modifies sample hello extension to conform to the new registration scheme Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Renames route handlers Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Adds certificate generation script Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes spotless errors Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes Javadoc Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Cleans up route handlers to be more readable and adds an interface Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Updates test to reflect changes in route handler signatures Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes slf4j gradle build issue Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes replaced named route tests Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Changes the way named routes are serialized to conform to core and fixes tests Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Removes mention of shortNames and uses extensionName as permission prefix Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Used builder for named routes Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes broken changes Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Updates dev guide to state to use credentials when registering extension while security is enabled Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Replaces NamedRouteHandler and update logic to map route handlers for Rest request Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes typos Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Removes references to ReplaceNamedRouteHandlers and DeprecatedNamedRouteHandlers Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Addresses PR feedback Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Refactors ReplacedRoute and deprecated route handlers to use RestResponse Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Forces httpcore5 to 5.2.2 Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Updates documentation Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Addresses PR feedback Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes broken reference due to changes in core 52a5e3f6e0ca599e3193807134ea42660ecdd195 Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Removes extra resolutionStrategy Signed-off-by: Darshit Chanpura <dchanp@amazon.com> --------- Signed-off-by: Craig Perkins <cwperx@amazon.com> Signed-off-by: Darshit Chanpura <dchanp@amazon.com> Co-authored-by: Craig Perkins <cwperx@amazon.com> (cherry picked from commit 09c22b0)
|
Looks like the Integ Test fix from original doesn't work on backport.... |
|
I've created the backport for the integ test fix: opensearch-project/OpenSearch#8588 |
|
Before we merge this backport : #827 (comment) |
dbwiddis
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See #827 (comment)
Addressed in a separate PR to main: #868 Will cherry-pick the changes into this branch once that PR is merged |
a076730 to
ebd13ad
Compare
|
@DarshitChanpura #868 has been merged |
…ject#868) * Renames demo extension to `helloWorld` Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Updates uniqueId to not reflect the change Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Adds a validation check for setting extension name Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes checkstyle errors Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Adds routePrefix as an optional setting in .yml Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Updates dev guide to add documentation for the optional setting `routePrefix` Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Renames `routePrefix` to `routeNamePrefix` Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Renames erroneous instance of `hello-world` Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Addresses PR feedback Signed-off-by: Darshit Chanpura <dchanp@amazon.com> (cherry picked from commit 0103ada30250693c7b986a9667fd0060b414a66e) * Changes allowed route name prefixes Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes error message and removes hyphen from allowed characters in route name prefix Signed-off-by: Darshit Chanpura <dchanp@amazon.com> --------- Signed-off-by: Darshit Chanpura <dchanp@amazon.com> (cherry picked from commit 9e31418)
|
@joshpalis @dbwiddis @owaiskazi19 @saratvemulapalli All relevant changes from |
…pensearch-project#827) and Makes route prefix setting routeNamePrefix optional opensearch-project#868 (opensearch-project#866)" This reverts commit 32d6567.
…pensearch-project#827) and Makes route prefix setting routeNamePrefix optional opensearch-project#868 (opensearch-project#866)" This reverts commit 32d6567. Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
) and Makes route prefix setting routeNamePrefix optional #868" (#877) * Revert "[Backport 1.x] Register new routes via SDK as named routes (#827) and Makes route prefix setting routeNamePrefix optional #868 (#866)" This reverts commit 32d6567. Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Updates extension() method call in build.gradle Signed-off-by: Darshit Chanpura <dchanp@amazon.com> --------- Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
…h-project#827) and Makes route prefix setting routeNamePrefix optional opensearch-project#868 (opensearch-project#866) * Register new routes via SDK as named routes (opensearch-project#827) * WIP on Handler naming and SSL Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add concept of extension shortname via settings Signed-off-by: Craig Perkins <cwperx@amazon.com> * WIP on extension ssl Signed-off-by: Craig Perkins <cwperx@amazon.com> * Get registry from runner Signed-off-by: Craig Perkins <cwperx@amazon.com> * Read settings from extension config file Signed-off-by: Craig Perkins <cwperx@amazon.com> * Update license headers Signed-off-by: Craig Perkins <cwperx@amazon.com> * Run spotlessApply Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove authz changes and only keep TLS Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove authz changes and only keep TLS Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove authz changes and only keep TLS Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove authz changes and only keep TLS Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove authz changes and only keep TLS Signed-off-by: Craig Perkins <cwperx@amazon.com> * Update cert generation documents Signed-off-by: Craig Perkins <cwperx@amazon.com> * Re-add authz changes for sample Hello world extension Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add ssl.transport.enabled in ExtensionsRunner Signed-off-by: Craig Perkins <cwperx@amazon.com> * Name all HelloWorld extension routes Signed-off-by: Craig Perkins <cwperx@amazon.com> * Run spotlessApply Signed-off-by: Craig Perkins <cwperx@amazon.com> * Merge main into branch Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add instructions for running in SSL only mode Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add all SSL settings to extension settings Signed-off-by: Craig Perkins <cwperx@amazon.com> * Update TestExtensionsRunner Signed-off-by: Craig Perkins <cwperx@amazon.com> * Set default enforce_hostname_verification Signed-off-by: Craig Perkins <cwperx@amazon.com> * Run spotlessApply Signed-off-by: Craig Perkins <cwperx@amazon.com> * Respond to code review feedback Signed-off-by: Craig Perkins <cwperx@amazon.com> * fix merge conflicts Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix typos in debug messages Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add docstrings Signed-off-by: Craig Perkins <cwperx@amazon.com> * Address code review feedback Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove duplicate Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove duplicate Signed-off-by: Craig Perkins <cwperx@amazon.com> * Create ExtensionRouteHandlerFactory Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove extension: from action naming Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add javadoc Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix test compilation errors Signed-off-by: Craig Perkins <cwperx@amazon.com> * Consolidate registerHandler Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix missed registerHandler usage Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix javadoc Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add method to check if class is initialized Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix failing tests Signed-off-by: Craig Perkins <cwperx@amazon.com> * Update helloworld-settings Signed-off-by: Craig Perkins <cwperx@amazon.com> * Run spotlessApply Signed-off-by: Craig Perkins <cwperx@amazon.com> * Run spotlessApply Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add shortExtensionName to BaseExtensionRouteHandler Signed-off-by: Craig Perkins <cwperx@amazon.com> * Adds support for legacy action names while registering extension routes on extension start up Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Modifies sample hello extension to conform to the new registration scheme Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Renames route handlers Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Adds certificate generation script Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes spotless errors Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes Javadoc Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Cleans up route handlers to be more readable and adds an interface Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Updates test to reflect changes in route handler signatures Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes slf4j gradle build issue Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes replaced named route tests Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Changes the way named routes are serialized to conform to core and fixes tests Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Removes mention of shortNames and uses extensionName as permission prefix Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Used builder for named routes Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes broken changes Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Updates dev guide to state to use credentials when registering extension while security is enabled Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Replaces NamedRouteHandler and update logic to map route handlers for Rest request Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes typos Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Removes references to ReplaceNamedRouteHandlers and DeprecatedNamedRouteHandlers Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Addresses PR feedback Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Refactors ReplacedRoute and deprecated route handlers to use RestResponse Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Forces httpcore5 to 5.2.2 Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Updates documentation Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Addresses PR feedback Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes broken reference due to changes in core 52a5e3f6e0ca599e3193807134ea42660ecdd195 Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Removes extra resolutionStrategy Signed-off-by: Darshit Chanpura <dchanp@amazon.com> --------- Signed-off-by: Craig Perkins <cwperx@amazon.com> Signed-off-by: Darshit Chanpura <dchanp@amazon.com> Co-authored-by: Craig Perkins <cwperx@amazon.com> (cherry picked from commit 09c22b0) * Makes route prefix setting `routeNamePrefix` optional (opensearch-project#868) * Renames demo extension to `helloWorld` Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Updates uniqueId to not reflect the change Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Adds a validation check for setting extension name Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes checkstyle errors Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Adds routePrefix as an optional setting in .yml Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Updates dev guide to add documentation for the optional setting `routePrefix` Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Renames `routePrefix` to `routeNamePrefix` Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Renames erroneous instance of `hello-world` Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Addresses PR feedback Signed-off-by: Darshit Chanpura <dchanp@amazon.com> (cherry picked from commit 0103ada30250693c7b986a9667fd0060b414a66e) * Changes allowed route name prefixes Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes error message and removes hyphen from allowed characters in route name prefix Signed-off-by: Darshit Chanpura <dchanp@amazon.com> --------- Signed-off-by: Darshit Chanpura <dchanp@amazon.com> (cherry picked from commit 9e31418)
…pensearch-project#827) and Makes route prefix setting routeNamePrefix optional opensearch-project#868" (opensearch-project#877) * Revert "[Backport 1.x] Register new routes via SDK as named routes (opensearch-project#827) and Makes route prefix setting routeNamePrefix optional opensearch-project#868 (opensearch-project#866)" This reverts commit 32d6567. Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Updates extension() method call in build.gradle Signed-off-by: Darshit Chanpura <dchanp@amazon.com> --------- Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Description
Manually Backports #827 & #868
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.