Chore: tidy appHandler with serveral deprecation #6300
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
chivalryq
requested review from
Somefive,
StevenLeiZhang,
charlie0129,
wangyikewxgm,
FogDong,
barnettZQG,
wonderflow,
leejanee and
jefree-cat
as code owners
wangyikewxgm
approved these changes
Aug 25, 2023
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## master #6300 +/- ##
===========================================
- Coverage 66.30% 33.13% -33.18%
===========================================
Files 183 180 -3
Lines 23954 23770 -184
===========================================
- Hits 15883 7875 -8008
- Misses 6508 14912 +8404
+ Partials 1563 983 -580
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
wonderflow
reviewed
Aug 26, 2023
Yes, I've chanegd the title. |
Somefive
approved these changes
Aug 26, 2023
|
@chivalryq It's still not clear, you'd better make a clarification about which features are deprecated. |
|
ping @wonderflow |
wonderflow
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of your changes
This PR mainly have several effects:
PackagedWorkloadResourcesandPackagedTraitResourcesfield in ComponentManifest. They are for helm-based component which has been depracated in schematic of ComponentDefinitionStandardWorkload -> ComponentOutputandTraits -> ComponentOutputAndTraits. The original names (StandardWorkload and Traits) can not reflect the actual usage of the fields.ComponentOutputcontains K8s resource generated from "output" block of ComponentDefinitionComponentOutputsAndTraitscontains both resources generated from "outputs" block of ComponentDefinition and resources generated from TraitDefinition🤖 Generated by Copilot at 70e261c
Summary
🚚🗑️🛠️
Refactored the appfile package and related packages to use a new data model for application components and their outputs. Renamed some structs and fields to align with the OAM spec and improve clarity. Simplified the application revision logic to use component manifests directly. Updated the tests and CLI commands to reflect the changes.
Walkthrough
StandardWorkloadtoComponentOutputandTraitstoComponentOutputsAndTraitsinComponentManifesttype to avoid confusion with OAM spec (link)prepareArtifactsDataandSetOAMContractinpkg/appfile/appfile.go(link, link)evalWorkloadWithContextinpkg/appfile/appfile.goandpkg/appfile/appfile_test.go(link, link, link, link)PrepareBeforeApplyandHandleCheckManageWorkloadTraitinpkg/controller/core.oam.dev/v1beta1/application/assemble/assemble.go(link, link, link)generateManifestinpkg/appfile/dryrun/diff.go(link, link)PrintDryRuninpkg/appfile/dryrun/dryrun.go(link, link)TestGenerateAppRevisionandTestGenerateAppRevisionWithWorkflowinpkg/controller/core.oam.dev/v1beta1/application/application_controller_test.go(link, link)TestGenerateComponentFromCUEModule,TestEvalWorkloadWithContext,TestPrepareArtifactsData, andTestGenerateComponentFromCUEModuleWithWorkflowinpkg/appfile/appfile_test.go(link, link, link, link, link)renderComponentsAndTraits,getComponentResources, andoverrideTraitsinpkg/controller/core.oam.dev/v1beta1/application/generator.go(link, link, link, link)overrideTraitstoredirectTraitToLocalIfNeedinpkg/controller/core.oam.dev/v1beta1/application/generator.goto better reflect its purpose and update the reference inrenderComponentsAndTraits(link, link)ProduceArtifactsfunction and related constants and imports inpkg/controller/core.oam.dev/v1beta1/application/apply.goandpkg/controller/core.oam.dev/v1beta1/application/revision.goas they are no longer needed after refactoring the application revision logic to use the component manifests directly (link, link, link, link, link)ComputeComponentRevisionHashfunction and related import inpkg/controller/core.oam.dev/v1beta1/application/revision.goas it is no longer needed after refactoring the application revision logic to use the component revision name and hash labels (link, link)ProduceArtifactsfunction in various tests inpkg/controller/core.oam.dev/v1beta1/application/revision_test.goas the function is no longer needed and removed (link, link, link, link, link, link)debugComponentsfunction inreferences/cli/debug.goto use the new field names ofComponentOutputandComponentOutputsAndTraitswhen creating the maps of components and traits from the component manifests (link)Fixes #
I have:
make reviewableto ensure this PR is ready for review.backport release-x.ylabels to auto-backport this PR if necessary.How has this code been tested
Special notes for your reviewer