Replaced kyma/epp package with local EPP package and fixed lint issues (

#15)

* Replaced kyma/epp pkg with local pkgs

* fixed lint issues

cmd/event-publisher-proxy/main.go

@@ -1,4 +1,4 @@
-package main
+package main //nolint:cyclop // it is only starting required instances.
 
 import (
 	golog "log"
@@ -7,12 +7,12 @@ import (
 	kymalogger "github.com/kyma-project/kyma/components/eventing-controller/logger"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/commander"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/commander/eventmesh"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/commander/nats"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/metrics"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/metrics/latency"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/options"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/commander"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/commander/eventmesh"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/commander/nats"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/metrics"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/metrics/latency"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/options"
 )
 
 const (

go.mod

@@ -1,4 +1,4 @@
-module github.com/kyma-project/kyma/components/event-publisher-proxy
+module github.com/kyma-project/eventing-publisher-proxy
 
 go 1.21
 

pkg/application/clean_test.go

@@ -7,7 +7,7 @@ import (
 
 	applicationv1alpha1 "github.com/kyma-project/kyma/components/application-operator/pkg/apis/applicationconnector/v1alpha1"
 
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/application/applicationtest"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/application/applicationtest"
 )
 
 func TestCleanName(t *testing.T) {
@@ -69,12 +69,15 @@ func TestCleanName(t *testing.T) {
 
 	for _, tc := range testCases {
 		if gotName := GetCleanTypeOrName(tc.givenApplication); tc.wantName != gotName {
-			t.Errorf("Clean application name:[%s] failed, want:[%v] but got:[%v]", tc.givenApplication.Name, tc.wantName, gotName)
+			t.Errorf("Clean application name:[%s] failed, want:[%v] but got:[%v]",
+				tc.givenApplication.Name, tc.wantName, gotName)
 		}
 	}
 }
 
 func Test_GetTypeOrName(t *testing.T) {
+	t.Parallel()
+
 	testCases := []struct {
 		name             string
 		givenApplication *applicationv1alpha1.Application
@@ -87,9 +90,10 @@ func Test_GetTypeOrName(t *testing.T) {
 			wantName:         "alphanumeric0123",
 		},
 		{
-			name:             "Should return application name if label with right key does not exists",
-			givenApplication: applicationtest.NewApplication("alphanumeric0123", map[string]string{"ignore-me": "value"}),
-			wantName:         "alphanumeric0123",
+			name: "Should return application name if label with right key does not exists",
+			givenApplication: applicationtest.NewApplication("alphanumeric0123",
+				map[string]string{"ignore-me": "value"}),
+			wantName: "alphanumeric0123",
 		},
 		{
 			name:             "Should return application name as unclean",
@@ -98,14 +102,16 @@ func Test_GetTypeOrName(t *testing.T) {
 		},
 		// application type label is available, then use it instead of the application name
 		{
-			name:             "Should return application label instead of name",
-			givenApplication: applicationtest.NewApplication("alphanumeric0123", map[string]string{TypeLabel: "apptype"}),
-			wantName:         "apptype",
+			name: "Should return application label instead of name",
+			givenApplication: applicationtest.NewApplication("alphanumeric0123",
+				map[string]string{TypeLabel: "apptype"}),
+			wantName: "apptype",
 		},
 		{
-			name:             "Should return application label as unclean",
-			givenApplication: applicationtest.NewApplication("alphanumeric0123", map[string]string{TypeLabel: "apptype=with.!@#none-$%^alphanumeric_&*-characters"}),
-			wantName:         "apptype=with.!@#none-$%^alphanumeric_&*-characters",
+			name: "Should return application label as unclean",
+			givenApplication: applicationtest.NewApplication("alphanumeric0123",
+				map[string]string{TypeLabel: "apptype=with.!@#none-$%^alphanumeric_&*-characters"}),
+			wantName: "apptype=with.!@#none-$%^alphanumeric_&*-characters",
 		},
 	}
 

pkg/application/fake/lister.go

@@ -10,7 +10,7 @@ import (
 
 	applicationv1alpha1 "github.com/kyma-project/kyma/components/application-operator/pkg/apis/applicationconnector/v1alpha1"
 
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/application"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/application"
 )
 
 func NewApplicationListerOrDie(ctx context.Context, app *applicationv1alpha1.Application) *application.Lister {

pkg/application/lister.go

@@ -15,7 +15,7 @@ import (
 	"k8s.io/client-go/dynamic/dynamicinformer"
 	"k8s.io/client-go/tools/cache"
 
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/informers"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/informers"
 )
 
 type Lister struct {

pkg/cloudevents/builder/eventmesh.go

@@ -6,7 +6,7 @@ import (
 	"github.com/kyma-project/kyma/components/eventing-controller/logger"
 	"github.com/kyma-project/kyma/components/eventing-controller/pkg/backend/cleaner"
 
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/application"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/application"
 )
 
 // Perform a compile-time check.

pkg/cloudevents/builder/eventmesh_test.go

@@ -9,10 +9,10 @@ import (
 
 	cloudevents "github.com/cloudevents/sdk-go/v2"
 
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/application"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/application/applicationtest"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/application/fake"
-	testingutils "github.com/kyma-project/kyma/components/event-publisher-proxy/testing"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/application"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/application/applicationtest"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/application/fake"
+	testingutils "github.com/kyma-project/eventing-publisher-proxy/testing"
 	kymalogger "github.com/kyma-project/kyma/components/eventing-controller/logger"
 	"github.com/kyma-project/kyma/components/eventing-controller/pkg/backend/cleaner"
 	"github.com/stretchr/testify/require"

pkg/cloudevents/builder/generic.go

@@ -10,18 +10,19 @@ import (
 	"github.com/kyma-project/kyma/components/eventing-controller/pkg/backend/cleaner"
 	"go.uber.org/zap"
 
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/application"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/application"
 )
 
 // Perform a compile-time check.
 var _ CloudEventBuilder = &GenericBuilder{}
 
-var (
+const (
 	// jsBuilderName used as the logger name.
 	genericBuilderName = "generic-type-builder"
 )
 
-func NewGenericBuilder(typePrefix string, cleaner cleaner.Cleaner, applicationLister *application.Lister, logger *logger.Logger) CloudEventBuilder {
+func NewGenericBuilder(typePrefix string, cleaner cleaner.Cleaner, applicationLister *application.Lister,
+	logger *logger.Logger) CloudEventBuilder {
 	return &GenericBuilder{
 		typePrefix:        typePrefix,
 		applicationLister: applicationLister,
@@ -84,7 +85,8 @@ func (gb *GenericBuilder) GetAppNameOrSource(source string, namedLogger *zap.Sug
 	if gb.isApplicationListerEnabled() {
 		if appObj, err := gb.applicationLister.Get(source); err == nil && appObj != nil {
 			appName = application.GetTypeOrName(appObj)
-			namedLogger.With("application", source).Debug("Using application name: %s as source.", appName)
+			namedLogger.With("application", source).Debug("Using application name: %s as source.",
+				appName)
 		} else {
 			namedLogger.With("application", source).Debug("Cannot find application.")
 		}

pkg/cloudevents/builder/generic_test.go

@@ -7,11 +7,11 @@ import (
 	"testing"
 
 	cloudevents "github.com/cloudevents/sdk-go/v2"
-	testingutils "github.com/kyma-project/kyma/components/event-publisher-proxy/testing"
+	testingutils "github.com/kyma-project/eventing-publisher-proxy/testing"
 
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/application"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/application/applicationtest"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/application/fake"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/application"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/application/applicationtest"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/application/fake"
 	kymalogger "github.com/kyma-project/kyma/components/eventing-controller/logger"
 	"github.com/kyma-project/kyma/components/eventing-controller/pkg/backend/cleaner"
 	"github.com/stretchr/testify/require"

pkg/cloudevents/builder/types.go

@@ -2,7 +2,7 @@ package builder
 
 import (
 	cev2event "github.com/cloudevents/sdk-go/v2/event"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/application"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/application"
 	"github.com/kyma-project/kyma/components/eventing-controller/logger"
 	"github.com/kyma-project/kyma/components/eventing-controller/pkg/backend/cleaner"
 )

pkg/cloudevents/eventtype/clean.go

@@ -8,7 +8,7 @@ import (
 	"github.com/kyma-project/kyma/components/eventing-controller/logger"
 	"go.uber.org/zap"
 
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/application"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/application"
 )
 
 var (

pkg/cloudevents/eventtype/clean_test.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/application"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/application/applicationtest"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/application/fake"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/application"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/application/applicationtest"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/application/fake"
 )
 
 //nolint:lll // we need long lines here as the event types can get very long

pkg/cloudevents/eventtype/eventtypetest/eventtypetest.go

@@ -15,7 +15,3 @@ func (c CleanerStub) Clean(_ string) (string, error) {
 func (cf CleanerFunc) Clean(eventType string) (string, error) {
 	return cf(eventType)
 }
-
-var DefaultCleaner = func(eventType string) (string, error) {
-	return eventType, nil
-}

pkg/cloudevents/eventtype/parse.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/cloudevents/builder"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/cloudevents/builder"
 )
 
 // parse splits the event-type using the given prefix and returns the application name, event and version

pkg/cloudevents/utils_test.go

@@ -10,8 +10,8 @@ import (
 
 	cehttp "github.com/cloudevents/sdk-go/v2/protocol/http"
 
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/internal"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/eventmesh"
+	"github.com/kyma-project/eventing-publisher-proxy/internal"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/eventmesh"
 )
 
 func TestWriteRequestWithHeaders(t *testing.T) {

pkg/commander/eventmesh/eventmesh.go

@@ -4,21 +4,21 @@ import (
 	"context"
 
 	"github.com/kelseyhightower/envconfig"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/application"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/cloudevents/builder"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/cloudevents/eventtype"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/env"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/handler"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/handler/health"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/informers"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/legacy"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/metrics"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/oauth"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/options"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/receiver"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/sender/eventmesh"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/signals"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/subscribed"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/application"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/cloudevents/builder"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/cloudevents/eventtype"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/env"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/handler"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/handler/health"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/informers"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/legacy"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/metrics"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/oauth"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/options"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/receiver"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/sender/eventmesh"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/signals"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/subscribed"
 	"github.com/kyma-project/kyma/components/eventing-controller/logger"
 	"github.com/kyma-project/kyma/components/eventing-controller/pkg/backend/cleaner"
 
@@ -101,7 +101,7 @@ func (c *Commander) Start() error {
 
 	// Configure Subscription Lister
 	subDynamicSharedInfFactory := subscribed.GenerateSubscriptionInfFactory(k8sConfig)
-	subLister := subDynamicSharedInfFactory.ForResource(subscribed.GVR).Lister()
+	subLister := subDynamicSharedInfFactory.ForResource(subscribed.SubscriptionGVR()).Lister()
 	subscribedProcessor := &subscribed.Processor{
 		SubscriptionLister: &subLister,
 		Prefix:             c.envCfg.EventTypePrefix,

pkg/commander/nats/nats.go

@@ -4,20 +4,20 @@ import (
 	"context"
 
 	"github.com/kelseyhightower/envconfig"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/application"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/cloudevents/builder"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/cloudevents/eventtype"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/env"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/handler"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/informers"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/legacy"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/metrics"
-	pkgnats "github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/nats"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/options"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/receiver"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/sender/jetstream"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/signals"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/subscribed"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/application"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/cloudevents/builder"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/cloudevents/eventtype"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/env"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/handler"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/informers"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/legacy"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/metrics"
+	pkgnats "github.com/kyma-project/eventing-publisher-proxy/pkg/nats"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/options"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/receiver"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/sender/jetstream"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/signals"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/subscribed"
 	"github.com/kyma-project/kyma/components/eventing-controller/logger"
 	"github.com/kyma-project/kyma/components/eventing-controller/pkg/backend/cleaner"
 
@@ -108,7 +108,7 @@ func (c *Commander) Start() error {
 
 	// configure Subscription Lister
 	subDynamicSharedInfFactory := subscribed.GenerateSubscriptionInfFactory(k8sConfig)
-	subLister := subDynamicSharedInfFactory.ForResource(subscribed.GVR).Lister()
+	subLister := subDynamicSharedInfFactory.ForResource(subscribed.SubscriptionGVR()).Lister()
 	subscribedProcessor := &subscribed.Processor{
 		SubscriptionLister: &subLister,
 		Prefix:             c.envCfg.ToConfig().EventTypePrefix,

pkg/handler/handler.go

@@ -7,10 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/env"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/metrics"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/env"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/metrics"
 
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/legacy/api"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/legacy/api"
 
 	"github.com/gorilla/mux"
 	"github.com/kyma-project/kyma/components/eventing-controller/logger"
@@ -21,15 +21,15 @@ import (
 	cev2event "github.com/cloudevents/sdk-go/v2/event"
 	cev2http "github.com/cloudevents/sdk-go/v2/protocol/http"
 
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/cloudevents/builder"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/cloudevents/eventtype"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/handler/health"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/legacy"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/options"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/receiver"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/sender"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/subscribed"
-	"github.com/kyma-project/kyma/components/event-publisher-proxy/pkg/tracing"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/cloudevents/builder"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/cloudevents/eventtype"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/handler/health"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/legacy"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/options"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/receiver"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/sender"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/subscribed"
+	"github.com/kyma-project/eventing-publisher-proxy/pkg/tracing"
 )
 
 // EventingHandler is responsible for receiving HTTP requests and dispatching them to the Backend.
@@ -149,6 +149,7 @@ func (h *Handler) handlePublishLegacyEvent(w http.ResponseWriter, r *http.Reques
 	ceEvent, err := h.LegacyTransformer.TransformPublishRequestToCloudEvent(data)
 	if err != nil {
 		legacy.WriteJSONResponse(w, legacy.ErrorResponse(http.StatusInternalServerError, err))
+		//nolint:nilnil // this will be removed once subscription v1alpha1 is removed.
 		return nil, nil
 	}
 
@@ -175,6 +176,7 @@ func (h *Handler) handlePublishLegacyEventV1alpha1(w http.ResponseWriter, r *htt
 	event, _ := h.LegacyTransformer.WriteLegacyRequestsToCE(w, data)
 	if event == nil {
 		h.namedLogger().Error("Failed to transform legacy event to CloudEvent, event is nil")
+		//nolint:nilnil // this will be removed once subscription v1alpha1 is removed.
 		return nil, nil
 	}