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

NET-4932 - xds v2 - implement base connect proxy functionality for endpoints #18500

Merged
merged 9 commits into from
Aug 17, 2023
Merged

NET-4932 - xds v2 - implement base connect proxy functionality for endpoints #18500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
735ccc5
NET-4853 - xds v2 - implement base connect proxy functionality for cl…
jmurret Aug 17, 2023
1b2319b
NET-4853 - xds v2 - implement base connect proxy functionality for cl…
jmurret Aug 17, 2023
2f4166e
NET-4932 - xds v2 - implement base connect proxy functionality for en…
jmurret Aug 17, 2023
25f6a71
Merge branch 'jm/NET-4853' into jm/NET-4932
jmurret Aug 17, 2023
a0eaa92
Update endpoints_test.go
jmurret Aug 17, 2023
e8aca7c
gofmt
jmurret Aug 17, 2023
e80bb34
Update naming.go
jmurret Aug 17, 2023
00222fe
Merge branch 'main' into jm/NET-4932
jmurret Aug 17, 2023
27e640d
gofmt
jmurret Aug 17, 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
3 changes: 2 additions & 1 deletion agent/xds/clusters_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package xds

import (
"bytes"
"github.com/hashicorp/consul/types"
"path/filepath"
"sort"
"testing"
Expand All @@ -26,7 +27,6 @@ import (
"github.com/hashicorp/consul/agent/xdsv2"
"github.com/hashicorp/consul/envoyextensions/xdscommon"
"github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/consul/types"
)

type mockCfgFetcher struct {
Expand Down Expand Up @@ -1138,6 +1138,7 @@ func TestClustersFromSnapshot(t *testing.T) {
require.NoError(t, err)

clusters = res[xdscommon.ClusterType]

// The order of clusters returned via CDS isn't relevant, so it's safe
// to sort these for the purposes of test comparisons.
sort.Slice(clusters, func(i, j int) bool {
Expand Down
Loading