diff --git a/agent/xds/listeners.go b/agent/xds/listeners.go index 9c44470edcbb..351df679eeb7 100644 --- a/agent/xds/listeners.go +++ b/agent/xds/listeners.go @@ -17,7 +17,6 @@ import ( envoyhttp "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2" envoytcp "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/tcp_proxy/v2" envoytype "github.com/envoyproxy/go-control-plane/envoy/type" - "github.com/envoyproxy/go-control-plane/pkg/wellknown" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" @@ -1120,7 +1119,7 @@ func makeListenerFilter(opts listenerFilterOpts) (*envoylistener.Filter, error) } func makeTLSInspectorListenerFilter() (*envoylistener.ListenerFilter, error) { - return &envoylistener.ListenerFilter{Name: wellknown.TlsInspector}, nil + return &envoylistener.ListenerFilter{Name: "envoy.filters.listener.tls_inspector"}, nil } func makeSNIFilterChainMatch(sniMatch string) *envoylistener.FilterChainMatch { diff --git a/agent/xds/server_test.go b/agent/xds/server_test.go index 0dd9bdfbe8fb..4bbcd5f9840b 100644 --- a/agent/xds/server_test.go +++ b/agent/xds/server_test.go @@ -737,16 +737,19 @@ func TestServer_StreamAggregatedResources_IngressEmptyResponse(t *testing.T) { emptyClusterJSON := `{ "versionInfo": "` + hexString(1) + `", "typeUrl": "type.googleapis.com/envoy.api.v2.Cluster", + "resources": [], "nonce": "` + hexString(1) + `" }` emptyListenerJSON := `{ "versionInfo": "` + hexString(1) + `", "typeUrl": "type.googleapis.com/envoy.api.v2.Listener", + "resources": [], "nonce": "` + hexString(2) + `" }` emptyRouteJSON := `{ "versionInfo": "` + hexString(1) + `", "typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration", + "resources": [], "nonce": "` + hexString(3) + `" }` diff --git a/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-14-x.golden b/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-14-x.golden index e699fae539ce..1e4be3b4e8c4 100644 --- a/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-14-x.golden +++ b/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-14-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.Cluster", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-15-x.golden b/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-15-x.golden index e699fae539ce..1e4be3b4e8c4 100644 --- a/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-15-x.golden +++ b/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-15-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.Cluster", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-16-x.golden b/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-16-x.golden index e699fae539ce..1e4be3b4e8c4 100644 --- a/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-16-x.golden +++ b/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-16-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.Cluster", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-14-x.golden b/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-14-x.golden index e699fae539ce..1e4be3b4e8c4 100644 --- a/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-14-x.golden +++ b/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-14-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.Cluster", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-15-x.golden b/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-15-x.golden index e699fae539ce..1e4be3b4e8c4 100644 --- a/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-15-x.golden +++ b/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-15-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.Cluster", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-16-x.golden b/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-16-x.golden index e699fae539ce..1e4be3b4e8c4 100644 --- a/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-16-x.golden +++ b/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-16-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.Cluster", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-14-x.golden b/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-14-x.golden index e699fae539ce..1e4be3b4e8c4 100644 --- a/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-14-x.golden +++ b/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-14-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.Cluster", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-15-x.golden b/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-15-x.golden index e699fae539ce..1e4be3b4e8c4 100644 --- a/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-15-x.golden +++ b/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-15-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.Cluster", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-16-x.golden b/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-16-x.golden index e699fae539ce..1e4be3b4e8c4 100644 --- a/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-16-x.golden +++ b/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-16-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.Cluster", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-14-x.golden b/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-14-x.golden index e1ae9410b78e..b11569ce9e50 100644 --- a/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-14-x.golden +++ b/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-14-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-15-x.golden index e1ae9410b78e..b11569ce9e50 100644 --- a/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-15-x.golden +++ b/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-15-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-16-x.golden b/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-16-x.golden index e1ae9410b78e..b11569ce9e50 100644 --- a/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-16-x.golden +++ b/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-16-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-14-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-14-x.golden index e1ae9410b78e..b11569ce9e50 100644 --- a/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-14-x.golden +++ b/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-14-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-15-x.golden index e1ae9410b78e..b11569ce9e50 100644 --- a/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-15-x.golden +++ b/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-15-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-16-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-16-x.golden index e1ae9410b78e..b11569ce9e50 100644 --- a/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-16-x.golden +++ b/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-16-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-14-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-14-x.golden index e1ae9410b78e..b11569ce9e50 100644 --- a/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-14-x.golden +++ b/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-14-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-15-x.golden index e1ae9410b78e..b11569ce9e50 100644 --- a/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-15-x.golden +++ b/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-15-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-16-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-16-x.golden index e1ae9410b78e..b11569ce9e50 100644 --- a/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-16-x.golden +++ b/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-16-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-14-x.golden b/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-14-x.golden index 98f14d200314..5909a14cae31 100644 --- a/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-14-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.Listener", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-15-x.golden index 98f14d200314..5909a14cae31 100644 --- a/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-15-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.Listener", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-16-x.golden b/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-16-x.golden index 98f14d200314..5909a14cae31 100644 --- a/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-16-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.Listener", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/defaults-no-chain.envoy-1-14-x.golden b/agent/xds/testdata/routes/defaults-no-chain.envoy-1-14-x.golden index a0fa487e737e..a065cc73d0e1 100644 --- a/agent/xds/testdata/routes/defaults-no-chain.envoy-1-14-x.golden +++ b/agent/xds/testdata/routes/defaults-no-chain.envoy-1-14-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/defaults-no-chain.envoy-1-15-x.golden b/agent/xds/testdata/routes/defaults-no-chain.envoy-1-15-x.golden index a0fa487e737e..a065cc73d0e1 100644 --- a/agent/xds/testdata/routes/defaults-no-chain.envoy-1-15-x.golden +++ b/agent/xds/testdata/routes/defaults-no-chain.envoy-1-15-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/defaults-no-chain.envoy-1-16-x.golden b/agent/xds/testdata/routes/defaults-no-chain.envoy-1-16-x.golden index a0fa487e737e..a065cc73d0e1 100644 --- a/agent/xds/testdata/routes/defaults-no-chain.envoy-1-16-x.golden +++ b/agent/xds/testdata/routes/defaults-no-chain.envoy-1-16-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-14-x.golden b/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-14-x.golden index a0fa487e737e..a065cc73d0e1 100644 --- a/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-14-x.golden +++ b/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-14-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-15-x.golden b/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-15-x.golden index a0fa487e737e..a065cc73d0e1 100644 --- a/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-15-x.golden +++ b/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-15-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-16-x.golden b/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-16-x.golden index a0fa487e737e..a065cc73d0e1 100644 --- a/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-16-x.golden +++ b/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-16-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-14-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-14-x.golden index a0fa487e737e..a065cc73d0e1 100644 --- a/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-14-x.golden +++ b/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-14-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-15-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-15-x.golden index a0fa487e737e..a065cc73d0e1 100644 --- a/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-15-x.golden +++ b/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-15-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-16-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-16-x.golden index a0fa487e737e..a065cc73d0e1 100644 --- a/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-16-x.golden +++ b/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-16-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-14-x.golden b/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-14-x.golden index a0fa487e737e..a065cc73d0e1 100644 --- a/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-14-x.golden +++ b/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-14-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-15-x.golden b/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-15-x.golden index a0fa487e737e..a065cc73d0e1 100644 --- a/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-15-x.golden +++ b/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-15-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-16-x.golden b/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-16-x.golden index a0fa487e737e..a065cc73d0e1 100644 --- a/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-16-x.golden +++ b/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-16-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/ingress-with-chain.envoy-1-14-x.golden b/agent/xds/testdata/routes/ingress-with-chain.envoy-1-14-x.golden index a0fa487e737e..a065cc73d0e1 100644 --- a/agent/xds/testdata/routes/ingress-with-chain.envoy-1-14-x.golden +++ b/agent/xds/testdata/routes/ingress-with-chain.envoy-1-14-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/ingress-with-chain.envoy-1-15-x.golden b/agent/xds/testdata/routes/ingress-with-chain.envoy-1-15-x.golden index a0fa487e737e..a065cc73d0e1 100644 --- a/agent/xds/testdata/routes/ingress-with-chain.envoy-1-15-x.golden +++ b/agent/xds/testdata/routes/ingress-with-chain.envoy-1-15-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/ingress-with-chain.envoy-1-16-x.golden b/agent/xds/testdata/routes/ingress-with-chain.envoy-1-16-x.golden index a0fa487e737e..a065cc73d0e1 100644 --- a/agent/xds/testdata/routes/ingress-with-chain.envoy-1-16-x.golden +++ b/agent/xds/testdata/routes/ingress-with-chain.envoy-1-16-x.golden @@ -1,5 +1,7 @@ { "versionInfo": "00000001", + "resources": [ + ], "typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "nonce": "00000001" } \ No newline at end of file diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/wellknown/wellknown.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/wellknown/wellknown.go deleted file mode 100644 index ff1978561a4f..000000000000 --- a/vendor/github.com/envoyproxy/go-control-plane/pkg/wellknown/wellknown.go +++ /dev/null @@ -1,134 +0,0 @@ -// Copyright 2018 Envoyproxy Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Package wellknown contains common names for filters, listeners, etc. -package wellknown - -// HTTP filter names -const ( - // Buffer HTTP filter - Buffer = "envoy.buffer" - // CORS HTTP filter - CORS = "envoy.cors" - // Dynamo HTTP filter - Dynamo = "envoy.http_dynamo_filter" - // Fault HTTP filter - Fault = "envoy.fault" - // GRPCHTTP1Bridge HTTP filter - GRPCHTTP1Bridge = "envoy.grpc_http1_bridge" - // GRPCJSONTranscoder HTTP filter - GRPCJSONTranscoder = "envoy.grpc_json_transcoder" - // GRPCWeb HTTP filter - GRPCWeb = "envoy.grpc_web" - // Gzip HTTP filter - Gzip = "envoy.gzip" - // IPTagging HTTP filter - IPTagging = "envoy.ip_tagging" - // HTTPRateLimit filter - HTTPRateLimit = "envoy.rate_limit" - // Router HTTP filter - Router = "envoy.router" - // Health checking HTTP filter - HealthCheck = "envoy.health_check" - // Lua HTTP filter - Lua = "envoy.lua" - // Squash HTTP filter - Squash = "envoy.squash" - // HTTPExternalAuthorization HTTP filter - HTTPExternalAuthorization = "envoy.filters.http.ext_authz" - // HTTPRoleBasedAccessControl HTTP filter - HTTPRoleBasedAccessControl = "envoy.filters.http.rbac" - // HTTPGRPCStats HTTP filter - HTTPGRPCStats = "envoy.filters.http.grpc_stats" -) - -// Network filter names -const ( - // ClientSSLAuth network filter - ClientSSLAuth = "envoy.client_ssl_auth" - // Echo network filter - Echo = "envoy.echo" - // HTTPConnectionManager network filter - HTTPConnectionManager = "envoy.http_connection_manager" - // TCPProxy network filter - TCPProxy = "envoy.tcp_proxy" - // RateLimit network filter - RateLimit = "envoy.ratelimit" - // MongoProxy network filter - MongoProxy = "envoy.mongo_proxy" - // ThriftProxy network filter - ThriftProxy = "envoy.filters.network.thrift_proxy" - // RedisProxy network filter - RedisProxy = "envoy.redis_proxy" - // MySQLProxy network filter - MySQLProxy = "envoy.filters.network.mysql_proxy" - // ExternalAuthorization network filter - ExternalAuthorization = "envoy.filters.network.ext_authz" - // RoleBasedAccessControl network filter - RoleBasedAccessControl = "envoy.filters.network.rbac" -) - -// Listener filter names -const ( - // OriginalDestination listener filter - OriginalDestination = "envoy.listener.original_dst" - // ProxyProtocol listener filter - ProxyProtocol = "envoy.listener.proxy_protocol" - // TlsInspector listener filter - TlsInspector = "envoy.listener.tls_inspector" - // HttpInspector listener filter - HttpInspector = "envoy.listener.http_inspector" -) - -// Tracing provider names -const ( - // Lightstep tracer name - Lightstep = "envoy.lightstep" - // Zipkin tracer name - Zipkin = "envoy.zipkin" - // DynamicOT tracer name - DynamicOT = "envoy.dynamic.ot" -) - -// Stats sink names -const ( - // Statsd sink - Statsd = "envoy.statsd" - // DogStatsD compatible stastsd sink - DogStatsd = "envoy.dog_statsd" - // MetricsService sink - MetricsService = "envoy.metrics_service" -) - -// Access log sink names -const ( - // FileAccessLog sink name - FileAccessLog = "envoy.file_access_log" - // HTTPGRPCAccessLog sink for the HTTP gRPC access log service - HTTPGRPCAccessLog = "envoy.http_grpc_access_log" -) - -// Transport socket names -const ( - // TransportSocket Alts - TransportSocketAlts = "envoy.transport_sockets.alts" - // TransportSocket Tap - TransportSocketTap = "envoy.transport_sockets.tap" - // TransportSocket RawBuffer - TransportSocketRawBuffer = "envoy.transport_sockets.raw_buffer" - // TransportSocket Tls - TransportSocketTls = "envoy.transport_sockets.tls" - // TransportSocket Quic - TransportSocketQuic = "envoy.transport_sockets.quic" -) diff --git a/vendor/modules.txt b/vendor/modules.txt index 9f6513a3a49a..1e614abf40d5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -139,7 +139,6 @@ github.com/envoyproxy/go-control-plane/envoy/type github.com/envoyproxy/go-control-plane/envoy/type/matcher github.com/envoyproxy/go-control-plane/envoy/type/metadata/v2 github.com/envoyproxy/go-control-plane/envoy/type/tracing/v2 -github.com/envoyproxy/go-control-plane/pkg/wellknown # github.com/envoyproxy/protoc-gen-validate v0.1.0 github.com/envoyproxy/protoc-gen-validate/validate # github.com/fatih/color v1.9.0