Rename proxy package (re-run of #4550) (#4638)

* Rename agent/proxy package to reflect that it is limited to managed proxy processes Rationale: we have several other components of the agent that relate to Connect proxies for example the ProxyConfigManager component needed for Envoy work. Those things are pretty separate from the focus of this package so far which is only concerned with managing external proxy processes so it's nota good fit to put code for that in here, yet there is a naming clash if we have other packages related to proxy functionality that are not in the `agent/proxy` package. Happy to bikeshed the name. I started by calling it `managedproxy` but `managedproxy.Manager` is especially unpleasant. `proxyprocess` seems good in that it's more specific about purpose but less clearly connected with the concept of "managed proxies". The names in use are cleaner though e.g. `proxyprocess.Manager`. This rename was completed automatically using golang.org/x/tools/cmd/gomvpkg. Depends on #4541 * Fix missed windows tagged files
hashicorp · Oct 10, 2018 · 2d2d69e · 2d2d69e
1 parent 597576f
commit 2d2d69e
Show file tree

Hide file tree

Showing 18 changed files with 20 additions and 20 deletions.
diff --git a/agent/agent.go b/agent/agent.go
@@ -27,7 +27,7 @@ import (
 	"github.com/hashicorp/consul/agent/config"
 	"github.com/hashicorp/consul/agent/consul"
 	"github.com/hashicorp/consul/agent/local"
-	"github.com/hashicorp/consul/agent/proxy"
+	"github.com/hashicorp/consul/agent/proxyprocess"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/systemd"
 	"github.com/hashicorp/consul/agent/token"
@@ -211,7 +211,7 @@ type Agent struct {
 	tokens *token.Store
 
 	// proxyManager is the proxy process manager for managed Connect proxies.
-	proxyManager *proxy.Manager
+	proxyManager *proxyprocess.Manager
 
 	// proxyLock protects proxy information in the local state from concurrent modification
 	proxyLock sync.Mutex
@@ -282,7 +282,7 @@ func (a *Agent) setupProxyManager() error {
 	if err != nil {
 		return fmt.Errorf("[INFO] agent: Connect managed proxies are disabled due to providing an invalid HTTP configuration")
 	}
-	a.proxyManager = proxy.NewManager()
+	a.proxyManager = proxyprocess.NewManager()
 	a.proxyManager.AllowRoot = a.config.ConnectProxyAllowManagedRoot
 	a.proxyManager.State = a.State
 	a.proxyManager.Logger = a.logger

diff --git a/agent/proxy/daemon.go → agent/proxyprocess/daemon.go b/agent/proxy/daemon.go → agent/proxyprocess/daemon.go
@@ -1,4 +1,4 @@
-package proxy
+package proxyprocess
 
 import (
 	"fmt"

diff --git a/agent/proxy/daemon_test.go → agent/proxyprocess/daemon_test.go b/agent/proxy/daemon_test.go → agent/proxyprocess/daemon_test.go
@@ -1,4 +1,4 @@
-package proxy
+package proxyprocess
 
 import (
 	"io/ioutil"

diff --git a/agent/proxy/exitstatus_other.go → agent/proxyprocess/exitstatus_other.go b/agent/proxy/exitstatus_other.go → agent/proxyprocess/exitstatus_other.go
@@ -1,6 +1,6 @@
 // +build !darwin,!linux,!windows
 
-package proxy
+package proxyprocess
 
 import "os"
 

diff --git a/agent/proxy/exitstatus_syscall.go → agent/proxyprocess/exitstatus_syscall.go b/agent/proxy/exitstatus_syscall.go → agent/proxyprocess/exitstatus_syscall.go
@@ -1,6 +1,6 @@
 // +build darwin linux windows
 
-package proxy
+package proxyprocess
 
 import (
 	"os"

diff --git a/agent/proxy/manager.go → agent/proxyprocess/manager.go b/agent/proxy/manager.go → agent/proxyprocess/manager.go
@@ -1,4 +1,4 @@
-package proxy
+package proxyprocess
 
 import (
 	"fmt"

diff --git a/agent/proxy/manager_test.go → agent/proxyprocess/manager_test.go b/agent/proxy/manager_test.go → agent/proxyprocess/manager_test.go
@@ -1,4 +1,4 @@
-package proxy
+package proxyprocess
 
 import (
 	"io/ioutil"

diff --git a/agent/proxy/noop.go → agent/proxyprocess/noop.go b/agent/proxy/noop.go → agent/proxyprocess/noop.go
@@ -1,4 +1,4 @@
-package proxy
+package proxyprocess
 
 // Noop implements Proxy and does nothing.
 type Noop struct{}

diff --git a/agent/proxy/noop_test.go → agent/proxyprocess/noop_test.go b/agent/proxy/noop_test.go → agent/proxyprocess/noop_test.go
@@ -1,4 +1,4 @@
-package proxy
+package proxyprocess
 
 import (
 	"testing"

diff --git a/agent/proxy/process.go → agent/proxyprocess/process.go b/agent/proxy/process.go → agent/proxyprocess/process.go
@@ -1,4 +1,4 @@
-package proxy
+package proxyprocess
 
 import (
 	"strings"

diff --git a/agent/proxy/process_unix.go → agent/proxyprocess/process_unix.go b/agent/proxy/process_unix.go → agent/proxyprocess/process_unix.go
@@ -1,6 +1,6 @@
 // +build !windows
 
-package proxy
+package proxyprocess
 
 import (
 	"fmt"

diff --git a/agent/proxy/process_windows.go → agent/proxyprocess/process_windows.go b/agent/proxy/process_windows.go → agent/proxyprocess/process_windows.go
@@ -1,6 +1,6 @@
 // +build windows
 
-package proxy
+package proxyprocess
 
 import (
 	"os"

diff --git a/agent/proxy/proxy.go → agent/proxyprocess/proxy.go b/agent/proxy/proxy.go → agent/proxyprocess/proxy.go
@@ -5,7 +5,7 @@
 //
 // This package does not contain the built-in proxy for Connect. The source
 // for that is available in the "connect/proxy" package.
-package proxy
+package proxyprocess
 
 import (
 	"github.com/hashicorp/consul/agent/structs"

diff --git a/agent/proxy/proxy_test.go → agent/proxyprocess/proxy_test.go b/agent/proxy/proxy_test.go → agent/proxyprocess/proxy_test.go
@@ -1,4 +1,4 @@
-package proxy
+package proxyprocess
 
 import (
 	"fmt"

diff --git a/agent/proxy/root.go → agent/proxyprocess/root.go b/agent/proxy/root.go → agent/proxyprocess/root.go
@@ -1,4 +1,4 @@
-package proxy
+package proxyprocess
 
 import (
 	"os"

diff --git a/agent/proxy/snapshot.go → agent/proxyprocess/snapshot.go b/agent/proxy/snapshot.go → agent/proxyprocess/snapshot.go
@@ -1,4 +1,4 @@
-package proxy
+package proxyprocess
 
 import (
 	"encoding/json"

diff --git a/agent/proxy/test.go → agent/proxyprocess/test.go b/agent/proxy/test.go → agent/proxyprocess/test.go
@@ -1,4 +1,4 @@
-package proxy
+package proxyprocess
 
 // defaultTestProxy is the test proxy that is instantiated for proxies with
 // an execution mode of ProxyExecModeTest.

diff --git a/command/connect/proxy/proxy.go b/command/connect/proxy/proxy.go
@@ -12,7 +12,7 @@ import (
 	"sort"
 	"strconv"
 
-	proxyAgent "github.com/hashicorp/consul/agent/proxy"
+	proxyAgent "github.com/hashicorp/consul/agent/proxyprocess"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/command/flags"
 	proxyImpl "github.com/hashicorp/consul/connect/proxy"