PR comments

agent/agent_endpoint_test.go

@@ -411,7 +411,7 @@ func TestAgent_Service(t *testing.T) {
 	// Copy and modify
 	updatedResponse := *expectedResponse
 	updatedResponse.Port = 9999
-	updatedResponse.ContentHash = "fa3af167b81f6721"
+	updatedResponse.ContentHash = "c7739b50900c7483"
 
 	// Simple response for non-proxy service registered in TestAgent config
 	expectWebResponse := &api.AgentService{

agent/service_manager.go

@@ -383,10 +383,7 @@ func mergeServiceConfig(defaults *structs.ServiceConfigResponse, service *struct
 		ns.Proxy.TransparentProxy = defaults.TransparentProxy
 	}
 
-	// seenUpstreams stores the upstreams seen from the local registration so that we can also add synthetic entries.
-	// for upstream configuration that was defined via service-defaults.UpstreamConfigs. In TransparentProxy mode
-	// ns.Proxy.Upstreams will likely be empty because users do not need to define upstreams explicitly.
-	// So to store upstream-specific flags from central config, we add entries to ns.Proxy.Upstream with thosee values.
+	// remoteUpstreams contains synthetic Upstreams generated from central config (service-defaults.UpstreamConfigs).
 	remoteUpstreams := make(map[structs.ServiceID]structs.Upstream)
 
 	for _, us := range defaults.UpstreamIDConfigs {
@@ -397,6 +394,8 @@ func mergeServiceConfig(defaults *structs.ServiceConfigResponse, service *struct
 
 		// Delete the mesh gateway key since this is the only place it is read from an opaque map.
 		// Later reads use Proxy.MeshGateway.
+		// Note that we use the "mesh_gateway" key and not other variants like "MeshGateway" because
+		// UpstreamConfig.MergeInto and ResolveServiceConfig only use "mesh_gateway".
 		delete(us.Config, "mesh_gateway")
 
 		remoteUpstreams[us.Upstream] = structs.Upstream{
@@ -408,6 +407,9 @@ func mergeServiceConfig(defaults *structs.ServiceConfigResponse, service *struct
 		}
 	}
 
+	// localUpstreams stores the upstreams seen from the local registration so that we can merge in the synthetic entries.
+	// In TransparentProxy mode ns.Proxy.Upstreams will likely be empty because users do not need to define upstreams explicitly.
+	// So to store upstream-specific flags from central config, we add entries to ns.Proxy.Upstream with those values.
 	localUpstreams := make(map[structs.ServiceID]struct{})
 
 	// Merge upstream defaults into the local registration

agent/structs/connect_proxy_config.go

@@ -268,7 +268,7 @@ type Upstream struct {
 
 	// CentrallyConfigured indicates whether the upstream was defined in a proxy
 	// instance registration or whether it was generated from a config entry.
-	CentrallyConfigured bool
+	CentrallyConfigured bool `json:",omitempty" bexpr:"-"`
 }
 
 func (t *Upstream) UnmarshalJSON(data []byte) (err error) {

agent/structs/structs_filtering_test.go

@@ -171,11 +171,6 @@ var expectedFieldConfigUpstreams bexpr.FieldConfigurations = bexpr.FieldConfigur
 		StructFieldName: "MeshGateway",
 		SubFields:       expectedFieldConfigMeshGatewayConfig,
 	},
-	"CentrallyConfigured": &bexpr.FieldConfiguration{
-		StructFieldName:     "CentrallyConfigured",
-		CoerceFn:            bexpr.CoerceBool,
-		SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual},
-	},
 }
 
 var expectedFieldConfigConnectProxyConfig bexpr.FieldConfigurations = bexpr.FieldConfigurations{

api/agent.go

@@ -407,7 +407,7 @@ type Upstream struct {
 	LocalBindPort        int                    `json:",omitempty"`
 	Config               map[string]interface{} `json:",omitempty" bexpr:"-"`
 	MeshGateway          MeshGatewayConfig      `json:",omitempty"`
-	CentrallyConfigured  bool                   `json:",omitempty"`
+	CentrallyConfigured  bool                   `json:",omitempty" bexpr:"-"`
 }
 
 // Agent can be used to query the Agent endpoints