luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Protobuf Refactoring for Multi-Module Cleanliness (#16302) 

Protobuf Refactoring for Multi-Module Cleanliness

This commit includes the following:

Moves all packages that were within proto/ to proto/private
Rewrites imports to account for the packages being moved
Adds in buf.work.yaml to enable buf workspaces
Names the proto-public buf module so that we can override the Go package imports within proto/buf.yaml
Bumps the buf version dependency to 1.14.0 (I was trying out the version to see if it would get around an issue - it didn't but it also doesn't break things and it seemed best to keep up with the toolchain changes)

Why:

In the future we will need to consume other protobuf dependencies such as the Google HTTP annotations for openapi generation or grpc-gateway usage.
There were some recent changes to have our own ratelimiting annotations.
The two combined were not working when I was trying to use them together (attempting to rebase another branch)
Buf workspaces should be the solution to the problem
Buf workspaces means that each module will have generated Go code that embeds proto file names relative to the proto dir and not the top level repo root.
This resulted in proto file name conflicts in the Go global protobuf type registry.
The solution to that was to add in a private/ directory into the path within the proto/ directory.
That then required rewriting all the imports.

Is this safe?

AFAICT yes
The gRPC wire protocol doesn't seem to care about the proto file names (although the Go grpc code does tack on the proto file name as Metadata in the ServiceDesc)
Other than imports, there were no changes to any generated code as a result of this.
This commit is contained in:
Matt Keeler 2023-02-17 16:14:46 -05:00 committed by GitHub
parent 29497be7e8
commit f3c80c4eef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
253 changed files with 5413 additions and 5466 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
GNUmakefile
View File

@ -9,7 +9,8 @@ SHELL = bash
### ###
GOLANGCI_LINT_VERSION='v1.51.1' GOLANGCI_LINT_VERSION='v1.51.1'
MOCKERY_VERSION='v2.20.0' MOCKERY_VERSION='v2.20.0'
BUF_VERSION='v1.4.0' BUF_VERSION='v1.14.0'
PROTOC_GEN_GO_GRPC_VERSION="v1.2.0" PROTOC_GEN_GO_GRPC_VERSION="v1.2.0"
MOG_VERSION='v0.4.0' MOG_VERSION='v0.4.0'
PROTOC_GO_INJECT_TAG_VERSION='v1.3.0' PROTOC_GO_INJECT_TAG_VERSION='v1.3.0'
@ -495,12 +496,11 @@ proto-format: proto-tools
.PHONY: proto-lint .PHONY: proto-lint
proto-lint: proto-tools proto-lint: proto-tools
@buf lint --config proto/buf.yaml --path proto @buf lint
@buf lint --config proto-public/buf.yaml --path proto-public
@for fn in $$(find proto -name '*.proto'); do \ @for fn in $$(find proto -name '*.proto'); do \
if [[ "$$fn" = "proto/pbsubscribe/subscribe.proto" ]]; then \ if [[ "$$fn" = "proto/private/pbsubscribe/subscribe.proto" ]]; then \
continue ; \ continue ; \
elif [[ "$$fn" = "proto/pbpartition/partition.proto" ]]; then \ elif [[ "$$fn" = "proto/private/pbpartition/partition.proto" ]]; then \
continue ; \ continue ; \
fi ; \ fi ; \
pkg=$$(grep "^package " "$$fn" | sed 's/^package \(.*\);/\1/'); \ pkg=$$(grep "^package " "$$fn" | sed 's/^package \(.*\);/\1/'); \

4
agent/agent.go
View File

@ -64,8 +64,8 @@ import (
"github.com/hashicorp/consul/lib/mutex" "github.com/hashicorp/consul/lib/mutex"
"github.com/hashicorp/consul/lib/routine" "github.com/hashicorp/consul/lib/routine"
"github.com/hashicorp/consul/logging" "github.com/hashicorp/consul/logging"
"github.com/hashicorp/consul/proto/pboperator" "github.com/hashicorp/consul/proto/private/pboperator"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/tlsutil" "github.com/hashicorp/consul/tlsutil"
"github.com/hashicorp/consul/types" "github.com/hashicorp/consul/types"
) )

2
agent/agent_test.go
View File

@ -54,7 +54,7 @@ import (
"github.com/hashicorp/consul/internal/go-sso/oidcauth/oidcauthtest" "github.com/hashicorp/consul/internal/go-sso/oidcauth/oidcauthtest"
"github.com/hashicorp/consul/ipaddr" "github.com/hashicorp/consul/ipaddr"
"github.com/hashicorp/consul/lib" "github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/proto/pbautoconf" "github.com/hashicorp/consul/proto/private/pbautoconf"
"github.com/hashicorp/consul/sdk/freeport" "github.com/hashicorp/consul/sdk/freeport"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/consul/sdk/testutil/retry" "github.com/hashicorp/consul/sdk/testutil/retry"

2
agent/auto-config/auto_config.go
View File

@ -14,7 +14,7 @@ import (
"github.com/hashicorp/consul/agent/token" "github.com/hashicorp/consul/agent/token"
"github.com/hashicorp/consul/lib/retry" "github.com/hashicorp/consul/lib/retry"
"github.com/hashicorp/consul/logging" "github.com/hashicorp/consul/logging"
"github.com/hashicorp/consul/proto/pbautoconf" "github.com/hashicorp/consul/proto/private/pbautoconf"
) )
// AutoConfig is all the state necessary for being able to parse a configuration // AutoConfig is all the state necessary for being able to parse a configuration

4
agent/auto-config/auto_config_test.go
View File

@ -22,8 +22,8 @@ import (
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/agent/token" "github.com/hashicorp/consul/agent/token"
"github.com/hashicorp/consul/lib/retry" "github.com/hashicorp/consul/lib/retry"
"github.com/hashicorp/consul/proto/pbautoconf" "github.com/hashicorp/consul/proto/private/pbautoconf"
"github.com/hashicorp/consul/proto/pbconfig" "github.com/hashicorp/consul/proto/private/pbconfig"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
testretry "github.com/hashicorp/consul/sdk/testutil/retry" testretry "github.com/hashicorp/consul/sdk/testutil/retry"
) )

6
agent/auto-config/config_translate.go
View File

@ -3,9 +3,9 @@ package autoconf
import ( import (
"github.com/hashicorp/consul/agent/config" "github.com/hashicorp/consul/agent/config"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbautoconf" "github.com/hashicorp/consul/proto/private/pbautoconf"
"github.com/hashicorp/consul/proto/pbconfig" "github.com/hashicorp/consul/proto/private/pbconfig"
"github.com/hashicorp/consul/proto/pbconnect" "github.com/hashicorp/consul/proto/private/pbconnect"
"github.com/hashicorp/consul/types" "github.com/hashicorp/consul/types"
) )

4
agent/auto-config/config_translate_test.go
View File

@ -7,8 +7,8 @@ import (
"github.com/hashicorp/consul/agent/config" "github.com/hashicorp/consul/agent/config"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
pbconfig "github.com/hashicorp/consul/proto/pbconfig" pbconfig "github.com/hashicorp/consul/proto/private/pbconfig"
"github.com/hashicorp/consul/proto/pbconnect" "github.com/hashicorp/consul/proto/private/pbconnect"
) )
func stringPointer(s string) *string { func stringPointer(s string) *string {

2
agent/auto-config/mock_test.go
View File

@ -15,7 +15,7 @@ import (
"github.com/hashicorp/consul/agent/metadata" "github.com/hashicorp/consul/agent/metadata"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/agent/token" "github.com/hashicorp/consul/agent/token"
"github.com/hashicorp/consul/proto/pbautoconf" "github.com/hashicorp/consul/proto/private/pbautoconf"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
) )

2
agent/auto-config/persist.go
View File

@ -5,7 +5,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/hashicorp/consul/proto/pbautoconf" "github.com/hashicorp/consul/proto/private/pbautoconf"
"google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/encoding/protojson"
) )

4
agent/auto-config/tls.go
View File

@ -9,8 +9,8 @@ import (
cachetype "github.com/hashicorp/consul/agent/cache-types" cachetype "github.com/hashicorp/consul/agent/cache-types"
"github.com/hashicorp/consul/agent/connect" "github.com/hashicorp/consul/agent/connect"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbautoconf" "github.com/hashicorp/consul/proto/private/pbautoconf"
"github.com/hashicorp/consul/proto/pbconnect" "github.com/hashicorp/consul/proto/private/pbconnect"
) )
const ( const (

2
agent/cache-types/mock_PeeringLister_test.go
View File

@ -9,7 +9,7 @@ import (
mock "github.com/stretchr/testify/mock" mock "github.com/stretchr/testify/mock"
pbpeering "github.com/hashicorp/consul/proto/pbpeering" pbpeering "github.com/hashicorp/consul/proto/private/pbpeering"
) )
// MockPeeringLister is an autogenerated mock type for the PeeringLister type // MockPeeringLister is an autogenerated mock type for the PeeringLister type

2
agent/cache-types/mock_TrustBundleLister_test.go
View File

@ -9,7 +9,7 @@ import (
mock "github.com/stretchr/testify/mock" mock "github.com/stretchr/testify/mock"
pbpeering "github.com/hashicorp/consul/proto/pbpeering" pbpeering "github.com/hashicorp/consul/proto/private/pbpeering"
) )
// MockTrustBundleLister is an autogenerated mock type for the TrustBundleLister type // MockTrustBundleLister is an autogenerated mock type for the TrustBundleLister type

2
agent/cache-types/mock_TrustBundleReader_test.go
View File

@ -9,7 +9,7 @@ import (
mock "github.com/stretchr/testify/mock" mock "github.com/stretchr/testify/mock"
pbpeering "github.com/hashicorp/consul/proto/pbpeering" pbpeering "github.com/hashicorp/consul/proto/private/pbpeering"
) )
// MockTrustBundleReader is an autogenerated mock type for the TrustBundleReader type // MockTrustBundleReader is an autogenerated mock type for the TrustBundleReader type

2
agent/cache-types/peerings.go
View File

@ -7,7 +7,7 @@ import (
"time" "time"
external "github.com/hashicorp/consul/agent/grpc-external" external "github.com/hashicorp/consul/agent/grpc-external"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/mitchellh/hashstructure" "github.com/mitchellh/hashstructure"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

2
agent/cache-types/peerings_test.go
View File

@ -13,7 +13,7 @@ import (
grpcstatus "google.golang.org/grpc/status" grpcstatus "google.golang.org/grpc/status"
"github.com/hashicorp/consul/agent/cache" "github.com/hashicorp/consul/agent/cache"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
) )
func TestPeerings(t *testing.T) { func TestPeerings(t *testing.T) {

2
agent/cache-types/trust_bundle.go
View File

@ -12,7 +12,7 @@ import (
"github.com/hashicorp/consul/agent/cache" "github.com/hashicorp/consul/agent/cache"
external "github.com/hashicorp/consul/agent/grpc-external" external "github.com/hashicorp/consul/agent/grpc-external"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
) )
// Recommended name for registration. // Recommended name for registration.

2
agent/cache-types/trust_bundle_test.go
View File

@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/hashicorp/consul/agent/cache" "github.com/hashicorp/consul/agent/cache"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
) )
func TestTrustBundle(t *testing.T) { func TestTrustBundle(t *testing.T) {

2
agent/cache-types/trust_bundles.go
View File

@ -14,7 +14,7 @@ import (
"github.com/hashicorp/consul/agent/cache" "github.com/hashicorp/consul/agent/cache"
external "github.com/hashicorp/consul/agent/grpc-external" external "github.com/hashicorp/consul/agent/grpc-external"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
) )
// Recommended name for registration. // Recommended name for registration.

2
agent/cache-types/trust_bundles_test.go
View File

@ -11,7 +11,7 @@ import (
grpcstatus "google.golang.org/grpc/status" grpcstatus "google.golang.org/grpc/status"
"github.com/hashicorp/consul/agent/cache" "github.com/hashicorp/consul/agent/cache"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
) )
func TestTrustBundles(t *testing.T) { func TestTrustBundles(t *testing.T) {

2
agent/config/runtime_test.go
View File

@ -33,7 +33,7 @@ import (
"github.com/hashicorp/consul/agent/token" "github.com/hashicorp/consul/agent/token"
"github.com/hashicorp/consul/lib" "github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/logging" "github.com/hashicorp/consul/logging"
"github.com/hashicorp/consul/proto/prototest" "github.com/hashicorp/consul/proto/private/prototest"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/consul/tlsutil" "github.com/hashicorp/consul/tlsutil"
"github.com/hashicorp/consul/types" "github.com/hashicorp/consul/types"

6
agent/consul/auto_config_endpoint.go
View File

@ -16,9 +16,9 @@ import (
"github.com/hashicorp/consul/agent/dns" "github.com/hashicorp/consul/agent/dns"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/lib/template" "github.com/hashicorp/consul/lib/template"
"github.com/hashicorp/consul/proto/pbautoconf" "github.com/hashicorp/consul/proto/private/pbautoconf"
"github.com/hashicorp/consul/proto/pbconfig" "github.com/hashicorp/consul/proto/private/pbconfig"
"github.com/hashicorp/consul/proto/pbconnect" "github.com/hashicorp/consul/proto/private/pbconnect"
"github.com/hashicorp/consul/tlsutil" "github.com/hashicorp/consul/tlsutil"
) )

8
agent/consul/auto_config_endpoint_test.go
View File

@ -23,10 +23,10 @@ import (
"github.com/hashicorp/consul/agent/connect" "github.com/hashicorp/consul/agent/connect"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/internal/go-sso/oidcauth/oidcauthtest" "github.com/hashicorp/consul/internal/go-sso/oidcauth/oidcauthtest"
"github.com/hashicorp/consul/proto/pbautoconf" "github.com/hashicorp/consul/proto/private/pbautoconf"
"github.com/hashicorp/consul/proto/pbconfig" "github.com/hashicorp/consul/proto/private/pbconfig"
"github.com/hashicorp/consul/proto/pbconnect" "github.com/hashicorp/consul/proto/private/pbconnect"
"github.com/hashicorp/consul/proto/prototest" "github.com/hashicorp/consul/proto/private/prototest"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/consul/tlsutil" "github.com/hashicorp/consul/tlsutil"
"github.com/hashicorp/consul/types" "github.com/hashicorp/consul/types"

2
agent/consul/autopilotevents/ready_servers_events.go
View File

@ -14,7 +14,7 @@ import (
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/consul/stream" "github.com/hashicorp/consul/agent/consul/stream"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
"github.com/hashicorp/consul/types" "github.com/hashicorp/consul/types"
) )

2
agent/consul/autopilotevents/ready_servers_events_test.go
View File

@ -13,7 +13,7 @@ import (
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/consul/stream" "github.com/hashicorp/consul/agent/consul/stream"
structs "github.com/hashicorp/consul/agent/structs" structs "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
types "github.com/hashicorp/consul/types" types "github.com/hashicorp/consul/types"
) )

2
agent/consul/fsm/commands_oss.go
View File

@ -10,7 +10,7 @@ import (
"github.com/hashicorp/consul/agent/consul/state" "github.com/hashicorp/consul/agent/consul/state"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
) )
var CommandsSummaries = []prometheus.SummaryDefinition{ var CommandsSummaries = []prometheus.SummaryDefinition{

2
agent/consul/fsm/snapshot_oss.go
View File

@ -10,7 +10,7 @@ import (
"github.com/hashicorp/consul/agent/consul/state" "github.com/hashicorp/consul/agent/consul/state"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
) )
func init() { func init() {

4
agent/consul/fsm/snapshot_test.go
View File

@ -16,8 +16,8 @@ import (
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/lib/stringslice" "github.com/hashicorp/consul/lib/stringslice"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/proto/prototest" "github.com/hashicorp/consul/proto/private/prototest"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
) )

2
agent/consul/internal_endpoint_test.go
View File

@ -19,7 +19,7 @@ import (
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/lib/stringslice" "github.com/hashicorp/consul/lib/stringslice"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/consul/sdk/testutil/retry" "github.com/hashicorp/consul/sdk/testutil/retry"
"github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/testrpc"

4
agent/consul/leader_peering.go
View File

@ -27,8 +27,8 @@ import (
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/logging" "github.com/hashicorp/consul/logging"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/proto/pbpeerstream" "github.com/hashicorp/consul/proto/private/pbpeerstream"
) )
var leaderExportedServicesCountKeyDeprecated = []string{"consul", "peering", "exported_services"} var leaderExportedServicesCountKeyDeprecated = []string{"consul", "peering", "exported_services"}

2
agent/consul/leader_peering_test.go
View File

@ -28,7 +28,7 @@ import (
"github.com/hashicorp/consul/agent/consul/state" "github.com/hashicorp/consul/agent/consul/state"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/sdk/freeport" "github.com/hashicorp/consul/sdk/freeport"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/consul/sdk/testutil/retry" "github.com/hashicorp/consul/sdk/testutil/retry"

3
agent/consul/operator_backend.go
View File

@ -2,10 +2,11 @@ package consul
import ( import (
"context" "context"
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/acl/resolver" "github.com/hashicorp/consul/acl/resolver"
"github.com/hashicorp/consul/agent/rpc/operator" "github.com/hashicorp/consul/agent/rpc/operator"
"github.com/hashicorp/consul/proto/pboperator" "github.com/hashicorp/consul/proto/private/pboperator"
"github.com/hashicorp/raft" "github.com/hashicorp/raft"
) )

16
agent/consul/operator_backend_test.go
View File

@ -2,14 +2,15 @@ package consul
import ( import (
"context" "context"
"testing"
"time"
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
external "github.com/hashicorp/consul/agent/grpc-external" external "github.com/hashicorp/consul/agent/grpc-external"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pboperator" "github.com/hashicorp/consul/proto/private/pboperator"
"github.com/hashicorp/consul/sdk/testutil/retry" "github.com/hashicorp/consul/sdk/testutil/retry"
"google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/credentials/insecure"
"testing"
"time"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
gogrpc "google.golang.org/grpc" gogrpc "google.golang.org/grpc"
@ -124,8 +125,7 @@ func TestOperatorBackend_TransferLeaderWithACL(t *testing.T) {
require.Nil(t, reply) require.Nil(t, reply)
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
testrpc.WaitForLeader(t, s1.RPC, "dc1") testrpc.WaitForLeader(t, s1.RPC, "dc1")
retry.Run(t, func(r *retry.R) { retry.RunWith(&retry.Timer{Wait: time.Second, Timeout: 3 * time.Second}, t, func(r *retry.R) {
time.Sleep(1 * time.Second)
afterLeader, _ := s1.raft.LeaderWithID() afterLeader, _ := s1.raft.LeaderWithID()
require.NotEmpty(r, afterLeader) require.NotEmpty(r, afterLeader)
if afterLeader != beforeLeader { if afterLeader != beforeLeader {
@ -151,8 +151,7 @@ func TestOperatorBackend_TransferLeaderWithACL(t *testing.T) {
require.True(t, acl.IsErrPermissionDenied(err)) require.True(t, acl.IsErrPermissionDenied(err))
require.Nil(t, reply) require.Nil(t, reply)
testrpc.WaitForLeader(t, s1.RPC, "dc1") testrpc.WaitForLeader(t, s1.RPC, "dc1")
retry.Run(t, func(r *retry.R) { retry.RunWith(&retry.Timer{Wait: time.Second, Timeout: 3 * time.Second}, t, func(r *retry.R) {
time.Sleep(1 * time.Second)
afterLeader, _ := s1.raft.LeaderWithID() afterLeader, _ := s1.raft.LeaderWithID()
require.NotEmpty(r, afterLeader) require.NotEmpty(r, afterLeader)
if afterLeader != beforeLeader { if afterLeader != beforeLeader {
@ -176,8 +175,7 @@ func TestOperatorBackend_TransferLeaderWithACL(t *testing.T) {
require.True(t, reply.Success) require.True(t, reply.Success)
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
testrpc.WaitForLeader(t, s1.RPC, "dc1") testrpc.WaitForLeader(t, s1.RPC, "dc1")
retry.Run(t, func(r *retry.R) { retry.RunWith(&retry.Timer{Wait: 2 * time.Second, Timeout: 6 * time.Second}, t, func(r *retry.R) {
time.Sleep(1 * time.Second)
afterLeader, _ := s1.raft.LeaderWithID() afterLeader, _ := s1.raft.LeaderWithID()
require.NotEmpty(r, afterLeader) require.NotEmpty(r, afterLeader)
if afterLeader == beforeLeader { if afterLeader == beforeLeader {

2
agent/consul/peering_backend.go
View File

@ -21,7 +21,7 @@ import (
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/ipaddr" "github.com/hashicorp/consul/ipaddr"
"github.com/hashicorp/consul/lib" "github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
) )
type PeeringBackend struct { type PeeringBackend struct {

2
agent/consul/peering_backend_oss_test.go
View File

@ -13,7 +13,7 @@ import (
"github.com/hashicorp/consul/agent/connect" "github.com/hashicorp/consul/agent/connect"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/sdk/freeport" "github.com/hashicorp/consul/sdk/freeport"
"github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/testrpc"
) )

4
agent/consul/peering_backend_test.go
View File

@ -17,8 +17,8 @@ import (
"github.com/hashicorp/consul/agent/consul/state" "github.com/hashicorp/consul/agent/consul/state"
"github.com/hashicorp/consul/agent/pool" "github.com/hashicorp/consul/agent/pool"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/proto/pbpeerstream" "github.com/hashicorp/consul/proto/private/pbpeerstream"
"github.com/hashicorp/consul/sdk/freeport" "github.com/hashicorp/consul/sdk/freeport"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/testrpc"

2
agent/consul/prepared_query_endpoint_test.go
View File

@ -27,7 +27,7 @@ import (
"github.com/hashicorp/consul/agent/structs/aclfilter" "github.com/hashicorp/consul/agent/structs/aclfilter"
tokenStore "github.com/hashicorp/consul/agent/token" tokenStore "github.com/hashicorp/consul/agent/token"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/sdk/freeport" "github.com/hashicorp/consul/sdk/freeport"
"github.com/hashicorp/consul/sdk/testutil/retry" "github.com/hashicorp/consul/sdk/testutil/retry"
"github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/testrpc"

2
agent/consul/rpc_test.go
View File

@ -39,7 +39,7 @@ import (
tokenStore "github.com/hashicorp/consul/agent/token" tokenStore "github.com/hashicorp/consul/agent/token"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/lib" "github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/consul/sdk/testutil/retry" "github.com/hashicorp/consul/sdk/testutil/retry"
"github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/testrpc"

2
agent/consul/server.go
View File

@ -64,7 +64,7 @@ import (
"github.com/hashicorp/consul/lib" "github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/lib/routine" "github.com/hashicorp/consul/lib/routine"
"github.com/hashicorp/consul/logging" "github.com/hashicorp/consul/logging"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
"github.com/hashicorp/consul/tlsutil" "github.com/hashicorp/consul/tlsutil"
"github.com/hashicorp/consul/types" "github.com/hashicorp/consul/types"
cslversion "github.com/hashicorp/consul/version" cslversion "github.com/hashicorp/consul/version"

2
agent/consul/state/acl.go
View File

@ -8,7 +8,7 @@ import (
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbacl" "github.com/hashicorp/consul/proto/private/pbacl"
) )
// ACLTokens is used when saving a snapshot // ACLTokens is used when saving a snapshot

2
agent/consul/state/acl_test.go
View File

@ -13,7 +13,7 @@ import (
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbacl" "github.com/hashicorp/consul/proto/private/pbacl"
) )
const ( const (

6
agent/consul/state/catalog_events.go
View File

@ -9,9 +9,9 @@ import (
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/consul/stream" "github.com/hashicorp/consul/agent/consul/stream"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbcommon" "github.com/hashicorp/consul/proto/private/pbcommon"
"github.com/hashicorp/consul/proto/pbservice" "github.com/hashicorp/consul/proto/private/pbservice"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
) )
// EventSubjectService is a stream.Subject used to route and receive events for // EventSubjectService is a stream.Subject used to route and receive events for

4
agent/consul/state/catalog_events_test.go
View File

@ -12,8 +12,8 @@ import (
"github.com/hashicorp/consul/agent/consul/stream" "github.com/hashicorp/consul/agent/consul/stream"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
"github.com/hashicorp/consul/proto/prototest" "github.com/hashicorp/consul/proto/private/prototest"
"github.com/hashicorp/consul/types" "github.com/hashicorp/consul/types"
) )

4
agent/consul/state/config_entry_events.go
View File

@ -6,8 +6,8 @@ import (
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/consul/stream" "github.com/hashicorp/consul/agent/consul/stream"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbconfigentry" "github.com/hashicorp/consul/proto/private/pbconfigentry"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
) )
// Adding events for a new config entry kind? Remember to update ConfigEntryFromStructs and ConfigEntryToStructs. // Adding events for a new config entry kind? Remember to update ConfigEntryFromStructs and ConfigEntryToStructs.

2
agent/consul/state/config_entry_events_test.go
View File

@ -7,7 +7,7 @@ import (
"github.com/hashicorp/consul/agent/consul/stream" "github.com/hashicorp/consul/agent/consul/stream"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
) )
func TestConfigEntryEventsFromChanges(t *testing.T) { func TestConfigEntryEventsFromChanges(t *testing.T) {

2
agent/consul/state/connect_ca_events.go
View File

@ -4,7 +4,7 @@ import (
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/consul/stream" "github.com/hashicorp/consul/agent/consul/stream"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
) )
// EventTopicCARoots is the streaming topic to which events will be published // EventTopicCARoots is the streaming topic to which events will be published

2
agent/consul/state/connect_ca_test.go
View File

@ -4,7 +4,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/hashicorp/consul/proto/prototest" "github.com/hashicorp/consul/proto/private/prototest"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/go-memdb" "github.com/hashicorp/go-memdb"

2
agent/consul/state/events.go
View File

@ -6,7 +6,7 @@ import (
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/consul/stream" "github.com/hashicorp/consul/agent/consul/stream"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
) )
// PBToStreamSubscribeRequest takes a protobuf subscribe request and enterprise // PBToStreamSubscribeRequest takes a protobuf subscribe request and enterprise

2
agent/consul/state/events_test.go
View File

@ -8,7 +8,7 @@ import (
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/consul/stream" "github.com/hashicorp/consul/agent/consul/stream"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
) )
const aclToken = "67b04fbc-e35f-494a-ad43-739f1c8b839c" const aclToken = "67b04fbc-e35f-494a-ad43-739f1c8b839c"

2
agent/consul/state/memdb.go
View File

@ -6,7 +6,7 @@ import (
"github.com/hashicorp/go-memdb" "github.com/hashicorp/go-memdb"
"github.com/hashicorp/consul/agent/consul/stream" "github.com/hashicorp/consul/agent/consul/stream"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
) )
// ReadTxn is implemented by memdb.Txn to perform read operations. // ReadTxn is implemented by memdb.Txn to perform read operations.

2
agent/consul/state/peering.go
View File

@ -14,7 +14,7 @@ import (
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/lib" "github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/lib/maps" "github.com/hashicorp/consul/lib/maps"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
) )
const ( const (

2
agent/consul/state/peering_oss.go
View File

@ -7,7 +7,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
) )
func indexPeeringFromQuery(q Query) ([]byte, error) { func indexPeeringFromQuery(q Query) ([]byte, error) {

2
agent/consul/state/peering_oss_test.go
View File

@ -7,7 +7,7 @@ import (
"time" "time"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
) )
func testIndexerTablePeering() map[string]indexerTestCase { func testIndexerTablePeering() map[string]indexerTestCase {

4
agent/consul/state/peering_test.go
View File

@ -11,8 +11,8 @@ import (
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/connect" "github.com/hashicorp/consul/agent/connect"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/proto/prototest" "github.com/hashicorp/consul/proto/private/prototest"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
) )

2
agent/consul/state/schema_test.go
View File

@ -7,7 +7,7 @@ import (
"github.com/hashicorp/go-memdb" "github.com/hashicorp/go-memdb"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
) )
type indexerTestCase struct { type indexerTestCase struct {

2
agent/consul/state/state_store_test.go
View File

@ -12,7 +12,7 @@ import (
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/types" "github.com/hashicorp/consul/types"
) )

2
agent/consul/state/store_integration_test.go
View File

@ -10,7 +10,7 @@ import (
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/consul/stream" "github.com/hashicorp/consul/agent/consul/stream"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
) )
func TestStore_IntegrationWithEventPublisher_ACLTokenUpdate(t *testing.T) { func TestStore_IntegrationWithEventPublisher_ACLTokenUpdate(t *testing.T) {

2
agent/consul/stream/event.go
View File

@ -8,7 +8,7 @@ import (
"fmt" "fmt"
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
) )
// Topic is an identifier that partitions events. A subscription will only receive // Topic is an identifier that partitions events. A subscription will only receive

2
agent/consul/stream/event_publisher_test.go
View File

@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
) )

4
agent/consul/subscribe_backend_test.go
View File

@ -19,8 +19,8 @@ import (
"github.com/hashicorp/consul/agent/grpc-internal/resolver" "github.com/hashicorp/consul/agent/grpc-internal/resolver"
"github.com/hashicorp/consul/agent/router" "github.com/hashicorp/consul/agent/router"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbservice" "github.com/hashicorp/consul/proto/private/pbservice"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/testrpc"
) )

2
agent/consul/usagemetrics/usagemetrics_oss_test.go
View File

@ -16,7 +16,7 @@ import (
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/consul/state" "github.com/hashicorp/consul/agent/consul/state"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
) )

2
agent/envoyextensions/builtin/aws-lambda/aws_lambda_test.go
View File

@ -20,7 +20,7 @@ import (
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/envoyextensions/extensioncommon" "github.com/hashicorp/consul/envoyextensions/extensioncommon"
"github.com/hashicorp/consul/proto/prototest" "github.com/hashicorp/consul/proto/private/prototest"
) )
func TestConstructor(t *testing.T) { func TestConstructor(t *testing.T) {

8
agent/grpc-external/services/peerstream/replication.go
View File

@ -13,10 +13,10 @@ import (
"github.com/hashicorp/consul/agent/cache" "github.com/hashicorp/consul/agent/cache"
"github.com/hashicorp/consul/agent/consul/state" "github.com/hashicorp/consul/agent/consul/state"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/proto/pbpeerstream" "github.com/hashicorp/consul/proto/private/pbpeerstream"
"github.com/hashicorp/consul/proto/pbservice" "github.com/hashicorp/consul/proto/private/pbservice"
"github.com/hashicorp/consul/proto/pbstatus" "github.com/hashicorp/consul/proto/private/pbstatus"
"github.com/hashicorp/consul/types" "github.com/hashicorp/consul/types"
) )

4
agent/grpc-external/services/peerstream/server.go
View File

@ -12,8 +12,8 @@ import (
"github.com/hashicorp/consul/agent/consul/state" "github.com/hashicorp/consul/agent/consul/state"
"github.com/hashicorp/consul/agent/consul/stream" "github.com/hashicorp/consul/agent/consul/stream"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/proto/pbpeerstream" "github.com/hashicorp/consul/proto/private/pbpeerstream"
) )
// TODO(peering): fix up these interfaces to be more testable now that they are // TODO(peering): fix up these interfaces to be more testable now that they are

4
agent/grpc-external/services/peerstream/server_test.go
View File

@ -4,8 +4,8 @@ import (
"context" "context"
"testing" "testing"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/proto/pbpeerstream" "github.com/hashicorp/consul/proto/private/pbpeerstream"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

4
agent/grpc-external/services/peerstream/stream_resources.go
View File

@ -21,8 +21,8 @@ import (
external "github.com/hashicorp/consul/agent/grpc-external" external "github.com/hashicorp/consul/agent/grpc-external"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/lib" "github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/proto/pbpeerstream" "github.com/hashicorp/consul/proto/private/pbpeerstream"
) )
type BidirectionalStream interface { type BidirectionalStream interface {

12
agent/grpc-external/services/peerstream/stream_test.go
View File

@ -29,12 +29,12 @@ import (
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/lib" "github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/logging" "github.com/hashicorp/consul/logging"
"github.com/hashicorp/consul/proto/pbcommon" "github.com/hashicorp/consul/proto/private/pbcommon"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/proto/pbpeerstream" "github.com/hashicorp/consul/proto/private/pbpeerstream"
"github.com/hashicorp/consul/proto/pbservice" "github.com/hashicorp/consul/proto/private/pbservice"
"github.com/hashicorp/consul/proto/pbstatus" "github.com/hashicorp/consul/proto/private/pbstatus"
"github.com/hashicorp/consul/proto/prototest" "github.com/hashicorp/consul/proto/private/prototest"
"github.com/hashicorp/consul/sdk/freeport" "github.com/hashicorp/consul/sdk/freeport"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/consul/sdk/testutil/retry" "github.com/hashicorp/consul/sdk/testutil/retry"

2
agent/grpc-external/services/peerstream/subscription_blocking.go
View File

@ -11,7 +11,7 @@ import (
"github.com/hashicorp/consul/agent/cache" "github.com/hashicorp/consul/agent/cache"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/lib/retry" "github.com/hashicorp/consul/lib/retry"
"github.com/hashicorp/consul/proto/pbservice" "github.com/hashicorp/consul/proto/private/pbservice"
) )
// This file contains direct state store functions that need additional // This file contains direct state store functions that need additional

8
agent/grpc-external/services/peerstream/subscription_manager.go
View File

@ -24,10 +24,10 @@ import (
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/agent/submatview" "github.com/hashicorp/consul/agent/submatview"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/proto/pbcommon" "github.com/hashicorp/consul/proto/private/pbcommon"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/proto/pbpeerstream" "github.com/hashicorp/consul/proto/private/pbpeerstream"
"github.com/hashicorp/consul/proto/pbservice" "github.com/hashicorp/consul/proto/private/pbservice"
) )
type MaterializedViewStore interface { type MaterializedViewStore interface {

10
agent/grpc-external/services/peerstream/subscription_manager_test.go
View File

@ -18,11 +18,11 @@ import (
"github.com/hashicorp/consul/agent/consul/stream" "github.com/hashicorp/consul/agent/consul/stream"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/proto/pbcommon" "github.com/hashicorp/consul/proto/private/pbcommon"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/proto/pbpeerstream" "github.com/hashicorp/consul/proto/private/pbpeerstream"
"github.com/hashicorp/consul/proto/pbservice" "github.com/hashicorp/consul/proto/private/pbservice"
"github.com/hashicorp/consul/proto/prototest" "github.com/hashicorp/consul/proto/private/prototest"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/consul/types" "github.com/hashicorp/consul/types"
) )

2
agent/grpc-external/services/peerstream/subscription_state.go
View File

@ -12,7 +12,7 @@ import (
"github.com/hashicorp/consul/agent/cache" "github.com/hashicorp/consul/agent/cache"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbservice" "github.com/hashicorp/consul/proto/private/pbservice"
) )
// subscriptionState is a collection of working state tied to a peerID subscription. // subscriptionState is a collection of working state tied to a peerID subscription.

2
agent/grpc-external/services/peerstream/subscription_state_test.go
View File

@ -12,7 +12,7 @@ import (
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/cache" "github.com/hashicorp/consul/agent/cache"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbservice" "github.com/hashicorp/consul/proto/private/pbservice"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
) )

4
agent/grpc-external/services/peerstream/subscription_view.go
View File

@ -12,8 +12,8 @@ import (
"github.com/hashicorp/consul/agent/consul/stream" "github.com/hashicorp/consul/agent/consul/stream"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/agent/submatview" "github.com/hashicorp/consul/agent/submatview"
"github.com/hashicorp/consul/proto/pbservice" "github.com/hashicorp/consul/proto/private/pbservice"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
) )
type Subscriber interface { type Subscriber interface {

4
agent/grpc-external/services/peerstream/subscription_view_test.go
View File

@ -18,8 +18,8 @@ import (
"github.com/hashicorp/consul/agent/consul/stream" "github.com/hashicorp/consul/agent/consul/stream"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/agent/submatview" "github.com/hashicorp/consul/agent/submatview"
"github.com/hashicorp/consul/proto/pbservice" "github.com/hashicorp/consul/proto/private/pbservice"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
) )
// testInitialIndex is the first index that will be used in simulated updates. // testInitialIndex is the first index that will be used in simulated updates.

2
agent/grpc-external/services/peerstream/testing.go
View File

@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
"github.com/hashicorp/consul/proto/pbpeerstream" "github.com/hashicorp/consul/proto/private/pbpeerstream"
) )
type MockClient struct { type MockClient struct {

2
agent/grpc-external/services/serverdiscovery/watch_servers_test.go
View File

@ -20,7 +20,7 @@ import (
"github.com/hashicorp/consul/agent/grpc-external/testutils" "github.com/hashicorp/consul/agent/grpc-external/testutils"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto-public/pbserverdiscovery" "github.com/hashicorp/consul/proto-public/pbserverdiscovery"
"github.com/hashicorp/consul/proto/prototest" "github.com/hashicorp/consul/proto/private/prototest"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
) )

2
agent/grpc-external/stats_test.go
View File

@ -18,7 +18,7 @@ import (
grpcmiddleware "github.com/hashicorp/consul/agent/grpc-middleware" grpcmiddleware "github.com/hashicorp/consul/agent/grpc-middleware"
"github.com/hashicorp/consul/agent/grpc-middleware/testutil" "github.com/hashicorp/consul/agent/grpc-middleware/testutil"
"github.com/hashicorp/consul/agent/grpc-middleware/testutil/testservice" "github.com/hashicorp/consul/agent/grpc-middleware/testutil/testservice"
"github.com/hashicorp/consul/proto/prototest" "github.com/hashicorp/consul/proto/private/prototest"
) )
func TestServer_EmitsStats(t *testing.T) { func TestServer_EmitsStats(t *testing.T) {

2
agent/grpc-internal/services/subscribe/logger.go
View File

@ -7,7 +7,7 @@ import (
"github.com/hashicorp/go-uuid" "github.com/hashicorp/go-uuid"
"github.com/hashicorp/consul/agent/consul/stream" "github.com/hashicorp/consul/agent/consul/stream"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
) )
// streamID is used in logs as a unique identifier for a subscription. The value // streamID is used in logs as a unique identifier for a subscription. The value

2
agent/grpc-internal/services/subscribe/subscribe.go
View File

@ -12,7 +12,7 @@ import (
"github.com/hashicorp/consul/agent/consul/state" "github.com/hashicorp/consul/agent/consul/state"
"github.com/hashicorp/consul/agent/consul/stream" "github.com/hashicorp/consul/agent/consul/stream"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
) )
// Server implements a StateChangeSubscriptionServer for accepting SubscribeRequests, // Server implements a StateChangeSubscriptionServer for accepting SubscribeRequests,

8
agent/grpc-internal/services/subscribe/subscribe_test.go
View File

@ -25,10 +25,10 @@ import (
grpc "github.com/hashicorp/consul/agent/grpc-internal" grpc "github.com/hashicorp/consul/agent/grpc-internal"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/proto/pbcommon" "github.com/hashicorp/consul/proto/private/pbcommon"
"github.com/hashicorp/consul/proto/pbservice" "github.com/hashicorp/consul/proto/private/pbservice"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
"github.com/hashicorp/consul/proto/prototest" "github.com/hashicorp/consul/proto/private/prototest"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/consul/types" "github.com/hashicorp/consul/types"
) )

2
agent/grpc-internal/stats_test.go
View File

@ -17,7 +17,7 @@ import (
"github.com/hashicorp/consul/agent/consul/rate" "github.com/hashicorp/consul/agent/consul/rate"
"github.com/hashicorp/consul/agent/grpc-middleware/testutil" "github.com/hashicorp/consul/agent/grpc-middleware/testutil"
"github.com/hashicorp/consul/agent/grpc-middleware/testutil/testservice" "github.com/hashicorp/consul/agent/grpc-middleware/testutil/testservice"
"github.com/hashicorp/consul/proto/prototest" "github.com/hashicorp/consul/proto/private/prototest"
) )
func noopRegister(*grpc.Server) {} func noopRegister(*grpc.Server) {}

2
agent/grpc-middleware/testutil/testservice/simple.pb.binary.go
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-go-binary. DO NOT EDIT. // Code generated by protoc-gen-go-binary. DO NOT EDIT.
// source: agent/grpc-middleware/testutil/testservice/simple.proto // source: simple.proto
package testservice package testservice

123
agent/grpc-middleware/testutil/testservice/simple.pb.go
View File

@ -2,7 +2,7 @@
// versions: // versions:
// protoc-gen-go v1.28.1 // protoc-gen-go v1.28.1
// protoc (unknown) // protoc (unknown)
// source: agent/grpc-middleware/testutil/testservice/simple.proto // source: simple.proto
package testservice package testservice
@ -31,7 +31,7 @@ type Req struct {
func (x *Req) Reset() { func (x *Req) Reset() {
*x = Req{} *x = Req{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_agent_grpc_middleware_testutil_testservice_simple_proto_msgTypes[0] mi := &file_simple_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -44,7 +44,7 @@ func (x *Req) String() string {
func (*Req) ProtoMessage() {} func (*Req) ProtoMessage() {}
func (x *Req) ProtoReflect() protoreflect.Message { func (x *Req) ProtoReflect() protoreflect.Message {
mi := &file_agent_grpc_middleware_testutil_testservice_simple_proto_msgTypes[0] mi := &file_simple_proto_msgTypes[0]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -57,7 +57,7 @@ func (x *Req) ProtoReflect() protoreflect.Message {
// Deprecated: Use Req.ProtoReflect.Descriptor instead. // Deprecated: Use Req.ProtoReflect.Descriptor instead.
func (*Req) Descriptor() ([]byte, []int) { func (*Req) Descriptor() ([]byte, []int) {
return file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDescGZIP(), []int{0} return file_simple_proto_rawDescGZIP(), []int{0}
} }
func (x *Req) GetDatacenter() string { func (x *Req) GetDatacenter() string {
@ -79,7 +79,7 @@ type Resp struct {
func (x *Resp) Reset() { func (x *Resp) Reset() {
*x = Resp{} *x = Resp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_agent_grpc_middleware_testutil_testservice_simple_proto_msgTypes[1] mi := &file_simple_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -92,7 +92,7 @@ func (x *Resp) String() string {
func (*Resp) ProtoMessage() {} func (*Resp) ProtoMessage() {}
func (x *Resp) ProtoReflect() protoreflect.Message { func (x *Resp) ProtoReflect() protoreflect.Message {
mi := &file_agent_grpc_middleware_testutil_testservice_simple_proto_msgTypes[1] mi := &file_simple_proto_msgTypes[1]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -105,7 +105,7 @@ func (x *Resp) ProtoReflect() protoreflect.Message {
// Deprecated: Use Resp.ProtoReflect.Descriptor instead. // Deprecated: Use Resp.ProtoReflect.Descriptor instead.
func (*Resp) Descriptor() ([]byte, []int) { func (*Resp) Descriptor() ([]byte, []int) {
return file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDescGZIP(), []int{1} return file_simple_proto_rawDescGZIP(), []int{1}
} }
func (x *Resp) GetServerName() string { func (x *Resp) GetServerName() string {
@ -122,62 +122,57 @@ func (x *Resp) GetDatacenter() string {
return "" return ""
} }
var File_agent_grpc_middleware_testutil_testservice_simple_proto protoreflect.FileDescriptor var File_simple_proto protoreflect.FileDescriptor
var file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDesc = []byte{ var file_simple_proto_rawDesc = []byte{
0x0a, 0x37, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x2d, 0x6d, 0x69, 0x64, 0x0a, 0x0c, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0b,
0x64, 0x6c, 0x65, 0x77, 0x61, 0x72, 0x65, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x75, 0x74, 0x69, 0x6c, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x25, 0x0a, 0x03, 0x52,
0x2f, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x73, 0x69, 0x6d, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72,
0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0b, 0x74, 0x65, 0x73, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74,
0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x25, 0x0a, 0x03, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x65, 0x72, 0x22, 0x46, 0x0a, 0x04, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65,
0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x22, 0x46, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61,
0x04, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x65, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x32, 0x6d, 0x0a, 0x06, 0x53, 0x69,
0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x32, 0x0a, 0x09, 0x53, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x69, 0x6e,
0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x67, 0x12, 0x10, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
0x65, 0x6e, 0x74, 0x65, 0x72, 0x32, 0x6d, 0x0a, 0x06, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
0x32, 0x0a, 0x09, 0x53, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x2e, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x2f, 0x0a, 0x04, 0x46, 0x6c, 0x6f, 0x77,
0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x12, 0x10, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x52,
0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
0x70, 0x22, 0x00, 0x12, 0x2f, 0x0a, 0x04, 0x46, 0x6c, 0x6f, 0x77, 0x12, 0x10, 0x2e, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x30, 0x01, 0x42, 0xb2, 0x01, 0x0a, 0x0f, 0x63, 0x6f,
0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x6d, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x0b, 0x53,
0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69,
0x22, 0x00, 0x30, 0x01, 0x42, 0xdd, 0x01, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x0b, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f,
0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x71, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2d, 0x6d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x77, 0x61, 0x72, 0x65, 0x2f,
0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x74, 0x65, 0x73, 0x74, 0x75, 0x74, 0x69, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72,
0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x2d, 0x76, 0x69, 0x63, 0x65, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58, 0xaa, 0x02, 0x0b, 0x54, 0x65, 0x73,
0x6d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x77, 0x61, 0x72, 0x65, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x75, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xca, 0x02, 0x0b, 0x54, 0x65, 0x73, 0x74, 0x73,
0x74, 0x69, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xe2, 0x02, 0x17, 0x54, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72,
0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x2d, 0x6d, 0x69, 0x64, 0x64, 0x6c, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
0x65, 0x77, 0x61, 0x72, 0x65, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x75, 0x74, 0x69, 0x6c, 0x2f, 0x74, 0xea, 0x02, 0x0b, 0x54, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06,
0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0xaa, 0x02, 0x0b, 0x54, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xca, 0x02,
0x0b, 0x54, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xe2, 0x02, 0x17, 0x54,
0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65,
0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0b, 0x54, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72,
0x76, 0x69, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDescOnce sync.Once file_simple_proto_rawDescOnce sync.Once
file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDescData = file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDesc file_simple_proto_rawDescData = file_simple_proto_rawDesc
) )
func file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDescGZIP() []byte { func file_simple_proto_rawDescGZIP() []byte {
file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDescOnce.Do(func() { file_simple_proto_rawDescOnce.Do(func() {
file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDescData = protoimpl.X.CompressGZIP(file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDescData) file_simple_proto_rawDescData = protoimpl.X.CompressGZIP(file_simple_proto_rawDescData)
}) })
return file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDescData return file_simple_proto_rawDescData
} }
var file_agent_grpc_middleware_testutil_testservice_simple_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_simple_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
var file_agent_grpc_middleware_testutil_testservice_simple_proto_goTypes = []interface{}{ var file_simple_proto_goTypes = []interface{}{
(*Req)(nil), // 0: testservice.Req (*Req)(nil), // 0: testservice.Req
(*Resp)(nil), // 1: testservice.Resp (*Resp)(nil), // 1: testservice.Resp
} }
var file_agent_grpc_middleware_testutil_testservice_simple_proto_depIdxs = []int32{ var file_simple_proto_depIdxs = []int32{
0, // 0: testservice.Simple.Something:input_type -> testservice.Req 0, // 0: testservice.Simple.Something:input_type -> testservice.Req
0, // 1: testservice.Simple.Flow:input_type -> testservice.Req 0, // 1: testservice.Simple.Flow:input_type -> testservice.Req
1, // 2: testservice.Simple.Something:output_type -> testservice.Resp 1, // 2: testservice.Simple.Something:output_type -> testservice.Resp
@ -189,13 +184,13 @@ var file_agent_grpc_middleware_testutil_testservice_simple_proto_depIdxs = []int
0, // [0:0] is the sub-list for field type_name 0, // [0:0] is the sub-list for field type_name
} }
func init() { file_agent_grpc_middleware_testutil_testservice_simple_proto_init() } func init() { file_simple_proto_init() }
func file_agent_grpc_middleware_testutil_testservice_simple_proto_init() { func file_simple_proto_init() {
if File_agent_grpc_middleware_testutil_testservice_simple_proto != nil { if File_simple_proto != nil {
return return
} }
if !protoimpl.UnsafeEnabled { if !protoimpl.UnsafeEnabled {
file_agent_grpc_middleware_testutil_testservice_simple_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { file_simple_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Req); i { switch v := v.(*Req); i {
case 0: case 0:
return &v.state return &v.state
@ -207,7 +202,7 @@ func file_agent_grpc_middleware_testutil_testservice_simple_proto_init() {
return nil return nil
} }
} }
file_agent_grpc_middleware_testutil_testservice_simple_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { file_simple_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Resp); i { switch v := v.(*Resp); i {
case 0: case 0:
return &v.state return &v.state
@ -224,18 +219,18 @@ func file_agent_grpc_middleware_testutil_testservice_simple_proto_init() {
out := protoimpl.TypeBuilder{ out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{ File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDesc, RawDescriptor: file_simple_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 2, NumMessages: 2,
NumExtensions: 0, NumExtensions: 0,
NumServices: 1, NumServices: 1,
}, },
GoTypes: file_agent_grpc_middleware_testutil_testservice_simple_proto_goTypes, GoTypes: file_simple_proto_goTypes,
DependencyIndexes: file_agent_grpc_middleware_testutil_testservice_simple_proto_depIdxs, DependencyIndexes: file_simple_proto_depIdxs,
MessageInfos: file_agent_grpc_middleware_testutil_testservice_simple_proto_msgTypes, MessageInfos: file_simple_proto_msgTypes,
}.Build() }.Build()
File_agent_grpc_middleware_testutil_testservice_simple_proto = out.File File_simple_proto = out.File
file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDesc = nil file_simple_proto_rawDesc = nil
file_agent_grpc_middleware_testutil_testservice_simple_proto_goTypes = nil file_simple_proto_goTypes = nil
file_agent_grpc_middleware_testutil_testservice_simple_proto_depIdxs = nil file_simple_proto_depIdxs = nil
} }

4
agent/grpc-middleware/testutil/testservice/simple_grpc.pb.go
View File

@ -2,7 +2,7 @@
// versions: // versions:
// - protoc-gen-go-grpc v1.2.0 // - protoc-gen-go-grpc v1.2.0
// - protoc (unknown) // - protoc (unknown)
// source: agent/grpc-middleware/testutil/testservice/simple.proto // source: simple.proto
package testservice package testservice
@ -163,5 +163,5 @@ var Simple_ServiceDesc = grpc.ServiceDesc{
ServerStreams: true, ServerStreams: true,
}, },
}, },
Metadata: "agent/grpc-middleware/testutil/testservice/simple.proto", Metadata: "simple.proto",
} }

2
agent/http.go
View File

@ -35,7 +35,7 @@ import (
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/lib" "github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/logging" "github.com/hashicorp/consul/logging"
"github.com/hashicorp/consul/proto/pbcommon" "github.com/hashicorp/consul/proto/private/pbcommon"
) )
var HTTPSummaries = []prometheus.SummaryDefinition{ var HTTPSummaries = []prometheus.SummaryDefinition{

2
agent/operator_endpoint.go
View File

@ -8,7 +8,7 @@ import (
"github.com/armon/go-metrics" "github.com/armon/go-metrics"
external "github.com/hashicorp/consul/agent/grpc-external" external "github.com/hashicorp/consul/agent/grpc-external"
"github.com/hashicorp/consul/proto/pboperator" "github.com/hashicorp/consul/proto/private/pboperator"
multierror "github.com/hashicorp/go-multierror" multierror "github.com/hashicorp/go-multierror"
"github.com/hashicorp/raft" "github.com/hashicorp/raft"

2
agent/peering_endpoint.go
View File

@ -10,7 +10,7 @@ import (
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/lib" "github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
) )
// PeeringEndpoint handles GET, DELETE on v1/peering/name // PeeringEndpoint handles GET, DELETE on v1/peering/name

2
agent/peering_endpoint_oss_test.go
View File

@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/testrpc"
) )

2
agent/peering_endpoint_test.go
View File

@ -17,7 +17,7 @@ import (
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/sdk/testutil/retry" "github.com/hashicorp/consul/sdk/testutil/retry"
"github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/testrpc"
) )

2
agent/pool/pool.go
View File

@ -18,7 +18,7 @@ import (
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/lib" "github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/proto/pbcommon" "github.com/hashicorp/consul/proto/private/pbcommon"
"github.com/hashicorp/consul/tlsutil" "github.com/hashicorp/consul/tlsutil"
) )

6
agent/proxycfg-glue/config_entry.go
View File

@ -10,9 +10,9 @@ import (
"github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/proxycfg"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/agent/submatview" "github.com/hashicorp/consul/agent/submatview"
"github.com/hashicorp/consul/proto/pbcommon" "github.com/hashicorp/consul/proto/private/pbcommon"
"github.com/hashicorp/consul/proto/pbconfigentry" "github.com/hashicorp/consul/proto/private/pbconfigentry"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
) )
// CacheConfigEntry satisfies the proxycfg.ConfigEntry interface by sourcing // CacheConfigEntry satisfies the proxycfg.ConfigEntry interface by sourcing

4
agent/proxycfg-glue/config_entry_test.go
View File

@ -7,8 +7,8 @@ import (
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbconfigentry" "github.com/hashicorp/consul/proto/private/pbconfigentry"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
) )

2
agent/proxycfg-glue/exported_peered_services_test.go
View File

@ -7,7 +7,7 @@ import (
"github.com/hashicorp/consul/agent/consul/state" "github.com/hashicorp/consul/agent/consul/state"
"github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/proxycfg"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

2
agent/proxycfg-glue/glue.go
View File

@ -6,7 +6,7 @@ import (
"github.com/hashicorp/go-hclog" "github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-memdb" "github.com/hashicorp/go-memdb"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/cache" "github.com/hashicorp/consul/agent/cache"

2
agent/proxycfg-glue/health_test.go
View File

@ -15,7 +15,7 @@ import (
"github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/proxycfg"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/agent/submatview" "github.com/hashicorp/consul/agent/submatview"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
) )

2
agent/proxycfg-glue/intentions.go
View File

@ -11,7 +11,7 @@ import (
"github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/proxycfg"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/agent/submatview" "github.com/hashicorp/consul/agent/submatview"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
) )
// CacheIntentions satisfies the proxycfg.Intentions interface by sourcing data // CacheIntentions satisfies the proxycfg.Intentions interface by sourcing data

2
agent/proxycfg-glue/intentions_ent_test.go
View File

@ -14,7 +14,7 @@ import (
"github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/proxycfg"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/agent/submatview" "github.com/hashicorp/consul/agent/submatview"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
) )

2
agent/proxycfg-glue/intentions_oss.go
View File

@ -6,7 +6,7 @@ package proxycfgglue
import ( import (
"github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
) )
func (s serverIntentions) buildSubjects(serviceName string, entMeta acl.EnterpriseMeta) []*pbsubscribe.NamedSubject { func (s serverIntentions) buildSubjects(serviceName string, entMeta acl.EnterpriseMeta) []*pbsubscribe.NamedSubject {

2
agent/proxycfg-glue/intentions_test.go
View File

@ -16,7 +16,7 @@ import (
"github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/proxycfg"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/agent/submatview" "github.com/hashicorp/consul/agent/submatview"
"github.com/hashicorp/consul/proto/pbsubscribe" "github.com/hashicorp/consul/proto/private/pbsubscribe"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
) )

2
agent/proxycfg-glue/peering_list.go
View File

@ -11,7 +11,7 @@ import (
"github.com/hashicorp/consul/agent/consul/watch" "github.com/hashicorp/consul/agent/consul/watch"
"github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/proxycfg"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
) )
// CachePeeringList satisfies the proxycfg.PeeringList interface by sourcing // CachePeeringList satisfies the proxycfg.PeeringList interface by sourcing

2
agent/proxycfg-glue/peering_list_test.go
View File

@ -10,7 +10,7 @@ import (
cachetype "github.com/hashicorp/consul/agent/cache-types" cachetype "github.com/hashicorp/consul/agent/cache-types"
"github.com/hashicorp/consul/agent/consul/state" "github.com/hashicorp/consul/agent/consul/state"
"github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/proxycfg"
"github.com/hashicorp/consul/proto/pbpeering" "github.com/hashicorp/consul/proto/private/pbpeering"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
) )

Some files were not shown because too many files have changed in this diff Show More