-
Notifications
You must be signed in to change notification settings - Fork 57
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
Implement saved query substitution for S3 integrations #1705
Implement saved query substitution for S3 integrations #1705
Conversation
Signed-off-by: Simeon Widdis <[email protected]>
Signed-off-by: Simeon Widdis <[email protected]>
Signed-off-by: Simeon Widdis <[email protected]>
Signed-off-by: Simeon Widdis <[email protected]>
Signed-off-by: Simeon Widdis <[email protected]>
Signed-off-by: Simeon Widdis <[email protected]>
Signed-off-by: Simeon Widdis <[email protected]>
Signed-off-by: Simeon Widdis <[email protected]>
const builtInstance = await this.buildInstance(integration, refs, options); | ||
return builtInstance; | ||
} | ||
|
||
// If we have a data source or table specified, hunt for saved queries and update them with the | ||
// new DS/table. | ||
substituteQueries(assets: SavedObject[], dataSource?: string, tableName?: string): SavedObject[] { |
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.
Heart of the substitution updates: here's where we search for saved queries to update
workflows?: string[], | ||
skipRedirect?: boolean | ||
skipRedirect?: boolean, | ||
dataSourceInfo?: { dataSource: string; tableName: string } |
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.
For the front-end we need to add this pair of params to send to the back-end, so we do so. Todo: this method has a lot of parameters and should probably be broken up somehow.
Going to have zombie lint failures, tracking issue #1363 |
The backport to
To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/dashboards-observability/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-observability/backport-2.x
# Create a new branch
git switch --create backport/backport-1705-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0b58e64baa0cd26df839a3ed46e038d61b031baf
# Push it to GitHub
git push --set-upstream origin backport/backport-1705-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-observability/backport-2.x Then, create a pull request where the |
* Add example queries for cloudfront Signed-off-by: Simeon Widdis <[email protected]> * Add Flint S3 label to haproxy Signed-off-by: Simeon Widdis <[email protected]> * Add query substitution method to build process Signed-off-by: Simeon Widdis <[email protected]> * Fix tests Signed-off-by: Simeon Widdis <[email protected]> * Update build API with new data source fields Signed-off-by: Simeon Widdis <[email protected]> * Update frontend to use new API term Signed-off-by: Simeon Widdis <[email protected]> * Use new fields in original integration creation request Signed-off-by: Simeon Widdis <[email protected]> * Fix broken data source usage ref Signed-off-by: Simeon Widdis <[email protected]> --------- Signed-off-by: Simeon Widdis <[email protected]> (cherry picked from commit 0b58e64) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…ver from public folder (opensearch-project#1705) (opensearch-project#1716) Signed-off-by: Craig Perkins <[email protected]> Co-authored-by: Yulong Ruan <[email protected]>
…oject#1705) * Add example queries for cloudfront Signed-off-by: Simeon Widdis <[email protected]> * Add Flint S3 label to haproxy Signed-off-by: Simeon Widdis <[email protected]> * Add query substitution method to build process Signed-off-by: Simeon Widdis <[email protected]> * Fix tests Signed-off-by: Simeon Widdis <[email protected]> * Update build API with new data source fields Signed-off-by: Simeon Widdis <[email protected]> * Update frontend to use new API term Signed-off-by: Simeon Widdis <[email protected]> * Use new fields in original integration creation request Signed-off-by: Simeon Widdis <[email protected]> * Fix broken data source usage ref Signed-off-by: Simeon Widdis <[email protected]> --------- Signed-off-by: Simeon Widdis <[email protected]> (cherry picked from commit 0b58e64)
Description
Activates the queries workflow with some simple example queries. It turns out that queries had hard refs to the tables and data sources they're defined with, so I also had to implement the ability to swap them out by adding it to the integration building process.
Issues Resolved
N/A
Check List
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.