Skip to content

NET-5392 Replace dev dependencies w/ latest release tags #3178

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

Merged
nathancoleman merged 5 commits into from
Nov 7, 2023
Merged

NET-5392 Replace dev dependencies w/ latest release tags #3178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d81a10
NET-5392 Replace dev dependencies w/ latest release tags
nathancoleman Nov 7, 2023
c2b184d
go mod tidy
nathancoleman Nov 7, 2023
667d390
Adjust api-gateway logic based on changes in consul/api
nathancoleman Nov 7, 2023
3db33e5
Stop setting removed field EnvoyExtensions in test
nathancoleman Nov 7, 2023
aac727a
gofmt
nathancoleman Nov 7, 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
6 changes: 4 additions & 2 deletions control-plane/api-gateway/common/diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,10 @@ func (e entryComparator) urlRewritesEqual(a, b api.URLRewrite) bool {
}

func (e entryComparator) retryFiltersEqual(a, b api.RetryFilter) bool {
return BothNilOrEqual(a.NumRetries, b.NumRetries) && BothNilOrEqual(a.RetryOnConnectFailure, b.RetryOnConnectFailure) &&
slices.Equal(a.RetryOn, b.RetryOn) && slices.Equal(a.RetryOnStatusCodes, b.RetryOnStatusCodes)
return a.NumRetries == b.NumRetries &&
Comment thread
jm96441n marked this conversation as resolved.
a.RetryOnConnectFailure == b.RetryOnConnectFailure &&
slices.Equal(a.RetryOn, b.RetryOn) &&
slices.Equal(a.RetryOnStatusCodes, b.RetryOnStatusCodes)
}

func (e entryComparator) timeoutFiltersEqual(a, b api.TimeoutFilter) bool {
Expand Down
18 changes: 13 additions & 5 deletions control-plane/api-gateway/common/translation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,20 @@ func ToContainerPort(portNumber gwv1beta1.PortNumber, mapPrivilegedContainerPort
}

func (t ResourceTranslator) translateRouteRetryFilter(routeRetryFilter *v1alpha1.RouteRetryFilter) *api.RetryFilter {
return &api.RetryFilter{
NumRetries: routeRetryFilter.Spec.NumRetries,
RetryOn: routeRetryFilter.Spec.RetryOn,
RetryOnStatusCodes: routeRetryFilter.Spec.RetryOnStatusCodes,
RetryOnConnectFailure: routeRetryFilter.Spec.RetryOnConnectFailure,
filter := &api.RetryFilter{
RetryOn: routeRetryFilter.Spec.RetryOn,
RetryOnStatusCodes: routeRetryFilter.Spec.RetryOnStatusCodes,
}

if routeRetryFilter.Spec.NumRetries != nil {
filter.NumRetries = *routeRetryFilter.Spec.NumRetries
}

if routeRetryFilter.Spec.RetryOnConnectFailure != nil {
filter.RetryOnConnectFailure = *routeRetryFilter.Spec.RetryOnConnectFailure
}

return filter
}

func (t ResourceTranslator) translateRouteTimeoutFilter(routeTimeoutFilter *v1alpha1.RouteTimeoutFilter) *api.TimeoutFilter {
Expand Down
8 changes: 4 additions & 4 deletions control-plane/api-gateway/common/translation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,10 +1428,10 @@ func TestTranslator_ToHTTPRoute(t *testing.T) {
Headers: []api.HTTPHeaderFilter{},
URLRewrite: nil,
RetryFilter: &api.RetryFilter{
NumRetries: pointer.Uint32(3),
NumRetries: 3,
RetryOn: []string{"cancelled"},
RetryOnStatusCodes: []uint32{500, 502},
RetryOnConnectFailure: pointer.Bool(false),
RetryOnConnectFailure: false,
},
TimeoutFilter: &api.TimeoutFilter{
RequestTimeout: time.Duration(10 * time.Nanosecond),
Expand Down Expand Up @@ -1484,10 +1484,10 @@ func TestTranslator_ToHTTPRoute(t *testing.T) {
Filters: api.HTTPFilters{
Headers: []api.HTTPHeaderFilter{},
RetryFilter: &api.RetryFilter{
NumRetries: pointer.Uint32(3),
NumRetries: 3,
RetryOn: []string{"cancelled"},
RetryOnStatusCodes: []uint32{500, 502},
RetryOnConnectFailure: pointer.Bool(false),
RetryOnConnectFailure: false,
},
},
ResponseFilters: api.HTTPResponseFilters{
Expand Down
57 changes: 0 additions & 57 deletions control-plane/api/mesh/v2beta1/proxy_configuration_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/testing/protocmp"
"google.golang.org/protobuf/types/known/durationpb"
"google.golang.org/protobuf/types/known/structpb"
"google.golang.org/protobuf/types/known/timestamppb"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -109,20 +108,6 @@ func TestProxyConfiguration_MatchesConsul(t *testing.T) {
JsonFormat: "jsonFormat",
TextFormat: "text format.",
},
EnvoyExtensions: []*pbmesh.EnvoyExtension{
Copy link
Copy Markdown
Member Author

@nathancoleman nathancoleman Nov 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This field was intentionally removed in hashicorp/consul#19186.
I've confirmed with @ishustava that it's safe to remove this code from the test.

{
Name: "extension-1",
Required: true,
Arguments: &structpb.Struct{
Fields: map[string]*structpb.Value{
"field-1": {},
"field-2": {},
},
},
ConsulVersion: "1.22.3-beta1",
EnvoyVersion: "1.33.4",
},
},
PublicListenerJson: "publicListenerJson{}",
ListenerTracingJson: "listenerTracingJson{}",
LocalClusterJson: "localClusterJson{}",
Expand Down Expand Up @@ -196,20 +181,6 @@ func TestProxyConfiguration_MatchesConsul(t *testing.T) {
JsonFormat: "jsonFormat",
TextFormat: "text format.",
},
EnvoyExtensions: []*pbmesh.EnvoyExtension{
{
Name: "extension-1",
Required: true,
Arguments: &structpb.Struct{
Fields: map[string]*structpb.Value{
"field-1": {},
"field-2": {},
},
},
ConsulVersion: "1.22.3-beta1",
EnvoyVersion: "1.33.4",
},
},
PublicListenerJson: "publicListenerJson{}",
ListenerTracingJson: "listenerTracingJson{}",
LocalClusterJson: "localClusterJson{}",
Expand Down Expand Up @@ -347,20 +318,6 @@ func TestProxyConfiguration_Resource(t *testing.T) {
JsonFormat: "jsonFormat",
TextFormat: "text format.",
},
EnvoyExtensions: []*pbmesh.EnvoyExtension{
{
Name: "extension-1",
Required: true,
Arguments: &structpb.Struct{
Fields: map[string]*structpb.Value{
"field-1": {},
"field-2": {},
},
},
ConsulVersion: "1.22.3-beta1",
EnvoyVersion: "1.33.4",
},
},
PublicListenerJson: "publicListenerJson{}",
ListenerTracingJson: "listenerTracingJson{}",
LocalClusterJson: "localClusterJson{}",
Expand Down Expand Up @@ -434,20 +391,6 @@ func TestProxyConfiguration_Resource(t *testing.T) {
JsonFormat: "jsonFormat",
TextFormat: "text format.",
},
EnvoyExtensions: []*pbmesh.EnvoyExtension{
{
Name: "extension-1",
Required: true,
Arguments: &structpb.Struct{
Fields: map[string]*structpb.Value{
"field-1": {},
"field-2": {},
},
},
ConsulVersion: "1.22.3-beta1",
EnvoyVersion: "1.33.4",
},
},
PublicListenerJson: "publicListenerJson{}",
ListenerTracingJson: "listenerTracingJson{}",
LocalClusterJson: "localClusterJson{}",
Expand Down
14 changes: 3 additions & 11 deletions control-plane/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
module github.com/hashicorp/consul-k8s/control-plane

// TODO: remove these when the SDK is released for Consul 1.17 and coinciding patch releases
replace (
// This replace directive is needed because `api` requires 0.4.1 of proto-public but we need an unreleased version
github.com/hashicorp/consul/proto-public v0.4.1 => github.com/hashicorp/consul/proto-public v0.1.2-0.20231013204122-3d1a606c3b58
// This replace directive is needed because `api` requires 0.14.1 of `sdk` but we need an unreleased version
github.com/hashicorp/consul/sdk v0.14.1 => github.com/hashicorp/consul/sdk v0.4.1-0.20231011203909-c26d5cf62cb9
)

require (
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/containernetworking/cni v1.1.1
Expand All @@ -18,9 +10,9 @@ require (
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
github.com/hashicorp/consul-k8s/control-plane/cni v0.0.0-20230825213844-4ea04860c5ed
github.com/hashicorp/consul-server-connection-manager v0.1.6
github.com/hashicorp/consul/api v1.10.1-0.20231011171434-ca1a755f0c5a
github.com/hashicorp/consul/proto-public v0.4.1
github.com/hashicorp/consul/sdk v0.14.1
github.com/hashicorp/consul/api v1.26.1
github.com/hashicorp/consul/proto-public v0.5.1
github.com/hashicorp/consul/sdk v0.15.0
github.com/hashicorp/go-bexpr v0.1.11
github.com/hashicorp/go-discover v0.0.0-20230519164032-214571b6a530
github.com/hashicorp/go-hclog v1.5.0
Expand Down
12 changes: 6 additions & 6 deletions control-plane/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,12 +263,12 @@ github.com/hashicorp/consul-k8s/control-plane/cni v0.0.0-20230825213844-4ea04860
github.com/hashicorp/consul-k8s/control-plane/cni v0.0.0-20230825213844-4ea04860c5ed/go.mod h1:mwODEC+VTCA1LY/m2RUG4S2c5lNRvBcsvqaMJtMLLos=
github.com/hashicorp/consul-server-connection-manager v0.1.6 h1:ktj8Fi+dRXn9hhM+FXsfEJayhzzgTqfH08Ne5M6Fmug=
github.com/hashicorp/consul-server-connection-manager v0.1.6/go.mod h1:HngMIv57MT+pqCVeRQMa1eTB5dqnyMm8uxjyv+Hn8cs=
github.com/hashicorp/consul/api v1.10.1-0.20231011171434-ca1a755f0c5a h1:+cjavDME42W6nzw+xyCQ+eczqTFA+Qk4SLl7BHZ2dxI=
github.com/hashicorp/consul/api v1.10.1-0.20231011171434-ca1a755f0c5a/go.mod h1:+pNEP6hQgkrBLjQlYLI13/tyyb1GK3MGVw1PC/IHk9M=
github.com/hashicorp/consul/proto-public v0.1.2-0.20231013204122-3d1a606c3b58 h1:3VHvqLs2zTa9YWMsE4A9IricAZB6rAcXVe8e+pb5slw=
github.com/hashicorp/consul/proto-public v0.1.2-0.20231013204122-3d1a606c3b58/go.mod h1:KAOxsaELPpA7JX10kMeygAskAqsQnu3SPgeruMhYZMU=
github.com/hashicorp/consul/sdk v0.4.1-0.20231011203909-c26d5cf62cb9 h1:j0Rvt1KiKIKlMc2UnA0ilHfIGo66SzrBztGZaCou3+w=
github.com/hashicorp/consul/sdk v0.4.1-0.20231011203909-c26d5cf62cb9/go.mod h1:vFt03juSzocLRFo59NkeQHHmQa6+g7oU0pfzdI1mUhg=
github.com/hashicorp/consul/api v1.26.1 h1:5oSXOO5fboPZeW5SN+TdGFP/BILDgBm19OrPZ/pICIM=
github.com/hashicorp/consul/api v1.26.1/go.mod h1:B4sQTeaSO16NtynqrAdwOlahJ7IUDZM9cj2420xYL8A=
github.com/hashicorp/consul/proto-public v0.5.1 h1:g4xHZ7rJ56iktDi1uThKp+IbvHrP6nveZeGVt2Qw5x0=
github.com/hashicorp/consul/proto-public v0.5.1/go.mod h1:SayEhfXS3DQDnW/vKSZXvkwDObg7XK60KTfrJcp0wrg=
github.com/hashicorp/consul/sdk v0.15.0 h1:2qK9nDrr4tiJKRoxPGhm6B7xJjLVIQqkjiab2M4aKjU=
github.com/hashicorp/consul/sdk v0.15.0/go.mod h1:r/OmRRPbHOe0yxNahLw7G9x5WG17E1BIECMtCjcPSNo=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
Expand Down