Allow disabling the HTTP API again.

agent/agent.go

@@ -277,6 +277,10 @@ func LocalConfig(cfg *config.RuntimeConfig) local.Config {
 	return lc
 }
 
+func shouldRunProxyManager(cfg *config.RuntimeConfig) bool {
+	return !cfg.ConnectTestDisableManagedProxies && cfg.ConnectEnabled
+}
+
 func (a *Agent) Start() error {
 	c := a.config
 
@@ -372,7 +376,7 @@ func (a *Agent) Start() error {
 	// create the proxy process manager and start it. This is purposely
 	// done here after the local state above is loaded in so we can have
 	// a more accurate initial state view.
-	if !c.ConnectTestDisableManagedProxies {
+	if shouldRunProxyManager(c) {
 		a.proxyManager = proxy.NewManager()
 		a.proxyManager.AllowRoot = a.config.ConnectProxyAllowManagedRoot
 		a.proxyManager.State = a.State

agent/agent_test.go

@@ -3054,3 +3054,21 @@ func TestAgent_ReLoadProxiesFromConfig(t *testing.T) {
 	proxies = a.State.Proxies()
 	require.Len(proxies, 0)
 }
+
+func TestAgent_ShouldRunProxyManager(t *testing.T) {
+	t.Parallel()
+	tests := []struct {
+		Config                config.RuntimeConfig
+		ShouldRunProxyManager bool
+	}{
+		{config.RuntimeConfig{ConnectEnabled: true, ConnectTestDisableManagedProxies: true}, false},
+		{config.RuntimeConfig{ConnectEnabled: true, ConnectTestDisableManagedProxies: false}, true},
+		{config.RuntimeConfig{ConnectEnabled: false, ConnectTestDisableManagedProxies: true}, false},
+		{config.RuntimeConfig{ConnectEnabled: false, ConnectTestDisableManagedProxies: false}, false},
+	}
+	for _, tt := range tests {
+		if shouldRunProxyManager(&tt.Config) != tt.ShouldRunProxyManager {
+			t.Fatal("Mismatch")
+		}
+	}
+}