Remove old notification infra code

Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com>

Author: johananl

pkg/i2gw/notifications/notifications.go

@@ -17,19 +17,11 @@ limitations under the License.
 package notifications
 
 import (
-	"fmt"
 	"strings"
-	"sync"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
-
-	"github.com/olekukonko/tablewriter"
 )
 
-func init() {
-	NotificationAggr = NotificationAggregator{Notifications: map[string][]Notification{}}
-}
-
 const (
 	InfoNotification    MessageType = "INFO"
 	WarningNotification MessageType = "WARNING"
@@ -44,49 +36,6 @@ type Notification struct {
 	CallingObjects []client.Object
 }
 
-type NotificationAggregator struct {
-	mutex         sync.Mutex
-	Notifications map[string][]Notification
-}
-
-var NotificationAggr NotificationAggregator
-
-// DispatchNotification is used to send a notification to the NotificationAggregator
-func (na *NotificationAggregator) DispatchNotification(notification Notification, ProviderName string) {
-	na.mutex.Lock()
-	na.Notifications[ProviderName] = append(na.Notifications[ProviderName], notification)
-	na.mutex.Unlock()
-}
-
-// CreateNotificationTables takes all generated notifications and returns a map[string]string
-// that displays the notifications in a tabular format based on provider
-func (na *NotificationAggregator) CreateNotificationTables() map[string]string {
-	notificationTablesMap := make(map[string]string)
-
-	na.mutex.Lock()
-	defer na.mutex.Unlock()
-
-	for provider, msgs := range na.Notifications {
-		providerTable := strings.Builder{}
-
-		t := tablewriter.NewWriter(&providerTable)
-		t.SetHeader([]string{"Message Type", "Notification", "Calling Object"})
-		t.SetColWidth(200)
-		t.SetRowLine(true)
-
-		for _, n := range msgs {
-			row := []string{string(n.Type), n.Message, convertObjectsToStr(n.CallingObjects)}
-			t.Append(row)
-		}
-
-		providerTable.WriteString(fmt.Sprintf("Notifications from %v:\n", strings.ToUpper(provider)))
-		t.Render()
-		notificationTablesMap[provider] = providerTable.String()
-	}
-
-	return notificationTablesMap
-}
-
 func convertObjectsToStr(ob []client.Object) string {
 	var sb strings.Builder
 

pkg/i2gw/notifications/notifications_test.go

@@ -17,181 +17,16 @@ limitations under the License.
 package notifications
 
 import (
-	"sync"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 
-	istioclientv1beta1 "istio.io/client-go/pkg/apis/networking/v1beta1"
 	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
 
-func TestCreateNotificationsTables(t *testing.T) {
-	testCases := []struct {
-		name          string
-		notifications map[string][]Notification
-		wantedTables  map[string]string
-	}{
-		{
-			name:          "no notifications",
-			notifications: map[string][]Notification{},
-			wantedTables:  map[string]string{},
-		},
-		{
-			name: "single provider with one notification",
-			notifications: map[string][]Notification{
-				"provider1": {
-					{
-						Type:    WarningNotification,
-						Message: "warning message",
-					},
-				},
-			},
-			wantedTables: map[string]string{
-				"provider1": `Notifications from PROVIDER1:
-+--------------+-----------------+----------------+
-| MESSAGE TYPE |  NOTIFICATION   | CALLING OBJECT |
-+--------------+-----------------+----------------+
-| WARNING      | warning message |                |
-+--------------+-----------------+----------------+
-`,
-			},
-		},
-		{
-			name: "two providers each with two notifications",
-			notifications: map[string][]Notification{
-				"istio": {
-					{
-						Type:    WarningNotification,
-						Message: "a very long warning notification generated by VirtualService ns/test from the provider istio",
-						CallingObjects: []client.Object{
-							&istioclientv1beta1.VirtualService{
-								TypeMeta: metav1.TypeMeta{
-									Kind: "VirtualService",
-								},
-								ObjectMeta: metav1.ObjectMeta{
-									Name:      "test",
-									Namespace: "ns",
-								},
-							},
-						},
-					},
-					{
-						Type:    InfoNotification,
-						Message: "successfully converted VirtualService ns/test to HTTPRoute",
-						CallingObjects: []client.Object{
-							&istioclientv1beta1.VirtualService{
-								TypeMeta: metav1.TypeMeta{
-									Kind: "VirtualService",
-								},
-								ObjectMeta: metav1.ObjectMeta{
-									Name:      "test",
-									Namespace: "ns",
-								},
-							},
-						},
-					},
-				},
-				"kong": {
-					{
-						Type:    InfoNotification,
-						Message: "informational notification from kong provider",
-						CallingObjects: []client.Object{
-							&networkingv1.Ingress{
-								TypeMeta: metav1.TypeMeta{
-									Kind: "Ingress",
-								},
-								ObjectMeta: metav1.ObjectMeta{
-									Name:      "ingress-kong",
-									Namespace: "default",
-								},
-							},
-						},
-					},
-					{
-						Type:    ErrorNotification,
-						Message: "error notification genereated by kong",
-					},
-				},
-			},
-			wantedTables: map[string]string{
-				"istio": `Notifications from ISTIO:
-+--------------+----------------------------------------------------------------------------------------------+-------------------------+
-| MESSAGE TYPE |                                         NOTIFICATION                                         |     CALLING OBJECT      |
-+--------------+----------------------------------------------------------------------------------------------+-------------------------+
-| WARNING      | a very long warning notification generated by VirtualService ns/test from the provider istio | VirtualService: ns/test |
-+--------------+----------------------------------------------------------------------------------------------+-------------------------+
-| INFO         | successfully converted VirtualService ns/test to HTTPRoute                                   | VirtualService: ns/test |
-+--------------+----------------------------------------------------------------------------------------------+-------------------------+
-`,
-				"kong": `Notifications from KONG:
-+--------------+-----------------------------------------------+-------------------------------+
-| MESSAGE TYPE |                 NOTIFICATION                  |        CALLING OBJECT         |
-+--------------+-----------------------------------------------+-------------------------------+
-| INFO         | informational notification from kong provider | Ingress: default/ingress-kong |
-+--------------+-----------------------------------------------+-------------------------------+
-| ERROR        | error notification genereated by kong         |                               |
-+--------------+-----------------------------------------------+-------------------------------+
-`,
-			},
-		},
-	}
-
-	for _, tc := range testCases {
-		tc := tc
-		t.Run(tc.name, func(t *testing.T) {
-			na := NotificationAggregator{
-				Notifications: tc.notifications,
-			}
-			result := na.CreateNotificationTables()
-			for provider, table := range result {
-				assert.Equal(t, tc.wantedTables[provider], table)
-			}
-		})
-	}
-}
-
-// TestNotificationAggregatorRace checks for data races in NotificationAggregator when accessed
-// concurrently.
-func TestNotificationAggregatorRace(_ *testing.T) {
-	na := NotificationAggregator{Notifications: map[string][]Notification{}}
-
-	providers := []string{"provider1", "provider2", "provider3", "provider4"}
-	var wg sync.WaitGroup
-
-	// Start multiple goroutines that dispatch notifications concurrently.
-	for _, provider := range providers {
-		wg.Add(1)
-		go func(p string) {
-			for range 100 {
-				na.DispatchNotification(
-					Notification{
-						Type:    WarningNotification,
-						Message: "concurrent warning",
-					},
-					p,
-				)
-			}
-			wg.Done()
-		}(provider)
-	}
-
-	// Concurrently read from the aggregator while writes are happening.
-	wg.Add(1)
-	go func() {
-		for range 100 {
-			_ = na.CreateNotificationTables()
-		}
-		wg.Done()
-	}()
-
-	// Wait for all goroutines to complete.
-	wg.Wait()
-}
-
 func TestConvertObjectsToStr(t *testing.T) {
 	testCases := []struct {
 		name    string