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.

Sign up for GitHub

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

Jump to bottom

代码规范：user-manager lint #2662

Merged
merged 2 commits into from
Sep 28, 2023
Merged

代码规范：user-manager lint #2662

merged 2 commits into from
Sep 28, 2023

Conversation

jonesyang12
Copy link
Contributor

No description provided.

adevjoe
adevjoe suggested changes Sep 28, 2023
View reviewed changes
bcs-services/bcs-user-manager/app/pkg/discovery/discovery_test.go Outdated
@@ -56,7 +55,8 @@ func Test_GetRandomServiceInstance(t *testing.T) {

node, err := sd.GetRandomServiceInstance()
if err != nil {
t.Fatalf("GetRandomServiceInstance failed: %v", err)
Copy link
Contributor

Choose a reason for hiding this comment

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

这里不用修改吧

bcs-services/bcs-user-manager/app/pkg/encrypt/des.go
package encrypt

import (
"bytes"
"crypto/cipher"

// NOCC:gas/crypto(设计如此)
Copy link
Contributor

Choose a reason for hiding this comment

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

这里不需要删除

bcs-services/bcs-user-manager/app/pkg/utils/retry.go
@@ -65,13 +64,11 @@ func RetryWithTimeout(fn func() error, opts ...RetryOption) error {
err = fn()
}()

select {
Copy link
Contributor

Choose a reason for hiding this comment

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

不做修改

bcs-services/bcs-user-manager/app/user-manager/v1http/permission/permission.go Outdated
select {
case <-ticker.C:
}
<-ticker.C
Copy link
Contributor

Choose a reason for hiding this comment

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

不做修改

@wenxinlee2015 wenxinlee2015 merged commit 319fc65 into TencentBlueKing:master Sep 28, 2023
5 checks passed
wenxinlee2015 added a commit that referenced this pull request Sep 28, 2023
@wenxinlee2015
Merge remote-tracking branch 'github-bk-bcs/master'
5400506 
* github-bk-bcs/master:
  代码规范：user-manager lint (#2662)
  修复bcs-ui 目录下代码遵循规范 (#2657)
  代码规范：netservice lint (#2651)
  代码规范：storage lint (#2650)
  nodegroup lint (#2652)
  bcs-common pkg目录下遵循代码规范 (#2661)
  bcs-log-manager、 bcs-kube-agent、 bcs-k8s-watch、bcs-helm-manager规范修改 (#2663)
  update: 前端添加eslint规范 (#2664)
  修复bcs-common common目录下遵循代码规范 (#2659)
  bcs-cluster-manger规范修改 (#2658)
  bcs-cli、bcs-client、bcs-data-manager、bcs-gateway-discovery规范修改 (#2654)
  feat: 配置模板侧边栏拖拽 (#2660)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wenxinlee2015 wenxinlee2015 wenxinlee2015 approved these changes

@adevjoe adevjoe adevjoe approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jonesyang12 @adevjoe @wenxinlee2015