Skip to content

Commit f540a46

Browse files
committed
lint
Signed-off-by: Pavel Okhlopkov <pavel.okhlopkov@flant.com>
1 parent 5b36814 commit f540a46

File tree

11 files changed

+24
-23
lines changed

11 files changed

+24
-23
lines changed

internal/metrics/storage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func (m *metricStorage) registerHistogram(metric string, labels map[string]strin
193193

194194
// labelNames returns sorted label keys
195195
func labelNames(labels map[string]string) []string {
196-
names := make([]string, 0)
196+
names := make([]string, 0, len(labels))
197197
for labelName := range labels {
198198
names = append(names, labelName)
199199
}

internal/module/module.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ func mapContainerRules(linterSettings *pkg.LintersSettings, configSettings *conf
201201
globalConfig.Container.Rules.NamespaceLabelsRule.Impact,
202202
configSettings.Container.Impact,
203203
)
204-
linterSettings.Container.Rules.ApiVersionRule.SetLevel(
205-
globalConfig.Container.Rules.ApiVersionRule.Impact,
204+
linterSettings.Container.Rules.APIVersionRule.SetLevel(
205+
globalConfig.Container.Rules.APIVersionRule.Impact,
206206
configSettings.Container.Impact,
207207
)
208208
linterSettings.Container.Rules.PriorityClassRule.SetLevel(

internal/promremote/convert.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ func ConvertMetric(metric prometheus.Metric, name string) TimeSeries {
4444
var value float64
4545
var timestamp time.Time
4646

47-
if dtoMetric.Gauge != nil {
47+
switch {
48+
case dtoMetric.Gauge != nil:
4849
value = dtoMetric.Gauge.GetValue()
49-
} else if dtoMetric.Counter != nil {
50+
case dtoMetric.Counter != nil:
5051
value = dtoMetric.Counter.GetValue()
51-
} else if dtoMetric.Untyped != nil {
52+
case dtoMetric.Untyped != nil:
5253
value = dtoMetric.Untyped.GetValue()
5354
}
5455

internal/promremote/promremote.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"net/http"
2727
"time"
2828

29-
"github.com/golang/protobuf/proto"
29+
"github.com/golang/protobuf/proto" //nolint:staticcheck // Required for prompb compatibility
3030
"github.com/golang/snappy"
3131
"github.com/prometheus/prometheus/prompb"
3232
)

internal/promtool/checkrule.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ func CheckRules(data []byte) error {
5353
rgs, errs := rulefmt.Parse(data, ls.ignoreUnknownFields)
5454
var ruleErrors, checkGroupErrors error
5555
if errs != nil {
56-
errStr := make([]string, len(errs))
56+
errStr := make([]string, 0, len(errs))
5757
for _, e := range errs {
5858
errStr = append(errStr, e.Error())
5959
}
6060
ruleErrors = fmt.Errorf("%s", strings.Join(errStr, "\n"))
6161
}
6262
if errs := checkRuleGroups(rgs, ls); errs != nil {
63-
errStr := make([]string, len(errs))
63+
errStr := make([]string, 0, len(errs))
6464
for _, e := range errs {
6565
errStr = append(errStr, e.Error())
6666
}
@@ -118,7 +118,7 @@ func compare(a, b compareRuleType) int {
118118

119119
func checkDuplicates(groups []rulefmt.RuleGroup) []compareRuleType {
120120
var duplicates []compareRuleType
121-
var cRules compareRuleTypes
121+
cRules := make(compareRuleTypes, 0, 100) // Preallocate with reasonable capacity
122122

123123
for _, group := range groups {
124124
for _, rule := range group.Rules {

internal/storage/storage_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ func TestStoreObject_GetInitContainers(t *testing.T) {
199199
require.Error(t, err)
200200
} else {
201201
require.NoError(t, err)
202-
var containerNames []string
202+
var containerNames []string //nolint:prealloc // Must return nil when no containers
203203
for _, container := range initContainers {
204204
containerNames = append(containerNames, container.Name)
205205
}
@@ -283,7 +283,7 @@ func TestStoreObject_GetContainers(t *testing.T) {
283283
require.Error(t, err)
284284
} else {
285285
require.NoError(t, err)
286-
var containerNames []string
286+
var containerNames []string //nolint:prealloc // Must return nil when no containers
287287
for _, container := range containers {
288288
containerNames = append(containerNames, container.Name)
289289
}
@@ -387,7 +387,7 @@ func TestStoreObject_GetAllContainers(t *testing.T) {
387387
require.Error(t, err)
388388
} else {
389389
require.NoError(t, err)
390-
var containerNames []string
390+
var containerNames []string //nolint:prealloc // Must return nil when no containers
391391
for _, container := range allContainers {
392392
containerNames = append(containerNames, container.Name)
393393
}

pkg/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ func (l PrefixRuleExcludeList) Get() []PrefixRuleExclude {
292292
type ContainerLinterRules struct {
293293
RecommendedLabelsRule RuleConfig
294294
NamespaceLabelsRule RuleConfig
295-
ApiVersionRule RuleConfig
295+
APIVersionRule RuleConfig
296296
PriorityClassRule RuleConfig
297297
DNSPolicyRule RuleConfig
298298
ControllerSecurityContextRule RuleConfig

pkg/config/global/global.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ type ContainerLinterConfig struct {
4747
type ContainerRules struct {
4848
RecommendedLabelsRule RuleConfig `mapstructure:"recommended-labels"`
4949
NamespaceLabelsRule RuleConfig `mapstructure:"namespace-labels"`
50-
ApiVersionRule RuleConfig `mapstructure:"api-version"`
50+
APIVersionRule RuleConfig `mapstructure:"api-version"`
5151
PriorityClassRule RuleConfig `mapstructure:"priority-class"`
5252
DNSPolicyRule RuleConfig `mapstructure:"dns-policy"`
5353
ControllerSecurityContextRule RuleConfig `mapstructure:"controller-security-context"`

pkg/linters/container/rules.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func (l *Container) applyContainerRules(object storage.StoreObject, storageMap m
2929

3030
rules.NewRecommendedLabelsRule().ObjectRecommendedLabels(object, errorList.WithMaxLevel(l.cfg.Rules.RecommendedLabelsRule.GetLevel()))
3131
rules.NewNamespaceLabelsRule().ObjectNamespaceLabels(object, storageMap, errorList.WithMaxLevel(l.cfg.Rules.NamespaceLabelsRule.GetLevel()))
32-
rules.NewAPIVersionRule().ObjectAPIVersion(object, errorList.WithMaxLevel(l.cfg.Rules.ApiVersionRule.GetLevel()))
32+
rules.NewAPIVersionRule().ObjectAPIVersion(object, errorList.WithMaxLevel(l.cfg.Rules.APIVersionRule.GetLevel()))
3333
rules.NewPriorityClassRule().ObjectPriorityClass(object, errorList.WithMaxLevel(l.cfg.Rules.PriorityClassRule.GetLevel()))
3434
rules.NewDNSPolicyRule(l.cfg.ExcludeRules.DNSPolicy.Get()).
3535
ObjectDNSPolicy(object, errorList.WithMaxLevel(l.cfg.Rules.DNSPolicyRule.GetLevel()))

pkg/linters/module/rules/license_parser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ func (*LicenseParser) normalizeText(text string) string {
406406

407407
// Remove common comment line prefixes
408408
lines := strings.Split(text, "\n")
409-
var normalized []string
409+
normalized := make([]string, 0, len(lines))
410410

411411
for _, line := range lines {
412412
line = strings.TrimSpace(line)

0 commit comments

Comments
 (0)