diff --git a/.golangci.yml b/.golangci.yml index cc41c8c15..a6608ce9e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -8,6 +8,7 @@ linters: - depguard - godot - testifylint + - unconvert issues: exclude-rules: diff --git a/pkg/prometheus/promcfg.go b/pkg/prometheus/promcfg.go index c74104b9f..6e7cc23de 100644 --- a/pkg/prometheus/promcfg.go +++ b/pkg/prometheus/promcfg.go @@ -636,7 +636,7 @@ func (cg *ConfigGenerator) appendAlertingConfig( alertmanagerConfigs := cg.generateAlertmanagerConfig(alerting, cpf.APIServerConfig, store) var additionalAlertmanagerConfigsYaml []yaml.MapSlice - if err := yaml.Unmarshal([]byte(additionalAlertmanagerConfigs), &additionalAlertmanagerConfigsYaml); err != nil { + if err := yaml.Unmarshal(additionalAlertmanagerConfigs, &additionalAlertmanagerConfigsYaml); err != nil { return nil, fmt.Errorf("unmarshalling additional alertmanager configs failed") } alertmanagerConfigs = append(alertmanagerConfigs, additionalAlertmanagerConfigsYaml...) @@ -657,7 +657,7 @@ func (cg *ConfigGenerator) appendAlertingConfig( } var additionalAlertRelabelConfigsYaml []yaml.MapSlice - if err := yaml.Unmarshal([]byte(additionalAlertRelabelConfigs), &additionalAlertRelabelConfigsYaml); err != nil { + if err := yaml.Unmarshal(additionalAlertRelabelConfigs, &additionalAlertRelabelConfigsYaml); err != nil { return nil, fmt.Errorf("unmarshalling additional alerting relabel configs failed: %w", err) } alertRelabelConfigs = append(alertRelabelConfigs, additionalAlertRelabelConfigsYaml...) @@ -1667,7 +1667,7 @@ func (cg *ConfigGenerator) generateAdditionalScrapeConfigs( shards int32, ) ([]yaml.MapSlice, error) { var additionalScrapeConfigsYaml []yaml.MapSlice - err := yaml.Unmarshal([]byte(additionalScrapeConfigs), &additionalScrapeConfigsYaml) + err := yaml.Unmarshal(additionalScrapeConfigs, &additionalScrapeConfigsYaml) if err != nil { return nil, fmt.Errorf("unmarshalling additional scrape configs failed: %w", err) } diff --git a/pkg/thanos/statefulset_test.go b/pkg/thanos/statefulset_test.go index 9eda5649d..213ff0bf3 100644 --- a/pkg/thanos/statefulset_test.go +++ b/pkg/thanos/statefulset_test.go @@ -1069,7 +1069,7 @@ func TestThanosVersion(t *testing.T) { {"0.29.0-0123", "", true}, {"0.29.0.DEV", "", true}, } { - t.Run(string(tc.version), func(t *testing.T) { + t.Run(tc.version, func(t *testing.T) { sset, err := makeStatefulSet(&monitoringv1.ThanosRuler{ Spec: monitoringv1.ThanosRulerSpec{ QueryEndpoints: emptyQueryEndpoints, diff --git a/test/framework/prometheus.go b/test/framework/prometheus.go index 7a7d27f1e..44caaf08e 100644 --- a/test/framework/prometheus.go +++ b/test/framework/prometheus.go @@ -325,7 +325,7 @@ func (f *Framework) ScalePrometheusAndWaitUntilReady(ctx context.Context, name, ns, monitoringv1.PrometheusSpec{ CommonPrometheusFields: monitoringv1.CommonPrometheusFields{ - Replicas: ptr.To(int32(replicas)), + Replicas: ptr.To(replicas), }, }, )