This is an automated email from the ASF dual-hosted git repository.
tianxiaoliang pushed a commit to branch v1.x
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
The following commit(s) were added to refs/heads/v1.x by this push:
new 6f26aaa SCB-2176 Fix: Add response obj context value (#910)
6f26aaa is described below
commit 6f26aaa7698691d40e17c6644ac71d51b6770772
Author: little-cui <[email protected]>
AuthorDate: Mon Mar 22 22:17:19 2021 +0800
SCB-2176 Fix: Add response obj context value (#910)
---
go.mod | 2 +-
pkg/rest/common.go | 9 +++++----
server/broker/controller.go | 12 ++++++------
server/rest/admin/controller_v4.go | 8 ++++----
server/rest/controller/rest_util.go | 5 ++++-
server/rest/controller/v4/dependency_controller.go | 8 ++++----
server/rest/controller/v4/instance_controller.go | 22 +++++++++++-----------
server/rest/controller/v4/main_controller.go | 2 +-
.../rest/controller/v4/microservice_controller.go | 14 +++++++-------
server/rest/controller/v4/query_rule_controller.go | 8 ++++----
server/rest/controller/v4/schema_controller.go | 10 +++++-----
server/rest/controller/v4/tag_controller.go | 8 ++++----
server/rest/govern/controller_v4.go | 10 +++++-----
13 files changed, 61 insertions(+), 57 deletions(-)
diff --git a/go.mod b/go.mod
index 575b010..7d7edd3 100644
--- a/go.mod
+++ b/go.mod
@@ -9,7 +9,7 @@ require (
github.com/coreos/etcd v3.3.22+incompatible
github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea // v4
github.com/dgrijalva/jwt-go v3.2.0+incompatible
- github.com/elithrar/simple-scrypt v1.3.0 // indirect
+ github.com/elithrar/simple-scrypt v1.3.0
github.com/go-chassis/foundation v0.3.0
github.com/go-chassis/go-archaius v1.3.2
github.com/go-chassis/go-chassis v0.0.0-20200826064053-d90be848aa10
diff --git a/pkg/rest/common.go b/pkg/rest/common.go
index 0e364e8..1369d3b 100644
--- a/pkg/rest/common.go
+++ b/pkg/rest/common.go
@@ -27,10 +27,11 @@ const (
HTTPMethodPost = http.MethodPost
HTTPMethodDelete = http.MethodDelete
- CtxResponse = "_server_response"
- CtxRequest = "_server_request"
- CtxMatchPattern = "_server_match_pattern"
- CtxMatchFunc = "_server_match_func"
+ CtxResponse = "_server_response"
+ CtxRequest = "_server_request"
+ CtxMatchPattern = "_server_match_pattern"
+ CtxMatchFunc = "_server_match_func"
+ CtxResponseObject = "_server_response_object"
ServerChainName = "_server_chain"
diff --git a/server/broker/controller.go b/server/broker/controller.go
index 19c1ef3..a5c1063 100644
--- a/server/broker/controller.go
+++ b/server/broker/controller.go
@@ -71,7 +71,7 @@ func (brokerService *Controller) GetHome(w
http.ResponseWriter, r *http.Request)
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (*Controller) PublishPact(w http.ResponseWriter, r *http.Request) {
@@ -98,7 +98,7 @@ func (*Controller) PublishPact(w http.ResponseWriter, r
*http.Request) {
}
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (*Controller) GetAllProviderPacts(w http.ResponseWriter, r *http.Request)
{
@@ -124,7 +124,7 @@ func (*Controller) GetAllProviderPacts(w
http.ResponseWriter, r *http.Request) {
PactLogger.Infof("Pact info: %s\n", string(linksObj))
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (*Controller) GetPactsOfProvider(w http.ResponseWriter, r *http.Request) {
@@ -151,7 +151,7 @@ func (*Controller) DeletePacts(w http.ResponseWriter, r
*http.Request) {
HostAddress: r.Host,
Scheme: getScheme(r),
})
- controller.WriteResponse(w, resp, nil)
+ controller.WriteResponse(w, r, resp, nil)
}
func (*Controller) PublishVerificationResults(w http.ResponseWriter, r
*http.Request) {
@@ -190,7 +190,7 @@ func (*Controller) PublishVerificationResults(w
http.ResponseWriter, r *http.Req
}
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (*Controller) RetrieveVerificationResults(w http.ResponseWriter, r
*http.Request) {
@@ -203,7 +203,7 @@ func (*Controller) RetrieveVerificationResults(w
http.ResponseWriter, r *http.Re
resp, _ := ServiceAPI.RetrieveVerificationResults(r.Context(), request)
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func getScheme(r *http.Request) string {
diff --git a/server/rest/admin/controller_v4.go
b/server/rest/admin/controller_v4.go
index c4a0a79..5f24b6f 100644
--- a/server/rest/admin/controller_v4.go
+++ b/server/rest/admin/controller_v4.go
@@ -54,7 +54,7 @@ func (ctrl *ControllerV4) Dump(w http.ResponseWriter, r
*http.Request) {
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (ctrl *ControllerV4) Clusters(w http.ResponseWriter, r *http.Request) {
@@ -64,7 +64,7 @@ func (ctrl *ControllerV4) Clusters(w http.ResponseWriter, r
*http.Request) {
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (ctrl *ControllerV4) AlarmList(w http.ResponseWriter, r *http.Request) {
@@ -74,12 +74,12 @@ func (ctrl *ControllerV4) AlarmList(w http.ResponseWriter,
r *http.Request) {
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (ctrl *ControllerV4) ClearAlarm(w http.ResponseWriter, r *http.Request) {
request := &model.ClearAlarmRequest{}
ctx := r.Context()
resp, _ := AdminServiceAPI.ClearAlarm(ctx, request)
- controller.WriteResponse(w, resp.Response, nil)
+ controller.WriteResponse(w, r, resp.Response, nil)
}
diff --git a/server/rest/controller/rest_util.go
b/server/rest/controller/rest_util.go
index 2be3846..7ca6284 100644
--- a/server/rest/controller/rest_util.go
+++ b/server/rest/controller/rest_util.go
@@ -46,7 +46,7 @@ func WriteError(w http.ResponseWriter, code int32, detail
string) {
}
}
-func WriteResponse(w http.ResponseWriter, resp *pb.Response, obj interface{}) {
+func WriteResponse(w http.ResponseWriter, r *http.Request, resp *pb.Response,
obj interface{}) {
if resp != nil && resp.GetCode() != proto.Response_SUCCESS {
WriteError(w, resp.GetCode(), resp.GetMessage())
return
@@ -59,6 +59,9 @@ func WriteResponse(w http.ResponseWriter, resp *pb.Response,
obj interface{}) {
return
}
+ // async handler maybe need this obj
+ util.SetRequestContext(r, rest.CtxResponseObject, obj)
+
b, err := json.Marshal(obj)
if err != nil {
WriteError(w, scerror.ErrInternal, err.Error())
diff --git a/server/rest/controller/v4/dependency_controller.go
b/server/rest/controller/v4/dependency_controller.go
index d4e2f18..d4bee4a 100644
--- a/server/rest/controller/v4/dependency_controller.go
+++ b/server/rest/controller/v4/dependency_controller.go
@@ -63,7 +63,7 @@ func (s *DependencyService) AddDependenciesForMicroServices(w
http.ResponseWrite
controller.WriteError(w, scerr.ErrInternal, err.Error())
}
w.Header().Add("Deprecation", "version=\"v4\"")
- controller.WriteResponse(w, resp.Response, nil)
+ controller.WriteResponse(w, r, resp.Response, nil)
}
func (s *DependencyService) CreateDependenciesForMicroServices(w
http.ResponseWriter, r *http.Request) {
@@ -86,7 +86,7 @@ func (s *DependencyService)
CreateDependenciesForMicroServices(w http.ResponseWr
controller.WriteError(w, scerr.ErrInternal, err.Error())
}
w.Header().Add("Deprecation", "version=\"v4\"")
- controller.WriteResponse(w, resp.Response, nil)
+ controller.WriteResponse(w, r, resp.Response, nil)
}
func (s *DependencyService) GetConProDependencies(w http.ResponseWriter, r
*http.Request) {
@@ -99,7 +99,7 @@ func (s *DependencyService) GetConProDependencies(w
http.ResponseWriter, r *http
resp, _ := core.ServiceAPI.GetConsumerDependencies(r.Context(), request)
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (s *DependencyService) GetProConDependencies(w http.ResponseWriter, r
*http.Request) {
@@ -112,5 +112,5 @@ func (s *DependencyService) GetProConDependencies(w
http.ResponseWriter, r *http
resp, _ := core.ServiceAPI.GetProviderDependencies(r.Context(), request)
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
diff --git a/server/rest/controller/v4/instance_controller.go
b/server/rest/controller/v4/instance_controller.go
index 2bc13e1..6f5306c 100644
--- a/server/rest/controller/v4/instance_controller.go
+++ b/server/rest/controller/v4/instance_controller.go
@@ -78,7 +78,7 @@ func (s *MicroServiceInstanceService) RegisterInstance(w
http.ResponseWriter, r
}
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
//TODO 什么样的服务允许更新服务心跳，只能是本服务才可以更新自己，如何屏蔽其他服务伪造的心跳更新？
@@ -89,7 +89,7 @@ func (s *MicroServiceInstanceService) Heartbeat(w
http.ResponseWriter, r *http.R
InstanceId: query.Get(":instanceId"),
}
resp, _ := core.InstanceAPI.Heartbeat(r.Context(), request)
- controller.WriteResponse(w, resp.Response, nil)
+ controller.WriteResponse(w, r, resp.Response, nil)
}
func (s *MicroServiceInstanceService) HeartbeatSet(w http.ResponseWriter, r
*http.Request) {
@@ -110,12 +110,12 @@ func (s *MicroServiceInstanceService) HeartbeatSet(w
http.ResponseWriter, r *htt
resp, _ := core.InstanceAPI.HeartbeatSet(r.Context(), request)
if resp.Response.GetCode() == proto.Response_SUCCESS {
- controller.WriteResponse(w, nil, nil)
+ controller.WriteResponse(w, r, nil, nil)
return
}
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (s *MicroServiceInstanceService) UnregisterInstance(w
http.ResponseWriter, r *http.Request) {
@@ -125,7 +125,7 @@ func (s *MicroServiceInstanceService) UnregisterInstance(w
http.ResponseWriter,
InstanceId: query.Get(":instanceId"),
}
resp, _ := core.InstanceAPI.Unregister(r.Context(), request)
- controller.WriteResponse(w, resp.Response, nil)
+ controller.WriteResponse(w, r, resp.Response, nil)
}
func (s *MicroServiceInstanceService) FindInstances(w http.ResponseWriter, r
*http.Request) {
@@ -158,7 +158,7 @@ func (s *MicroServiceInstanceService) FindInstances(w
http.ResponseWriter, r *ht
return
}
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (s *MicroServiceInstanceService) InstancesAction(w http.ResponseWriter, r
*http.Request) {
@@ -184,7 +184,7 @@ func (s *MicroServiceInstanceService) InstancesAction(w
http.ResponseWriter, r *
resp, _ := core.InstanceAPI.BatchFind(ctx, request)
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
default:
err = fmt.Errorf("Invalid action: %s", action)
log.Errorf(err, "invalid request")
@@ -217,7 +217,7 @@ func (s *MicroServiceInstanceService) GetOneInstance(w
http.ResponseWriter, r *h
w.WriteHeader(http.StatusNotModified)
return
}
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (s *MicroServiceInstanceService) GetInstances(w http.ResponseWriter, r
*http.Request) {
@@ -243,7 +243,7 @@ func (s *MicroServiceInstanceService) GetInstances(w
http.ResponseWriter, r *htt
w.WriteHeader(http.StatusNotModified)
return
}
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (s *MicroServiceInstanceService) UpdateStatus(w http.ResponseWriter, r
*http.Request) {
@@ -255,7 +255,7 @@ func (s *MicroServiceInstanceService) UpdateStatus(w
http.ResponseWriter, r *htt
Status: status,
}
resp, _ := core.InstanceAPI.UpdateStatus(r.Context(), request)
- controller.WriteResponse(w, resp.Response, nil)
+ controller.WriteResponse(w, r, resp.Response, nil)
}
func (s *MicroServiceInstanceService) UpdateMetadata(w http.ResponseWriter, r
*http.Request) {
@@ -281,5 +281,5 @@ func (s *MicroServiceInstanceService) UpdateMetadata(w
http.ResponseWriter, r *h
log.Errorf(err, "can not update instance")
controller.WriteError(w, scerr.ErrInternal, "can not update
instance")
}
- controller.WriteResponse(w, resp.Response, nil)
+ controller.WriteResponse(w, r, resp.Response, nil)
}
diff --git a/server/rest/controller/v4/main_controller.go
b/server/rest/controller/v4/main_controller.go
index fae4d7b..a310d48 100644
--- a/server/rest/controller/v4/main_controller.go
+++ b/server/rest/controller/v4/main_controller.go
@@ -58,7 +58,7 @@ func (s *MainService) ClusterHealth(w http.ResponseWriter, r
*http.Request) {
resp, _ := core.InstanceAPI.ClusterHealth(r.Context())
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (s *MainService) GetVersion(w http.ResponseWriter, r *http.Request) {
diff --git a/server/rest/controller/v4/microservice_controller.go
b/server/rest/controller/v4/microservice_controller.go
index 574f45a..84bb594 100644
--- a/server/rest/controller/v4/microservice_controller.go
+++ b/server/rest/controller/v4/microservice_controller.go
@@ -70,7 +70,7 @@ func (s *MicroServiceService) Register(w http.ResponseWriter,
r *http.Request) {
}
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (s *MicroServiceService) Update(w http.ResponseWriter, r *http.Request) {
@@ -95,7 +95,7 @@ func (s *MicroServiceService) Update(w http.ResponseWriter, r
*http.Request) {
controller.WriteError(w, scerr.ErrInternal, "can not update
service")
return
}
- controller.WriteResponse(w, resp.Response, nil)
+ controller.WriteResponse(w, r, resp.Response, nil)
}
func (s *MicroServiceService) Unregister(w http.ResponseWriter, r
*http.Request) {
@@ -119,7 +119,7 @@ func (s *MicroServiceService) Unregister(w
http.ResponseWriter, r *http.Request)
controller.WriteError(w, scerr.ErrInternal, "delete service
failed")
return
}
- controller.WriteResponse(w, resp.Response, nil)
+ controller.WriteResponse(w, r, resp.Response, nil)
}
func (s *MicroServiceService) GetServices(w http.ResponseWriter, r
*http.Request) {
@@ -132,7 +132,7 @@ func (s *MicroServiceService) GetServices(w
http.ResponseWriter, r *http.Request
}
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (s *MicroServiceService) GetExistence(w http.ResponseWriter, r
*http.Request) {
@@ -156,7 +156,7 @@ func (s *MicroServiceService) GetExistence(w
http.ResponseWriter, r *http.Reques
respInternal := resp.Response
resp.Response = nil
resp.Summary = ""
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (s *MicroServiceService) GetServiceOne(w http.ResponseWriter, r
*http.Request) {
@@ -171,7 +171,7 @@ func (s *MicroServiceService) GetServiceOne(w
http.ResponseWriter, r *http.Reque
}
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (s *MicroServiceService) UnregisterServices(w http.ResponseWriter, r
*http.Request) {
@@ -199,5 +199,5 @@ func (s *MicroServiceService) UnregisterServices(w
http.ResponseWriter, r *http.
}
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
diff --git a/server/rest/controller/v4/query_rule_controller.go
b/server/rest/controller/v4/query_rule_controller.go
index 588c4c8..1b7dbb6 100644
--- a/server/rest/controller/v4/query_rule_controller.go
+++ b/server/rest/controller/v4/query_rule_controller.go
@@ -69,7 +69,7 @@ func (s *RuleService) AddRule(w http.ResponseWriter, r
*http.Request) {
}
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (s *RuleService) DeleteRule(w http.ResponseWriter, r *http.Request) {
@@ -81,7 +81,7 @@ func (s *RuleService) DeleteRule(w http.ResponseWriter, r
*http.Request) {
ServiceId: query.Get(":serviceId"),
RuleIds: ids,
})
- controller.WriteResponse(w, resp.Response, nil)
+ controller.WriteResponse(w, r, resp.Response, nil)
}
func (s *RuleService) UpdateRule(w http.ResponseWriter, r *http.Request) {
@@ -110,7 +110,7 @@ func (s *RuleService) UpdateRule(w http.ResponseWriter, r
*http.Request) {
controller.WriteError(w, scerr.ErrInternal, "update rule
failed")
return
}
- controller.WriteResponse(w, resp.Response, nil)
+ controller.WriteResponse(w, r, resp.Response, nil)
}
func (s *RuleService) GetRules(w http.ResponseWriter, r *http.Request) {
@@ -119,5 +119,5 @@ func (s *RuleService) GetRules(w http.ResponseWriter, r
*http.Request) {
})
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
diff --git a/server/rest/controller/v4/schema_controller.go
b/server/rest/controller/v4/schema_controller.go
index cefc20d..63f570f 100644
--- a/server/rest/controller/v4/schema_controller.go
+++ b/server/rest/controller/v4/schema_controller.go
@@ -68,7 +68,7 @@ func (s *SchemaService) GetSchemas(w http.ResponseWriter, r
*http.Request) {
resp.SchemaSummary = ""
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (s *SchemaService) ModifySchema(w http.ResponseWriter, r *http.Request) {
@@ -95,7 +95,7 @@ func (s *SchemaService) ModifySchema(w http.ResponseWriter, r
*http.Request) {
controller.WriteError(w, scerr.ErrInternal, "can not update
schema")
return
}
- controller.WriteResponse(w, resp.Response, nil)
+ controller.WriteResponse(w, r, resp.Response, nil)
}
func (s *SchemaService) ModifySchemas(w http.ResponseWriter, r *http.Request) {
@@ -120,7 +120,7 @@ func (s *SchemaService) ModifySchemas(w
http.ResponseWriter, r *http.Request) {
controller.WriteError(w, scerr.ErrInternal, "can not update
schema")
return
}
- controller.WriteResponse(w, resp.Response, nil)
+ controller.WriteResponse(w, r, resp.Response, nil)
}
func (s *SchemaService) DeleteSchemas(w http.ResponseWriter, r *http.Request) {
@@ -130,7 +130,7 @@ func (s *SchemaService) DeleteSchemas(w
http.ResponseWriter, r *http.Request) {
SchemaId: query.Get(":schemaId"),
}
resp, _ := core.ServiceAPI.DeleteSchema(r.Context(), request)
- controller.WriteResponse(w, resp.Response, nil)
+ controller.WriteResponse(w, r, resp.Response, nil)
}
func (s *SchemaService) GetAllSchemas(w http.ResponseWriter, r *http.Request) {
@@ -148,5 +148,5 @@ func (s *SchemaService) GetAllSchemas(w
http.ResponseWriter, r *http.Request) {
resp, _ := core.ServiceAPI.GetAllSchemaInfo(r.Context(), request)
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
diff --git a/server/rest/controller/v4/tag_controller.go
b/server/rest/controller/v4/tag_controller.go
index 8cfadd1..7aad092 100644
--- a/server/rest/controller/v4/tag_controller.go
+++ b/server/rest/controller/v4/tag_controller.go
@@ -68,7 +68,7 @@ func (s *TagService) AddTags(w http.ResponseWriter, r
*http.Request) {
controller.WriteError(w, scerr.ErrInternal, "can not add tag")
return
}
- controller.WriteResponse(w, resp.Response, nil)
+ controller.WriteResponse(w, r, resp.Response, nil)
}
func (s *TagService) UpdateTag(w http.ResponseWriter, r *http.Request) {
@@ -78,7 +78,7 @@ func (s *TagService) UpdateTag(w http.ResponseWriter, r
*http.Request) {
Key: query.Get(":key"),
Value: query.Get("value"),
})
- controller.WriteResponse(w, resp.Response, nil)
+ controller.WriteResponse(w, r, resp.Response, nil)
}
func (s *TagService) GetTags(w http.ResponseWriter, r *http.Request) {
@@ -87,7 +87,7 @@ func (s *TagService) GetTags(w http.ResponseWriter, r
*http.Request) {
})
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (s *TagService) DeleteTags(w http.ResponseWriter, r *http.Request) {
@@ -99,5 +99,5 @@ func (s *TagService) DeleteTags(w http.ResponseWriter, r
*http.Request) {
ServiceId: query.Get(":serviceId"),
Keys: ids,
})
- controller.WriteResponse(w, resp.Response, nil)
+ controller.WriteResponse(w, r, resp.Response, nil)
}
diff --git a/server/rest/govern/controller_v4.go
b/server/rest/govern/controller_v4.go
index c73bf03..2011b0e 100644
--- a/server/rest/govern/controller_v4.go
+++ b/server/rest/govern/controller_v4.go
@@ -87,7 +87,7 @@ func (governService *ResourceV4) GetGraph(w
http.ResponseWriter, r *http.Request
if err != nil {
log.Errorf(err, "get service[%s/%s/%s/%s]'s providers
failed",
service.Environment, service.AppId,
service.ServiceName, service.Version)
- controller.WriteResponse(w, proResp.Response, nil)
+ controller.WriteResponse(w, r, proResp.Response, nil)
return
}
@@ -96,7 +96,7 @@ func (governService *ResourceV4) GetGraph(w
http.ResponseWriter, r *http.Request
graph.Lines = append(graph.Lines, lines...)
}
graph.Nodes = nodes
- controller.WriteResponse(w, nil, graph)
+ controller.WriteResponse(w, r, nil, graph)
}
func (governService *ResourceV4) genLinesFromNode(withShared bool,
domainProject string, node Node, providers []*pb.MicroService) []Line {
@@ -136,7 +136,7 @@ func (governService *ResourceV4) GetServiceDetail(w
http.ResponseWriter, r *http
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (governService *ResourceV4) GetAllServicesInfo(w http.ResponseWriter, r
*http.Request) {
@@ -160,7 +160,7 @@ func (governService *ResourceV4) GetAllServicesInfo(w
http.ResponseWriter, r *ht
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
func (governService *ResourceV4) GetAllApplications(w http.ResponseWriter, r
*http.Request) {
@@ -173,5 +173,5 @@ func (governService *ResourceV4) GetAllApplications(w
http.ResponseWriter, r *ht
respInternal := resp.Response
resp.Response = nil
- controller.WriteResponse(w, respInternal, resp)
+ controller.WriteResponse(w, r, respInternal, resp)
}
