fix:删除数据集接口修改

Former-commit-id: 88d78d4dc3c127027fa4bf813f1228a73c30474b

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/deletedatasetlogic.go

@@ -1,10 +1,14 @@
 package logic
 
 import (
+	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"context"
+	"fmt"
+	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
+	"net/http"
 	"strings"
 
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
@@ -31,17 +35,69 @@ func NewDeleteDataSetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Del
 func (l *DeleteDataSetLogic) DeleteDataSet(in *modelarts.DeleteDataSetReq) (*modelarts.DeleteDataSetResq, error) {
 	// todo: add your logic here and delete this line
 	var resp modelarts.DeleteDataSetResq
-	url := "https://modelarts.cn-north-4.myhuaweicloud.com/v2/" + in.ProjectId + "/datasets/" + in.DatasetId
+	//根据智算类型判断走华为智算还是南京智算
-	reqByte, err := json.Marshal(in)
+	modelArtsType := in.ModelArtsType
-	if err != nil {
+	if modelArtsType == l.svcCtx.Config.HaweiModelArtsType {
-		return nil, err
+		modelArtsUrl := l.svcCtx.Config.ModelArtsUrl
+		url := modelArtsUrl + "v2/" + in.ProjectId + "/datasets/" + in.DatasetId
+		reqByte, err := json.Marshal(in)
+		if err != nil {
+			return nil, err
+		}
+		payload := strings.NewReader(string(reqByte))
+		token := common.GetToken()
+		statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.DELETE, url, payload, token)
+		if err != nil {
+			return nil, err
+		}
+		json.Unmarshal(body, &resp)
+		if err != nil {
+			return nil, err
+		}
+		if statusCode == 202 {
+			json.Unmarshal(body, &resp)
+			resp.Code = 200
+			resp.Msg = "Success"
+		} else if statusCode != 202 {
+			json.Unmarshal(body, &resp)
+			resp.Code = 400
+			resp.Msg = "Failure"
+		}
+	} else if modelArtsType == l.svcCtx.Config.NanjingModelArtsType {
+		AK := l.svcCtx.Config.AK
+		SK := l.svcCtx.Config.SK
+		NanjingModelArtsUrl := l.svcCtx.Config.NanjingModelArtsUrl
+		XProjectId := l.svcCtx.Config.XProjectId
+		s := core.Signer{
+			Key:    AK,
+			Secret: SK,
+		}
+		r, err := http.NewRequest("DELETE", NanjingModelArtsUrl+"v2/"+in.ProjectId+"/datasets/"+in.DatasetId,
+			nil)
+		if err != nil {
+			fmt.Println(err)
+		}
+		r.Header.Add("content-type", "application/json;charset=UTF-8")
+		r.Header.Add("X-Project-Id", XProjectId)
+		r.Header.Add("x-stage", "RELEASE")
+		s.Sign(r)
+		client := http.DefaultClient
+		res, err := client.Do(r)
+		if err != nil {
+			fmt.Println(err)
+		}
+		defer res.Body.Close()
+		body, err := ioutil.ReadAll(res.Body)
+		statusCode := res.StatusCode
+		if statusCode == 202 {
+			json.Unmarshal(body, &resp)
+			resp.Code = 200
+			resp.Msg = "Success"
+		} else if statusCode != 202 {
+			json.Unmarshal(body, &resp)
+			resp.Code = 400
+			resp.Msg = "Failure"
+		}
 	}
-	payload := strings.NewReader(string(reqByte))
-	token := common.GetToken()
-	body, err := tool.HttpClient(tool.DELETE, url, payload, token)
-	if err != nil {
-		return nil, err
-	}
-	json.Unmarshal(body, &resp)
 	return &resp, nil
 }

adaptor/PCM-AI/PCM-MODELARTS/rpc/pb/pcm-modelarts.proto

@@ -1726,7 +1726,9 @@ message DeleteDataSetReq {
 }
 
 message DeleteDataSetResq{
-
+  int32 code =1;                  //@gotags: copier:"Code"
+  string msg =2;                  //@gotags: copier:"Msg"
+  string  error_msg =3;// @gotags: copier:"ErrorMsg"
 }
 /******************create dataset end*************************/