chore: enable gci linter (#453)

Signed-off-by: Simon Pasquier <[email protected]>

.github/tools

@@ -1,6 +1,6 @@
 # DO NOT EDIT! Autogenerated by make tools
 
-golangci-lint v1.52.2
+golangci-lint v1.55.2
 controller-gen v0.14.0
 kustomize v4.5.2
 oc v4.8.11

.golangci.yml

@@ -3,13 +3,17 @@ run:
 
 linters:
   enable:
-    - goimports
+    - gci
 
 issues:
   exclude-rules:
-  - path: zz_generated.deepcopy.go
-    linters:
-      - goimports
-  - path: _test.go
-    linters:
-    - errcheck
+   - path: _test.go
+     linters:
+     - errcheck
+
+linters-settings:
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/rhobs/observability-operator)

Makefile.tools

@@ -20,7 +20,7 @@ OPM=$(TOOLS_DIR)/opm
 OPM_VERSION = v1.39.0
 
 GOLANGCI_LINT=$(TOOLS_DIR)/golangci-lint
-GOLANGCI_LINT_VERSION = v1.52.2
+GOLANGCI_LINT_VERSION = v1.55.2
 
 ## NOTE: promq does not have any releases, so we use a fake version starting with v0.0.1
 # thus to upgrade/invalidate the github cache, increment the value

cmd/operator/main.go

@@ -22,15 +22,14 @@ import (
 	"os"
 	"slices"
 
-	"github.com/rhobs/observability-operator/pkg/operator"
-	"go.uber.org/zap/zapcore"
-
 	obopo "github.com/rhobs/obo-prometheus-operator/pkg/operator"
-
+	"go.uber.org/zap/zapcore"
 	k8sflag "k8s.io/component-base/cli/flag"
 	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+
+	"github.com/rhobs/observability-operator/pkg/operator"
 )
 
 // The default values we use. Prometheus and Alertmanager are handled by

pkg/assets/loader.go

@@ -4,7 +4,6 @@ import (
 	"os"
 
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-
 	"k8s.io/apimachinery/pkg/util/yaml"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )

pkg/controllers/monitoring/monitoring-stack/alertmanager.go

@@ -1,16 +1,15 @@
 package monitoringstack
 
 import (
-	stack "github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
+	monv1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1"
+	corev1 "k8s.io/api/core/v1"
 	policyv1 "k8s.io/api/policy/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
-	"k8s.io/utils/ptr"
-
-	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
+	"k8s.io/utils/ptr"
 
-	monv1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	stack "github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
 )
 
 func newAlertmanager(

pkg/controllers/monitoring/monitoring-stack/components.go

@@ -3,19 +3,16 @@ package monitoringstack
 import (
 	"reflect"
 
-	"github.com/rhobs/observability-operator/pkg/reconciler"
-
-	stack "github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
-
-	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/utils/ptr"
-
 	monv1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1"
+	corev1 "k8s.io/api/core/v1"
 	policyv1 "k8s.io/api/policy/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
-
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/intstr"
+	"k8s.io/utils/ptr"
+
+	stack "github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
+	"github.com/rhobs/observability-operator/pkg/reconciler"
 )
 
 const AdditionalScrapeConfigsSelfScrapeKey = "self-scrape-config"

pkg/controllers/monitoring/monitoring-stack/components_test.go

@@ -3,12 +3,11 @@ package monitoringstack
 import (
 	"testing"
 
-	"k8s.io/apimachinery/pkg/api/resource"
-
 	monv1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1"
 	v1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1"
 	"gotest.tools/v3/assert"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 )
 
 func TestStorageSpec(t *testing.T) {

pkg/controllers/monitoring/monitoring-stack/conditions.go

@@ -4,8 +4,9 @@ import (
 	"fmt"
 
 	monv1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1"
-	"github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
 )
 
 const (

pkg/controllers/monitoring/monitoring-stack/conditions_test.go

@@ -4,9 +4,10 @@ import (
 	"testing"
 
 	monv1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1"
-	"github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
 	"gotest.tools/v3/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
 )
 
 func TestUpdateAvailable(t *testing.T) {

pkg/controllers/monitoring/monitoring-stack/controller.go

@@ -22,24 +22,20 @@ import (
 	"strings"
 	"time"
 
-	"sigs.k8s.io/controller-runtime/pkg/builder"
-	"sigs.k8s.io/controller-runtime/pkg/controller"
-
-	policyv1 "k8s.io/api/policy/v1"
-
+	"github.com/go-logr/logr"
+	monv1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1"
 	v1 "k8s.io/api/core/v1"
+	policyv1 "k8s.io/api/policy/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
-	"sigs.k8s.io/controller-runtime/pkg/predicate"
-
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
 	stack "github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
-
-	"github.com/go-logr/logr"
-	monv1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1"
 )
 
 type resourceManager struct {

pkg/controllers/monitoring/thanos-querier/controller.go

@@ -17,13 +17,11 @@ import (
 	"fmt"
 	"time"
 
-	msoapi "github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
-
+	"github.com/go-logr/logr"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
@@ -34,7 +32,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	"github.com/go-logr/logr"
+	msoapi "github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
 )
 
 type resourceManager struct {

pkg/eventsource/ticker.go

@@ -6,7 +6,6 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 )

pkg/operator/operator.go

@@ -4,15 +4,14 @@ import (
 	"context"
 	"fmt"
 
-	stackctrl "github.com/rhobs/observability-operator/pkg/controllers/monitoring/monitoring-stack"
-	tqctrl "github.com/rhobs/observability-operator/pkg/controllers/monitoring/thanos-querier"
-
+	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
-
-	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
+
+	stackctrl "github.com/rhobs/observability-operator/pkg/controllers/monitoring/monitoring-stack"
+	tqctrl "github.com/rhobs/observability-operator/pkg/controllers/monitoring/thanos-querier"
 )
 
 // NOTE: The instance selector label is hardcoded in static assets.

pkg/operator/scheme.go

@@ -1,13 +1,13 @@
 package operator
 
 import (
-	rhobsv1alpha1 "github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
-
 	monitoringv1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+
+	rhobsv1alpha1 "github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
 )
 
 func NewScheme() *runtime.Scheme {

test/e2e/framework/assertions.go

@@ -11,18 +11,16 @@ import (
 
 	"github.com/prometheus/common/expfmt"
 	"github.com/prometheus/common/model"
-
-	"github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
-
-	"sigs.k8s.io/controller-runtime/pkg/client"
-
 	monv1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
 )
 
 // default ForeverTestTimeout is 30, some test fail because they take more than 30s

test/e2e/framework/framework.go

@@ -10,15 +10,12 @@ import (
 	"testing"
 
 	"github.com/pkg/errors"
-	policyv1 "k8s.io/api/policy/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes"
-
 	appsv1 "k8s.io/api/apps/v1"
-
 	corev1 "k8s.io/api/core/v1"
+	policyv1 "k8s.io/api/policy/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-
+	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/portforward"
 	"k8s.io/client-go/transport/spdy"

test/e2e/framework/monitoring_stack.go

@@ -4,11 +4,12 @@ import (
 	"context"
 	"testing"
 
-	stack "github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
 	"gotest.tools/v3/assert"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/util/retry"
+
+	stack "github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
 )
 
 type MonitoringStackConfig func(monitoringStack *stack.MonitoringStack)

test/e2e/main_test.go

@@ -7,14 +7,13 @@ import (
 	"os"
 	"testing"
 
-	"github.com/rhobs/observability-operator/pkg/operator"
-	"github.com/rhobs/observability-operator/test/e2e/framework"
-
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"github.com/rhobs/observability-operator/pkg/operator"
+	"github.com/rhobs/observability-operator/test/e2e/framework"
 )
 
 var (

test/e2e/monitoring_stack_controller_test.go

@@ -8,34 +8,25 @@ import (
 	"testing"
 	"time"
 
+	"github.com/google/go-cmp/cmp"
+	monv1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1"
+	"golang.org/x/exp/slices"
+	"gotest.tools/v3/assert"
 	corev1 "k8s.io/api/core/v1"
 	policyv1 "k8s.io/api/policy/v1"
-	"k8s.io/utils/ptr"
-
-	"github.com/rhobs/observability-operator/test/e2e/framework"
-
-	"golang.org/x/exp/slices"
-
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-
 	"k8s.io/apimachinery/pkg/util/intstr"
-
 	"k8s.io/apimachinery/pkg/util/wait"
-
-	"github.com/google/go-cmp/cmp"
+	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/utils/ptr"
 
 	stack "github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
 	monitoringstack "github.com/rhobs/observability-operator/pkg/controllers/monitoring/monitoring-stack"
 	operator "github.com/rhobs/observability-operator/pkg/operator"
-
-	monv1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1"
-
-	"gotest.tools/v3/assert"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	"k8s.io/client-go/kubernetes/scheme"
+	"github.com/rhobs/observability-operator/test/e2e/framework"
 )
 
 type alert struct {

test/e2e/prometheus_operator_test.go

@@ -5,13 +5,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/rhobs/observability-operator/test/e2e/framework"
-
 	v1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/rhobs/observability-operator/test/e2e/framework"
 )
 
 var (