Fixes

Makefile

@@ -18,22 +18,23 @@ test: system-check
 	@go test -v  -race ./...
 
 test-integration-slack: system-check
-	@go test -timeout=20m -v -tags=integration -race -count=1 ./test/e2e/... -run "TestSlack"
+	@cd ./test; go test -timeout=20m -v -tags=integration -race -count=1 ./e2e/... -run "TestSlack"
 
 test-integration-discord: system-check
-	@go test -timeout=20m -v -tags=integration -race -count=1 ./test/e2e/... -run "TestDiscord"
+	@cd ./test; go test -timeout=20m -v -tags=integration -race -count=1 ./e2e/... -run "TestDiscord"
 
 test-integration-teams: system-check
-	@go test -timeout=20m -v -tags=integration -race -count=1 ./test/e2e/... -run "TestTeams"
+
+	@cd ./test; go test -timeout=20m -v -tags=integration -race -count=1 ./e2e/... -run "TestTeams"
 
 test-cli-migration-e2e: system-check
-	@go test -v -tags=migration -race -count=1 ./test/e2e/...
+	@cd ./test; go test -v -tags=migration -race -count=1 ./e2e/...
 
 test-cloud-slack-dev-e2e: system-check
-	@go test -tags=cloud_slack_dev_e2e -race -p 1 -v -timeout 30m ./test/cloud-slack-dev-e2e/...
+	@cd ./test; go test -tags=cloud_slack_dev_e2e -race -p 1 -v -timeout 30m ./cloud-slack-dev-e2e/...
 
 test-cloud-slack-dev-e2e-show-browser: system-check
-	@go test -tags=cloud_slack_dev_e2e -race -p 1 -v -timeout 30m -rod=show ./test/cloud-slack-dev-e2e/...
+	@cd ./test; go test -tags=cloud_slack_dev_e2e -race -p 1 -v -timeout 30m -rod=show ./cloud-slack-dev-e2e/...
 
 # Build Botkube official plugins for all supported platforms.
 build-plugins: pre-build gen-plugins-goreleaser

cmd/botkube-agent/main.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/kubeshop/botkube/pkg/httpx"
-	"github.com/kubeshop/botkube/pkg/loggerx"
 	"net/http"
 	"time"
 
@@ -44,6 +42,8 @@ import (
 	"github.com/kubeshop/botkube/pkg/config"
 	"github.com/kubeshop/botkube/pkg/controller"
 	"github.com/kubeshop/botkube/pkg/execute"
+	"github.com/kubeshop/botkube/pkg/httpx"
+	"github.com/kubeshop/botkube/pkg/loggerx"
 	"github.com/kubeshop/botkube/pkg/maputil"
 	"github.com/kubeshop/botkube/pkg/multierror"
 	"github.com/kubeshop/botkube/pkg/notifier"

cmd/executor/exec/main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"fmt"
-	"github.com/kubeshop/botkube/pkg/loggerx"
 	"strings"
 
 	"github.com/MakeNowJust/heredoc"
@@ -18,6 +17,7 @@ import (
 	"github.com/kubeshop/botkube/pkg/api"
 	"github.com/kubeshop/botkube/pkg/api/executor"
 	"github.com/kubeshop/botkube/pkg/formatx"
+	"github.com/kubeshop/botkube/pkg/loggerx"
 	"github.com/kubeshop/botkube/pkg/pluginx"
 )
 

cmd/executor/flux/main.go

@@ -2,14 +2,14 @@ package main
 
 import (
 	"context"
-	"github.com/kubeshop/botkube/pkg/loggerx"
 	"time"
 
 	"github.com/allegro/bigcache/v3"
 	"github.com/hashicorp/go-plugin"
 
 	"github.com/kubeshop/botkube/internal/executor/flux"
 	"github.com/kubeshop/botkube/pkg/api/executor"
+	"github.com/kubeshop/botkube/pkg/loggerx"
 )
 
 // version is set via ldflags by GoReleaser.

cmd/executor/gh/main.go

@@ -5,14 +5,14 @@ import (
 	"context"
 	_ "embed"
 	"fmt"
-	"github.com/kubeshop/botkube/pkg/loggerx"
 	"text/template"
 
 	"github.com/hashicorp/go-plugin"
 
 	"github.com/kubeshop/botkube/pkg/api"
 	"github.com/kubeshop/botkube/pkg/api/executor"
 	"github.com/kubeshop/botkube/pkg/config"
+	"github.com/kubeshop/botkube/pkg/loggerx"
 	"github.com/kubeshop/botkube/pkg/pluginx"
 )
 

hack/gen-plugin-index.go

@@ -2,11 +2,12 @@ package main
 
 import (
 	"flag"
-	"github.com/kubeshop/botkube/internal/plugin"
-	"github.com/kubeshop/botkube/pkg/loggerx"
 	"os"
 	"path/filepath"
 
+	"github.com/kubeshop/botkube/internal/plugin"
+	"github.com/kubeshop/botkube/pkg/loggerx"
+
 	"github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v3"
 )

hack/target/build-plugins/main.go

@@ -3,12 +3,13 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/kubeshop/botkube/pkg/loggerx"
 	"log"
 	"os"
 	"os/exec"
 	"strings"
 
+	"github.com/kubeshop/botkube/pkg/loggerx"
+
 	"github.com/mattn/go-shellwords"
 )
 

hack/target/gen-goreleaser/main.go

@@ -2,9 +2,10 @@ package main
 
 import (
 	"fmt"
-	"github.com/kubeshop/botkube/pkg/loggerx"
 	"os"
 	"text/template"
+
+	"github.com/kubeshop/botkube/pkg/loggerx"
 )
 
 const (

internal/analytics/segment_reporter.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/kubeshop/botkube/pkg/ptr"
 	"time"
 
 	segment "github.com/segmentio/analytics-go"
@@ -15,6 +14,7 @@ import (
 
 	"github.com/kubeshop/botkube/internal/analytics/batched"
 	"github.com/kubeshop/botkube/pkg/config"
+	"github.com/kubeshop/botkube/pkg/ptr"
 	"github.com/kubeshop/botkube/pkg/version"
 )
 

internal/analytics/segment_reporter_test.go

@@ -12,7 +12,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/kubeshop/botkube/pkg/loggerx"
 	"sync"
 	"testing"
 	"time"
@@ -30,6 +29,7 @@ import (
 	"github.com/kubeshop/botkube/internal/analytics"
 	"github.com/kubeshop/botkube/pkg/config"
 	"github.com/kubeshop/botkube/pkg/execute/command"
+	"github.com/kubeshop/botkube/pkg/loggerx"
 	"github.com/kubeshop/botkube/pkg/version"
 )
 

internal/cli/analytics/segment_reporter.go

@@ -1,7 +1,6 @@
 package analytics
 
 import (
-	"github.com/kubeshop/botkube/pkg/loggerx"
 	"runtime"
 
 	"github.com/denisbrodbeck/machineid"
@@ -11,6 +10,7 @@ import (
 
 	"github.com/kubeshop/botkube/internal/analytics"
 	"github.com/kubeshop/botkube/internal/cli"
+	"github.com/kubeshop/botkube/pkg/loggerx"
 )
 
 var _ Reporter = &SegmentReporter{}

internal/cli/config/get.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/kubeshop/botkube/pkg/ptr"
 	"os"
 	"strings"
 	"time"
@@ -28,6 +27,7 @@ import (
 	"github.com/kubeshop/botkube/internal/cli/printer"
 	"github.com/kubeshop/botkube/internal/config/remote"
 	"github.com/kubeshop/botkube/pkg/formatx"
+	"github.com/kubeshop/botkube/pkg/ptr"
 )
 
 const (

internal/cli/helmx/action_cfg.go

@@ -2,13 +2,13 @@ package helmx
 
 import (
 	"fmt"
-	"github.com/kubeshop/botkube/pkg/ptr"
 
 	"helm.sh/helm/v3/pkg/action"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/client-go/rest"
 
 	"github.com/kubeshop/botkube/internal/cli"
+	"github.com/kubeshop/botkube/pkg/ptr"
 )
 
 const helmDriver = "secrets"

internal/cli/install/helm/version.go

@@ -2,13 +2,14 @@ package helm
 
 import (
 	"fmt"
-	"github.com/kubeshop/botkube/pkg/httpx"
 	"io"
 	"net/url"
 
 	"github.com/pkg/errors"
 	"helm.sh/helm/v3/pkg/repo"
 	"sigs.k8s.io/yaml"
+
+	"github.com/kubeshop/botkube/pkg/httpx"
 )
 
 // GetLatestVersion loads an index file and returns version of the latest chart. Sort by SemVer.

internal/cli/migrate/converter.go

@@ -3,14 +3,14 @@ package migrate
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/kubeshop/botkube/pkg/ptr"
 	"strings"
 
 	"github.com/xyproto/randomstring"
 
 	gqlModel "github.com/kubeshop/botkube/internal/remote/graphql"
 	bkconfig "github.com/kubeshop/botkube/pkg/config"
 	"github.com/kubeshop/botkube/pkg/multierror"
+	"github.com/kubeshop/botkube/pkg/ptr"
 )
 
 // Converter converts OS config into GraphQL create input.

internal/command/guard_test.go

@@ -2,14 +2,15 @@ package command
 
 import (
 	"errors"
-	"github.com/kubeshop/botkube/pkg/loggerx"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/discovery"
+
+	"github.com/kubeshop/botkube/pkg/loggerx"
 )
 
 func TestCommandGuard_GetAllowedResourcesForVerb(t *testing.T) {

internal/config/reloader/in_cluster_test.go

@@ -2,7 +2,6 @@ package reloader
 
 import (
 	"context"
-	"github.com/kubeshop/botkube/pkg/loggerx"
 	"sync"
 	"testing"
 	"time"
@@ -22,6 +21,7 @@ import (
 
 	"github.com/kubeshop/botkube/internal/analytics"
 	"github.com/kubeshop/botkube/pkg/config"
+	"github.com/kubeshop/botkube/pkg/loggerx"
 )
 
 var (

internal/config/reloader/remote_test.go

@@ -1,7 +1,6 @@
 package reloader
 
 import (
-	"github.com/kubeshop/botkube/pkg/loggerx"
 	"testing"
 	"time"
 
@@ -10,6 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/kubeshop/botkube/pkg/config"
+	"github.com/kubeshop/botkube/pkg/loggerx"
 )
 
 func TestRemote_ProcessConfig(t *testing.T) {

internal/config/reloader/restarter_test.go

@@ -3,7 +3,6 @@ package reloader_test
 import (
 	"context"
 	"fmt"
-	"github.com/kubeshop/botkube/pkg/loggerx"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -14,6 +13,7 @@ import (
 
 	"github.com/kubeshop/botkube/internal/config/reloader"
 	"github.com/kubeshop/botkube/pkg/config"
+	"github.com/kubeshop/botkube/pkg/loggerx"
 )
 
 func TestRestarter_Do_HappyPath(t *testing.T) {

internal/executor/doctor/executor.go

@@ -5,7 +5,6 @@ import (
 	_ "embed"
 	"errors"
 	"fmt"
-	"github.com/kubeshop/botkube/pkg/loggerx"
 	"regexp"
 	"strings"
 	"sync"
@@ -17,6 +16,7 @@ import (
 	"github.com/kubeshop/botkube/pkg/api"
 	"github.com/kubeshop/botkube/pkg/api/executor"
 	"github.com/kubeshop/botkube/pkg/config"
+	"github.com/kubeshop/botkube/pkg/loggerx"
 	"github.com/kubeshop/botkube/pkg/pluginx"
 )
 

internal/executor/flux/diff_ks_cmd_test.go

@@ -1,11 +1,12 @@
 package flux
 
 import (
-	"github.com/kubeshop/botkube/pkg/loggerx"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
+
+	"github.com/kubeshop/botkube/pkg/loggerx"
 )
 
 func TestNewKustomizeDiffCmd(t *testing.T) {

internal/executor/flux/executor.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	_ "embed"
 	"fmt"
-	loggerx2 "github.com/kubeshop/botkube/pkg/loggerx"
 
 	"github.com/allegro/bigcache/v3"
 
@@ -14,6 +13,7 @@ import (
 	"github.com/kubeshop/botkube/internal/executor/x/state"
 	"github.com/kubeshop/botkube/pkg/api"
 	"github.com/kubeshop/botkube/pkg/api/executor"
+	"github.com/kubeshop/botkube/pkg/loggerx"
 	"github.com/kubeshop/botkube/pkg/pluginx"
 )
 
@@ -100,7 +100,7 @@ func (d *Executor) Execute(ctx context.Context, in executor.ExecuteInput) (execu
 		return executor.ExecuteOutput{}, fmt.Errorf("while merging input configuration: %w", err)
 	}
 
-	log := loggerx2.New(cfg.Logger)
+	log := loggerx.New(cfg.Logger)
 
 	kubeConfigPath, deleteFn, err := pluginx.PersistKubeConfig(ctx, in.Context.KubeConfig)
 	if err != nil {
@@ -165,7 +165,7 @@ func (d *Executor) Help(context.Context) (api.Message, error) {
 		return api.Message{}, fmt.Errorf("while registering message renderers: %v", err)
 	}
 
-	runner := x.NewRunner(loggerx2.NewNoop(), renderer)
+	runner := x.NewRunner(loggerx.NewNoop(), renderer)
 
 	templates, err := commands.LoadTemplates()
 	if err != nil {

internal/executor/kubectl/builder/kubectl_test.go

@@ -3,7 +3,6 @@ package builder_test
 import (
 	"context"
 	"errors"
-	"github.com/kubeshop/botkube/pkg/loggerx"
 	"testing"
 
 	"github.com/slack-go/slack"
@@ -16,6 +15,7 @@ import (
 	"github.com/kubeshop/botkube/internal/executor/kubectl/builder"
 	"github.com/kubeshop/botkube/pkg/api"
 	"github.com/kubeshop/botkube/pkg/execute/kubectl"
+	"github.com/kubeshop/botkube/pkg/loggerx"
 )
 
 const (