Skip to content
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

Fix: fix inputs conflict for workflow #5251

Merged
merged 1 commit into from
Jan 4, 2023

Conversation

FogDong
Copy link
Member

@FogDong FogDong commented Jan 3, 2023

Signed-off-by: FogDong dongtianxin.tx@alibaba-inc.com

Description of your changes

Previously, if the key in inputs.parameterKey is also specified in parameter, it will cause conflict like:

  workflow:
    steps:
    - inputs:
      - from: context.name
        parameterKey: slack.message.text
      name: slack-message
      properties:
        slack:
          message:
            text: myText
          url:
            value: <url>
      type: notification

This PR update workflow vendor and resolve conflicts like this.

I have:

  • Read and followed KubeVela's contribution process.
  • Related Docs updated properly. In a new feature or configuration option, an update to the documentation is necessary.
  • Run make reviewable to ensure this PR is ready for review.
  • Added backport release-x.y labels to auto-backport this PR if necessary.

How has this code been tested

Special notes for your reviewer

cc @barnettZQG

@codecov
Copy link

codecov bot commented Jan 3, 2023

Codecov Report

Base: 58.44% // Head: 61.19% // Increases project coverage by +2.74% 🎉

Coverage data is based on head (4f9ab4c) compared to base (6461625).
Patch has no changes to coverable lines.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5251      +/-   ##
==========================================
+ Coverage   58.44%   61.19%   +2.74%     
==========================================
  Files         280      306      +26     
  Lines       42678    45775    +3097     
==========================================
+ Hits        24942    28010    +3068     
+ Misses      15002    14868     -134     
- Partials     2734     2897     +163     
Flag Coverage Δ
apiserver-e2etests 35.05% <ø> (-0.01%) ⬇️
apiserver-unittests 36.90% <ø> (-0.03%) ⬇️
core-unittests 55.22% <ø> (+0.08%) ⬆️
e2e-multicluster-test 19.22% <ø> (?)
e2e-rollout-tests 20.72% <ø> (?)
e2etests 26.14% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...kg/apiserver/infrastructure/datastore/datastore.go 64.28% <0.00%> (-14.29%) ⬇️
pkg/apiserver/interfaces/api/oam_application.go 64.28% <0.00%> (-5.11%) ⬇️
pkg/apiserver/event/sync/cr2ux.go 45.88% <0.00%> (-4.71%) ⬇️
pkg/apiserver/event/sync/store.go 69.95% <0.00%> (-3.59%) ⬇️
pkg/apiserver/domain/service/oam_application.go 84.61% <0.00%> (-3.30%) ⬇️
pkg/appfile/dryrun/dryrun.go 44.24% <0.00%> (-2.66%) ⬇️
...server/infrastructure/datastore/kubeapi/kubeapi.go 62.60% <0.00%> (-0.84%) ⬇️
pkg/apiserver/domain/service/application.go 57.83% <0.00%> (-0.21%) ⬇️
...dev/v1alpha2/applicationconfiguration/workloads.go 0.00% <0.00%> (ø)
...am.dev/v1alpha2/applicationconfiguration/helper.go 0.00% <0.00%> (ø)
... and 98 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

Copy link
Collaborator

@barnettZQG barnettZQG left a comment

Choose a reason for hiding this comment

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

lgtm

@FogDong FogDong force-pushed the fix-inputs branch 2 times, most recently from 94af6bf to f5b8e70 Compare January 3, 2023 07:31
Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>
@wonderflow wonderflow merged commit 5f71d05 into kubevela:master Jan 4, 2023
barnettZQG pushed a commit to barnettZQG/kubevela that referenced this pull request Jan 30, 2023
Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>

Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>
zhaohuiweixiao pushed a commit to zhaohuiweixiao/kubevela that referenced this pull request Mar 7, 2023
Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>

Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants