Merge branch 'main' into ordered-delta-watch

envoyproxy · Sep 14, 2023 · 8e58be9 · 8e58be9
2 parents 34cb745 + ddfd240
commit 8e58be9
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 14 deletions.
diff --git a/envoy/COMMIT b/envoy/COMMIT
@@ -1 +1 @@
-95e84e6e94547a683bd00623777aaa41f13efc93
+9d8cb4b0c6892452741fc41e87d50934bf58acc3
diff --git a/envoy/admin/v3/config_dump.pb.go b/envoy/admin/v3/config_dump.pb.go
diff --git a/envoy/config/listener/v3/listener.pb.go b/envoy/config/listener/v3/listener.pb.go
diff --git a/internal/example/resource.go b/internal/example/resource.go
@@ -30,7 +30,6 @@ import (
 	"github.com/envoyproxy/go-control-plane/pkg/cache/types"
 	"github.com/envoyproxy/go-control-plane/pkg/cache/v3"
 	"github.com/envoyproxy/go-control-plane/pkg/resource/v3"
-	"github.com/envoyproxy/go-control-plane/pkg/wellknown"
 )
 
 const (
@@ -118,7 +117,7 @@ func makeHTTPListener(listenerName string, route string) *listener.Listener {
 			},
 		},
 		HttpFilters: []*hcm.HttpFilter{{
-			Name:       wellknown.Router,
+			Name:       "http-router",
 			ConfigType: &hcm.HttpFilter_TypedConfig{TypedConfig: routerConfig},
 		}},
 	}
@@ -142,7 +141,7 @@ func makeHTTPListener(listenerName string, route string) *listener.Listener {
 		},
 		FilterChains: []*listener.FilterChain{{
 			Filters: []*listener.Filter{{
-				Name: wellknown.HTTPConnectionManager,
+				Name: "http-connection-manager",
 				ConfigType: &listener.Filter_TypedConfig{
 					TypedConfig: pbst,
 				},

diff --git a/pkg/server/delta/v3/server.go b/pkg/server/delta/v3/server.go
@@ -31,7 +31,7 @@ type Callbacks interface {
 	// OnStreamDeltaRequest is called once a request is received on a stream.
 	// Returning an error will end processing and close the stream. OnStreamClosed will still be called.
 	OnStreamDeltaRequest(int64, *discovery.DeltaDiscoveryRequest) error
-	// OnStreamDelatResponse is called immediately prior to sending a response on a stream.
+	// OnStreamDeltaResponse is called immediately prior to sending a response on a stream.
 	OnStreamDeltaResponse(int64, *discovery.DeltaDiscoveryRequest, *discovery.DeltaDiscoveryResponse)
 }
 

diff --git a/pkg/test/resource/v3/resource.go b/pkg/test/resource/v3/resource.go
@@ -38,7 +38,6 @@ import (
 	"github.com/envoyproxy/go-control-plane/pkg/cache/types"
 	"github.com/envoyproxy/go-control-plane/pkg/cache/v3"
 	"github.com/envoyproxy/go-control-plane/pkg/resource/v3"
-	"github.com/envoyproxy/go-control-plane/pkg/wellknown"
 )
 
 const (
@@ -268,11 +267,11 @@ func buildHTTPConnectionManager() *hcm.HttpConnectionManager {
 		CodecType:  hcm.HttpConnectionManager_AUTO,
 		StatPrefix: "http",
 		HttpFilters: []*hcm.HttpFilter{{
-			Name:       wellknown.Router,
+			Name:       "http-router",
 			ConfigType: &hcm.HttpFilter_TypedConfig{TypedConfig: routerConfig},
 		}},
 		AccessLog: []*alf.AccessLog{{
-			Name: wellknown.HTTPGRPCAccessLog,
+			Name: "access-logger",
 			ConfigType: &alf.AccessLog_TypedConfig{
 				TypedConfig: alsConfigPbst,
 			},
@@ -374,7 +373,7 @@ func MakeScopedRouteHTTPListener(mode string, listenerName string, port uint32)
 		{
 			Filters: []*listener.Filter{
 				{
-					Name: wellknown.HTTPConnectionManager,
+					Name: "http-connection-manager",
 					ConfigType: &listener.Filter_TypedConfig{
 						TypedConfig: pbst,
 					},
@@ -431,7 +430,7 @@ func MakeScopedRouteHTTPListenerForRoute(mode string, listenerName string, port
 		{
 			Filters: []*listener.Filter{
 				{
-					Name: wellknown.HTTPConnectionManager,
+					Name: "http-connection-manager",
 					ConfigType: &listener.Filter_TypedConfig{
 						TypedConfig: pbst,
 					},
@@ -461,7 +460,7 @@ func MakeTCPListener(listenerName string, port uint32, clusterName string) *list
 		{
 			Filters: []*listener.Filter{
 				{
-					Name: wellknown.TCPProxy,
+					Name: "tcp-proxy",
 					ConfigType: &listener.Filter_TypedConfig{
 						TypedConfig: pbst,
 					},
@@ -506,7 +505,7 @@ func MakeExtensionConfig(mode string, extensionConfigName string, route string)
 			},
 		},
 		HttpFilters: []*hcm.HttpFilter{{
-			Name:       wellknown.Router,
+			Name:       "http-router",
 			ConfigType: &hcm.HttpFilter_TypedConfig{TypedConfig: routerConfig},
 		}},
 	}

diff --git a/pkg/wellknown/wellknown.go b/pkg/wellknown/wellknown.go
@@ -14,7 +14,7 @@
 
 // Package wellknown contains common names for filters, listeners, etc.
 //
-// Deprecated: Envoy no longer requires specific names when configuring
+// Deprecated. Envoy no longer requires specific names when configuring
 // filters or other properties, since it inspects the Protobuf type URL
 // to decide how to the decode a message. Because of this, no new names
 // are being added to this package.