fix: Notifier v1 removed (#6705)

* notifier v1 removed

* notifier v1 removed

Author: prkhrkat

client/events/EventClient.go

@@ -39,7 +39,6 @@ import (
 type EventClientConfig struct {
 	DestinationURL     string             `env:"EVENT_URL" envDefault:"http://localhost:3000/notify" description:"Notifier service url"`
 	NotificationMedium NotificationMedium `env:"NOTIFICATION_MEDIUM" envDefault:"rest" description:"notification medium"`
-	EnableNotifierV2   bool               `env:"ENABLE_NOTIFIER_V2" envDefault:"false" description:"enable notifier v2"`
 }
 type NotificationMedium string
 
@@ -243,7 +242,7 @@ func (impl *EventRESTClientImpl) sendEvent(event Event) (bool, error) {
 	impl.logger.Debugw("event before send", "event", event)
 
 	// Step 1: Create payload and destination URL based on config
-	bodyBytes, destinationUrl, err := impl.createPayloadAndDestination(event)
+	bodyBytes, destinationUrl, err := impl.createV2PayloadAndDestination(event)
 	if err != nil {
 		return false, err
 	}
@@ -252,13 +251,6 @@ func (impl *EventRESTClientImpl) sendEvent(event Event) (bool, error) {
 	return impl.deliverEvent(bodyBytes, destinationUrl)
 }
 
-func (impl *EventRESTClientImpl) createPayloadAndDestination(event Event) ([]byte, string, error) {
-	if impl.config.EnableNotifierV2 {
-		return impl.createV2PayloadAndDestination(event)
-	}
-	return impl.createDefaultPayloadAndDestination(event)
-}
-
 func (impl *EventRESTClientImpl) createV2PayloadAndDestination(event Event) ([]byte, string, error) {
 	destinationUrl := impl.config.DestinationURL + "/v2"
 
@@ -302,15 +294,6 @@ func (impl *EventRESTClientImpl) createV2PayloadAndDestination(event Event) ([]b
 	return bodyBytes, destinationUrl, nil
 }
 
-func (impl *EventRESTClientImpl) createDefaultPayloadAndDestination(event Event) ([]byte, string, error) {
-	bodyBytes, err := json.Marshal(event)
-	if err != nil {
-		impl.logger.Errorw("error while marshaling event request", "err", err)
-		return nil, "", err
-	}
-	return bodyBytes, impl.config.DestinationURL, nil
-}
-
 func (impl *EventRESTClientImpl) processNotificationSettings(notificationSettings []repository.NotificationSettings) ([]*repository.NotificationSettingsBean, error) {
 	notificationSettingsBean := make([]*repository.NotificationSettingsBean, 0)
 	for _, item := range notificationSettings {

env_gen.json

@@ -181,7 +181,6 @@
  | ECR_REPO_NAME_PREFIX | string |test/ | Prefix for ECR repo to be created in does not exist |  | false |
  | ENABLE_ASYNC_ARGO_CD_INSTALL_DEVTRON_CHART | bool |false | To enable async installation of gitops application |  | false |
  | ENABLE_ASYNC_INSTALL_DEVTRON_CHART | bool |false | To enable async installation of no-gitops application |  | false |
- | ENABLE_NOTIFIER_V2 | bool |false | enable notifier v2 |  | false |
  | EPHEMERAL_SERVER_VERSION_REGEX | string |v[1-9]\.\b(2[3-9]\|[3-9][0-9])\b.* | ephemeral containers support version regex that is compared with k8sServerVersion |  | false |
  | EVENT_URL | string |http://localhost:3000/notify | Notifier service url |  | false |
  | EXECUTE_WIRE_NIL_CHECKER | bool |false | checks for any nil pointer in wire.go |  | false |