Handle host headers in dataplane for identification of channel instan…

…ces (knative-extensions#1990)
pierDipi · May 12, 2022 · fffc6ce · fffc6ce
1 parent bf1924e
commit fffc6ce
Show file tree

Hide file tree

Showing 16 changed files with 593 additions and 695 deletions.
diff --git a/control-plane/pkg/contract/contract.pb.go b/control-plane/pkg/contract/contract.pb.go
diff --git a/control-plane/pkg/contract/log_marshaller.go b/control-plane/pkg/contract/log_marshaller.go
@@ -67,13 +67,8 @@ func (x *Resource) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
 }
 
 func (x *Ingress) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	switch it := x.IngressType.(type) {
-	case *Ingress_Path:
-		encoder.AddString("ingress_path", it.Path)
-	case *Ingress_Host:
-		encoder.AddString("ingress_host", it.Host)
-	}
-
+	encoder.AddString("ingress_path", x.Path)
+	encoder.AddString("ingress_host", x.Host)
 	encoder.AddString("contentMode", x.ContentMode.String())
 	return nil
 }

diff --git a/control-plane/pkg/core/config/resource_test.go b/control-plane/pkg/core/config/resource_test.go
@@ -108,9 +108,7 @@ func TestAddOrUpdateResourcesConfig(t *testing.T) {
 							},
 						},
 						Ingress: &contract.Ingress{
-							IngressType: &contract.Ingress_Path{
-								Path: "/broker-ns/broker-name",
-							},
+							Path:        "/broker-ns/broker-name",
 							ContentMode: contract.ContentMode_STRUCTURED,
 						},
 						BootstrapServers: "broker:9092",
@@ -122,9 +120,7 @@ func TestAddOrUpdateResourcesConfig(t *testing.T) {
 				Uid:    "1",
 				Topics: []string{"topic-name-1"},
 				Ingress: &contract.Ingress{
-					IngressType: &contract.Ingress_Path{
-						Path: "/broker-ns/broker-name",
-					},
+					Path:        "/broker-ns/broker-name",
 					ContentMode: contract.ContentMode_STRUCTURED,
 				},
 				Egresses: []*contract.Egress{
@@ -148,9 +144,7 @@ func TestAddOrUpdateResourcesConfig(t *testing.T) {
 						Uid:    "2",
 						Topics: []string{"topic-name-1"},
 						Ingress: &contract.Ingress{
-							IngressType: &contract.Ingress_Path{
-								Path: "/broker-ns/broker-name",
-							},
+							Path:        "/broker-ns/broker-name",
 							ContentMode: contract.ContentMode_STRUCTURED,
 						},
 						Egresses: []*contract.Egress{
@@ -184,9 +178,7 @@ func TestAddOrUpdateResourcesConfig(t *testing.T) {
 						},
 						BootstrapServers: "broker:9092",
 						Ingress: &contract.Ingress{
-							IngressType: &contract.Ingress_Path{
-								Path: "/broker-ns/broker-name",
-							},
+							Path:        "/broker-ns/broker-name",
 							ContentMode: contract.ContentMode_STRUCTURED,
 						},
 					},
@@ -215,9 +207,7 @@ func TestAddOrUpdateResourcesConfig(t *testing.T) {
 						},
 						BootstrapServers: "broker:9092",
 						Ingress: &contract.Ingress{
-							IngressType: &contract.Ingress_Path{
-								Path: "/broker-ns/broker-name",
-							},
+							Path:        "/broker-ns/broker-name",
 							ContentMode: contract.ContentMode_STRUCTURED,
 						},
 					},
@@ -243,9 +233,7 @@ func TestAddOrUpdateResourcesConfig(t *testing.T) {
 				},
 				BootstrapServers: "broker:9092,broker-2:9092",
 				Ingress: &contract.Ingress{
-					IngressType: &contract.Ingress_Path{
-						Path: "/broker-ns/broker-name",
-					},
+					Path:        "/broker-ns/broker-name",
 					ContentMode: contract.ContentMode_STRUCTURED,
 				},
 			},
@@ -269,9 +257,7 @@ func TestAddOrUpdateResourcesConfig(t *testing.T) {
 						},
 						BootstrapServers: "broker:9092,broker-2:9092",
 						Ingress: &contract.Ingress{
-							IngressType: &contract.Ingress_Path{
-								Path: "/broker-ns/broker-name",
-							},
+							Path:        "/broker-ns/broker-name",
 							ContentMode: contract.ContentMode_STRUCTURED,
 						},
 					},
@@ -300,9 +286,7 @@ func TestAddOrUpdateResourcesConfig(t *testing.T) {
 						},
 						BootstrapServers: "broker:9092",
 						Ingress: &contract.Ingress{
-							IngressType: &contract.Ingress_Path{
-								Path: "/broker-ns/broker-name",
-							},
+							Path:        "/broker-ns/broker-name",
 							ContentMode: contract.ContentMode_STRUCTURED,
 						},
 					},
@@ -326,9 +310,7 @@ func TestAddOrUpdateResourcesConfig(t *testing.T) {
 				},
 				BootstrapServers: "broker:9092",
 				Ingress: &contract.Ingress{
-					IngressType: &contract.Ingress_Path{
-						Path: "/broker-ns/broker-name",
-					},
+					Path:        "/broker-ns/broker-name",
 					ContentMode: contract.ContentMode_STRUCTURED,
 				},
 			},
@@ -353,9 +335,7 @@ func TestAddOrUpdateResourcesConfig(t *testing.T) {
 						},
 						BootstrapServers: "broker:9092",
 						Ingress: &contract.Ingress{
-							IngressType: &contract.Ingress_Path{
-								Path: "/broker-ns/broker-name",
-							},
+							Path:        "/broker-ns/broker-name",
 							ContentMode: contract.ContentMode_STRUCTURED,
 						},
 					},

diff --git a/control-plane/pkg/reconciler/broker/broker.go b/control-plane/pkg/reconciler/broker/broker.go
@@ -430,9 +430,7 @@ func (r *Reconciler) reconcilerBrokerResource(ctx context.Context, topic string,
 		Uid:    string(broker.UID),
 		Topics: []string{topic},
 		Ingress: &contract.Ingress{
-			IngressType: &contract.Ingress_Path{
-				Path: receiver.PathFromObject(broker),
-			},
+			Path: receiver.PathFromObject(broker),
 		},
 		BootstrapServers: config.GetBootstrapServers(),
 		Reference: &contract.Reference{