bugfix: get log request add orgName (#3723) (#3724)

Co-authored-by: 郭刚平 <512979011@qq.com>

bundle/dashboard.go

@@ -125,7 +125,7 @@ func (b *Bundle) getHostMetric(clusterName, metric string) (map[string]float64,
 	return hostMetrics, nil
 }
 
-func (b *Bundle) GetLog(req apistructs.DashboardSpotLogRequest) (*apistructs.DashboardSpotLogData, error) {
+func (b *Bundle) GetLog(orgName string, req apistructs.DashboardSpotLogRequest) (*apistructs.DashboardSpotLogData, error) {
 	host, err := b.urls.Monitor()
 	if err != nil {
 		return nil, err
@@ -134,6 +134,7 @@ func (b *Bundle) GetLog(req apistructs.DashboardSpotLogRequest) (*apistructs.Das
 
 	request := hc.Get(host).Path("/api/logs").
 		Header("Internal-Client", "bundle").
+		Header("org", orgName).
 		Param("count", strconv.FormatInt(req.Count, 10)).
 		Param("id", req.ID).
 		Param("stream", string(req.Stream)).

modules/cmp/endpoints/log.go

@@ -83,7 +83,7 @@ func (e *Endpoints) Logs(ctx context.Context, r *http.Request, vars map[string]s
 		End:      time.Duration(endNum),
 		Count:    countNum,
 	}
-	logdata, err := e.nodes.Logs(req)
+	logdata, err := e.nodes.Logs(r.Header.Get("org"), req)
 	if err != nil {
 		return httpserver.ErrResp(200, "2", err.Error())
 	}

modules/cmp/impl/nodes/log.go

@@ -23,7 +23,7 @@ import (
 	"github.com/erda-project/erda/apistructs"
 )
 
-func (n *Nodes) Logs(req apistructs.OpLogsRequest) (*apistructs.DashboardSpotLogData, error) {
+func (n *Nodes) Logs(orgName string, req apistructs.OpLogsRequest) (*apistructs.DashboardSpotLogData, error) {
 	records, err := n.db.RecordsReader().ByIDs(fmt.Sprintf("%d", req.RecordID)).Do()
 	if err != nil {
 		errstr := fmt.Sprintf("failed to get record: %v", err)
@@ -42,7 +42,7 @@ func (n *Nodes) Logs(req apistructs.OpLogsRequest) (*apistructs.DashboardSpotLog
 		logrus.Errorf(errstr)
 		return nil, errors.New(errstr)
 	}
-	logData, err := n.bdl.GetLog(apistructs.DashboardSpotLogRequest{
+	logData, err := n.bdl.GetLog(orgName, apistructs.DashboardSpotLogRequest{
 		ID:     task.Extra.UUID,
 		Source: apistructs.DashboardSpotLogSourceJob,
 		Stream: apistructs.DashboardSpotLogStream(req.Stream),

modules/dop/endpoints/apitest.go

@@ -245,7 +245,7 @@ func (e *Endpoints) GetPipelineTaskLogs(ctx context.Context, r *http.Request, va
 	logReq.ID = task.Extra.UUID
 	logReq.Source = apistructs.DashboardSpotLogSourceJob
 
-	log, err := e.bdl.GetLog(logReq)
+	log, err := e.bdl.GetLog(r.Header.Get("org"), logReq)
 	if err != nil {
 		return apierrors.ErrGetPipelineLog.InternalError(err).ToResp(), nil
 	}

modules/dop/endpoints/cicd.go

@@ -62,7 +62,7 @@ func (e *Endpoints) CICDTaskLog(ctx context.Context, r *http.Request, vars map[s
 	logReq.ID = logID
 	logReq.Source = apistructs.DashboardSpotLogSourceJob
 
-	log, err := e.bdl.GetLog(logReq)
+	log, err := e.bdl.GetLog(r.Header.Get("org"), logReq)
 	if err != nil {
 		return errorresp.ErrResp(err)
 	}

modules/dop/services/cdp/cdp.go

@@ -233,7 +233,7 @@ func (cdp *CDP) getFailedTaskLogs(pipelineDetail *apistructs.PipelineDetailDTO)
 	}
 	failedDetailLogs := ""
 	for taskName, taskID := range failedTasks {
-		stdError, err := cdp.bdl.GetLog(apistructs.DashboardSpotLogRequest{
+		stdError, err := cdp.bdl.GetLog(pipelineDetail.OrgName, apistructs.DashboardSpotLogRequest{
 			ID:     taskID,
 			Source: apistructs.DashboardSpotLogSourceJob,
 			Stream: apistructs.DashboardSpotLogStreamStderr,
@@ -244,7 +244,7 @@ func (cdp *CDP) getFailedTaskLogs(pipelineDetail *apistructs.PipelineDetailDTO)
 		if err != nil {
 			return "", err
 		}
-		stdOut, err := cdp.bdl.GetLog(apistructs.DashboardSpotLogRequest{
+		stdOut, err := cdp.bdl.GetLog(pipelineDetail.OrgName, apistructs.DashboardSpotLogRequest{
 			ID:     taskID,
 			Source: apistructs.DashboardSpotLogSourceJob,
 			Stream: apistructs.DashboardSpotLogStreamStdout,

modules/orchestrator/endpoints/addon.go

@@ -702,7 +702,7 @@ func (e *Endpoints) AddonLogs(ctx context.Context, r *http.Request, vars map[str
 	logReq.ID = containerID
 	logReq.Source = apistructs.DashboardSpotLogSourceContainer
 
-	logResult, err := e.bdl.GetLog(logReq)
+	logResult, err := e.bdl.GetLog(r.Header.Get("org"), logReq)
 	if err != nil {
 		return nil, err
 	}

modules/orchestrator/endpoints/migration.go

@@ -42,7 +42,7 @@ func (e *Endpoints) MigrationLog(ctx context.Context, r *http.Request, vars map[
 	logReq.ID = "migration-task-" + vars["migrationId"]
 	logReq.Source = apistructs.DashboardSpotLogSourceJob
 	// 查询日志信息
-	log, err := e.bdl.GetLog(logReq)
+	log, err := e.bdl.GetLog(r.Header.Get("org"), logReq)
 	if err != nil {
 		return errorresp.ErrResp(err)
 	}

modules/orchestrator/endpoints/runtime.go

@@ -412,7 +412,7 @@ func (e *Endpoints) RuntimeLogs(ctx context.Context, r *http.Request, vars map[s
 	if err != nil {
 		return apierrors.ErrGetRuntime.InvalidParameter(strutil.Concat("deploymentID: ", id)).ToResp(), nil
 	}
-	result, err := e.runtime.RuntimeDeployLogs(userID, orgID, deploymentID, r.URL.Query())
+	result, err := e.runtime.RuntimeDeployLogs(userID, orgID, r.Header.Get("org"), deploymentID, r.URL.Query())
 	if err != nil {
 		return apierrors.ErrGetRuntime.InvalidParameter(strutil.Concat("deploymentID: ", id)).ToResp(), nil
 	}
@@ -438,7 +438,7 @@ func (e *Endpoints) OrgcenterJobLogs(ctx context.Context, r *http.Request, vars
 	if clusterName == "" {
 		return apierrors.ErrGetRuntime.MissingParameter("clusterName").ToResp(), nil
 	}
-	result, err := e.runtime.OrgJobLogs(userID, orgID, jobID, clusterName, r.URL.Query())
+	result, err := e.runtime.OrgJobLogs(userID, orgID, r.Header.Get("org"), jobID, clusterName, r.URL.Query())
 	if err != nil {
 		return apierrors.ErrGetRuntime.InvalidParameter(strutil.Concat("jobID: ", jobID)).ToResp(), nil
 	}

modules/orchestrator/services/runtime/runtime.go

@@ -1886,7 +1886,7 @@ func (r *Runtime) markOutdated(deployment *dbclient.Deployment) {
 }
 
 // RuntimeDeployLogs deploy发布日志接口
-func (r *Runtime) RuntimeDeployLogs(userID user.ID, orgID uint64, deploymentID uint64, paramValues url.Values) (*apistructs.DashboardSpotLogData, error) {
+func (r *Runtime) RuntimeDeployLogs(userID user.ID, orgID uint64, orgName string, deploymentID uint64, paramValues url.Values) (*apistructs.DashboardSpotLogData, error) {
 	deployment, err := r.db.GetDeployment(deploymentID)
 	if err != nil {
 		return nil, apierrors.ErrGetRuntime.InternalError(err)
@@ -1897,11 +1897,11 @@ func (r *Runtime) RuntimeDeployLogs(userID user.ID, orgID uint64, deploymentID u
 	if err := r.checkRuntimeScopePermission(userID, deployment.RuntimeId); err != nil {
 		return nil, err
 	}
-	return r.requestMonitorLog(strconv.FormatUint(deploymentID, 10), paramValues, apistructs.DashboardSpotLogSourceDeploy)
+	return r.requestMonitorLog(strconv.FormatUint(deploymentID, 10), orgName, paramValues, apistructs.DashboardSpotLogSourceDeploy)
 }
 
 // OrgJobLogs 数据中心--->任务列表 日志接口
-func (r *Runtime) OrgJobLogs(userID user.ID, orgID uint64, jobID, clusterName string, paramValues url.Values) (*apistructs.DashboardSpotLogData, error) {
+func (r *Runtime) OrgJobLogs(userID user.ID, orgID uint64, orgName string, jobID, clusterName string, paramValues url.Values) (*apistructs.DashboardSpotLogData, error) {
 	if clusterName == "" {
 		logrus.Errorf("job instance infos without cluster, jobID is: %s", jobID)
 		return nil, apierrors.ErrOrgLog.AccessDenied()
@@ -1918,7 +1918,7 @@ func (r *Runtime) OrgJobLogs(userID user.ID, orgID uint64, jobID, clusterName st
 	if err := r.checkOrgScopePermission(userID, orgID); err != nil {
 		return nil, err
 	}
-	return r.requestMonitorLog(jobID, paramValues, apistructs.DashboardSpotLogSourceJob)
+	return r.requestMonitorLog(jobID, orgName, paramValues, apistructs.DashboardSpotLogSourceJob)
 }
 
 // checkRuntimeScopePermission 检测runtime级别的权限
@@ -1964,7 +1964,7 @@ func (r *Runtime) checkOrgScopePermission(userID user.ID, orgID uint64) error {
 }
 
 // requestMonitorLog 调用bundle monitor log接口获取数据
-func (r *Runtime) requestMonitorLog(requestID string, paramValues url.Values, source apistructs.DashboardSpotLogSource) (*apistructs.DashboardSpotLogData, error) {
+func (r *Runtime) requestMonitorLog(requestID string, orgName string, paramValues url.Values, source apistructs.DashboardSpotLogSource) (*apistructs.DashboardSpotLogData, error) {
 	// 获取日志
 	var logReq apistructs.DashboardSpotLogRequest
 	if err := queryStringDecoder.Decode(&logReq, paramValues); err != nil {
@@ -1973,7 +1973,7 @@ func (r *Runtime) requestMonitorLog(requestID string, paramValues url.Values, so
 	logReq.ID = requestID
 	logReq.Source = source
 
-	logResult, err := r.bdl.GetLog(logReq)
+	logResult, err := r.bdl.GetLog(orgName, logReq)
 	if err != nil {
 		return nil, err
 	}