Skip to content

Commit 1d759b5

Browse files
authored
Upgrade golangci-lint to 1.57.2 and enable gci linter (#2849)
* Update golangci-lint to 1.57.2 * Enable gci linter and run the gci formatter * Clean up golangci-lint configuration
1 parent 15bd804 commit 1d759b5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+75
-98
lines changed

.golangci.yaml

+13-6
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ linters-settings:
1010
template-path: header.txt
1111
goimports:
1212
local-prefixes: github.com/open-telemetry/opentelemetry-operator
13-
maligned:
14-
suggest-new: true
13+
gci:
14+
sections:
15+
- standard
16+
- default
17+
- prefix(github.com/open-telemetry/opentelemetry-operator)
1518
misspell:
1619
locale: US
1720
ignore-words:
@@ -22,9 +25,6 @@ linters-settings:
2225
- kilometre
2326
- kilometres
2427
govet:
25-
# report about shadowed variables
26-
check-shadowing: true
27-
2828
# settings per analyzer
2929
settings:
3030
printf: # analyzer name, run `go tool vet help` to see all analyzers
@@ -41,7 +41,7 @@ linters-settings:
4141
gofmt:
4242
simplify: true
4343
revive:
44-
min-confidence: 0.8
44+
confidence: 0.8
4545

4646
depguard:
4747
rules:
@@ -52,6 +52,12 @@ linters-settings:
5252
- pkg: github.com/pkg/errors
5353
desc: "Use 'errors' or 'fmt' instead of github.com/pkg/errors"
5454

55+
issues:
56+
exclude-rules:
57+
- linters:
58+
- gci
59+
source: "// \\+kubebuilder"
60+
5561
linters:
5662
enable:
5763
- goheader
@@ -71,3 +77,4 @@ linters:
7177
- depguard
7278
- errcheck
7379
- errorlint
80+
- gci

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ CHAINSAW ?= $(LOCALBIN)/chainsaw
379379

380380
KUSTOMIZE_VERSION ?= v5.0.3
381381
CONTROLLER_TOOLS_VERSION ?= v0.14.0
382-
GOLANGCI_LINT_VERSION ?= v1.54.0
382+
GOLANGCI_LINT_VERSION ?= v1.57.2
383383
KIND_VERSION ?= v0.20.0
384384
CHAINSAW_VERSION ?= v0.1.7
385385

apis/v1alpha1/opampbridge_webhook.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ import (
2020
"strings"
2121

2222
"github.com/go-logr/logr"
23-
24-
"github.com/open-telemetry/opentelemetry-operator/internal/config"
25-
2623
"k8s.io/apimachinery/pkg/runtime"
2724
"k8s.io/apimachinery/pkg/util/validation"
2825
ctrl "sigs.k8s.io/controller-runtime"
2926
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
27+
28+
"github.com/open-telemetry/opentelemetry-operator/internal/config"
3029
)
3130

3231
var (

apis/v1alpha1/opampbridge_webhook_test.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@ import (
2121
"testing"
2222

2323
"github.com/go-logr/logr"
24-
25-
"github.com/open-telemetry/opentelemetry-operator/internal/config"
26-
2724
"github.com/stretchr/testify/assert"
28-
2925
v1 "k8s.io/api/core/v1"
3026
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
27+
28+
"github.com/open-telemetry/opentelemetry-operator/internal/config"
3129
)
3230

3331
func TestOpAMPBridgeDefaultingWebhook(t *testing.T) {

cmd/operator-opamp-bridge/metrics/reporter.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,14 @@ import (
2323

2424
"github.com/go-logr/logr"
2525
"github.com/oklog/ulid/v2"
26+
"github.com/open-telemetry/opamp-go/protobufs"
2627
"github.com/shirou/gopsutil/process"
2728
"go.opentelemetry.io/otel/attribute"
2829
"go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp"
2930
"go.opentelemetry.io/otel/metric"
3031
sdkmetric "go.opentelemetry.io/otel/sdk/metric"
3132
otelresource "go.opentelemetry.io/otel/sdk/resource"
3233
semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
33-
34-
"github.com/open-telemetry/opamp-go/protobufs"
3534
)
3635

3736
// MetricReporter is a metric reporter that collects Agent metrics and sends them to an

cmd/otel-allocator/allocation/least_weighted.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ package allocation
1717
import (
1818
"sync"
1919

20-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/diff"
21-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
22-
2320
"github.com/go-logr/logr"
2421
"github.com/prometheus/client_golang/prometheus"
22+
23+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/diff"
24+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
2525
)
2626

2727
var _ Allocator = &leastWeightedAllocator{}

cmd/otel-allocator/allocation/per_node.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ package allocation
1717
import (
1818
"sync"
1919

20-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/diff"
21-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
22-
2320
"github.com/go-logr/logr"
2421
"github.com/prometheus/client_golang/prometheus"
22+
23+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/diff"
24+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
2525
)
2626

2727
var _ Allocator = &perNodeAllocator{}

cmd/otel-allocator/allocation/per_node_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ package allocation
1717
import (
1818
"testing"
1919

20-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
21-
2220
"github.com/prometheus/common/model"
2321
"github.com/stretchr/testify/assert"
2422
logf "sigs.k8s.io/controller-runtime/pkg/log"
23+
24+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
2525
)
2626

2727
var loggerPerNode = logf.Log.WithName("unit-tests")

cmd/otel-allocator/collector/collector_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@ import (
2222
"testing"
2323
"time"
2424

25-
"k8s.io/apimachinery/pkg/watch"
26-
logf "sigs.k8s.io/controller-runtime/pkg/log"
27-
2825
"github.com/stretchr/testify/assert"
2926
v1 "k8s.io/api/core/v1"
3027
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
28+
"k8s.io/apimachinery/pkg/watch"
3129
"k8s.io/client-go/kubernetes/fake"
30+
logf "sigs.k8s.io/controller-runtime/pkg/log"
3231

3332
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
3433
)

cmd/otel-allocator/config/config_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ import (
2020
"time"
2121

2222
commonconfig "github.com/prometheus/common/config"
23-
promconfig "github.com/prometheus/prometheus/config"
24-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
25-
2623
"github.com/prometheus/common/model"
24+
promconfig "github.com/prometheus/prometheus/config"
2725
"github.com/prometheus/prometheus/discovery"
2826
"github.com/prometheus/prometheus/discovery/file"
2927
"github.com/stretchr/testify/assert"
28+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3029
)
3130

3231
var defaultScrapeProtocols = []promconfig.ScrapeProtocol{
@@ -237,6 +236,7 @@ func TestValidateConfig(t *testing.T) {
237236
}
238237

239238
for _, tc := range testCases {
239+
tc := tc
240240
t.Run(tc.name, func(t *testing.T) {
241241
err := ValidateConfig(&tc.fileConfig)
242242
assert.Equal(t, tc.expectedErr, err)

cmd/otel-allocator/watcher/promOperator.go

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333
"github.com/prometheus-operator/prometheus-operator/pkg/operator"
3434
"github.com/prometheus-operator/prometheus-operator/pkg/prometheus"
3535
prometheusgoclient "github.com/prometheus/client_golang/prometheus"
36-
3736
promconfig "github.com/prometheus/prometheus/config"
3837
kubeDiscovery "github.com/prometheus/prometheus/discovery/kubernetes"
3938
"gopkg.in/yaml.v2"

controllers/builder_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"github.com/go-logr/logr"
2222
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
2323
"github.com/stretchr/testify/require"
24+
colfeaturegate "go.opentelemetry.io/collector/featuregate"
2425
go_yaml "gopkg.in/yaml.v3"
2526
appsv1 "k8s.io/api/apps/v1"
2627
corev1 "k8s.io/api/core/v1"
@@ -31,8 +32,6 @@ import (
3132
"k8s.io/utils/ptr"
3233
"sigs.k8s.io/controller-runtime/pkg/client"
3334

34-
colfeaturegate "go.opentelemetry.io/collector/featuregate"
35-
3635
"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
3736
"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
3837
"github.com/open-telemetry/opentelemetry-operator/internal/config"

hack/check-operator-ready.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@ import (
2121
"path/filepath"
2222
"time"
2323

24+
"github.com/spf13/pflag"
2425
appsv1 "k8s.io/api/apps/v1"
26+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2527
k8sruntime "k8s.io/apimachinery/pkg/runtime"
2628
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2729
"k8s.io/apimachinery/pkg/util/wait"
28-
29-
"github.com/spf13/pflag"
30-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3130
"k8s.io/client-go/tools/clientcmd"
3231
"k8s.io/client-go/util/homedir"
3332
"sigs.k8s.io/controller-runtime/pkg/client"

internal/manifests/collector/ingress_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@ import (
2323
networkingv1 "k8s.io/api/networking/v1"
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525

26-
"github.com/open-telemetry/opentelemetry-operator/internal/manifests"
27-
"github.com/open-telemetry/opentelemetry-operator/internal/naming"
28-
2926
"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
3027
"github.com/open-telemetry/opentelemetry-operator/internal/config"
28+
"github.com/open-telemetry/opentelemetry-operator/internal/manifests"
29+
"github.com/open-telemetry/opentelemetry-operator/internal/naming"
3130
)
3231

3332
const testFileIngress = "testdata/ingress_testdata.yaml"

internal/manifests/collector/parser/exporter/exporter_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"testing"
1919

2020
"github.com/stretchr/testify/assert"
21-
2221
v1 "k8s.io/api/core/v1"
2322
"k8s.io/apimachinery/pkg/util/intstr"
2423
)

internal/manifests/collector/podmonitor_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import (
1818
"fmt"
1919
"testing"
2020

21+
"github.com/stretchr/testify/assert"
22+
2123
"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
2224
"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/prometheus"
2325
"github.com/open-telemetry/opentelemetry-operator/internal/config"
2426
"github.com/open-telemetry/opentelemetry-operator/internal/manifests"
25-
26-
"github.com/stretchr/testify/assert"
2727
)
2828

2929
func sidecarParams() manifests.Params {

internal/manifests/collector/service_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ import (
2121
v1 "k8s.io/api/core/v1"
2222
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2323

24-
"github.com/open-telemetry/opentelemetry-operator/internal/manifests"
25-
"github.com/open-telemetry/opentelemetry-operator/internal/manifests/manifestutils"
26-
2724
"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
2825
"github.com/open-telemetry/opentelemetry-operator/internal/config"
26+
"github.com/open-telemetry/opentelemetry-operator/internal/manifests"
27+
"github.com/open-telemetry/opentelemetry-operator/internal/manifests/manifestutils"
2928
)
3029

3130
func TestExtractPortNumbersAndNames(t *testing.T) {

internal/manifests/manifestutils/annotations_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919

2020
"github.com/stretchr/testify/assert"
2121
"github.com/stretchr/testify/require"
22-
2322
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423

2524
"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"

internal/manifests/manifestutils/labels.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import (
1818
"regexp"
1919
"strings"
2020

21+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
22+
2123
"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
2224
"github.com/open-telemetry/opentelemetry-operator/internal/naming"
23-
24-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
)
2626

2727
func IsFilteredSet(sourceSet string, filterSet []string) bool {

internal/manifests/manifestutils/labels_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222

2323
"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
2424
"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
25-
2625
"github.com/open-telemetry/opentelemetry-operator/internal/naming"
2726
)
2827

internal/manifests/opampbridge/annotations_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/go-logr/logr"
2323
"github.com/stretchr/testify/assert"
2424
"github.com/stretchr/testify/require"
25-
2625
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2726

2827
"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"

internal/manifests/opampbridge/configmap.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515
package opampbridge
1616

1717
import (
18+
"gopkg.in/yaml.v2"
1819
corev1 "k8s.io/api/core/v1"
1920
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2021

21-
"gopkg.in/yaml.v2"
22-
2322
"github.com/open-telemetry/opentelemetry-operator/internal/manifests"
2423
"github.com/open-telemetry/opentelemetry-operator/internal/manifests/manifestutils"
2524
"github.com/open-telemetry/opentelemetry-operator/internal/naming"

internal/manifests/opampbridge/configmap_test.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
package opampbridge
1616

1717
import (
18-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
19-
2018
"testing"
2119

20+
"github.com/stretchr/testify/assert"
21+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
22+
2223
"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
2324
"github.com/open-telemetry/opentelemetry-operator/internal/config"
2425
"github.com/open-telemetry/opentelemetry-operator/internal/manifests"
25-
26-
"github.com/stretchr/testify/assert"
2726
)
2827

2928
func expectedLabels() map[string]string {

internal/manifests/targetallocator/adapters/config_to_prom_config_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"reflect"
2222
"testing"
2323

24-
ta "github.com/open-telemetry/opentelemetry-operator/internal/manifests/targetallocator/adapters"
25-
2624
"github.com/stretchr/testify/assert"
25+
26+
ta "github.com/open-telemetry/opentelemetry-operator/internal/manifests/targetallocator/adapters"
2727
)
2828

2929
func TestExtractPromConfigFromConfig(t *testing.T) {

internal/manifests/targetallocator/poddisruptionbudget.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ package targetallocator
1717
import (
1818
"fmt"
1919

20+
policyV1 "k8s.io/api/policy/v1"
21+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
22+
2023
"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
2124
"github.com/open-telemetry/opentelemetry-operator/internal/manifests"
2225
"github.com/open-telemetry/opentelemetry-operator/internal/manifests/manifestutils"
2326
"github.com/open-telemetry/opentelemetry-operator/internal/naming"
24-
25-
policyV1 "k8s.io/api/policy/v1"
26-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
)
2828

2929
func PodDisruptionBudget(params manifests.Params) (*policyV1.PodDisruptionBudget, error) {

internal/manifests/targetallocator/servicemonitor_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ import (
1818
"fmt"
1919
"testing"
2020

21+
"github.com/stretchr/testify/assert"
2122
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2223

2324
"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
2425
"github.com/open-telemetry/opentelemetry-operator/internal/config"
2526
"github.com/open-telemetry/opentelemetry-operator/internal/manifests"
26-
27-
"github.com/stretchr/testify/assert"
2827
)
2928

3029
func TestDesiredServiceMonitors(t *testing.T) {

0 commit comments

Comments
 (0)