Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix lint warnings on deprecated wellknown names. #771

Merged
merged 2 commits into from
Sep 14, 2023
Merged

Fix lint warnings on deprecated wellknown names. #771

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca2d181
Fix lint warnings on deprecated wellknown names.
jpeach Sep 4, 2023
50930f9
Merge branch 'main' into fix-deprecated-lint
jpeach Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions internal/example/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -118,7 +117,7 @@ func makeHTTPListener(listenerName string, route string) *listener.Listener {
},
},
HttpFilters: []*hcm.HttpFilter{{
Name: wellknown.Router,
Name: "http-router",
jpeach marked this conversation as resolved.
Show resolved Hide resolved
ConfigType: &hcm.HttpFilter_TypedConfig{TypedConfig: routerConfig},
}},
}
Expand All @@ -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,
},
Expand Down
13 changes: 6 additions & 7 deletions pkg/test/resource/v3/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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,
},
Expand Down Expand Up @@ -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,
},
Expand Down Expand Up @@ -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,
},
Expand Down Expand Up @@ -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,
},
Expand Down Expand Up @@ -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},
}},
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/wellknown/wellknown.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down