fix golangci-lint

Signed-off-by: Charly Molter <[email protected]>

Author: lahabana

app/kuma-dp/cmd/run.go

@@ -249,7 +249,6 @@ func newRunCmd(opts kuma_cmd.RunCmdOpts, rootCtx *RootContext) *cobra.Command {
 					rootCtx.BootstrapDynamicMetadata[core_xds.FieldPrefixDependenciesVersion+".coredns"] = version
 					components = append(components, dnsServer)
 				}
-
 			}
 
 			envoyComponent, err := envoy.New(opts)

app/kuma-dp/pkg/dataplane/configfetcher/component.go

@@ -66,7 +66,6 @@ func (cf *ConfigFetcher) AddHandler(h Handler) error {
 	}
 	if !strings.HasPrefix(h.Path(), "/") {
 		return fmt.Errorf("invalid path: %s, must start with '/'", h.Path())
-
 	}
 	cf.handlers = append(cf.handlers, handlerInfo{
 		handler:  h,
@@ -123,7 +122,6 @@ func (cf *ConfigFetcher) Step() {
 		h.metrics.HandlerTickCount.Add(1)
 		start := time.Now()
 		hasChanged, err := cf.stepForHandler(h)
-
 		if err != nil {
 			h.metrics.HandlerErrorCount.Add(1)
 			h.l.Error(err, "failed handle")

app/kuma-dp/pkg/dataplane/dnsproxy/component.go

@@ -46,16 +46,6 @@ type dnsMap struct {
 	AAAARecords map[string]*dnsEntry
 }
 
-func (d *dnsMap) getEntry(qType uint16, name string) *dnsEntry {
-	switch qType {
-	case dns.TypeA:
-		return d.ARecords[name]
-	case dns.TypeAAAA:
-		return d.AAAARecords[name]
-	}
-	return nil
-}
-
 type dnsEntry struct {
 	RCode uint16
 	RR    []dns.RR
@@ -127,18 +117,14 @@ func (s *Server) Start(stop <-chan struct{}) error {
 		err := srv.ListenAndServe()
 		done <- err
 	}()
-	shutdownCalled := false
 	select {
 	case <-stop:
-		shutdownCalled = true
 		err := srv.Shutdown()
 		if err != nil {
 			log.Error(err, "server shutdown returned an error")
 		}
-	case err := <-done:
-		if !shutdownCalled {
-			log.Info("[WARNING] server stopped with shutdown ever being called")
-		}
+	case err = <-done:
+		log.Info("[WARNING] server stopped with shutdown ever being called")
 		if err != nil {
 			return err
 		}
@@ -197,7 +183,6 @@ func (s *Server) ReloadMap(ctx context.Context, reader io.Reader) error {
 					&dns.AAAA{Hdr: dns.RR_Header{Name: n, Ttl: uint32(configuration.TTL), Rrtype: dns.TypeAAAA, Class: dns.ClassINET}, AAAA: ip},
 				)
 			}
-
 		}
 	}
 	log.V(1).Info("DNS proxy configured", "config", res)

app/kuma-dp/pkg/dataplane/meshmetrics/manager.go

@@ -7,7 +7,6 @@ import (
 	"io"
 	"time"
 
-	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	"go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc"
 	sdkmetric "go.opentelemetry.io/otel/sdk/metric"
@@ -57,7 +56,7 @@ func (cf *Manager) OnChange(ctx context.Context, reader io.Reader) error {
 	logger.V(1).Info("updating hijacker configuration", "conf", configuration)
 	newApplicationsToScrape := cf.mapApplicationToApplicationToScrape(configuration.Observability.Metrics.Applications, configuration.Observability.Metrics.Sidecar, configuration.Observability.Metrics.ExtraLabels)
 	cf.configurePrometheus(newApplicationsToScrape, getPrometheusBackends(configuration.Observability.Metrics.Backends))
-	err := cf.configureOpenTelemetryExporter(cf.ctx, newApplicationsToScrape, getOpenTelemetryBackends(configuration.Observability.Metrics.Backends))
+	err := cf.configureOpenTelemetryExporter(cf.ctx, newApplicationsToScrape, getOpenTelemetryBackends(configuration.Observability.Metrics.Backends)) // nolint:contextcheck
 	if err != nil {
 		return fmt.Errorf("configuring OpenTelemetry Exporter failed %w", err)
 	}
@@ -228,14 +227,18 @@ func (cf *Manager) Shutdown(ctx context.Context) error {
 	cf.cancel()
 	ctx, cancel := context.WithTimeout(ctx, cf.drainTime)
 	defer cancel()
-	var err error
+	hasError := false
 	for backendName := range cf.runningBackends {
 		bErr := cf.shutdownBackend(ctx, backendName)
 		if bErr != nil {
-			err = multierror.Append(err, fmt.Errorf("failed shutdown of %s %w", backendName, bErr))
+			logger.Error(bErr, "Failed to shutdown backend", "backend", backendName)
+			hasError = true
 		}
 	}
-	return err
+	if hasError {
+		return errors.New("failed to shutdown some backend")
+	}
+	return nil
 }
 
 type runningBackend struct {