Merge branch 'main' into TestCoverage3

Author: adity1raut

go.mod

@@ -162,7 +162,7 @@ require (
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/prometheus/prometheus v0.300.1 // indirect
 	github.com/quic-go/qpack v0.5.1 // indirect
-	github.com/quic-go/quic-go v0.48.2 // indirect
+	github.com/quic-go/quic-go v0.49.1 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect

go.sum

@@ -369,8 +369,8 @@ github.com/prometheus/prometheus v0.300.1 h1:9KKcTTq80gkzmXW0Et/QCFSrBPgmwiS3Hlc
 github.com/prometheus/prometheus v0.300.1/go.mod h1:gtTPY/XVyCdqqnjA3NzDMb0/nc5H9hOu1RMame+gHyM=
 github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
 github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
-github.com/quic-go/quic-go v0.48.2 h1:wsKXZPeGWpMpCGSWqOcqpW2wZYic/8T3aqiOID0/KWE=
-github.com/quic-go/quic-go v0.48.2/go.mod h1:yBgs3rWBOADpga7F+jJsb6Ybg1LSYiQvwWlLX+/6HMs=
+github.com/quic-go/quic-go v0.49.1 h1:e5JXpUyF0f2uFjckQzD8jTghZrOUK1xxDqqZhlwixo0=
+github.com/quic-go/quic-go v0.49.1/go.mod h1:s2wDnmCdooUQBmQfpUSTCYBl1/D4FcqbULMMkASvR6s=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=

pkg/controller/encryption/ipsec/ipsec_controller_test.go

@@ -44,6 +44,7 @@ import (
 	"kmesh.net/kmesh/daemon/options"
 	"kmesh.net/kmesh/pkg/bpf"
 	"kmesh.net/kmesh/pkg/constants"
+	"kmesh.net/kmesh/pkg/controller/encryption"
 	"kmesh.net/kmesh/pkg/kube"
 	v1alpha1 "kmesh.net/kmesh/pkg/kube/apis/kmeshnodeinfo/v1alpha1"
 	fakeKmeshClientset "kmesh.net/kmesh/pkg/kube/nodeinfo/clientset/versioned/fake"
@@ -96,7 +97,7 @@ var (
 		},
 	}
 
-	testKey = IpSecKey{
+	testKey = encryption.IpSecKey{
 		Spi:         1,
 		AeadKeyName: "rfc4106(gcm(aes))",
 		AeadKey:     DecodeHex("abc9410d7cd6b324461bf16db518646594276c5362c30fc476ebca3f1a394b6ed4462161"),

pkg/controller/encryption/ipsec/ipsec_handler_test.go

@@ -32,6 +32,7 @@ import (
 	"github.com/vishvananda/netlink"
 
 	"kmesh.net/kmesh/pkg/constants"
+	"kmesh.net/kmesh/pkg/controller/encryption"
 )
 
 // DecodeHex is a utility function to decode a hex string into bytes.
@@ -48,13 +49,13 @@ func TestLoadIPSecKey(t *testing.T) {
 	aeadKey := DecodeHex("2dc9410d7cd6b324461bf16db518646594276c5362c30fc476ebca3f1a394b6ed4462161")
 	tests := []struct {
 		name        string
-		keyData     IpSecKey
+		keyData     encryption.IpSecKey
 		expectError bool
 		errorMsg    string
 	}{
 		{ // Valid
 			name: "valid_rfc4106_key",
-			keyData: IpSecKey{
+			keyData: encryption.IpSecKey{
 				Spi:         1,
 				AeadKeyName: "rfc4106(gcm(aes))",
 				AeadKey:     aeadKey,
@@ -64,7 +65,7 @@ func TestLoadIPSecKey(t *testing.T) {
 		},
 		{
 			name: "invalid_algo_name",
-			keyData: IpSecKey{
+			keyData: encryption.IpSecKey{
 				Spi:         3,
 				AeadKeyName: "aes-gcm", // should start with "rfc"
 				AeadKey:     aeadKey,
@@ -75,7 +76,7 @@ func TestLoadIPSecKey(t *testing.T) {
 		},
 		{
 			name: "empty_algo_name",
-			keyData: IpSecKey{
+			keyData: encryption.IpSecKey{
 				Spi:         4,
 				AeadKeyName: "",
 				AeadKey:     aeadKey,
@@ -161,13 +162,13 @@ func TestLoadIPSecKey(t *testing.T) {
 	// Test multiple key loading (should update history)
 	tests = []struct {
 		name        string
-		keyData     IpSecKey
+		keyData     encryption.IpSecKey
 		expectError bool
 		errorMsg    string
 	}{
 		{
 			name: "first_key",
-			keyData: IpSecKey{
+			keyData: encryption.IpSecKey{
 				Spi:         1,
 				AeadKeyName: "rfc4106(gcm(aes))",
 				AeadKey:     aeadKey,
@@ -177,7 +178,7 @@ func TestLoadIPSecKey(t *testing.T) {
 		},
 		{
 			name: "second_key",
-			keyData: IpSecKey{
+			keyData: encryption.IpSecKey{
 				Spi:         2,
 				AeadKeyName: "rfc4106(gcm(aes))",
 				AeadKey:     DecodeHex("abc9410d7cd6b324461bf16db518646594276c5362c30fc476ebca3f1a394b6ed4462161"),
@@ -334,7 +335,7 @@ func hasStateRule(state *netlink.XfrmState) (bool, error) {
 func TestCreateStateRule(t *testing.T) {
 	handler := NewIpSecHandler()
 	testKey := DecodeHex("2dc9410d7cd6b324461bf16db518646594276c5362c30fc476ebca3f1a394b6ed4462161")
-	ipsecKey := IpSecKey{
+	ipsecKey := encryption.IpSecKey{
 		Spi:         1001,
 		AeadKeyName: "rfc4106(gcm(aes))",
 		AeadKey:     testKey,
@@ -536,7 +537,7 @@ func TestFlush(t *testing.T) {
 
 	// create state rule
 	testKey := DecodeHex("2dc9410d7cd6b324461bf16db518646594276c5362c30fc476ebca3f1a394b6ed4462161")
-	ipsecKey := IpSecKey{
+	ipsecKey := encryption.IpSecKey{
 		Spi:         1001,
 		AeadKeyName: "rfc4106(gcm(aes))",
 		AeadKey:     testKey,