refactor list and watch logic out (#1523)

Co-authored-by: Ping Xiang <>

Author: pxaws

plugins/processors/awsapplicationsignals/internal/resolver/kubernetes.go

@@ -10,6 +10,8 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"sync"
+	"time"
 
 	corev1 "k8s.io/api/core/v1"
 )
@@ -140,3 +142,38 @@ func isIP(ipString string) bool {
 	ip := net.ParseIP(ipString)
 	return ip != nil
 }
+
+// a safe channel which can be closed multiple times
+type safeChannel struct {
+	sync.Mutex
+
+	ch     chan struct{}
+	closed bool
+}
+
+func (sc *safeChannel) Close() {
+	sc.Lock()
+	defer sc.Unlock()
+
+	if !sc.closed {
+		close(sc.ch)
+		sc.closed = true
+	}
+}
+
+// Deleter represents a type that can delete a key from a map after a certain delay.
+type Deleter interface {
+	DeleteWithDelay(m *sync.Map, key interface{})
+}
+
+// TimedDeleter deletes a key after a specified delay.
+type TimedDeleter struct {
+	Delay time.Duration
+}
+
+func (td *TimedDeleter) DeleteWithDelay(m *sync.Map, key interface{}) {
+	go func() {
+		time.Sleep(td.Delay)
+		m.Delete(key)
+	}()
+}

plugins/processors/awsapplicationsignals/internal/resolver/kubernetes_test.go

@@ -0,0 +1,229 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+package resolver
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// TestAttachNamespace function
+func TestAttachNamespace(t *testing.T) {
+	result := attachNamespace("testResource", "testNamespace")
+	if result != "testResource@testNamespace" {
+		t.Errorf("attachNamespace was incorrect, got: %s, want: %s.", result, "testResource@testNamespace")
+	}
+}
+
+// TestGetServiceAndNamespace function
+func TestGetServiceAndNamespace(t *testing.T) {
+	service := &corev1.Service{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "testService",
+			Namespace: "testNamespace",
+		},
+	}
+	result := getServiceAndNamespace(service)
+	if result != "testService@testNamespace" {
+		t.Errorf("getServiceAndNamespace was incorrect, got: %s, want: %s.", result, "testService@testNamespace")
+	}
+}
+
+// TestExtractResourceAndNamespace function
+func TestExtractResourceAndNamespace(t *testing.T) {
+	// Test normal case
+	name, namespace := extractResourceAndNamespace("testService@testNamespace")
+	if name != "testService" || namespace != "testNamespace" {
+		t.Errorf("extractResourceAndNamespace was incorrect, got: %s and %s, want: %s and %s.", name, namespace, "testService", "testNamespace")
+	}
+
+	// Test invalid case
+	name, namespace = extractResourceAndNamespace("invalid")
+	if name != "" || namespace != "" {
+		t.Errorf("extractResourceAndNamespace was incorrect, got: %s and %s, want: %s and %s.", name, namespace, "", "")
+	}
+}
+
+func TestExtractWorkloadNameFromRS(t *testing.T) {
+	testCases := []struct {
+		name           string
+		replicaSetName string
+		want           string
+		shouldErr      bool
+	}{
+		{
+			name:           "Valid ReplicaSet Name",
+			replicaSetName: "my-deployment-5859ffc7ff",
+			want:           "my-deployment",
+			shouldErr:      false,
+		},
+		{
+			name:           "Invalid ReplicaSet Name - No Hyphen",
+			replicaSetName: "mydeployment5859ffc7ff",
+			want:           "",
+			shouldErr:      true,
+		},
+		{
+			name:           "Invalid ReplicaSet Name - Less Than 10 Suffix Characters",
+			replicaSetName: "my-deployment-bc2",
+			want:           "",
+			shouldErr:      true,
+		},
+		{
+			name:           "Invalid ReplicaSet Name - More Than 10 Suffix Characters",
+			replicaSetName: "my-deployment-5859ffc7ffx",
+			want:           "",
+			shouldErr:      true,
+		},
+		{
+			name:           "Invalid ReplicaSet Name - Invalid Characters in Suffix",
+			replicaSetName: "my-deployment-aeiou12345",
+			want:           "",
+			shouldErr:      true,
+		},
+		{
+			name:           "Invalid ReplicaSet Name - Empty String",
+			replicaSetName: "",
+			want:           "",
+			shouldErr:      true,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			got, err := extractWorkloadNameFromRS(tc.replicaSetName)
+
+			if (err != nil) != tc.shouldErr {
+				t.Errorf("extractWorkloadNameFromRS() error = %v, wantErr %v", err, tc.shouldErr)
+				return
+			}
+
+			if got != tc.want {
+				t.Errorf("extractWorkloadNameFromRS() = %v, want %v", got, tc.want)
+			}
+		})
+	}
+}
+
+func TestExtractWorkloadNameFromPodName(t *testing.T) {
+	testCases := []struct {
+		name      string
+		podName   string
+		want      string
+		shouldErr bool
+	}{
+		{
+			name:      "Valid Pod Name",
+			podName:   "my-replicaset-bc24f",
+			want:      "my-replicaset",
+			shouldErr: false,
+		},
+		{
+			name:      "Invalid Pod Name - No Hyphen",
+			podName:   "myreplicasetbc24f",
+			want:      "",
+			shouldErr: true,
+		},
+		{
+			name:      "Invalid Pod Name - Less Than 5 Suffix Characters",
+			podName:   "my-replicaset-bc2",
+			want:      "",
+			shouldErr: true,
+		},
+		{
+			name:      "Invalid Pod Name - More Than 5 Suffix Characters",
+			podName:   "my-replicaset-bc24f5",
+			want:      "",
+			shouldErr: true,
+		},
+		{
+			name:      "Invalid Pod Name - Empty String",
+			podName:   "",
+			want:      "",
+			shouldErr: true,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			got, err := extractWorkloadNameFromPodName(tc.podName)
+
+			if (err != nil) != tc.shouldErr {
+				t.Errorf("extractWorkloadNameFromPodName() error = %v, wantErr %v", err, tc.shouldErr)
+				return
+			}
+
+			if got != tc.want {
+				t.Errorf("extractWorkloadNameFromPodName() = %v, want %v", got, tc.want)
+			}
+		})
+	}
+}
+
+// TestGetWorkloadAndNamespace function
+func TestGetWorkloadAndNamespace(t *testing.T) {
+	// Test ReplicaSet case
+	pod := &corev1.Pod{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "testPod",
+			Namespace: "testNamespace",
+			OwnerReferences: []metav1.OwnerReference{
+				{
+					Kind: "ReplicaSet",
+					Name: "testDeployment-5d68bc5f49",
+				},
+			},
+		},
+	}
+	result := getWorkloadAndNamespace(pod)
+	if result != "testDeployment@testNamespace" {
+		t.Errorf("getDeploymentAndNamespace was incorrect, got: %s, want: %s.", result, "testDeployment@testNamespace")
+	}
+
+	// Test StatefulSet case
+	pod.ObjectMeta.OwnerReferences[0].Kind = "StatefulSet"
+	pod.ObjectMeta.OwnerReferences[0].Name = "testStatefulSet"
+	result = getWorkloadAndNamespace(pod)
+	if result != "testStatefulSet@testNamespace" {
+		t.Errorf("getWorkloadAndNamespace was incorrect, got: %s, want: %s.", result, "testStatefulSet@testNamespace")
+	}
+
+	// Test Other case
+	pod.ObjectMeta.OwnerReferences[0].Kind = "Other"
+	pod.ObjectMeta.OwnerReferences[0].Name = "testOther"
+	result = getWorkloadAndNamespace(pod)
+	if result != "" {
+		t.Errorf("getWorkloadAndNamespace was incorrect, got: %s, want: %s.", result, "")
+	}
+
+	// Test no OwnerReferences case
+	pod.ObjectMeta.OwnerReferences = nil
+	result = getWorkloadAndNamespace(pod)
+	if result != "" {
+		t.Errorf("getWorkloadAndNamespace was incorrect, got: %s, want: %s.", result, "")
+	}
+}
+
+func TestExtractIPPort(t *testing.T) {
+	// Test valid IP:Port
+	ip, port, ok := extractIPPort("192.0.2.0:8080")
+	assert.Equal(t, "192.0.2.0", ip)
+	assert.Equal(t, "8080", port)
+	assert.True(t, ok)
+
+	// Test invalid IP:Port
+	ip, port, ok = extractIPPort("192.0.2:8080")
+	assert.Equal(t, "", ip)
+	assert.Equal(t, "", port)
+	assert.False(t, ok)
+
+	// Test IP only
+	ip, port, ok = extractIPPort("192.0.2.0")
+	assert.Equal(t, "", ip)
+	assert.Equal(t, "", port)
+	assert.False(t, ok)
+}