From e3290f59713742743b5775139dc021d02d488e97 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Fri, 2 Oct 2020 11:58:18 -0400 Subject: [PATCH] Move agent/subscribe -> agent/rpc/subscribe --- agent/consul/server.go | 2 +- agent/consul/subscribe_backend.go | 5 +++-- agent/{ => rpc}/subscribe/auth.go | 0 agent/{ => rpc}/subscribe/logger.go | 0 agent/{ => rpc}/subscribe/subscribe.go | 0 agent/{ => rpc}/subscribe/subscribe_test.go | 0 6 files changed, 4 insertions(+), 3 deletions(-) rename agent/{ => rpc}/subscribe/auth.go (100%) rename agent/{ => rpc}/subscribe/logger.go (100%) rename agent/{ => rpc}/subscribe/subscribe.go (100%) rename agent/{ => rpc}/subscribe/subscribe_test.go (100%) diff --git a/agent/consul/server.go b/agent/consul/server.go index dbfa5b4614..ec3cf4ff22 100644 --- a/agent/consul/server.go +++ b/agent/consul/server.go @@ -40,8 +40,8 @@ import ( "github.com/hashicorp/consul/agent/metadata" "github.com/hashicorp/consul/agent/pool" "github.com/hashicorp/consul/agent/router" + "github.com/hashicorp/consul/agent/rpc/subscribe" "github.com/hashicorp/consul/agent/structs" - "github.com/hashicorp/consul/agent/subscribe" "github.com/hashicorp/consul/agent/token" "github.com/hashicorp/consul/lib" "github.com/hashicorp/consul/logging" diff --git a/agent/consul/subscribe_backend.go b/agent/consul/subscribe_backend.go index e7c1ca90a8..56f2bac01a 100644 --- a/agent/consul/subscribe_backend.go +++ b/agent/consul/subscribe_backend.go @@ -1,11 +1,12 @@ package consul import ( + "google.golang.org/grpc" + "github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/agent/consul/stream" agentgrpc "github.com/hashicorp/consul/agent/grpc" - "github.com/hashicorp/consul/agent/subscribe" - "google.golang.org/grpc" + "github.com/hashicorp/consul/agent/rpc/subscribe" ) type subscribeBackend struct { diff --git a/agent/subscribe/auth.go b/agent/rpc/subscribe/auth.go similarity index 100% rename from agent/subscribe/auth.go rename to agent/rpc/subscribe/auth.go diff --git a/agent/subscribe/logger.go b/agent/rpc/subscribe/logger.go similarity index 100% rename from agent/subscribe/logger.go rename to agent/rpc/subscribe/logger.go diff --git a/agent/subscribe/subscribe.go b/agent/rpc/subscribe/subscribe.go similarity index 100% rename from agent/subscribe/subscribe.go rename to agent/rpc/subscribe/subscribe.go diff --git a/agent/subscribe/subscribe_test.go b/agent/rpc/subscribe/subscribe_test.go similarity index 100% rename from agent/subscribe/subscribe_test.go rename to agent/rpc/subscribe/subscribe_test.go