Fix make verify

gardener · Apr 1, 2023 · e50ffb8 · e50ffb8
1 parent 3f077fb
commit e50ffb8
Show file tree

Hide file tree

Showing 44 changed files with 136 additions and 140 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -35,6 +35,7 @@ issues:
   - "invalid operation: cannot compare .*"
   - "client.StopWait undefined .*"
   - "could not import github.com/gardener/gardener/pkg/apis/core/v1beta1/constants .*"
+  - "Error return value of `informer.AddEventHandler` is not checked"
   exclude-rules:
   - linters:
     - staticcheck

diff --git a/Makefile b/Makefile
@@ -98,6 +98,8 @@ test:
 .PHONY: install-requirements
 install-requirements:
 	@go install -mod=vendor github.com/onsi/ginkgo/ginkgo
+	@go install -v github.com/incu6us/goimports-reviser/v3@latest
+	@GO111MODULE=off go get golang.org/x/tools/cmd/goimports
 	@$(REPO_ROOT)/hack/install-requirements.sh
 
 .PHONY: verify

diff --git a/cmd/event-logger/app/options.go b/cmd/event-logger/app/options.go
@@ -19,9 +19,6 @@ import (
 	"flag"
 
 	"github.com/gardener/gardener/pkg/logger"
-
-	"github.com/gardener/logging/pkg/events"
-
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -33,6 +30,8 @@ import (
 	"k8s.io/component-base/version"
 	"k8s.io/component-base/version/verflag"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
+
+	"github.com/gardener/logging/pkg/events"
 )
 
 // NewCommandStartGardenerEventLogger creates a *cobra.Command object with default parameters.

diff --git a/cmd/fluent-bit-loki-plugin/out_loki.go b/cmd/fluent-bit-loki-plugin/out_loki.go
@@ -8,7 +8,6 @@ Modifications Copyright (c) 2020 SAP SE or an SAP affiliate company. All rights
 package main
 
 import (
-	"C"
 	"fmt"
 	"net/http"
 	_ "net/http/pprof"
@@ -18,14 +17,7 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/gardener/logging/pkg/config"
-	"github.com/gardener/logging/pkg/healthz"
-	"github.com/gardener/logging/pkg/lokiplugin"
-	"github.com/gardener/logging/pkg/metrics"
-
-	gardenerclientsetversioned "github.com/gardener/logging/pkg/cluster/clientset/versioned"
-	gardeninternalcoreinformers "github.com/gardener/logging/pkg/cluster/informers/externalversions"
-
+	"C"
 	"github.com/fluent/fluent-bit-go/output"
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
@@ -34,6 +26,13 @@ import (
 	"github.com/weaveworks/common/logging"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
+
+	gardenerclientsetversioned "github.com/gardener/logging/pkg/cluster/clientset/versioned"
+	gardeninternalcoreinformers "github.com/gardener/logging/pkg/cluster/informers/externalversions"
+	"github.com/gardener/logging/pkg/config"
+	"github.com/gardener/logging/pkg/healthz"
+	"github.com/gardener/logging/pkg/lokiplugin"
+	"github.com/gardener/logging/pkg/metrics"
 )
 
 var (

diff --git a/cmd/loki-curator/app/loki_curator.go b/cmd/loki-curator/app/loki_curator.go
@@ -18,11 +18,11 @@ import (
 	"flag"
 	"os"
 
-	config "github.com/gardener/logging/pkg/loki/curator/config"
-
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
 	"github.com/weaveworks/common/logging"
+
+	config "github.com/gardener/logging/pkg/loki/curator/config"
 )
 
 var (

diff --git a/cmd/loki-curator/main.go b/cmd/loki-curator/main.go
@@ -16,17 +16,16 @@ package main
 
 import (
 	"net/http"
+	_ "net/http/pprof"
 	"os"
 	"os/signal"
 	"runtime"
 
-	"github.com/gardener/logging/cmd/loki-curator/app"
-	"github.com/gardener/logging/pkg/loki/curator"
 	"github.com/go-kit/kit/log/level"
-
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
-	_ "net/http/pprof"
+	"github.com/gardener/logging/cmd/loki-curator/app"
+	"github.com/gardener/logging/pkg/loki/curator"
 )
 
 func main() {

diff --git a/pkg/buffer/buffer.go b/pkg/buffer/buffer.go
@@ -9,10 +9,10 @@ package buffer
 import (
 	"fmt"
 
+	"github.com/go-kit/kit/log"
+
 	"github.com/gardener/logging/pkg/config"
 	"github.com/gardener/logging/pkg/types"
-
-	"github.com/go-kit/kit/log"
 )
 
 // NewBuffer makes a new buffered Client.

diff --git a/pkg/buffer/buffer_test.go b/pkg/buffer/buffer_test.go
@@ -19,15 +19,15 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gardener/logging/pkg/config"
-	"github.com/gardener/logging/pkg/types"
-
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/prometheus/common/model"
 	"github.com/weaveworks/common/logging"
+
+	"github.com/gardener/logging/pkg/config"
+	"github.com/gardener/logging/pkg/types"
 )
 
 var _ = Describe("Buffer", func() {

diff --git a/pkg/buffer/dque.go b/pkg/buffer/dque.go
@@ -13,15 +13,15 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gardener/logging/pkg/config"
-	"github.com/gardener/logging/pkg/metrics"
-	"github.com/gardener/logging/pkg/types"
-
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/joncrlsn/dque"
 	"github.com/prometheus/common/model"
+
+	"github.com/gardener/logging/pkg/config"
+	"github.com/gardener/logging/pkg/metrics"
+	"github.com/gardener/logging/pkg/types"
 )
 
 type dqueEntry struct {

diff --git a/pkg/client/buffer_client.go b/pkg/client/buffer_client.go
@@ -9,11 +9,11 @@ package client
 import (
 	"fmt"
 
+	"github.com/go-kit/kit/log"
+
 	"github.com/gardener/logging/pkg/buffer"
 	"github.com/gardener/logging/pkg/config"
 	"github.com/gardener/logging/pkg/types"
-
-	"github.com/go-kit/kit/log"
 )
 
 // NewBufferDecorator makes a new buffered Client.

diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -17,12 +17,12 @@ package client
 import (
 	"time"
 
-	"github.com/gardener/logging/pkg/config"
-	"github.com/gardener/logging/pkg/types"
-
 	"github.com/go-kit/kit/log"
 	"github.com/grafana/loki/pkg/promtail/client"
 	"github.com/prometheus/common/model"
+
+	"github.com/gardener/logging/pkg/config"
+	"github.com/gardener/logging/pkg/types"
 )
 
 const (

diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go
@@ -19,8 +19,6 @@ import (
 	"os"
 	"time"
 
-	"github.com/gardener/logging/pkg/config"
-
 	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/cortexproject/cortex/pkg/util/flagext"
 	"github.com/go-kit/kit/log"
@@ -31,6 +29,8 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/prometheus/common/model"
 	"github.com/weaveworks/common/logging"
+
+	"github.com/gardener/logging/pkg/config"
 )
 
 var _ = Describe("Client", func() {

diff --git a/pkg/client/metric_promtail_client.go b/pkg/client/metric_promtail_client.go
@@ -17,15 +17,15 @@ package client
 import (
 	"time"
 
-	"github.com/gardener/logging/pkg/metrics"
-	"github.com/gardener/logging/pkg/types"
-
 	"github.com/go-kit/kit/log"
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/pkg/promtail/api"
 	"github.com/grafana/loki/pkg/promtail/client"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
+
+	"github.com/gardener/logging/pkg/metrics"
+	"github.com/gardener/logging/pkg/types"
 )
 
 type promtailClientWithForwardedLogsMetricCounter struct {

diff --git a/pkg/client/multi_tenant_client.go b/pkg/client/multi_tenant_client.go
@@ -18,15 +18,14 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gardener/logging/pkg/batch"
-	"github.com/gardener/logging/pkg/config"
-	"github.com/gardener/logging/pkg/types"
 	"github.com/go-kit/kit/log"
-
 	"github.com/grafana/loki/pkg/promtail/client"
+	giterrors "github.com/pkg/errors"
 	"github.com/prometheus/common/model"
 
-	giterrors "github.com/pkg/errors"
+	"github.com/gardener/logging/pkg/batch"
+	"github.com/gardener/logging/pkg/config"
+	"github.com/gardener/logging/pkg/types"
 )
 
 type multiTenantClient struct {

diff --git a/pkg/client/multi_tenant_client_test.go b/pkg/client/multi_tenant_client_test.go
@@ -18,18 +18,18 @@ import (
 	"os"
 	"time"
 
-	"github.com/gardener/logging/pkg/client"
-	"github.com/gardener/logging/pkg/config"
-	"github.com/gardener/logging/pkg/types"
-	"github.com/weaveworks/common/logging"
-
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
 	promtailclient "github.com/grafana/loki/pkg/promtail/client"
 	. "github.com/onsi/ginkgo"
 	ginkotable "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
 	"github.com/prometheus/common/model"
+	"github.com/weaveworks/common/logging"
+
+	"github.com/gardener/logging/pkg/client"
+	"github.com/gardener/logging/pkg/config"
+	"github.com/gardener/logging/pkg/types"
 )
 
 var _ = Describe("Multi Tenant Client", func() {

diff --git a/pkg/client/pack_client.go b/pkg/client/pack_client.go
@@ -19,11 +19,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gardener/logging/pkg/config"
-	"github.com/gardener/logging/pkg/types"
 	"github.com/go-kit/kit/log"
-
 	"github.com/prometheus/common/model"
+
+	"github.com/gardener/logging/pkg/config"
+	"github.com/gardener/logging/pkg/types"
 )
 
 type packClient struct {

diff --git a/pkg/client/pack_client_test.go b/pkg/client/pack_client_test.go
@@ -19,18 +19,18 @@ import (
 	"os"
 	"time"
 
-	"github.com/gardener/logging/pkg/client"
-	"github.com/gardener/logging/pkg/config"
-	"github.com/gardener/logging/pkg/types"
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
-	"github.com/weaveworks/common/logging"
-
 	"github.com/grafana/loki/pkg/logproto"
 	. "github.com/onsi/ginkgo"
 	ginkotable "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
 	"github.com/prometheus/common/model"
+	"github.com/weaveworks/common/logging"
+
+	"github.com/gardener/logging/pkg/client"
+	"github.com/gardener/logging/pkg/config"
+	"github.com/gardener/logging/pkg/types"
 )
 
 var _ = Describe("Pack Client", func() {

diff --git a/pkg/client/sorted_client.go b/pkg/client/sorted_client.go
@@ -18,14 +18,14 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gardener/logging/pkg/batch"
-	"github.com/gardener/logging/pkg/config"
-	"github.com/gardener/logging/pkg/types"
-
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/prometheus/common/model"
+
+	"github.com/gardener/logging/pkg/batch"
+	"github.com/gardener/logging/pkg/config"
+	"github.com/gardener/logging/pkg/types"
 )
 
 type sortedClient struct {

diff --git a/pkg/client/sorted_client_test.go b/pkg/client/sorted_client_test.go
@@ -19,18 +19,18 @@ import (
 	"time"
 
 	"github.com/cortexproject/cortex/pkg/util/flagext"
-	"github.com/gardener/logging/pkg/client"
-	"github.com/gardener/logging/pkg/config"
-	"github.com/gardener/logging/pkg/types"
-	"github.com/weaveworks/common/logging"
-
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
 	"github.com/grafana/loki/pkg/logproto"
 	promtailclient "github.com/grafana/loki/pkg/promtail/client"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/prometheus/common/model"
+	"github.com/weaveworks/common/logging"
+
+	"github.com/gardener/logging/pkg/client"
+	"github.com/gardener/logging/pkg/config"
+	"github.com/gardener/logging/pkg/types"
 )
 
 var _ = Describe("Sorted Client", func() {

diff --git a/pkg/client/types.go b/pkg/client/types.go
@@ -17,12 +17,12 @@ package client
 import (
 	"time"
 
-	"github.com/gardener/logging/pkg/config"
-	"github.com/gardener/logging/pkg/types"
-
 	"github.com/go-kit/kit/log"
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/prometheus/common/model"
+
+	"github.com/gardener/logging/pkg/config"
+	"github.com/gardener/logging/pkg/types"
 )
 
 // LokiClient represents an instance which sends logs to Loki ingester