lint

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

pkg/app/webhook.go

@@ -1,11 +1,10 @@
 package app
 
 import (
-	"gopkg.in/alecthomas/kingpin.v2"
-
 	"github.com/deckhouse/module-sdk/pkg/webhook/admission"
 	"github.com/deckhouse/module-sdk/pkg/webhook/conversion"
 	"github.com/deckhouse/module-sdk/pkg/webhook/server"
+	"gopkg.in/alecthomas/kingpin.v2"
 )
 
 var ValidatingWebhookSettings = &admission.WebhookSettings{

pkg/hook/binding_context/binding_context.go

@@ -4,11 +4,10 @@ import (
 	"encoding/json"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
-	v1 "k8s.io/api/admission/v1"
-	apixv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-
 	. "github.com/deckhouse/module-sdk/pkg/hook/types"
 	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
+	v1 "k8s.io/api/admission/v1"
+	apixv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 )
 
 // BindingContext contains information about event for hook

pkg/hook/config/config.go

@@ -3,9 +3,8 @@ package config
 import (
 	"fmt"
 
-	"sigs.k8s.io/yaml"
-
 	. "github.com/deckhouse/module-sdk/pkg/hook/types"
+	"sigs.k8s.io/yaml"
 )
 
 var validBindingTypes = []BindingType{OnStartup, Schedule, OnKubernetesEvent, KubernetesValidating, KubernetesMutating, KubernetesConversion}

pkg/hook/config/config_v0.go

@@ -3,13 +3,12 @@ package config
 import (
 	"fmt"
 
-	"gopkg.in/robfig/cron.v2"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	. "github.com/deckhouse/module-sdk/pkg/hook/types"
 	"github.com/deckhouse/module-sdk/pkg/kube-events-manager"
 	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
 	. "github.com/deckhouse/module-sdk/pkg/schedule-manager/types"
+	"gopkg.in/robfig/cron.v2"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 type HookConfigV0 struct {

pkg/hook/config/config_v1.go

@@ -5,19 +5,19 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/hashicorp/go-multierror"
-	"gopkg.in/robfig/cron.v2"
-	v1 "k8s.io/api/admissionregistration/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-
 	. "github.com/deckhouse/module-sdk/pkg/hook/types"
 	"github.com/deckhouse/module-sdk/pkg/kube-events-manager"
 	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
 	. "github.com/deckhouse/module-sdk/pkg/schedule-manager/types"
 	"github.com/deckhouse/module-sdk/pkg/webhook/admission"
 	"github.com/deckhouse/module-sdk/pkg/webhook/conversion"
 	"github.com/deckhouse/module-sdk/pkg/webhook/validating/validation"
+	"github.com/hashicorp/go-multierror"
+	"gopkg.in/robfig/cron.v2"
+	v1 "k8s.io/api/admissionregistration/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
 	"github.com/flant/shell-operator/pkg/app"
 )
 

pkg/hook/controller/admission_bindings_controller.go

@@ -2,11 +2,10 @@ package controller
 
 import (
 	"github.com/deckhouse/deckhouse/pkg/log"
-	v1 "k8s.io/api/admission/v1"
-
 	. "github.com/deckhouse/module-sdk/pkg/hook/binding-context"
 	. "github.com/deckhouse/module-sdk/pkg/hook/types"
 	"github.com/deckhouse/module-sdk/pkg/webhook/admission"
+	v1 "k8s.io/api/admission/v1"
 )
 
 // AdmissionBindingToWebhookLink is a link between a hook and a webhook configuration.

pkg/hook/controller/conversion_bindings_controller.go

@@ -2,11 +2,10 @@ package controller
 
 import (
 	"github.com/deckhouse/deckhouse/pkg/log"
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-
 	. "github.com/deckhouse/module-sdk/pkg/hook/binding-context"
 	. "github.com/deckhouse/module-sdk/pkg/hook/types"
 	"github.com/deckhouse/module-sdk/pkg/webhook/conversion"
+	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 )
 
 // A link between a hook and a kube monitor

pkg/hook/controller/hook_controller.go

@@ -2,14 +2,14 @@ package controller
 
 import (
 	"github.com/deckhouse/deckhouse/pkg/log"
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-
 	. "github.com/deckhouse/module-sdk/pkg/hook/binding-context"
 	. "github.com/deckhouse/module-sdk/pkg/hook/types"
 	"github.com/deckhouse/module-sdk/pkg/kube-events-manager"
 	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
 	"github.com/deckhouse/module-sdk/pkg/webhook/admission"
 	"github.com/deckhouse/module-sdk/pkg/webhook/conversion"
+	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+
 	"github.com/flant/shell-operator/pkg/schedule_manager"
 )
 

pkg/hook/controller/hook_controller_test.go

@@ -5,12 +5,12 @@ import (
 	"testing"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
-	. "github.com/onsi/gomega"
-
 	"github.com/deckhouse/module-sdk/pkg/hook/binding-context"
 	"github.com/deckhouse/module-sdk/pkg/hook/types"
 	"github.com/deckhouse/module-sdk/pkg/kube-events-manager"
 	types2 "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
+	. "github.com/onsi/gomega"
+
 	"github.com/flant/kube-client/fake"
 	"github.com/flant/shell-operator/pkg/hook/config"
 )

pkg/hook/controller/kubernetes_bindings_controller.go

@@ -4,11 +4,11 @@ import (
 	"fmt"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
-
 	. "github.com/deckhouse/module-sdk/pkg/hook/binding-context"
 	. "github.com/deckhouse/module-sdk/pkg/hook/types"
 	"github.com/deckhouse/module-sdk/pkg/kube-events-manager"
 	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
+
 	utils "github.com/flant/shell-operator/pkg/utils/labels"
 )
 

pkg/hook/controller/schedule_bindings_controller.go

@@ -3,6 +3,7 @@ package controller
 import (
 	. "github.com/deckhouse/module-sdk/pkg/hook/binding-context"
 	. "github.com/deckhouse/module-sdk/pkg/hook/types"
+
 	"github.com/flant/shell-operator/pkg/schedule_manager"
 )
 

pkg/hook/hook.go

@@ -9,15 +9,15 @@ import (
 	"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/module-sdk/pkg/hook/binding-context"
 	. "github.com/deckhouse/module-sdk/pkg/hook/types"
 	"github.com/deckhouse/module-sdk/pkg/metric-storage/operation"
 	"github.com/deckhouse/module-sdk/pkg/webhook/admission"
 	"github.com/deckhouse/module-sdk/pkg/webhook/conversion"
+	uuid "github.com/gofrs/uuid/v5"
+	"github.com/kennygrant/sanitize"
+	"golang.org/x/time/rate"
+
 	"github.com/flant/shell-operator/pkg/app"
 	"github.com/flant/shell-operator/pkg/executor"
 	"github.com/flant/shell-operator/pkg/hook/config"

pkg/hook/hook_manager.go

@@ -9,13 +9,13 @@ import (
 	"strings"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-
 	. "github.com/deckhouse/module-sdk/pkg/hook/types"
 	"github.com/deckhouse/module-sdk/pkg/kube-events-manager"
 	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
 	"github.com/deckhouse/module-sdk/pkg/webhook/admission"
 	"github.com/deckhouse/module-sdk/pkg/webhook/conversion"
+	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+
 	"github.com/flant/shell-operator/pkg/executor"
 	"github.com/flant/shell-operator/pkg/hook/controller"
 	"github.com/flant/shell-operator/pkg/schedule_manager"

pkg/hook/hook_manager_test.go

@@ -6,11 +6,11 @@ import (
 	"testing"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
-	. "github.com/onsi/gomega"
-
 	"github.com/deckhouse/module-sdk/pkg/hook/types"
 	"github.com/deckhouse/module-sdk/pkg/webhook/admission"
 	"github.com/deckhouse/module-sdk/pkg/webhook/conversion"
+	. "github.com/onsi/gomega"
+
 	"github.com/flant/shell-operator/pkg/app"
 	"github.com/flant/shell-operator/pkg/hook/controller"
 )

pkg/hook/hook_test.go

@@ -6,10 +6,10 @@ import (
 	"time"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
+	. "github.com/deckhouse/module-sdk/pkg/hook/types"
 	. "github.com/onsi/gomega"
 	"golang.org/x/time/rate"
 
-	. "github.com/deckhouse/module-sdk/pkg/hook/types"
 	"github.com/flant/shell-operator/pkg/hook/config"
 )
 

pkg/hook/task_metadata/task_metadata.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
-
 	"github.com/deckhouse/module-sdk/pkg/hook/binding-context"
 	"github.com/deckhouse/module-sdk/pkg/hook/types"
+
 	"github.com/flant/shell-operator/pkg/task"
 )
 

pkg/hook/task_metadata/task_metadata_test.go

@@ -5,10 +5,10 @@ import (
 	"strings"
 	"testing"
 
-	. "github.com/onsi/gomega"
-
 	. "github.com/deckhouse/module-sdk/pkg/hook/binding-context"
 	. "github.com/deckhouse/module-sdk/pkg/hook/types"
+	. "github.com/onsi/gomega"
+
 	"github.com/flant/shell-operator/pkg/task"
 	"github.com/flant/shell-operator/pkg/task/queue"
 )

pkg/kube_events_manager/filter.go

@@ -8,9 +8,9 @@ import (
 	"runtime"
 	"runtime/trace"
 
+	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
-	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
 	"github.com/flant/shell-operator/pkg/app"
 	"github.com/flant/shell-operator/pkg/jq"
 	utils_checksum "github.com/flant/shell-operator/pkg/utils/checksum"

pkg/kube_events_manager/kube_events_manager.go

@@ -6,9 +6,9 @@ import (
 	"sync"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
-
 	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
 	"github.com/deckhouse/module-sdk/pkg/metric-storage"
+
 	klient "github.com/flant/kube-client/client"
 )
 

pkg/kube_events_manager/kube_events_manager_test.go

@@ -7,14 +7,14 @@ import (
 	"time"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
+	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/version"
 	fakediscovery "k8s.io/client-go/discovery/fake"
 
-	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
 	klient "github.com/flant/kube-client/client"
 )
 

pkg/kube_events_manager/monitor.go

@@ -6,9 +6,9 @@ import (
 	"sort"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
-
 	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
 	"github.com/deckhouse/module-sdk/pkg/metric-storage"
+
 	klient "github.com/flant/kube-client/client"
 	utils "github.com/flant/shell-operator/pkg/utils/labels"
 )

pkg/kube_events_manager/monitor_config.go

@@ -2,10 +2,9 @@ package kube_events_manager
 
 import (
 	"github.com/deckhouse/deckhouse/pkg/log"
+	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-
-	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
 )
 
 // MonitorConfig is a config that suits the latest

pkg/kube_events_manager/monitor_test.go

@@ -6,11 +6,11 @@ import (
 	"testing"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
+	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
 	"github.com/flant/kube-client/fake"
 	"github.com/flant/kube-client/manifest"
 )

pkg/kube_events_manager/resource_informer.go

@@ -8,14 +8,14 @@ import (
 	"time"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
+	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
+	"github.com/deckhouse/module-sdk/pkg/metric-storage"
 	"github.com/gofrs/uuid/v5"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/tools/cache"
 
-	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
-	"github.com/deckhouse/module-sdk/pkg/metric-storage"
 	klient "github.com/flant/kube-client/client"
 	"github.com/flant/shell-operator/pkg/utils/measure"
 )

pkg/kube_events_manager/util.go

@@ -5,11 +5,10 @@ import (
 	"math/rand/v2"
 	"time"
 
+	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/fields"
-
-	. "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
 )
 
 // ResourceId describes object with namespace, kind and name

pkg/metric/storage.go

@@ -1,9 +1,8 @@
 package metric
 
 import (
-	"github.com/prometheus/client_golang/prometheus"
-
 	"github.com/deckhouse/module-sdk/pkg/metric-storage/operation"
+	"github.com/prometheus/client_golang/prometheus"
 )
 
 type Storage interface {

pkg/metric_storage/metric_storage.go

@@ -8,12 +8,12 @@ import (
 	"sync"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
-
 	"github.com/deckhouse/module-sdk/pkg/metric"
 	"github.com/deckhouse/module-sdk/pkg/metric-storage/operation"
 	"github.com/deckhouse/module-sdk/pkg/metric-storage/vault"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+
 	. "github.com/flant/shell-operator/pkg/utils/labels"
 )
 

pkg/metric_storage/vault/vault.go

@@ -5,9 +5,9 @@ import (
 	"sync"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
+	"github.com/deckhouse/module-sdk/pkg/metric"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/deckhouse/module-sdk/pkg/metric"
 	. "github.com/flant/shell-operator/pkg/utils/labels"
 )
 

pkg/schedule_manager/schedule_manager.go

@@ -4,9 +4,8 @@ import (
 	"context"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
-	"gopkg.in/robfig/cron.v2"
-
 	. "github.com/deckhouse/module-sdk/pkg/schedule-manager/types"
+	"gopkg.in/robfig/cron.v2"
 )
 
 type ScheduleManager interface {