Skip to content

Align proxy --policy default with shared env config helpers #9779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lpcox merged 2 commits into from
Jul 21, 2026
Merged

Align proxy --policy default with shared env config helpers #9779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58722d9
Initial plan
Copilot Jul 21, 2026
16327ba
Use envutil for proxy policy default
Copilot Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/cmd/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions internal/cmd/proxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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)
Expand Down
Loading