From 8c1ccd89c94c6dc3b0de28c7b1487fc1acfadd2b Mon Sep 17 00:00:00 2001 From: dove0012 Date: Wed, 4 Sep 2024 13:03:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgolangci-lint=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bcs-cluster-manager/internal/cloudprovider/aws/taskmgr.go | 4 ++-- .../internal/cloudprovider/aws/tasks/update_desired_nodes.go | 4 ++-- .../internal/cloudprovider/azure/tasks/utils.go | 2 +- .../internal/cloudprovider/ladder/nodegroup.go | 2 +- .../internal/cloudprovider/qcloud/nodemgr.go | 2 +- bcs-services/bcs-cluster-manager/internal/daemon/cache.go | 2 +- bcs-services/bcs-cluster-manager/internal/remote/passcc/cc.go | 2 +- .../internal/remote/resource/tresource/options.go | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/taskmgr.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/taskmgr.go index dadad6abbc..e3f36bf53e 100644 --- a/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/taskmgr.go +++ b/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/taskmgr.go @@ -407,7 +407,7 @@ func (t *Task) BuildCreateNodeGroupTask(group *proto.NodeGroup, opt *cloudprovid // BuildCleanNodesInGroupTask clean specified nodes in NodeGroup // including remove nodes from NodeGroup, clean data in nodes -func (t *Task) BuildCleanNodesInGroupTask(nodes []*proto.Node, group *proto.NodeGroup, +func (t *Task) BuildCleanNodesInGroupTask(nodes []*proto.Node, group *proto.NodeGroup, // nolint opt *cloudprovider.CleanNodesOption) (*proto.Task, error) { // clean nodeGroup nodes in cloud only has two steps: // 1. call asg RemoveInstances to clean cluster nodes @@ -580,7 +580,7 @@ func (t *Task) BuildMoveNodesToGroupTask(nodes []*proto.Node, group *proto.NodeG } // BuildUpdateDesiredNodesTask build update desired nodes task -func (t *Task) BuildUpdateDesiredNodesTask(desired uint32, group *proto.NodeGroup, +func (t *Task) BuildUpdateDesiredNodesTask(desired uint32, group *proto.NodeGroup, // nolint opt *cloudprovider.UpdateDesiredNodeOption) (*proto.Task, error) { // validate request params if desired == 0 { diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/tasks/update_desired_nodes.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/tasks/update_desired_nodes.go index 424df611c9..39e5725f2f 100644 --- a/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/tasks/update_desired_nodes.go +++ b/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/tasks/update_desired_nodes.go @@ -559,8 +559,8 @@ func CheckClusterNodesStatusTask(taskID string, stepName string) error { return nil } -func checkClusterInstanceStatus(ctx context.Context, info *cloudprovider.CloudDependBasicInfo, - instanceNames []string) ([]string, []string, []string, error) { // nolint +func checkClusterInstanceStatus(ctx context.Context, info *cloudprovider.CloudDependBasicInfo, // nolint + instanceNames []string) ([]string, []string, []string, error) { var ( addSuccessNodes = make([]string, 0) addFailureNodes = make([]string, 0) diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/azure/tasks/utils.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/azure/tasks/utils.go index 867a4d3216..3d25b31538 100644 --- a/bcs-services/bcs-cluster-manager/internal/cloudprovider/azure/tasks/utils.go +++ b/bcs-services/bcs-cluster-manager/internal/cloudprovider/azure/tasks/utils.go @@ -76,7 +76,7 @@ func setModuleInfo(group *proto.NodeGroup, bkBizIDString string) { } } -func getClusterResourceGroup(cls *proto.Cluster) string { +func getClusterResourceGroup(cls *proto.Cluster) string { // nolint if cls.GetExtraInfo() == nil { return "" } diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/ladder/nodegroup.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/ladder/nodegroup.go index c36f66c8e5..520e09b767 100644 --- a/bcs-services/bcs-cluster-manager/internal/cloudprovider/ladder/nodegroup.go +++ b/bcs-services/bcs-cluster-manager/internal/cloudprovider/ladder/nodegroup.go @@ -364,7 +364,7 @@ func (ng *NodeGroup) SwitchAutoScalingOptionStatus(scalingOption *proto.ClusterA } // CheckResourcePoolQuota check resource pool quota when revise group limit -func (ng *NodeGroup) CheckResourcePoolQuota(group *proto.NodeGroup, scaleUpNum uint32) error { +func (ng *NodeGroup) CheckResourcePoolQuota(group *proto.NodeGroup, scaleUpNum uint32) error { // nolint cloud, err := cloudprovider.GetCloudByProvider(cloudName) if err == nil && cloud.GetConfInfo().GetDisableCheckGroupResource() { return nil diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/nodemgr.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/nodemgr.go index fd64e66ab6..4d1e9b4a5f 100644 --- a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/nodemgr.go +++ b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/nodemgr.go @@ -228,7 +228,7 @@ func (nm *NodeManager) ListNodeInstanceType(info cloudprovider.InstanceInfo, opt } // getInnerInstanceTypes get inner instance types info -func (nm *NodeManager) getInnerInstanceTypes(info cloudprovider.InstanceInfo) ( +func (nm *NodeManager) getInnerInstanceTypes(info cloudprovider.InstanceInfo) ( // nolint []*proto.InstanceType, error) { blog.Infof("getInnerInstanceTypes %+v", info) diff --git a/bcs-services/bcs-cluster-manager/internal/daemon/cache.go b/bcs-services/bcs-cluster-manager/internal/daemon/cache.go index 45d6190d34..9cea136a1f 100644 --- a/bcs-services/bcs-cluster-manager/internal/daemon/cache.go +++ b/bcs-services/bcs-cluster-manager/internal/daemon/cache.go @@ -15,8 +15,8 @@ package daemon import ( "fmt" - "github.com/Tencent/bk-bcs/bcs-common/common/blog" + "github.com/Tencent/bk-bcs/bcs-common/common/blog" gocache "github.com/patrickmn/go-cache" "github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/remote/cache" diff --git a/bcs-services/bcs-cluster-manager/internal/remote/passcc/cc.go b/bcs-services/bcs-cluster-manager/internal/remote/passcc/cc.go index 0161790a44..3016af1dd6 100644 --- a/bcs-services/bcs-cluster-manager/internal/remote/passcc/cc.go +++ b/bcs-services/bcs-cluster-manager/internal/remote/passcc/cc.go @@ -329,7 +329,7 @@ func (cc *ClientConfig) getAccessToken(clientAuth *auth.ClientAuth) (string, err } var ( - appToken = "" + appToken string err error ) diff --git a/bcs-services/bcs-cluster-manager/internal/remote/resource/tresource/options.go b/bcs-services/bcs-cluster-manager/internal/remote/resource/tresource/options.go index 14cd2b72bd..5dec9ed645 100644 --- a/bcs-services/bcs-cluster-manager/internal/remote/resource/tresource/options.go +++ b/bcs-services/bcs-cluster-manager/internal/remote/resource/tresource/options.go @@ -127,7 +127,7 @@ const ( usedQuota = "usedQuota" availableQuota = "availableQuota" // OverSold ratio - OverSold = "oversold" + OverSold = "oversold" ) // PoolLabel xxx