From 58722d9c8a9c7fb926d6301a2b302d6e37b472be Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 21 Jul 2026 12:32:15 +0000 Subject: [PATCH 1/2] Initial plan From 16327ba230d475a86527178d1630553651850d9b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 21 Jul 2026 12:35:10 +0000 Subject: [PATCH 2/2] Use envutil for proxy policy default --- internal/cmd/proxy.go | 2 +- internal/cmd/proxy_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/cmd/proxy.go b/internal/cmd/proxy.go index dbcdd45da..30d2ced6a 100644 --- a/internal/cmd/proxy.go +++ b/internal/cmd/proxy.go @@ -103,7 +103,7 @@ Local usage: // purpose: it runs as a standalone HTTPS forward proxy, not an MCP gateway. Keeping // them independent avoids confusion and allows each command to evolve separately. cmd.Flags().StringVar(&proxyGuardWasm, "guard-wasm", defaultGuard, guardHelp) - cmd.Flags().StringVar(&proxyPolicy, "policy", os.Getenv("MCP_GATEWAY_GUARD_POLICY_JSON"), "Guard policy JSON") + cmd.Flags().StringVar(&proxyPolicy, "policy", envutil.GetEnvString(config.EnvGuardPolicyJSON, ""), "Guard policy JSON") cmd.Flags().StringVar(&proxyToken, "github-token", "", "Fallback GitHub API token (default: forwards client Authorization header)") cmd.Flags().StringVarP(&proxyListen, "listen", "l", "127.0.0.1:8080", "Proxy listen address") cmd.Flags().StringVar(&proxyLogDir, "log-dir", defaultProxyLogDir, "Log file directory") diff --git a/internal/cmd/proxy_test.go b/internal/cmd/proxy_test.go index d1d4ccdd1..9f5e71032 100644 --- a/internal/cmd/proxy_test.go +++ b/internal/cmd/proxy_test.go @@ -163,7 +163,7 @@ func TestNewProxyCmd_CommandMetadata(t *testing.T) { func TestNewProxyCmd_DefaultFlagValues(t *testing.T) { // Clear relevant env vars to get clean defaults envVarsToClear := []string{ - "MCP_GATEWAY_GUARD_POLICY_JSON", + config.EnvGuardPolicyJSON, "MCP_GATEWAY_GUARDS_MODE", "MCP_GATEWAY_LOG_DIR", "OTEL_EXPORTER_OTLP_ENDPOINT", @@ -291,7 +291,7 @@ func TestNewProxyCmd_GuardsModeDefaultFromEnv(t *testing.T) { // default value from the MCP_GATEWAY_GUARD_POLICY_JSON environment variable. func TestNewProxyCmd_PolicyDefaultFromEnv(t *testing.T) { envPolicy := `{"allow-only":{"repos":"public","min-integrity":"none"}}` - t.Setenv("MCP_GATEWAY_GUARD_POLICY_JSON", envPolicy) + t.Setenv(config.EnvGuardPolicyJSON, envPolicy) cmd := newProxyCmd() require.NotNil(t, cmd)