golangci-lint

Signed-off-by: Pavel Okhlopkov <[email protected]>

.github/workflows/build.yaml

@@ -8,10 +8,10 @@ jobs:
     name: Build shell-operator binary
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.22
+      - name: Set up Go 1.23
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.23"
 
       - name: Check out shell-operator code
         uses: actions/checkout@v4

.github/workflows/lint.yaml

@@ -10,10 +10,10 @@ jobs:
     name: Run linter
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.22
+      - name: Set up Go 1.23
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.23"
 
       - name: Check out shell-operator code
         uses: actions/checkout@v4
@@ -36,7 +36,7 @@ jobs:
 
       - name: Run golangci-lint
         run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b . v1.59.1
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b . v1.60.1
           ./golangci-lint run --sort-results --build-tags integration,test
 
 

.github/workflows/tests-labeled.yaml

@@ -63,10 +63,10 @@ jobs:
           cluster_name: "kube-1-27"
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.22
+      - name: Set up Go 1.23
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.23"
 
       - name: Check out shell-operator code
         uses: actions/checkout@v4

.github/workflows/tests.yaml

@@ -9,10 +9,10 @@ jobs:
     name: Run unit tests
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.22
+      - name: Set up Go 1.23
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.23"
 
       - name: Check out shell-operator code
         uses: actions/checkout@v4

cmd/shell-operator/main.go

@@ -6,9 +6,9 @@ import (
 	"os"
 	"time"
 
+	"github.com/deckhouse/deckhouse/pkg/log"
 	"gopkg.in/alecthomas/kingpin.v2"
 
-	"github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/flant/kube-client/klogtolog"
 	"github.com/flant/shell-operator/pkg/app"
 	"github.com/flant/shell-operator/pkg/debug"

pkg/app/log.go

@@ -5,9 +5,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/deckhouse/deckhouse/pkg/log"
 	"gopkg.in/alecthomas/kingpin.v2"
 
-	"github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/flant/shell-operator/pkg/config"
 )
 

pkg/debug/server.go

@@ -9,11 +9,11 @@ import (
 	"os"
 	"path"
 
+	"github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 	"gopkg.in/yaml.v3"
 
-	"github.com/deckhouse/deckhouse/pkg/log"
 	utils "github.com/flant/shell-operator/pkg/utils/file"
 	structuredLogger "github.com/flant/shell-operator/pkg/utils/structured-logger"
 )

pkg/executor/executor.go

@@ -14,9 +14,9 @@ import (
 	"time"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
-	utils "github.com/flant/shell-operator/pkg/utils/labels"
 
 	"github.com/flant/shell-operator/pkg/app"
+	utils "github.com/flant/shell-operator/pkg/utils/labels"
 )
 
 type CmdUsage struct {

pkg/hook/controller/hook_controller.go

@@ -1,9 +1,9 @@
 package controller
 
 import (
+	"github.com/deckhouse/deckhouse/pkg/log"
 	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 
-	"github.com/deckhouse/deckhouse/pkg/log"
 	. "github.com/flant/shell-operator/pkg/hook/binding_context"
 	. "github.com/flant/shell-operator/pkg/hook/types"
 	"github.com/flant/shell-operator/pkg/kube_events_manager"

pkg/hook/hook.go

@@ -8,11 +8,11 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/deckhouse/deckhouse/pkg/log"
 	uuid "github.com/gofrs/uuid/v5"
 	"github.com/kennygrant/sanitize"
 	"golang.org/x/time/rate"
 
-	"github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/flant/shell-operator/pkg/app"
 	"github.com/flant/shell-operator/pkg/executor"
 	. "github.com/flant/shell-operator/pkg/hook/binding_context"

pkg/hook/hook_manager.go

@@ -8,9 +8,9 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/deckhouse/deckhouse/pkg/log"
 	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 
-	"github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/flant/shell-operator/pkg/executor"
 	"github.com/flant/shell-operator/pkg/hook/controller"
 	. "github.com/flant/shell-operator/pkg/hook/types"

pkg/kube_events_manager/error_handler.go

@@ -3,10 +3,10 @@ package kube_events_manager
 import (
 	"io"
 
+	"github.com/deckhouse/deckhouse/pkg/log"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/tools/cache"
 
-	"github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/flant/shell-operator/pkg/metric_storage"
 	utils "github.com/flant/shell-operator/pkg/utils/labels"
 )

pkg/kube_events_manager/monitor.go

@@ -6,6 +6,7 @@ import (
 	"sort"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
+
 	klient "github.com/flant/kube-client/client"
 	. "github.com/flant/shell-operator/pkg/kube_events_manager/types"
 	"github.com/flant/shell-operator/pkg/metric_storage"

pkg/kube_events_manager/monitor_config.go

@@ -1,10 +1,10 @@
 package kube_events_manager
 
 import (
+	"github.com/deckhouse/deckhouse/pkg/log"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
-	"github.com/deckhouse/deckhouse/pkg/log"
 	. "github.com/flant/shell-operator/pkg/kube_events_manager/types"
 )
 

pkg/metric/storage.go

@@ -1,8 +1,9 @@
 package metric
 
 import (
-	"github.com/flant/shell-operator/pkg/metric_storage/operation"
 	"github.com/prometheus/client_golang/prometheus"
+
+	"github.com/flant/shell-operator/pkg/metric_storage/operation"
 )
 
 type Storage interface {

pkg/metric_storage/metric_storage.go

@@ -7,12 +7,11 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/flant/shell-operator/pkg/metric"
-
+	"github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
-	"github.com/deckhouse/deckhouse/pkg/log"
+	"github.com/flant/shell-operator/pkg/metric"
 	"github.com/flant/shell-operator/pkg/metric_storage/operation"
 	"github.com/flant/shell-operator/pkg/metric_storage/vault"
 	. "github.com/flant/shell-operator/pkg/utils/labels"

pkg/metric_storage/vault/vault.go

@@ -4,11 +4,10 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/flant/shell-operator/pkg/metric"
-
 	log "github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/prometheus/client_golang/prometheus"
 
+	"github.com/flant/shell-operator/pkg/metric"
 	. "github.com/flant/shell-operator/pkg/utils/labels"
 )
 

pkg/schedule_manager/schedule_manager.go

@@ -3,9 +3,9 @@ package schedule_manager
 import (
 	"context"
 
+	"github.com/deckhouse/deckhouse/pkg/log"
 	"gopkg.in/robfig/cron.v2"
 
-	"github.com/deckhouse/deckhouse/pkg/log"
 	. "github.com/flant/shell-operator/pkg/schedule_manager/types"
 )
 

pkg/schedule_manager/schedule_manager_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
+
 	"github.com/flant/shell-operator/pkg/schedule_manager/types"
 )
 

pkg/shell-operator/bootstrap.go

@@ -6,6 +6,7 @@ import (
 	"log/slog"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
+
 	"github.com/flant/shell-operator/pkg/app"
 	"github.com/flant/shell-operator/pkg/config"
 	"github.com/flant/shell-operator/pkg/debug"

pkg/shell-operator/debug_server.go

@@ -6,9 +6,9 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/go-chi/chi/v5"
 
-	"github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/flant/shell-operator/pkg/config"
 	"github.com/flant/shell-operator/pkg/debug"
 	"github.com/flant/shell-operator/pkg/task/dump"

pkg/shell-operator/kube_client.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
+
 	klient "github.com/flant/kube-client/client"
 	"github.com/flant/shell-operator/pkg/app"
 	"github.com/flant/shell-operator/pkg/kube/object_patch"

pkg/shell-operator/operator.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/gofrs/uuid/v5"
 	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 
-	"github.com/deckhouse/deckhouse/pkg/log"
 	klient "github.com/flant/kube-client/client"
 	"github.com/flant/shell-operator/pkg/hook"
 	"github.com/flant/shell-operator/pkg/hook/binding_context"

pkg/webhook/admission/handler.go

@@ -7,12 +7,12 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 	v1 "k8s.io/api/admission/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/deckhouse/deckhouse/pkg/log"
 	structuredLogger "github.com/flant/shell-operator/pkg/utils/structured-logger"
 )
 

pkg/webhook/conversion/handler.go

@@ -7,13 +7,13 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	"github.com/deckhouse/deckhouse/pkg/log"
 	structuredLogger "github.com/flant/shell-operator/pkg/utils/structured-logger"
 )
 

test/hook/context/generator.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
+
 	"github.com/flant/kube-client/fake"
 	"github.com/flant/shell-operator/pkg/hook"
 	. "github.com/flant/shell-operator/pkg/hook/binding_context"

test/integration/kube_event_manager/kube_event_manager_test.go

@@ -11,6 +11,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
+	"github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/flant/shell-operator/pkg/app"
 	"github.com/flant/shell-operator/pkg/kube_events_manager"
 	. "github.com/flant/shell-operator/pkg/kube_events_manager/types"
@@ -26,7 +27,7 @@ var _ = Describe("Binding 'kubernetes' with kind 'Pod' should emit KubeEvent obj
 	var KubeEventsManager kube_events_manager.KubeEventsManager
 
 	BeforeEach(func() {
-		KubeEventsManager = kube_events_manager.NewKubeEventsManager(context.Background(), KubeClient)
+		KubeEventsManager = kube_events_manager.NewKubeEventsManager(context.Background(), KubeClient, log.NewNop())
 	})
 
 	Context("with configVersion: v1", func() {
@@ -67,7 +68,7 @@ var _ = Describe("Binding 'kubernetes' with kind 'Pod' should emit KubeEvent obj
 
 		When("Pod is Added", func() {
 			JustBeforeEach(func() {
-				app.SetupLogging(nil)
+				app.SetupLogging(nil, log.NewNop())
 
 				// Unlock KubeEvent emitting.
 				m := KubeEventsManager.GetMonitor(monitorConfig.Metadata.MonitorId)

test/integration/suite/run.go

@@ -10,6 +10,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
+	"github.com/deckhouse/deckhouse/pkg/log"
 	klient "github.com/flant/kube-client/client"
 	"github.com/flant/shell-operator/pkg/kube/object_patch"
 )
@@ -36,5 +37,5 @@ var _ = BeforeSuite(func() {
 	err := KubeClient.Init()
 	Expect(err).ShouldNot(HaveOccurred())
 
-	ObjectPatcher = object_patch.NewObjectPatcher(KubeClient)
+	ObjectPatcher = object_patch.NewObjectPatcher(KubeClient, log.NewNop())
 })