-
Notifications
You must be signed in to change notification settings - Fork 54
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
Update integration format for better handling of multiple asset types #1498
Update integration format for better handling of multiple asset types #1498
Conversation
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1498 +/- ##
==========================================
+ Coverage 54.26% 54.36% +0.10%
==========================================
Files 343 344 +1
Lines 12338 12353 +15
Branches 3173 3173
==========================================
+ Hits 6695 6716 +21
+ Misses 5587 5581 -6
Partials 56 56
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
name: string; | ||
version: string; | ||
extension: string; | ||
type: SupportedAssetType; |
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.
This is the core change, most of the refactoring is following the consequences of this type update
@@ -190,6 +191,9 @@ export class ObservabilityPlugin | |||
}, | |||
}, | |||
}, | |||
migrations: { | |||
'3.0.0': migrateV1IntegrationToV2Integration, |
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.
Not 100% sure I've set up migration correctly, messed with it a bit to get the type checking to work out but I'm not sure when this migration triggers.
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.
Hi
How would migration be handled an by whom ?
For example if I have a migration script - where can I specify it ?
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.
Migrations run on OSD startup, it's handled in OSD and will apply to all of the installed templates that are on a lower version. But I'm not sure how OSD detects the version.
For content, I migrated all of the prebuilt content, but I'll need to update the bundle script for the new version.
* Update integration type for new format Signed-off-by: Simeon Widdis <sawiddis@amazon.com> * Update integration type validator for new type Signed-off-by: Simeon Widdis <sawiddis@amazon.com> * Fix type errors in integration_reader Signed-off-by: Simeon Widdis <sawiddis@amazon.com> * Fix return types in adaptor Signed-off-by: Simeon Widdis <sawiddis@amazon.com> * Update integrations constants Signed-off-by: Simeon Widdis <sawiddis@amazon.com> * Fix local repository and local repository tests Signed-off-by: Simeon Widdis <sawiddis@amazon.com> * Fix remaining integrations unit tests Signed-off-by: Simeon Widdis <sawiddis@amazon.com> * Add integration format migration Signed-off-by: Simeon Widdis <sawiddis@amazon.com> * Fix frontend usage of integration assets Signed-off-by: Simeon Widdis <sawiddis@amazon.com> * Update integration install query iteration Signed-off-by: Simeon Widdis <sawiddis@amazon.com> --------- Signed-off-by: Simeon Widdis <sawiddis@amazon.com> (cherry picked from commit b5ee6f8) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
) * Fix a bad import path - Resolves opensearch-project#1487 Signed-off-by: Peter Nied <petern@amazon.com> Signed-off-by: Peter Nied <peternied@hotmail.com> Co-authored-by: Ryan Liang <109499885+RyanL1997@users.noreply.github.com> (cherry picked from commit 32c02c8c18a509884613517fac38b684338d5273) Co-authored-by: Peter Nied <petern@amazon.com>
Description
To support multiple installation paths for integrations better, part of that is refactoring the current install flow to make the different types of assets more uniform. This PR:
Next steps are refactoring the installation flow to support multiple install paths, using these extensability updates.
Notice: I noticed while writing this that we don't have any unit/integration tests that ensure that all types of assets are being correctly installed. This will be included as part of the installation workflows PR, the current PR is already fairly big as-is. Followed the boy scout rule for some other misc. changes like removing dead code and fixing misused types.
Issues Resolved
Closes #1444
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.