Sync from Copyberry

GitOrigin-RevId: f88a51c0edd22b0ba2792877f767a01f66c1ff5f

Author: Copyberry

pkg/config/adapter_test.go

@@ -483,10 +483,8 @@ health:
 		},
 	}
 	for _, flavor := range adapterRuntimeFlavors() {
-		flavor := flavor
 		t.Run(string(flavor), func(t *testing.T) {
 			for _, tc := range cases {
-				tc := tc
 				t.Run(tc.name, func(t *testing.T) {
 					full, runtime := loadParityPairForFlavor(t, tc.args, lookupEnvMap(tc.env), flavor)
 					assertSharedRuntimeParity(t, full, runtime)
@@ -510,10 +508,8 @@ func TestFullAndRuntimeAcceptDefaultEquivalentFullOnlyEnvironment(t *testing.T)
 		{name: "HARPOON_CAPTURE_PAYLOADS", value: "false"},
 	}
 	for _, flavor := range adapterRuntimeFlavors() {
-		flavor := flavor
 		t.Run(string(flavor), func(t *testing.T) {
 			for _, tc := range cases {
-				tc := tc
 				t.Run(tc.name+"="+tc.value, func(t *testing.T) {
 					args := []string{
 						"--control-plane.tunnel-id", adapterTestTunnelID,
@@ -563,7 +559,6 @@ func TestFullAndRuntimeSharedProductionInputsParity(t *testing.T) {
 			"HARPOON_PROXY":         "http://harpoon-proxy.example.invalid:8080",
 		})
 		for _, flavor := range adapterRuntimeFlavors() {
-			flavor := flavor
 			t.Run(string(flavor), func(t *testing.T) {
 				full, runtime := loadParityPairForFlavor(t, args, lookup, flavor)
 				assertSharedRuntimeParity(t, full, runtime)
@@ -614,7 +609,6 @@ process:
   pid_file: relative/client.pid
 `)
 		for _, flavor := range adapterRuntimeFlavors() {
-			flavor := flavor
 			t.Run(string(flavor), func(t *testing.T) {
 				full, runtime := loadParityPairForFlavor(t, []string{"--config", profile}, lookupEnvMap(nil), flavor)
 				assertSharedRuntimeParity(t, full, runtime)
@@ -635,7 +629,6 @@ func TestFullAndRuntimeFlavorsPreserveExactProfileBytes(t *testing.T) {
 	lookup := lookupEnvMap(map[string]string{"CONTROL_PLANE_API_KEY": adapterTestAPIKey})
 
 	for _, flavor := range adapterRuntimeFlavors() {
-		flavor := flavor
 		t.Run(string(flavor), func(t *testing.T) {
 			full, runtime := loadParityPairForFlavor(t, []string{"--config", profile}, lookup, flavor)
 			assertSharedRuntimeParity(t, full, runtime)
@@ -854,15 +847,13 @@ func TestFullAndRuntimeFlavorsSharedEnvironmentParity(t *testing.T) {
 
 	covered := make(map[string]struct{})
 	for _, tc := range cases {
-		tc := tc
 		for name := range tc.env {
 			if adapterSharedEnvironmentName(name) {
 				covered[name] = struct{}{}
 			}
 		}
 		t.Run(tc.name, func(t *testing.T) {
 			for _, flavor := range adapterRuntimeFlavors() {
-				flavor := flavor
 				t.Run(string(flavor), func(t *testing.T) {
 					full, runtime := loadParityPairForFlavor(t, nil, lookupEnvMap(tc.env), flavor)
 					assertSharedRuntimeParity(t, full, runtime)
@@ -904,7 +895,6 @@ func TestFullAndRuntimeStandardProxyEnvironmentDetectionParity(t *testing.T) {
 
 	covered := make(map[string]struct{}, len(adapterStandardProxyEnvironmentVariables))
 	for _, testCase := range testCases {
-		testCase := testCase
 		for name := range testCase.env {
 			if adapterStandardProxyEnvironmentName(name) {
 				covered[name] = struct{}{}
@@ -978,7 +968,6 @@ proxy:
 			args := []string{"--config", profile}
 			lookup := lookupEnvMap(map[string]string{"CONTROL_PLANE_API_KEY": adapterTestAPIKey})
 			for _, flavor := range adapterRuntimeFlavors() {
-				flavor := flavor
 				t.Run(string(flavor), func(t *testing.T) {
 					full, runtime := loadParityPairForFlavor(t, args, lookup, flavor)
 					assertSharedRuntimeParity(t, full, runtime)

pkg/runtimeconfig/shared_config_test.go

@@ -1279,7 +1279,6 @@ func TestLoadMCPStartupWaitTimeout(t *testing.T) {
 	}
 
 	for _, testCase := range testCases {
-		testCase := testCase
 		t.Run(testCase.name, func(t *testing.T) {
 			t.Parallel()
 			args := append([]string{
@@ -1335,7 +1334,6 @@ func TestLoadMCPStdioSendInitializedNotification(t *testing.T) {
 	}
 
 	for _, testCase := range testCases {
-		testCase := testCase
 		t.Run(testCase.name, func(t *testing.T) {
 			t.Parallel()
 			args := append([]string{
@@ -2424,8 +2422,6 @@ func TestLoadValidatesTunnelIDFormat(t *testing.T) {
 	}
 
 	for name, tunnelID := range testCases {
-		name := name
-		tunnelID := tunnelID
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			_, err := LoadRuntimeForTest([]string{"--control-plane.tunnel-id", tunnelID}, func(key string) (string, bool) {
@@ -2566,7 +2562,6 @@ func TestParseHeader(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.input, func(t *testing.T) {
 			t.Parallel()
 			key, val, err := parseHeader(tc.input)
@@ -2593,7 +2588,6 @@ func TestParseHeaderRejectsInvalid(t *testing.T) {
 		{name: "missing value", input: "Missing-value:   "},
 		{name: "line break", input: "X-Auth: secret-value\ncontinuation", doNotExpose: "secret-value"},
 	} {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 			_, _, err := parseHeader(tc.input)
@@ -2713,7 +2707,6 @@ func TestBuildControlPlaneExtraHeadersRejectsReservedHeaders(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -2877,7 +2870,6 @@ func TestValidateFileConfigSyntaxRejectsReservedControlPlaneExtraHeaders(t *test
 	t.Parallel()
 
 	for _, header := range []string{"Authorization", "x-tunnel-mcp-server-info"} {
-		header := header
 		t.Run(header, func(t *testing.T) {
 			t.Parallel()