Fix make verify

.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

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.

cmd/vali-curator/main.go

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

go.mod

@@ -167,25 +167,13 @@ require (
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
-//github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v36.2.0+incompatible
+replace (
 
-//github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.0+incompatible
-
-//github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.0
-//github.com/hpcloud/tail => github.com/grafana/tail v0.0.0-20191024143944-0b54ddf21fe7
-//github.com/prometheus/common => github.com/prometheus/common v0.15.0
-
-//These two comes together
-replace github.com/weaveworks/common => github.com/weaveworks/common v0.0.0-20210419092856-009d1eebd624
-
-replace google.golang.org/grpc => google.golang.org/grpc v1.40.0
-
-// Loki 2.2.1 requere this
-replace github.com/prometheus/common => github.com/prometheus/common v0.20.0
-
-//golang.org/x/net v0.0.0-20190813000000-74dc4d7220e7 => golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7
-//k8s.io/api => k8s.io/api v0.17.9
-//k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.9
-//k8s.io/apimachinery => k8s.io/apimachinery v0.17.9
-//k8s.io/apiserver => k8s.io/apiserver v0.17.9
-replace k8s.io/client-go => k8s.io/client-go v0.26.2
+	// Vali requere this
+	github.com/prometheus/common => github.com/prometheus/common v0.20.0
+	//These two comes together
+	github.com/weaveworks/common => github.com/weaveworks/common v0.0.0-20210419092856-009d1eebd624
+	google.golang.org/grpc => google.golang.org/grpc v1.40.0
+	// From Gardener
+	k8s.io/client-go => k8s.io/client-go v0.26.2
+)

go.sum

@@ -822,8 +822,6 @@ github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/grafana/loki v1.6.2-0.20210406003638-babea82ef558 h1:Itqao8z6hKcQ9/ivLQCiucZoHUbFw4aSNAGO/NA53hI=
-github.com/grafana/loki v1.6.2-0.20210406003638-babea82ef558/go.mod h1:P9Y/8KplnFL6JWkC6fDgRlrG5Z7fAcNWfpK/xTloF/g=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=

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.

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() {
@@ -115,9 +115,9 @@ var _ = Describe("Buffer", func() {
 			fakeVali, ok := dQueCleint.vali.(*fakeValiclient)
 			Expect(ok).To(BeTrue())
 			time.Sleep(2 * time.Second)
-			fakeLoki.mu.Lock()
-			defer fakeLoki.mu.Unlock()
-			log := fakeLoki.sentLogs[0]
+			fakeVali.mu.Lock()
+			defer fakeVali.mu.Unlock()
+			log := fakeVali.sentLogs[0]
 			Expect(log.labelSet).To(Equal(ls))
 			Expect(log.timestamp).To(Equal(ts))
 			Expect(log.line).To(Equal(line))
@@ -129,9 +129,9 @@ var _ = Describe("Buffer", func() {
 			fakeVali, ok := dQueCleint.vali.(*fakeValiclient)
 			Expect(ok).To(BeTrue())
 			time.Sleep(2 * time.Second)
-			fakeLoki.mu.Lock()
-			defer fakeLoki.mu.Unlock()
-			Expect(fakeLoki.stopped).To(BeTrue())
+			fakeVali.mu.Lock()
+			defer fakeVali.mu.Unlock()
+			Expect(fakeVali.stopped).To(BeTrue())
 			_, err := os.Stat("/tmp/gardener")
 			Expect(os.IsNotExist(err)).To(BeFalse())
 		})
@@ -142,9 +142,9 @@ var _ = Describe("Buffer", func() {
 			fakeVali, ok := dQueCleint.vali.(*fakeValiclient)
 			Expect(ok).To(BeTrue())
 			time.Sleep(2 * time.Second)
-			fakeLoki.mu.Lock()
-			defer fakeLoki.mu.Unlock()
-			Expect(fakeLoki.stopped).To(BeTrue())
+			fakeVali.mu.Lock()
+			defer fakeVali.mu.Unlock()
+			Expect(fakeVali.stopped).To(BeTrue())
 			_, err := os.Stat("/tmp/gardener")
 			Expect(os.IsNotExist(err)).To(BeTrue())
 		})
@@ -162,7 +162,7 @@ func newFakeValiClient(c config.Config, logger log.Logger) (types.ValiClient, er
 	return &fakeValiclient{}, nil
 }
 
-func (c *fakeLokiclient) Handle(labels model.LabelSet, time time.Time, entry string) error {
+func (c *fakeValiclient) Handle(labels model.LabelSet, time time.Time, entry string) error {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 	c.sentLogs = append(c.sentLogs, logEntry{time, labels, entry})

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.

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"
 	valiflag "github.com/credativ/vali/pkg/util/flagext"
@@ -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() {

pkg/client/multi_tenant_client.go

@@ -21,12 +21,11 @@ import (
 	"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/credativ/vali/pkg/valitail/client"
-	"github.com/prometheus/common/model"
-
+	"github.com/go-kit/kit/log"
 	giterrors "github.com/pkg/errors"
+	"github.com/prometheus/common/model"
 )
 
 type multiTenantClient struct {

pkg/client/multi_tenant_client_test.go

@@ -21,7 +21,6 @@ import (
 	"github.com/gardener/logging/pkg/client"
 	"github.com/gardener/logging/pkg/config"
 	"github.com/gardener/logging/pkg/types"
-	"github.com/weaveworks/common/logging"
 
 	valitailclient "github.com/credativ/vali/pkg/valitail/client"
 	"github.com/go-kit/kit/log"
@@ -30,6 +29,7 @@ import (
 	ginkotable "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
 	"github.com/prometheus/common/model"
+	"github.com/weaveworks/common/logging"
 )
 
 var _ = Describe("Multi Tenant Client", func() {

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 {

pkg/client/pack_client_test.go

@@ -22,15 +22,15 @@ import (
 	"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/credativ/vali/pkg/logproto"
+	"github.com/go-kit/kit/log"
+	"github.com/go-kit/kit/log/level"
 	. "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"
 )
 
 var _ = Describe("Pack Client", func() {

pkg/client/sorted_client_test.go

@@ -18,19 +18,19 @@ import (
 	"os"
 	"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/cortexproject/cortex/pkg/util/flagext"
 	"github.com/credativ/vali/pkg/logproto"
 	valitailclient "github.com/credativ/vali/pkg/valitail/client"
 	"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"
 )
 
 var _ = Describe("Sorted Client", func() {

pkg/cluster/clientset/versioned/fake/clientset_generated.go

@@ -17,14 +17,15 @@ limitations under the License.
 package fake
 
 import (
-	clientset "github.com/gardener/logging/pkg/cluster/clientset/versioned"
-	extensionsv1alpha1 "github.com/gardener/logging/pkg/cluster/clientset/versioned/typed/extensions/v1alpha1"
-	fakeextensionsv1alpha1 "github.com/gardener/logging/pkg/cluster/clientset/versioned/typed/extensions/v1alpha1/fake"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/discovery"
 	fakediscovery "k8s.io/client-go/discovery/fake"
 	"k8s.io/client-go/testing"
+
+	clientset "github.com/gardener/logging/pkg/cluster/clientset/versioned"
+	extensionsv1alpha1 "github.com/gardener/logging/pkg/cluster/clientset/versioned/typed/extensions/v1alpha1"
+	fakeextensionsv1alpha1 "github.com/gardener/logging/pkg/cluster/clientset/versioned/typed/extensions/v1alpha1/fake"
 )
 
 // NewSimpleClientset returns a clientset that will respond with the provided objects.
@@ -64,10 +65,12 @@ type Clientset struct {
 	tracker   testing.ObjectTracker
 }
 
+// Discovery implements DiscoveryInterface
 func (c *Clientset) Discovery() discovery.DiscoveryInterface {
 	return c.discovery
 }
 
+// Tracker implements ObjectTracker
 func (c *Clientset) Tracker() testing.ObjectTracker {
 	return c.tracker
 }

pkg/cluster/clientset/versioned/fake/register.go

@@ -32,6 +32,8 @@ var localSchemeBuilder = runtime.SchemeBuilder{
 	extensionsv1alpha1.AddToScheme,
 }
 
+// AddToScheme applies all the stored functions to the scheme.
+// A non-nil error indicates that one function failed and the attempt was abandoned.
 var AddToScheme = localSchemeBuilder.AddToScheme
 
 func init() {

pkg/cluster/clientset/versioned/typed/extensions/v1alpha1/cluster.go

@@ -21,11 +21,12 @@ import (
 	"time"
 
 	v1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
-	scheme "github.com/gardener/logging/pkg/cluster/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
 	rest "k8s.io/client-go/rest"
+
+	scheme "github.com/gardener/logging/pkg/cluster/clientset/versioned/scheme"
 )
 
 // ClustersGetter has a method to return a ClusterInterface.

pkg/cluster/informers/externalversions/extensions/v1alpha1/cluster.go

@@ -21,13 +21,14 @@ import (
 	time "time"
 
 	extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
-	versioned "github.com/gardener/logging/pkg/cluster/clientset/versioned"
-	internalinterfaces "github.com/gardener/logging/pkg/cluster/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/gardener/logging/pkg/cluster/listers/extensions/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	cache "k8s.io/client-go/tools/cache"
+
+	versioned "github.com/gardener/logging/pkg/cluster/clientset/versioned"
+	internalinterfaces "github.com/gardener/logging/pkg/cluster/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/gardener/logging/pkg/cluster/listers/extensions/v1alpha1"
 )
 
 // ClusterInformer provides access to a shared informer and lister for

pkg/cluster/informers/externalversions/factory.go

@@ -21,13 +21,14 @@ import (
 	sync "sync"
 	time "time"
 
-	versioned "github.com/gardener/logging/pkg/cluster/clientset/versioned"
-	extensions "github.com/gardener/logging/pkg/cluster/informers/externalversions/extensions"
-	internalinterfaces "github.com/gardener/logging/pkg/cluster/informers/externalversions/internalinterfaces"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	cache "k8s.io/client-go/tools/cache"
+
+	versioned "github.com/gardener/logging/pkg/cluster/clientset/versioned"
+	extensions "github.com/gardener/logging/pkg/cluster/informers/externalversions/extensions"
+	internalinterfaces "github.com/gardener/logging/pkg/cluster/informers/externalversions/internalinterfaces"
 )
 
 // SharedInformerOption defines the functional option type for SharedInformerFactory.

pkg/cluster/informers/externalversions/internalinterfaces/factory_interfaces.go

@@ -19,10 +19,11 @@ package internalinterfaces
 import (
 	time "time"
 
-	versioned "github.com/gardener/logging/pkg/cluster/clientset/versioned"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	cache "k8s.io/client-go/tools/cache"
+
+	versioned "github.com/gardener/logging/pkg/cluster/clientset/versioned"
 )
 
 // NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer.