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 signedKey using platform id #4634

Merged
merged 1 commit into from Aug 23, 2022

Conversation

FogDong
Copy link
Member

@FogDong FogDong commented Aug 18, 2022

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

Description of your changes

Fixes #

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

@barnettZQG

@FogDong FogDong added backport release-1.4 add this label will automatically backport this PR to release-1.4 branch backport release-1.5 add this label will automatically backport this PR to release-1.5 branch labels Aug 18, 2022
@codecov
Copy link

codecov bot commented Aug 18, 2022

Codecov Report

Merging #4634 (7c6db17) into master (924d553) will decrease coverage by 0.10%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #4634      +/-   ##
==========================================
- Coverage   61.87%   61.77%   -0.11%     
==========================================
  Files         352      353       +1     
  Lines       34773    34823      +50     
==========================================
- Hits        21517    21513       -4     
- Misses      10458    10512      +54     
  Partials     2798     2798              
Flag Coverage Δ
apiserver-e2etests 27.95% <100.00%> (-0.16%) ⬇️
apiserver-unittests 40.33% <100.00%> (+<0.01%) ⬆️
core-unittests 56.42% <ø> (-0.16%) ⬇️
e2e-multicluster-test 20.29% <0.00%> (+0.10%) ⬆️
e2e-rollout-tests 23.24% <ø> (-0.01%) ⬇️
e2etests 30.22% <ø> (-0.11%) ⬇️

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

Impacted Files Coverage Δ
pkg/apiserver/domain/model/system_info.go 100.00% <ø> (ø)
pkg/apiserver/domain/service/authentication.go 50.66% <ø> (ø)
pkg/apiserver/domain/service/system_info.go 76.84% <100.00%> (+0.24%) ⬆️
apis/core.oam.dev/v1beta1/policy_definition.go 0.00% <0.00%> (-50.00%) ⬇️
pkg/utils/compression/gzip.go 0.00% <0.00%> (-33.34%) ⬇️
...tepdefinition/workflowstepdefinition_controller.go 62.03% <0.00%> (-9.26%) ⬇️
pkg/apiserver/interfaces/api/oam_application.go 63.07% <0.00%> (-6.16%) ⬇️
...es/policydefinition/policydefinition_controller.go 64.21% <0.00%> (-5.27%) ⬇️
...ponentdefinition/componentdefinition_controller.go 80.58% <0.00%> (-4.86%) ⬇️
pkg/cue/definition/template.go 65.54% <0.00%> (-3.37%) ⬇️
... and 27 more

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

cmd/apiserver/main.go Outdated Show resolved Hide resolved
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

@@ -63,6 +63,7 @@ func (u systemInfoServiceImpl) Get(ctx context.Context) (*model.SystemInfo, erro
}
return info, nil
}
info.SignedKey = rand.String(32)
Copy link
Collaborator

Choose a reason for hiding this comment

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

will the random string be persistented ?

@wonderflow
Copy link
Collaborator

it still has potential risks if we store them as configmap(database).

Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>
@barnettZQG barnettZQG merged commit ea20b6c into kubevela:master Aug 23, 2022
27 of 28 checks passed
@github-actions
Copy link

Backport failed for release-1.4, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-1.4
git worktree add -d .worktree/backport-4634-to-release-1.4 origin/release-1.4
cd .worktree/backport-4634-to-release-1.4
git checkout -b backport-4634-to-release-1.4
ancref=$(git merge-base 5a241078b7708893eb1381eee13494ef7929de3b 7c6db17a7fce94881f6d1a61ea6c0430a912f436)
git cherry-pick -x $ancref..7c6db17a7fce94881f6d1a61ea6c0430a912f436

@github-actions
Copy link

Backport failed for release-1.5, because it was unable to create a new branch.

Please cherry-pick the changes locally.

git fetch origin release-1.5
git worktree add -d .worktree/backport-4634-to-release-1.5 origin/release-1.5
cd .worktree/backport-4634-to-release-1.5
git checkout -b backport-4634-to-release-1.5
ancref=$(git merge-base 5a241078b7708893eb1381eee13494ef7929de3b 7c6db17a7fce94881f6d1a61ea6c0430a912f436)
git cherry-pick -x $ancref..7c6db17a7fce94881f6d1a61ea6c0430a912f436

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-1.4 add this label will automatically backport this PR to release-1.4 branch backport release-1.5 add this label will automatically backport this PR to release-1.5 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants