Add ClusterIP to the services in the egctl test data

internal/cmd/egctl/testdata/translate/in/authn-single-route-single-match-to-xds.yaml

@@ -29,6 +29,7 @@ metadata:
     app: backend
     service: backend
 spec:
+  clusterIP: 7.7.7.7
   ports:
     - name: http
       port: 3000

internal/cmd/egctl/testdata/translate/in/echo-gateway-api.yaml

@@ -29,6 +29,7 @@ metadata:
     app: backend
     service: backend
 spec:
+  clusterIP: 7.7.7.7
   ports:
     - name: http
       port: 3000

internal/cmd/egctl/testdata/translate/in/envoy-patch-policy.yaml

@@ -32,6 +32,7 @@ metadata:
     app: backend
     service: backend
 spec:
+  clusterIP: 7.7.7.7
   ports:
     - name: http
       port: 3000

internal/cmd/egctl/testdata/translate/in/quickstart.yaml

@@ -29,6 +29,7 @@ metadata:
     app: backend
     service: backend
 spec:
+  clusterIP: 7.7.7.7
   ports:
     - name: http
       port: 3000

internal/cmd/egctl/testdata/translate/in/rate-limit-filter-single-route-single-match-to-xds.yaml

@@ -29,6 +29,7 @@ metadata:
     app: backend
     service: backend
 spec:
+  clusterIP: 7.7.7.7
   ports:
     - name: http
       port: 3000

internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.json

@@ -191,6 +191,7 @@
                         "endpoint": {
                           "address": {
                             "socketAddress": {
+                              "address": "7.7.7.7",
                               "portValue": 3000
                             }
                           }

internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.yaml

@@ -109,6 +109,7 @@ xds:
             - endpoint:
                 address:
                   socketAddress:
+                    address: 7.7.7.7
                     portValue: 3000
               loadBalancingWeight: 1
             loadBalancingWeight: 1

internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.endpoint.yaml

@@ -10,6 +10,7 @@ xds:
           - endpoint:
               address:
                 socketAddress:
+                  address: "7.7.7.7"
                   portValue: 3000
             loadBalancingWeight: 1
           loadBalancingWeight: 1

internal/cmd/egctl/testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.all.json

@@ -191,6 +191,7 @@
                         "endpoint": {
                           "address": {
                             "socketAddress": {
+                              "address": "7.7.7.7",
                               "portValue": 3000
                             }
                           }

internal/cmd/egctl/testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.all.yaml

@@ -109,6 +109,7 @@ xds:
             - endpoint:
                 address:
                   socketAddress:
+                    address: 7.7.7.7
                     portValue: 3000
               loadBalancingWeight: 1
             loadBalancingWeight: 1

internal/cmd/egctl/testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.endpoint.yaml

@@ -10,6 +10,7 @@ xds:
           - endpoint:
               address:
                 socketAddress:
+                  address: 7.7.7.7
                   portValue: 3000
             loadBalancingWeight: 1
           loadBalancingWeight: 1

internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid-endpoint.yaml

@@ -0,0 +1,8 @@
+tcp:
+- name: "tcp-route-simple"
+  address: "0.0.0.0"
+  port: 10080
+  destinations:
+  - port: 50000
+  - host: "5.6.7.8"
+    port: 50001

internal/xds/translator/translator_test.go

@@ -239,6 +239,9 @@ func TestTranslateXdsNegative(t *testing.T) {
 		{
 			name: "tcp-route-invalid",
 		},
+		{
+			name: "tcp-route-invalid-endpoint",
+		},
 		{
 			name: "udp-route-invalid",
 		},

internal/xds/types/resourceversiontable.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 
 	clusterv3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
+	endpointv3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
 	listenerv3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
 	routev3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
 	tlsv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
@@ -107,8 +108,13 @@ func (t *ResourceVersionTable) AddXdsResource(rType resourcev3.Type, xdsResource
 		}
 
 	case resourcev3.EndpointType:
-		// TBD - ValidateAll() breaks existing test internal/cmd/egctl/translate_test
-		// authn-single-route-single-match-to-xds.endpoint expects address for socketAddress field, but this field currently only has port, does not have address
+		if resourceOfType, ok := xdsResource.(*endpointv3.ClusterLoadAssignment); ok {
+			if err := resourceOfType.ValidateAll(); err != nil {
+				return fmt.Errorf("validation failed for xds resource %+v, err:%v", xdsResource, err)
+			}
+		} else {
+			return fmt.Errorf("failed to cast xds resource %+v to ClusterLoadAssignment type", xdsResource)
+		}
 
 	case resourcev3.ClusterType:
 		// Handle specific operations

internal/xds/types/resourceversiontable_test.go

@@ -170,6 +170,58 @@ func TestAddOrReplaceXdsResource(t *testing.T) {
 			},
 		},
 	}
+	testEndpoint := &endpointv3.ClusterLoadAssignment{
+		ClusterName: "test-cluster",
+		Endpoints: []*endpointv3.LocalityLbEndpoints{
+			{
+				LbEndpoints: []*endpointv3.LbEndpoint{
+					{
+						HostIdentifier: &endpointv3.LbEndpoint_Endpoint{
+							Endpoint: &endpointv3.Endpoint{
+								Address: &corev3.Address{
+									Address: &corev3.Address_SocketAddress{
+										SocketAddress: &corev3.SocketAddress{
+											Address: "exampleservice.examplenamespace.svc.cluster.local",
+											PortSpecifier: &corev3.SocketAddress_PortValue{
+												PortValue: 5000,
+											},
+											Protocol: corev3.SocketAddress_TCP,
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+	updatedEndpoint := &endpointv3.ClusterLoadAssignment{
+		ClusterName: "test-cluster",
+		Endpoints: []*endpointv3.LocalityLbEndpoints{
+			{
+				LbEndpoints: []*endpointv3.LbEndpoint{
+					{
+						HostIdentifier: &endpointv3.LbEndpoint_Endpoint{
+							Endpoint: &endpointv3.Endpoint{
+								Address: &corev3.Address{
+									Address: &corev3.Address_SocketAddress{
+										SocketAddress: &corev3.SocketAddress{
+											Address: "modified.example.svc.cluster.local",
+											PortSpecifier: &corev3.SocketAddress_PortValue{
+												PortValue: 5000,
+											},
+											Protocol: corev3.SocketAddress_TCP,
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
 	testRouteConfig := &routev3.RouteConfiguration{
 		Name: "test-route-config",
 		VirtualHosts: []*routev3.VirtualHost{
@@ -274,6 +326,58 @@ func TestAddOrReplaceXdsResource(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "inject-new-endpoint",
+			tableIn: &ResourceVersionTable{
+				XdsResources: XdsResources{
+					resourcev3.EndpointType: []types.Resource{},
+				},
+			},
+			typeIn:     resourcev3.EndpointType,
+			resourceIn: testEndpoint,
+			funcIn: func(existing types.Resource, new types.Resource) bool {
+				oldEndpoint := existing.(*endpointv3.ClusterLoadAssignment)
+				newEndpoint := new.(*endpointv3.ClusterLoadAssignment)
+				if newEndpoint == nil || oldEndpoint == nil {
+					return false
+				}
+				if oldEndpoint.ClusterName == newEndpoint.ClusterName {
+					return true
+				}
+				return false
+			},
+			tableOut: &ResourceVersionTable{
+				XdsResources: XdsResources{
+					resourcev3.EndpointType: []types.Resource{testEndpoint},
+				},
+			},
+		},
+		{
+			name: "replace-endpoint",
+			tableIn: &ResourceVersionTable{
+				XdsResources: XdsResources{
+					resourcev3.EndpointType: []types.Resource{testEndpoint},
+				},
+			},
+			typeIn:     resourcev3.EndpointType,
+			resourceIn: updatedEndpoint,
+			funcIn: func(existing types.Resource, new types.Resource) bool {
+				oldEndpoint := existing.(*endpointv3.ClusterLoadAssignment)
+				newEndpoint := new.(*endpointv3.ClusterLoadAssignment)
+				if newEndpoint == nil || oldEndpoint == nil {
+					return false
+				}
+				if oldEndpoint.ClusterName == newEndpoint.ClusterName {
+					return true
+				}
+				return false
+			},
+			tableOut: &ResourceVersionTable{
+				XdsResources: XdsResources{
+					resourcev3.EndpointType: []types.Resource{updatedEndpoint},
+				},
+			},
+		},
 		{
 			name: "inject-new-listener",
 			tableIn: &ResourceVersionTable{
@@ -507,6 +611,32 @@ func TestInvalidAddXdsResource(t *testing.T) {
 			},
 		},
 	}
+	invalidEndpoint := &endpointv3.ClusterLoadAssignment{
+		ClusterName: "test-cluster",
+		Endpoints: []*endpointv3.LocalityLbEndpoints{
+			{
+				LbEndpoints: []*endpointv3.LbEndpoint{
+					{
+						HostIdentifier: &endpointv3.LbEndpoint_Endpoint{
+							Endpoint: &endpointv3.Endpoint{
+								Address: &corev3.Address{
+									Address: &corev3.Address_SocketAddress{
+										SocketAddress: &corev3.SocketAddress{
+											Address: "",
+											PortSpecifier: &corev3.SocketAddress_PortValue{
+												PortValue: 5000,
+											},
+											Protocol: corev3.SocketAddress_TCP,
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
 
 	invalidSecret := &tlsv3.Secret{
 		Name: "=*&",
@@ -532,7 +662,7 @@ func TestInvalidAddXdsResource(t *testing.T) {
 		tableOut   *ResourceVersionTable
 	}{
 		{
-			name: "inject-new-listener",
+			name: "inject-invalid-listener",
 			tableIn: &ResourceVersionTable{
 				XdsResources: XdsResources{
 					resourcev3.ListenerType: []types.Resource{},
@@ -558,7 +688,7 @@ func TestInvalidAddXdsResource(t *testing.T) {
 			},
 		},
 		{
-			name: "inject-new-route-config",
+			name: "inject-invalid-route-config",
 			tableIn: &ResourceVersionTable{
 				XdsResources: XdsResources{
 					resourcev3.RouteType: []types.Resource{},
@@ -580,7 +710,7 @@ func TestInvalidAddXdsResource(t *testing.T) {
 			tableOut: nil,
 		},
 		{
-			name: "inject-new-cluster",
+			name: "inject-invalid-cluster",
 			tableIn: &ResourceVersionTable{
 				XdsResources: XdsResources{
 					resourcev3.ClusterType: []types.Resource{},
@@ -711,6 +841,50 @@ func TestInvalidAddXdsResource(t *testing.T) {
 			},
 			tableOut: nil,
 		},
+		{
+			name: "inject-invalid-endpoint",
+			tableIn: &ResourceVersionTable{
+				XdsResources: XdsResources{
+					resourcev3.EndpointType: []types.Resource{},
+				},
+			},
+			typeIn:     resourcev3.EndpointType,
+			resourceIn: invalidEndpoint,
+			funcIn: func(existing types.Resource, new types.Resource) bool {
+				oldEndpoint := existing.(*endpointv3.ClusterLoadAssignment)
+				newEndpoint := new.(*endpointv3.ClusterLoadAssignment)
+				if newEndpoint == nil || oldEndpoint == nil {
+					return false
+				}
+				if oldEndpoint.ClusterName == newEndpoint.ClusterName {
+					return true
+				}
+				return false
+			},
+			tableOut: nil,
+		},
+		{
+			name: "cast-endpoint-type",
+			tableIn: &ResourceVersionTable{
+				XdsResources: XdsResources{
+					resourcev3.EndpointType: []types.Resource{},
+				},
+			},
+			typeIn:     resourcev3.EndpointType,
+			resourceIn: invalidListener,
+			funcIn: func(existing types.Resource, new types.Resource) bool {
+				oldEndpoint := existing.(*endpointv3.ClusterLoadAssignment)
+				newEndpoint := new.(*endpointv3.ClusterLoadAssignment)
+				if newEndpoint == nil || oldEndpoint == nil {
+					return false
+				}
+				if oldEndpoint.ClusterName == newEndpoint.ClusterName {
+					return true
+				}
+				return false
+			},
+			tableOut: nil,
+		},
 	}
 	for _, tc := range testCases {
 		tc := tc