diff --git a/pkg/kapis/devops/v1alpha2/devops.go b/pkg/kapis/devops/v1alpha2/devops.go index 482f1e7ae..93e37f2ff 100644 --- a/pkg/kapis/devops/v1alpha2/devops.go +++ b/pkg/kapis/devops/v1alpha2/devops.go @@ -116,7 +116,7 @@ func (h *ProjectPipelineHandler) ListPipelines(req *restful.Request, resp *restf Items: make([]clientDevOps.Pipeline, len(objs.Items)), } pipelineMap := make(map[string]int, pipelineList.Total) - for i, _ := range objs.Items { + for i := range objs.Items { if pipeline, ok := objs.Items[i].(v1alpha3.Pipeline); !ok { continue } else { @@ -139,7 +139,7 @@ func (h *ProjectPipelineHandler) ListPipelines(req *restful.Request, resp *restf if err != nil { log.Error(err) } else { - for i, _ := range res.Items { + for i := range res.Items { if index, ok := pipelineMap[res.Items[i].Name]; ok { // keep annotations field of pipelineList annotations := pipelineList.Items[index].Annotations diff --git a/pkg/kapis/monitoring/v1alpha3/helper.go b/pkg/kapis/monitoring/v1alpha3/helper.go index d574cced7..92e861aea 100644 --- a/pkg/kapis/monitoring/v1alpha3/helper.go +++ b/pkg/kapis/monitoring/v1alpha3/helper.go @@ -446,9 +446,9 @@ func (h handler) makeQueryOptions(r reqParams, lvl monitoring.Level) (q queryOpt func exportMetrics(metrics model.Metrics, startTime, endTime time.Time) (*bytes.Buffer, error) { var resBytes []byte - for i, _ := range metrics.Results { + for i := range metrics.Results { ret := metrics.Results[i] - for j, _ := range ret.MetricValues { + for j := range ret.MetricValues { ret.MetricValues[j].TransferToExportedMetricValue() } } diff --git a/pkg/kapis/monitoring/v1alpha3/meter.go b/pkg/kapis/monitoring/v1alpha3/meter.go index 8895ab628..d52bc5393 100644 --- a/pkg/kapis/monitoring/v1alpha3/meter.go +++ b/pkg/kapis/monitoring/v1alpha3/meter.go @@ -53,7 +53,7 @@ func (h handler) handleApplicationMetersQuery(meters []string, resp *restful.Res } appWorkloads := h.getAppWorkloads(aso.NamespaceName, aso.Applications) - for k, _ := range appWorkloads { + for k := range appWorkloads { opt := monitoring.ApplicationOption{ NamespaceName: aso.NamespaceName, Application: k, @@ -111,7 +111,7 @@ func (h handler) handleServiceMetersQuery(meters []string, resp *restful.Respons } svcPodsMap := h.mo.GetSerivePodsMap(sso.NamespaceName, sso.Services) - for k, _ := range svcPodsMap { + for k := range svcPodsMap { opt := monitoring.ServiceOption{ NamespaceName: sso.NamespaceName, ServiceName: k, @@ -425,7 +425,7 @@ func (h handler) handleOpenpitrixMetersQuery(meters []string, resp *restful.Resp opWorkloads := h.getOpWorkloads(oso.Cluster, oso.NamespaceName, oso.Openpitrixs) - for k, _ := range opWorkloads { + for k := range opWorkloads { opt := monitoring.ApplicationOption{ NamespaceName: oso.NamespaceName, Application: k, diff --git a/pkg/models/alerting/rules/utils_test.go b/pkg/models/alerting/rules/utils_test.go index 4de9fc2a9..e5b3e1bb8 100644 --- a/pkg/models/alerting/rules/utils_test.go +++ b/pkg/models/alerting/rules/utils_test.go @@ -27,10 +27,10 @@ func TestGetAlertingRulesStatus(t *testing.T) { Level: v2alpha1.RuleLevelNamespace, Custom: true, ResourceRulesMap: map[string]*ResourceRuleCollection{ - "custom-alerting-rule-jqbgn": &ResourceRuleCollection{ - GroupSet: map[string]struct{}{"alerting.custom.defaults": struct{}{}}, + "custom-alerting-rule-jqbgn": { + GroupSet: map[string]struct{}{"alerting.custom.defaults": {}}, NameRules: map[string][]*ResourceRuleItem{ - "ca7f09e76954e67c": []*ResourceRuleItem{{ + "ca7f09e76954e67c": {{ ResourceName: "custom-alerting-rule-jqbgn", RuleWithGroup: RuleWithGroup{ Group: "alerting.custom.defaults", diff --git a/pkg/models/devops/devops.go b/pkg/models/devops/devops.go index 74dc55cfc..d21698e34 100644 --- a/pkg/models/devops/devops.go +++ b/pkg/models/devops/devops.go @@ -291,7 +291,7 @@ func (d devopsOperator) ListPipelineObj(projectName string, filterFunc PipelineF } var result []interface{} - for i, _ := range data { + for i := range data { if filterFunc != nil && !filterFunc(data[i]) { continue } diff --git a/pkg/models/monitoring/monitoring.go b/pkg/models/monitoring/monitoring.go index d8816166e..37030578c 100644 --- a/pkg/models/monitoring/monitoring.go +++ b/pkg/models/monitoring/monitoring.go @@ -459,7 +459,7 @@ func (mo monitoringOperator) GetNamedMetersOverTime(meters []string, start, end ress := mo.prometheus.GetNamedMetersOverTime(meters, start, end, time.Hour, opts) sMap := generateScalingFactorMap(step) - for i, _ := range ress { + for i := range ress { ress[i].MetricData = updateMetricStatData(ress[i], sMap, priceInfo) } @@ -470,7 +470,7 @@ func (mo monitoringOperator) GetNamedMeters(meters []string, time time.Time, opt metersPerHour := mo.getNamedMetersWithHourInterval(meters, time, opt) - for metricIndex, _ := range metersPerHour.Results { + for metricIndex := range metersPerHour.Results { res := metersPerHour.Results[metricIndex] diff --git a/pkg/models/tenant/metering.go b/pkg/models/tenant/metering.go index 098ce79d6..0079c4840 100644 --- a/pkg/models/tenant/metering.go +++ b/pkg/models/tenant/metering.go @@ -607,7 +607,7 @@ func (t *tenantOperator) processApplicationMetersQuery(meters []string, q QueryO } componentsMap := t.mo.GetAppWorkloads(aso.NamespaceName, aso.Applications) - for k, _ := range componentsMap { + for k := range componentsMap { opt := monitoring.ApplicationOption{ NamespaceName: aso.NamespaceName, Application: k, @@ -655,7 +655,7 @@ func (t *tenantOperator) processServiceMetersQuery(meters []string, q QueryOptio } svcPodsMap := t.mo.GetSerivePodsMap(sso.NamespaceName, sso.Services) - for k, _ := range svcPodsMap { + for k := range svcPodsMap { opt := monitoring.ServiceOption{ NamespaceName: sso.NamespaceName, ServiceName: k, diff --git a/pkg/simple/client/devops/pipeline.go b/pkg/simple/client/devops/pipeline.go index b373f89ff..f9f0c8d8e 100644 --- a/pkg/simple/client/devops/pipeline.go +++ b/pkg/simple/client/devops/pipeline.go @@ -102,7 +102,7 @@ type Pipeline struct { func UnmarshalPipeline(total int, data []byte) (pipelineList *PipelineList, err error) { pipelineList = &PipelineList{Total: total} pipelineList.Items = make([]Pipeline, total) - for i, _ := range pipelineList.Items { + for i := range pipelineList.Items { pipelineList.Items[i].WeatherScore = 100 } err = json.Unmarshal(data, &pipelineList.Items) diff --git a/pkg/simple/client/monitoring/metricsserver/metricsserver.go b/pkg/simple/client/monitoring/metricsserver/metricsserver.go index c43fac88d..ee705faab 100644 --- a/pkg/simple/client/monitoring/metricsserver/metricsserver.go +++ b/pkg/simple/client/monitoring/metricsserver/metricsserver.go @@ -175,7 +175,7 @@ func (m metricsServer) getPodMetricsFromMetricsAPI(edgePods map[string]bool, opt // handle cases with when edgePodName contains namespaceName if opts.NamespacedResourcesFilter != "" { - for p, _ := range edgePods { + for p := range edgePods { splitedPodName := strings.Split(p, "/") ns, p = strings.ReplaceAll(splitedPodName[0], " ", ""), strings.ReplaceAll(splitedPodName[1], " ", "") pm := mc.PodMetricses(ns) @@ -344,7 +344,7 @@ func (m metricsServer) GetNodeLevelNamedMetrics(metrics []string, ts time.Time, } status := make(map[string]v1.NodeStatus) - for n, _ := range edgeNodeNamesFiltered { + for n := range edgeNodeNamesFiltered { status[n] = edgeNodes[n].Status } @@ -579,7 +579,7 @@ func (m metricsServer) GetNodeLevelNamedMetricsOverTime(metrics []string, start, } status := make(map[string]v1.NodeStatus) - for n, _ := range edgeNodeNamesFiltered { + for n := range edgeNodeNamesFiltered { status[n] = edgeNodes[n].Status } diff --git a/pkg/simple/client/monitoring/metricsserver/metricsserver_test.go b/pkg/simple/client/monitoring/metricsserver/metricsserver_test.go index 543d1695e..a6bfd0f8b 100644 --- a/pkg/simple/client/monitoring/metricsserver/metricsserver_test.go +++ b/pkg/simple/client/monitoring/metricsserver/metricsserver_test.go @@ -139,7 +139,7 @@ var ( Timestamp: metav1.Time{Time: metricsTime}, Window: metav1.Duration{Duration: time.Minute}, Containers: []metricsV1beta1.ContainerMetrics{ - metricsV1beta1.ContainerMetrics{ + { Name: "containers-1", Usage: v1.ResourceList{ v1.ResourceCPU: *resource.NewMilliQuantity( @@ -163,7 +163,7 @@ var ( Timestamp: metav1.Time{Time: metricsTime}, Window: metav1.Duration{Duration: time.Minute}, Containers: []metricsV1beta1.ContainerMetrics{ - metricsV1beta1.ContainerMetrics{ + { Name: "containers-1", Usage: v1.ResourceList{ v1.ResourceCPU: *resource.NewMilliQuantity( @@ -174,7 +174,7 @@ var ( resource.DecimalSI), }, }, - metricsV1beta1.ContainerMetrics{ + { Name: "containers-2", Usage: v1.ResourceList{ v1.ResourceCPU: *resource.NewMilliQuantity( diff --git a/pkg/simple/client/network/ippool/ipam/ipam.go b/pkg/simple/client/network/ippool/ipam/ipam.go index aedb29eff..cfb6b94e5 100644 --- a/pkg/simple/client/network/ippool/ipam/ipam.go +++ b/pkg/simple/client/network/ippool/ipam/ipam.go @@ -267,7 +267,7 @@ func (c IPAMClient) ReleaseByHandle(handleID string) error { return err } - for blockStr, _ := range handle.Spec.Block { + for blockStr := range handle.Spec.Block { blockName := v1alpha1.ConvertToBlockName(blockStr) if err := c.releaseByHandle(handleID, blockName); err != nil { return err diff --git a/pkg/simple/client/openpitrix/helmwrapper/helm_wrapper.go b/pkg/simple/client/openpitrix/helmwrapper/helm_wrapper.go index 47181f2de..c07523c84 100644 --- a/pkg/simple/client/openpitrix/helmwrapper/helm_wrapper.go +++ b/pkg/simple/client/openpitrix/helmwrapper/helm_wrapper.go @@ -299,8 +299,8 @@ func (c *helmWrapper) setupPostRenderEnvironment() error { kustomizationConfig := types.Kustomization{ Resources: []string{"./.local-helm-output.yaml"}, - CommonAnnotations: c.annotations, // add extra annotations to output - Labels: []types.Label{types.Label{Pairs: c.labels}}, // Labels to add to all objects but not selectors. + CommonAnnotations: c.annotations, // add extra annotations to output + Labels: []types.Label{{Pairs: c.labels}}, // Labels to add to all objects but not selectors. } err = yaml.NewEncoder(kustomization).Encode(kustomizationConfig)