Skip to content

Commit

Permalink
Add goimports to the golangci-lint configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
Boomatang committed May 3, 2024
1 parent 4211185 commit 14fb41d
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 6 deletions.
5 changes: 5 additions & 0 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ linters:
- unconvert
- unparam
- whitespace
- goimports
disable:
- errcheck

Expand All @@ -25,3 +26,7 @@ issues:
- text: "var-naming: don't use leading k in Go names"
linters:
- revive

linters-settings:
goimports:
local-prefixes: github.com/kuadrant/kuadrant-operator
3 changes: 2 additions & 1 deletion controllers/kuadrant_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"

authorinov1beta1 "github.com/kuadrant/authorino-operator/api/v1beta1"
limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1"

kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
"github.com/kuadrant/kuadrant-operator/pkg/common"
limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1"
)

const (
Expand Down
5 changes: 3 additions & 2 deletions controllers/ratelimitpolicy_status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ import (
"reflect"
"testing"

kuadrantv1beta2 "github.com/kuadrant/kuadrant-operator/api/v1beta2"
"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
gatewayapiv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"

kuadrantv1beta2 "github.com/kuadrant/kuadrant-operator/api/v1beta2"
"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
)

func TestRateLimitPolicyReconciler_calculateStatus(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion pkg/istio/mesh_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package istio
import (
"fmt"

maistrav2 "github.com/kuadrant/kuadrant-operator/api/external/maistra/v2"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/types/known/structpb"
istiomeshv1alpha1 "istio.io/api/mesh/v1alpha1"
Expand All @@ -14,6 +13,8 @@ import (
istiov1alpha1 "maistra.io/istio-operator/api/v1alpha1"
"maistra.io/istio-operator/pkg/helm"
"sigs.k8s.io/controller-runtime/pkg/client"

maistrav2 "github.com/kuadrant/kuadrant-operator/api/external/maistra/v2"
)

// The structs below implement the interface defined in pkg/common/mesh_config.go `ConfigWrapper`
Expand Down
3 changes: 2 additions & 1 deletion pkg/kuadranttools/limitador_tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import (
"fmt"
"reflect"

"github.com/kuadrant/kuadrant-operator/api/v1beta1"
limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/kuadrant/kuadrant-operator/api/v1beta1"
)

func LimitadorMutator(existingObj, desiredObj client.Object) (bool, error) {
Expand Down
3 changes: 2 additions & 1 deletion pkg/rlptools/rate_limit_index.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import (
"strings"

"github.com/elliotchance/orderedmap/v2"
"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
)

type RateLimitIndexKey = client.ObjectKey
Expand Down

0 comments on commit 14fb41d

Please sign in to comment.