From ad0fb576c376e21fb13e8a0f901736a893b98afe Mon Sep 17 00:00:00 2001 From: zhangwei <894646498@qq.com> Date: Mon, 12 Jun 2023 20:59:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=90=E8=A1=8C=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 231524986d0a7e75b6891b6baacdce9e3ae839f5 --- .../rpc/internal/logic/cronlogic.go | 2 +- .../rpc/modelarts/pcm-modelarts.pb.go | 92 ++++---- .../rpc/modelarts/pcm-modelarts_grpc.pb.go | 205 +++++++++++------- adaptor/PCM-CORE/api/desc/pcm.api | 7 +- .../internal/handler/image/checkhandler.go | 28 --- .../handler/image/chunkimagehandler.go | 77 ++++--- .../handler/image/uploadimagehandler.go | 3 +- .../PCM-CORE/api/internal/handler/routes.go | 9 +- .../api/internal/logic/core/tasklistlogic.go | 3 +- .../api/internal/logic/image/checklogic.go | 43 ---- .../internal/logic/image/uploadimagelogic.go | 21 +- adaptor/PCM-CORE/model/dataSetModel.go | 34 +++ adaptor/PCM-CORE/rpc/pb/pcmCore.proto | 4 +- adaptor/PCM-CORE/rpc/pcmCore/pcmCore.pb.go | 184 ++++++++-------- go.mod | 19 ++ go.sum | 38 ++++ image.tar.REMOVED.git-id | 1 - 17 files changed, 423 insertions(+), 347 deletions(-) delete mode 100644 adaptor/PCM-CORE/api/internal/handler/image/checkhandler.go delete mode 100644 adaptor/PCM-CORE/api/internal/logic/image/checklogic.go create mode 100644 adaptor/PCM-CORE/model/dataSetModel.go delete mode 100644 image.tar.REMOVED.git-id diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/cronlogic.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/cronlogic.go index a30e9901..c17b5f36 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/cronlogic.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/cronlogic.go @@ -25,7 +25,7 @@ func InitCron(svc *svc.ServiceContext) { } // 提交任务 submitJob(infoList, submitJobLogic) - // 查询运行中的任务列表同步信息 + // 查询运行中的任务列表同步信息 吧吧你 你 listReq := modelarts.ListTrainingJobsreq{ ProjectId: "0a62ffb0d48026c12fbfc011b8d23f0b", Limit: 10, diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts.pb.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts.pb.go index 34df7a0e..90e41dfb 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts.pb.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.30.0 // protoc v3.19.4 // source: pcm-modelarts.proto @@ -20,7 +20,7 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// *****************auth Start************************ +//*****************auth Start************************ type Auth struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -514,7 +514,7 @@ func (*TokenResp) Descriptor() ([]byte, []int) { return file_pcm_modelarts_proto_rawDescGZIP(), []int{9} } -// *****************find datasetList start************************ +//*****************find datasetList start************************ type DataSetReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -839,7 +839,7 @@ func (x *DataSources) GetDataType() int32 { return 0 } -// 数据集导入创建 +//数据集导入创建 type ImportTaskDataReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -982,7 +982,7 @@ func (x *ImportTaskDataResp) GetErrorMsg() string { return "" } -// 查询数据集导入列表 +//查询数据集导入列表 type ListImportTasksReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1766,7 +1766,7 @@ func (x *FileStatistics) GetFileSizeTotal() uint32 { return 0 } -// *****************ListTrainingJobs start************************ +//*****************ListTrainingJobs start************************ type ListTrainingJobsreq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -4843,17 +4843,15 @@ func (x *LogExportPath) GetHostPath() string { return "" } -// message demos{ -// repeated demo demo =1; -// } -// -// message demo{ -// map node_count_metrics =1; -// } -// -// message Node_count_metricsRes { -// repeated int32 values = 1; -// } +//message demos{ +// repeated demo demo =1; +//} +//message demo{ +// map node_count_metrics =1; +//} +//message Node_count_metricsRes { +// repeated int32 values = 1; +//} type TaskStatuses struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -4917,7 +4915,7 @@ func (x *TaskStatuses) GetMessage() string { return "" } -// 创建训练任务入参 +//创建训练任务入参 type CreateTrainingJobReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -5005,7 +5003,7 @@ func (x *CreateTrainingJobReq) GetModelArtsType() string { return "" } -// 创建训练任务出参 +//创建训练任务出参 type CreateTrainingJobResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -5761,7 +5759,7 @@ func (x *Specs) GetIsHostedLog() bool { return false } -// *****************CreateTrainingJobConfig start************************ +//*****************CreateTrainingJobConfig start************************ type SpecsC struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -6188,7 +6186,7 @@ func (x *DeleteTrainingJobResp) GetErrorMsg() string { return "" } -// *****************DeleteTrainingJobConfig start************************ +//*****************DeleteTrainingJobConfig start************************ type DeleteTrainingJobConfigReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -6331,7 +6329,7 @@ func (x *DeleteTrainingJobConfigResp) GetMsg() string { return "" } -// *****************ListTrainingJobConfig start************************ +//*****************ListTrainingJobConfig start************************ type ListTrainingJobConfigReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -6625,7 +6623,7 @@ func (x *ConfigResponse) GetUserCommand() string { return "" } -// *****************CreateAlgorithm start************************ +//*****************CreateAlgorithm start************************ type CreateAlgorithmReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -7564,7 +7562,7 @@ func (x *JobConfigAl) GetEngine() *EngineAlRq { return nil } -// 出参 +//出参 type CreateAlgorithmResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -8583,7 +8581,7 @@ func (x *EngineAlRp) GetImageSource() bool { return false } -// *****************ListAlgorithms start************************ +//*****************ListAlgorithms start************************ type ListAlgorithmsReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -8956,7 +8954,7 @@ func (x *JobConfigAlRq) GetEngine() *EngineAlRq { return nil } -// *****************Delete Algorithms start************************ +//*****************Delete Algorithms start************************ type DeleteAlgorithmsReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -9083,7 +9081,7 @@ func (x *DeleteAlgorithmsResp) GetErrorMsg() string { return "" } -// *****************Show Algorithm By Uuid start************************ +//*****************Show Algorithm By Uuid start************************ type ShowAlgorithmByUuidReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -9242,7 +9240,7 @@ func (x *ShowAlgorithmByUuidResp) GetErrorMsg() string { return "" } -// *****************TrainingJobFlavors start************************ +//*****************TrainingJobFlavors start************************ type TrainingJobFlavorsReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -9377,7 +9375,7 @@ func (x *TrainingJobFlavorsResp) GetCode() int32 { return 0 } -// *****************ListAiEngines start************************ +//*****************ListAiEngines start************************ type ListAiEnginesReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -9662,7 +9660,7 @@ func (x *Tags) GetValue() string { return "" } -// *****************Task(export) Start************************ +//*****************Task(export) Start************************ type ExportTaskReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -10496,7 +10494,7 @@ func (x *SearchProp) GetProps() map[string]*Weigou { return nil } -// *****************Get Export Tasks Of Dataset Start************************ +//*****************Get Export Tasks Of Dataset Start************************ type GetExportTasksOfDatasetReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -10934,7 +10932,7 @@ func (x *ExportTaskStatus) GetVersionFormat() string { return "" } -// *****************Get Export Task Status Of Dataset Start************************ +//*****************Get Export Task Status Of Dataset Start************************ type GetExportTaskStatusOfDatasetReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -11189,7 +11187,7 @@ func (x *GetExportTaskStatusOfDatasetResp) GetErrorMsg() string { return "" } -// *****************Create Processor Task Start************************ +//*****************Create Processor Task Start************************ type CreateProcessorTaskReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -11680,7 +11678,7 @@ func (x *OperatorParam) GetParams() string { return "" } -// *****************Describe Processor Task Start************************ +//*****************Describe Processor Task Start************************ type DescribeProcessorTaskReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -11927,7 +11925,7 @@ func (x *DescribeProcessorTaskResp) GetWorkspaceId() string { return "" } -// *****************Create Model Start************************ +//*****************Create Model Start************************ type CreateModelReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -12750,7 +12748,7 @@ func (x *Packages) GetRestraint() string { return "" } -// *****************Delete Model Start************************ +//*****************Delete Model Start************************ type DeleteModelReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -12956,7 +12954,7 @@ func (x *DeleteModelResponseFailedList) GetModelId() string { return "" } -// *****************List Model Start************************ +//*****************List Model Start************************ type ListModelReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -13449,7 +13447,7 @@ func (x *ModelSpecification) GetMinAscend() string { return "" } -// *****************Show Model Start************************ +//*****************Show Model Start************************ type ShowModelReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -14030,7 +14028,7 @@ func (x *ModelParamsInfo) GetParamType() string { return "" } -// *****************Create Service Start************************ +//*****************Create Service Start************************ type CreateServiceReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -14522,7 +14520,7 @@ func (x *CustomSpec) GetAscendA310() int64 { return 0 } -// *****************Delete Service Start************************ +//*****************Delete Service Start************************ type DeleteServiceReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -14649,7 +14647,7 @@ func (x *DeleteServiceResp) GetErrorMsg() string { return "" } -// *****************Show Service Start************************ +//*****************Show Service Start************************ type ShowServiceReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -15255,7 +15253,7 @@ func (x *QueryServiceConfig) GetAdditionalProperties() map[string]string { return nil } -// *****************List Services Start************************ +//*****************List Services Start************************ type ListServicesReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -15645,7 +15643,7 @@ func (x *ListServices) GetAdditionalProperties() map[string]string { return nil } -// *****************List Clusters Start************************ +//*****************List Clusters Start************************ type ListClustersReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -16120,7 +16118,7 @@ func (x *ClusterNode) GetSpecification() string { return "" } -// *****************create dataset start************************ +//*****************create dataset start************************ type CreateDataSetReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -16271,7 +16269,7 @@ func (x *CreateDataSetResq) GetDatasetId() string { return "" } -// *****************create dataset start************************ +//*****************create dataset start************************ type DeleteDataSetReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -16398,7 +16396,7 @@ func (x *DeleteDataSetResq) GetErrorMsg() string { return "" } -// *****************Notebook Start************************ +//*****************Notebook Start************************ type ListNotebookReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -19242,7 +19240,7 @@ func (x *LeaseReq) GetType() string { return "" } -// *****************Visualization Job Start************************ +//*****************Visualization Job Start************************ type GetVisualizationJobReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts_grpc.pb.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts_grpc.pb.go index 35e5a89c..b301e820 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts_grpc.pb.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts_grpc.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 +// - protoc-gen-go-grpc v1.3.0 // - protoc v3.19.4 // source: pcm-modelarts.proto @@ -18,6 +18,49 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + ModelArts_GetToken_FullMethodName = "/modelarts.ModelArts/GetToken" + ModelArts_GetDatasetList_FullMethodName = "/modelarts.ModelArts/GetDatasetList" + ModelArts_CreateDataSet_FullMethodName = "/modelarts.ModelArts/CreateDataSet" + ModelArts_DeleteDataSet_FullMethodName = "/modelarts.ModelArts/DeleteDataSet" + ModelArts_CreateTask_FullMethodName = "/modelarts.ModelArts/createTask" + ModelArts_GetImportTaskList_FullMethodName = "/modelarts.ModelArts/GetImportTaskList" + ModelArts_GetListTrainingJobs_FullMethodName = "/modelarts.ModelArts/GetListTrainingJobs" + ModelArts_CreateTrainingJob_FullMethodName = "/modelarts.ModelArts/CreateTrainingJob" + ModelArts_DeleteTrainingJob_FullMethodName = "/modelarts.ModelArts/DeleteTrainingJob" + ModelArts_CreateTrainingJobConfig_FullMethodName = "/modelarts.ModelArts/CreateTrainingJobConfig" + ModelArts_DeleteTrainingJobConfig_FullMethodName = "/modelarts.ModelArts/DeleteTrainingJobConfig" + ModelArts_ListTrainingJobConfig_FullMethodName = "/modelarts.ModelArts/ListTrainingJobConfig" + ModelArts_CreateAlgorithm_FullMethodName = "/modelarts.ModelArts/CreateAlgorithm" + ModelArts_ListAlgorithms_FullMethodName = "/modelarts.ModelArts/ListAlgorithms" + ModelArts_DeleteAlgorithms_FullMethodName = "/modelarts.ModelArts/DeleteAlgorithms" + ModelArts_ShowAlgorithmByUuid_FullMethodName = "/modelarts.ModelArts/ShowAlgorithmByUuid" + ModelArts_GetTrainingJobFlavors_FullMethodName = "/modelarts.ModelArts/GetTrainingJobFlavors" + ModelArts_GetAiEnginesList_FullMethodName = "/modelarts.ModelArts/GetAiEnginesList" + ModelArts_ExportTask_FullMethodName = "/modelarts.ModelArts/ExportTask" + ModelArts_GetExportTasksOfDataset_FullMethodName = "/modelarts.ModelArts/GetExportTasksOfDataset" + ModelArts_GetExportTaskStatusOfDataset_FullMethodName = "/modelarts.ModelArts/GetExportTaskStatusOfDataset" + ModelArts_CreateProcessorTask_FullMethodName = "/modelarts.ModelArts/CreateProcessorTask" + ModelArts_DescribeProcessorTask_FullMethodName = "/modelarts.ModelArts/DescribeProcessorTask" + ModelArts_CreateModel_FullMethodName = "/modelarts.ModelArts/CreateModel" + ModelArts_DeleteModel_FullMethodName = "/modelarts.ModelArts/DeleteModel" + ModelArts_ListModels_FullMethodName = "/modelarts.ModelArts/ListModels" + ModelArts_ShowModels_FullMethodName = "/modelarts.ModelArts/ShowModels" + ModelArts_CreateService_FullMethodName = "/modelarts.ModelArts/CreateService" + ModelArts_ListServices_FullMethodName = "/modelarts.ModelArts/ListServices" + ModelArts_ShowService_FullMethodName = "/modelarts.ModelArts/ShowService" + ModelArts_DeleteService_FullMethodName = "/modelarts.ModelArts/DeleteService" + ModelArts_ListClusters_FullMethodName = "/modelarts.ModelArts/ListClusters" + ModelArts_ListNotebook_FullMethodName = "/modelarts.ModelArts/ListNotebook" + ModelArts_CreateNotebook_FullMethodName = "/modelarts.ModelArts/CreateNotebook" + ModelArts_StartNotebook_FullMethodName = "/modelarts.ModelArts/StartNotebook" + ModelArts_StopNotebook_FullMethodName = "/modelarts.ModelArts/StopNotebook" + ModelArts_GetNotebookStorage_FullMethodName = "/modelarts.ModelArts/GetNotebookStorage" + ModelArts_MountNotebookStorage_FullMethodName = "/modelarts.ModelArts/MountNotebookStorage" + ModelArts_GetVisualizationJob_FullMethodName = "/modelarts.ModelArts/GetVisualizationJob" + ModelArts_CreateVisualizationJob_FullMethodName = "/modelarts.ModelArts/CreateVisualizationJob" +) + // ModelArtsClient is the client API for ModelArts service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -98,7 +141,7 @@ func NewModelArtsClient(cc grpc.ClientConnInterface) ModelArtsClient { func (c *modelArtsClient) GetToken(ctx context.Context, in *TokenReq, opts ...grpc.CallOption) (*TokenResp, error) { out := new(TokenResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/GetToken", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_GetToken_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -107,7 +150,7 @@ func (c *modelArtsClient) GetToken(ctx context.Context, in *TokenReq, opts ...gr func (c *modelArtsClient) GetDatasetList(ctx context.Context, in *DataSetReq, opts ...grpc.CallOption) (*DataSetResp, error) { out := new(DataSetResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/GetDatasetList", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_GetDatasetList_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -116,7 +159,7 @@ func (c *modelArtsClient) GetDatasetList(ctx context.Context, in *DataSetReq, op func (c *modelArtsClient) CreateDataSet(ctx context.Context, in *CreateDataSetReq, opts ...grpc.CallOption) (*CreateDataSetResq, error) { out := new(CreateDataSetResq) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/CreateDataSet", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_CreateDataSet_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -125,7 +168,7 @@ func (c *modelArtsClient) CreateDataSet(ctx context.Context, in *CreateDataSetRe func (c *modelArtsClient) DeleteDataSet(ctx context.Context, in *DeleteDataSetReq, opts ...grpc.CallOption) (*DeleteDataSetResq, error) { out := new(DeleteDataSetResq) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/DeleteDataSet", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_DeleteDataSet_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -134,7 +177,7 @@ func (c *modelArtsClient) DeleteDataSet(ctx context.Context, in *DeleteDataSetRe func (c *modelArtsClient) CreateTask(ctx context.Context, in *ImportTaskDataReq, opts ...grpc.CallOption) (*ImportTaskDataResp, error) { out := new(ImportTaskDataResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/createTask", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_CreateTask_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -143,7 +186,7 @@ func (c *modelArtsClient) CreateTask(ctx context.Context, in *ImportTaskDataReq, func (c *modelArtsClient) GetImportTaskList(ctx context.Context, in *ListImportTasksReq, opts ...grpc.CallOption) (*ListImportTasksResp, error) { out := new(ListImportTasksResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/GetImportTaskList", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_GetImportTaskList_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -152,7 +195,7 @@ func (c *modelArtsClient) GetImportTaskList(ctx context.Context, in *ListImportT func (c *modelArtsClient) GetListTrainingJobs(ctx context.Context, in *ListTrainingJobsreq, opts ...grpc.CallOption) (*ListTrainingJobsresp, error) { out := new(ListTrainingJobsresp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/GetListTrainingJobs", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_GetListTrainingJobs_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -161,7 +204,7 @@ func (c *modelArtsClient) GetListTrainingJobs(ctx context.Context, in *ListTrain func (c *modelArtsClient) CreateTrainingJob(ctx context.Context, in *CreateTrainingJobReq, opts ...grpc.CallOption) (*CreateTrainingJobResp, error) { out := new(CreateTrainingJobResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/CreateTrainingJob", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_CreateTrainingJob_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -170,7 +213,7 @@ func (c *modelArtsClient) CreateTrainingJob(ctx context.Context, in *CreateTrain func (c *modelArtsClient) DeleteTrainingJob(ctx context.Context, in *DeleteTrainingJobReq, opts ...grpc.CallOption) (*DeleteTrainingJobResp, error) { out := new(DeleteTrainingJobResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/DeleteTrainingJob", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_DeleteTrainingJob_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -179,7 +222,7 @@ func (c *modelArtsClient) DeleteTrainingJob(ctx context.Context, in *DeleteTrain func (c *modelArtsClient) CreateTrainingJobConfig(ctx context.Context, in *CreateTrainingJobConfigReq, opts ...grpc.CallOption) (*CreateTrainingJobConfigResp, error) { out := new(CreateTrainingJobConfigResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/CreateTrainingJobConfig", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_CreateTrainingJobConfig_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -188,7 +231,7 @@ func (c *modelArtsClient) CreateTrainingJobConfig(ctx context.Context, in *Creat func (c *modelArtsClient) DeleteTrainingJobConfig(ctx context.Context, in *DeleteTrainingJobConfigReq, opts ...grpc.CallOption) (*DeleteTrainingJobConfigResp, error) { out := new(DeleteTrainingJobConfigResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/DeleteTrainingJobConfig", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_DeleteTrainingJobConfig_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -197,7 +240,7 @@ func (c *modelArtsClient) DeleteTrainingJobConfig(ctx context.Context, in *Delet func (c *modelArtsClient) ListTrainingJobConfig(ctx context.Context, in *ListTrainingJobConfigReq, opts ...grpc.CallOption) (*ListTrainingJobConfigResp, error) { out := new(ListTrainingJobConfigResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/ListTrainingJobConfig", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_ListTrainingJobConfig_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -206,7 +249,7 @@ func (c *modelArtsClient) ListTrainingJobConfig(ctx context.Context, in *ListTra func (c *modelArtsClient) CreateAlgorithm(ctx context.Context, in *CreateAlgorithmReq, opts ...grpc.CallOption) (*CreateAlgorithmResp, error) { out := new(CreateAlgorithmResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/CreateAlgorithm", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_CreateAlgorithm_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -215,7 +258,7 @@ func (c *modelArtsClient) CreateAlgorithm(ctx context.Context, in *CreateAlgorit func (c *modelArtsClient) ListAlgorithms(ctx context.Context, in *ListAlgorithmsReq, opts ...grpc.CallOption) (*ListAlgorithmsResp, error) { out := new(ListAlgorithmsResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/ListAlgorithms", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_ListAlgorithms_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -224,7 +267,7 @@ func (c *modelArtsClient) ListAlgorithms(ctx context.Context, in *ListAlgorithms func (c *modelArtsClient) DeleteAlgorithms(ctx context.Context, in *DeleteAlgorithmsReq, opts ...grpc.CallOption) (*DeleteAlgorithmsResp, error) { out := new(DeleteAlgorithmsResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/DeleteAlgorithms", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_DeleteAlgorithms_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -233,7 +276,7 @@ func (c *modelArtsClient) DeleteAlgorithms(ctx context.Context, in *DeleteAlgori func (c *modelArtsClient) ShowAlgorithmByUuid(ctx context.Context, in *ShowAlgorithmByUuidReq, opts ...grpc.CallOption) (*ShowAlgorithmByUuidResp, error) { out := new(ShowAlgorithmByUuidResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/ShowAlgorithmByUuid", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_ShowAlgorithmByUuid_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -242,7 +285,7 @@ func (c *modelArtsClient) ShowAlgorithmByUuid(ctx context.Context, in *ShowAlgor func (c *modelArtsClient) GetTrainingJobFlavors(ctx context.Context, in *TrainingJobFlavorsReq, opts ...grpc.CallOption) (*TrainingJobFlavorsResp, error) { out := new(TrainingJobFlavorsResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/GetTrainingJobFlavors", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_GetTrainingJobFlavors_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -251,7 +294,7 @@ func (c *modelArtsClient) GetTrainingJobFlavors(ctx context.Context, in *Trainin func (c *modelArtsClient) GetAiEnginesList(ctx context.Context, in *ListAiEnginesReq, opts ...grpc.CallOption) (*ListAiEnginesResp, error) { out := new(ListAiEnginesResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/GetAiEnginesList", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_GetAiEnginesList_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -260,7 +303,7 @@ func (c *modelArtsClient) GetAiEnginesList(ctx context.Context, in *ListAiEngine func (c *modelArtsClient) ExportTask(ctx context.Context, in *ExportTaskReq, opts ...grpc.CallOption) (*ExportTaskDataResp, error) { out := new(ExportTaskDataResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/ExportTask", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_ExportTask_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -269,7 +312,7 @@ func (c *modelArtsClient) ExportTask(ctx context.Context, in *ExportTaskReq, opt func (c *modelArtsClient) GetExportTasksOfDataset(ctx context.Context, in *GetExportTasksOfDatasetReq, opts ...grpc.CallOption) (*GetExportTasksOfDatasetResp, error) { out := new(GetExportTasksOfDatasetResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/GetExportTasksOfDataset", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_GetExportTasksOfDataset_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -278,7 +321,7 @@ func (c *modelArtsClient) GetExportTasksOfDataset(ctx context.Context, in *GetEx func (c *modelArtsClient) GetExportTaskStatusOfDataset(ctx context.Context, in *GetExportTaskStatusOfDatasetReq, opts ...grpc.CallOption) (*GetExportTaskStatusOfDatasetResp, error) { out := new(GetExportTaskStatusOfDatasetResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/GetExportTaskStatusOfDataset", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_GetExportTaskStatusOfDataset_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -287,7 +330,7 @@ func (c *modelArtsClient) GetExportTaskStatusOfDataset(ctx context.Context, in * func (c *modelArtsClient) CreateProcessorTask(ctx context.Context, in *CreateProcessorTaskReq, opts ...grpc.CallOption) (*CreateProcessorTaskResp, error) { out := new(CreateProcessorTaskResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/CreateProcessorTask", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_CreateProcessorTask_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -296,7 +339,7 @@ func (c *modelArtsClient) CreateProcessorTask(ctx context.Context, in *CreatePro func (c *modelArtsClient) DescribeProcessorTask(ctx context.Context, in *DescribeProcessorTaskReq, opts ...grpc.CallOption) (*DescribeProcessorTaskResp, error) { out := new(DescribeProcessorTaskResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/DescribeProcessorTask", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_DescribeProcessorTask_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -305,7 +348,7 @@ func (c *modelArtsClient) DescribeProcessorTask(ctx context.Context, in *Describ func (c *modelArtsClient) CreateModel(ctx context.Context, in *CreateModelReq, opts ...grpc.CallOption) (*CreateModelResp, error) { out := new(CreateModelResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/CreateModel", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_CreateModel_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -314,7 +357,7 @@ func (c *modelArtsClient) CreateModel(ctx context.Context, in *CreateModelReq, o func (c *modelArtsClient) DeleteModel(ctx context.Context, in *DeleteModelReq, opts ...grpc.CallOption) (*DeleteModelResp, error) { out := new(DeleteModelResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/DeleteModel", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_DeleteModel_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -323,7 +366,7 @@ func (c *modelArtsClient) DeleteModel(ctx context.Context, in *DeleteModelReq, o func (c *modelArtsClient) ListModels(ctx context.Context, in *ListModelReq, opts ...grpc.CallOption) (*ListModelResp, error) { out := new(ListModelResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/ListModels", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_ListModels_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -332,7 +375,7 @@ func (c *modelArtsClient) ListModels(ctx context.Context, in *ListModelReq, opts func (c *modelArtsClient) ShowModels(ctx context.Context, in *ShowModelReq, opts ...grpc.CallOption) (*ShowModelResp, error) { out := new(ShowModelResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/ShowModels", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_ShowModels_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -341,7 +384,7 @@ func (c *modelArtsClient) ShowModels(ctx context.Context, in *ShowModelReq, opts func (c *modelArtsClient) CreateService(ctx context.Context, in *CreateServiceReq, opts ...grpc.CallOption) (*CreateServiceResp, error) { out := new(CreateServiceResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/CreateService", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_CreateService_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -350,7 +393,7 @@ func (c *modelArtsClient) CreateService(ctx context.Context, in *CreateServiceRe func (c *modelArtsClient) ListServices(ctx context.Context, in *ListServicesReq, opts ...grpc.CallOption) (*ListServicesResp, error) { out := new(ListServicesResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/ListServices", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_ListServices_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -359,7 +402,7 @@ func (c *modelArtsClient) ListServices(ctx context.Context, in *ListServicesReq, func (c *modelArtsClient) ShowService(ctx context.Context, in *ShowServiceReq, opts ...grpc.CallOption) (*ShowServiceResp, error) { out := new(ShowServiceResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/ShowService", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_ShowService_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -368,7 +411,7 @@ func (c *modelArtsClient) ShowService(ctx context.Context, in *ShowServiceReq, o func (c *modelArtsClient) DeleteService(ctx context.Context, in *DeleteServiceReq, opts ...grpc.CallOption) (*DeleteServiceResp, error) { out := new(DeleteServiceResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/DeleteService", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_DeleteService_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -377,7 +420,7 @@ func (c *modelArtsClient) DeleteService(ctx context.Context, in *DeleteServiceRe func (c *modelArtsClient) ListClusters(ctx context.Context, in *ListClustersReq, opts ...grpc.CallOption) (*ListClustersResp, error) { out := new(ListClustersResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/ListClusters", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_ListClusters_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -386,7 +429,7 @@ func (c *modelArtsClient) ListClusters(ctx context.Context, in *ListClustersReq, func (c *modelArtsClient) ListNotebook(ctx context.Context, in *ListNotebookReq, opts ...grpc.CallOption) (*ListNotebookResp, error) { out := new(ListNotebookResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/ListNotebook", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_ListNotebook_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -395,7 +438,7 @@ func (c *modelArtsClient) ListNotebook(ctx context.Context, in *ListNotebookReq, func (c *modelArtsClient) CreateNotebook(ctx context.Context, in *CreateNotebookReq, opts ...grpc.CallOption) (*CreateNotebookResp, error) { out := new(CreateNotebookResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/CreateNotebook", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_CreateNotebook_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -404,7 +447,7 @@ func (c *modelArtsClient) CreateNotebook(ctx context.Context, in *CreateNotebook func (c *modelArtsClient) StartNotebook(ctx context.Context, in *StartNotebookReq, opts ...grpc.CallOption) (*StartNotebookResp, error) { out := new(StartNotebookResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/StartNotebook", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_StartNotebook_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -413,7 +456,7 @@ func (c *modelArtsClient) StartNotebook(ctx context.Context, in *StartNotebookRe func (c *modelArtsClient) StopNotebook(ctx context.Context, in *StopNotebookReq, opts ...grpc.CallOption) (*StopNotebookResp, error) { out := new(StopNotebookResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/StopNotebook", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_StopNotebook_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -422,7 +465,7 @@ func (c *modelArtsClient) StopNotebook(ctx context.Context, in *StopNotebookReq, func (c *modelArtsClient) GetNotebookStorage(ctx context.Context, in *GetNotebookStorageReq, opts ...grpc.CallOption) (*GetNotebookStorageResp, error) { out := new(GetNotebookStorageResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/GetNotebookStorage", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_GetNotebookStorage_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -431,7 +474,7 @@ func (c *modelArtsClient) GetNotebookStorage(ctx context.Context, in *GetNoteboo func (c *modelArtsClient) MountNotebookStorage(ctx context.Context, in *MountNotebookStorageReq, opts ...grpc.CallOption) (*MountNotebookStorageResp, error) { out := new(MountNotebookStorageResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/MountNotebookStorage", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_MountNotebookStorage_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -440,7 +483,7 @@ func (c *modelArtsClient) MountNotebookStorage(ctx context.Context, in *MountNot func (c *modelArtsClient) GetVisualizationJob(ctx context.Context, in *GetVisualizationJobReq, opts ...grpc.CallOption) (*GetVisualizationJobResp, error) { out := new(GetVisualizationJobResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/GetVisualizationJob", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_GetVisualizationJob_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -449,7 +492,7 @@ func (c *modelArtsClient) GetVisualizationJob(ctx context.Context, in *GetVisual func (c *modelArtsClient) CreateVisualizationJob(ctx context.Context, in *CreateVisualizationJobReq, opts ...grpc.CallOption) (*CreateVisualizationJobResp, error) { out := new(CreateVisualizationJobResp) - err := c.cc.Invoke(ctx, "/modelarts.ModelArts/CreateVisualizationJob", in, out, opts...) + err := c.cc.Invoke(ctx, ModelArts_CreateVisualizationJob_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -674,7 +717,7 @@ func _ModelArts_GetToken_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/GetToken", + FullMethod: ModelArts_GetToken_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).GetToken(ctx, req.(*TokenReq)) @@ -692,7 +735,7 @@ func _ModelArts_GetDatasetList_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/GetDatasetList", + FullMethod: ModelArts_GetDatasetList_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).GetDatasetList(ctx, req.(*DataSetReq)) @@ -710,7 +753,7 @@ func _ModelArts_CreateDataSet_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/CreateDataSet", + FullMethod: ModelArts_CreateDataSet_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).CreateDataSet(ctx, req.(*CreateDataSetReq)) @@ -728,7 +771,7 @@ func _ModelArts_DeleteDataSet_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/DeleteDataSet", + FullMethod: ModelArts_DeleteDataSet_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).DeleteDataSet(ctx, req.(*DeleteDataSetReq)) @@ -746,7 +789,7 @@ func _ModelArts_CreateTask_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/createTask", + FullMethod: ModelArts_CreateTask_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).CreateTask(ctx, req.(*ImportTaskDataReq)) @@ -764,7 +807,7 @@ func _ModelArts_GetImportTaskList_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/GetImportTaskList", + FullMethod: ModelArts_GetImportTaskList_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).GetImportTaskList(ctx, req.(*ListImportTasksReq)) @@ -782,7 +825,7 @@ func _ModelArts_GetListTrainingJobs_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/GetListTrainingJobs", + FullMethod: ModelArts_GetListTrainingJobs_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).GetListTrainingJobs(ctx, req.(*ListTrainingJobsreq)) @@ -800,7 +843,7 @@ func _ModelArts_CreateTrainingJob_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/CreateTrainingJob", + FullMethod: ModelArts_CreateTrainingJob_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).CreateTrainingJob(ctx, req.(*CreateTrainingJobReq)) @@ -818,7 +861,7 @@ func _ModelArts_DeleteTrainingJob_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/DeleteTrainingJob", + FullMethod: ModelArts_DeleteTrainingJob_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).DeleteTrainingJob(ctx, req.(*DeleteTrainingJobReq)) @@ -836,7 +879,7 @@ func _ModelArts_CreateTrainingJobConfig_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/CreateTrainingJobConfig", + FullMethod: ModelArts_CreateTrainingJobConfig_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).CreateTrainingJobConfig(ctx, req.(*CreateTrainingJobConfigReq)) @@ -854,7 +897,7 @@ func _ModelArts_DeleteTrainingJobConfig_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/DeleteTrainingJobConfig", + FullMethod: ModelArts_DeleteTrainingJobConfig_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).DeleteTrainingJobConfig(ctx, req.(*DeleteTrainingJobConfigReq)) @@ -872,7 +915,7 @@ func _ModelArts_ListTrainingJobConfig_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/ListTrainingJobConfig", + FullMethod: ModelArts_ListTrainingJobConfig_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).ListTrainingJobConfig(ctx, req.(*ListTrainingJobConfigReq)) @@ -890,7 +933,7 @@ func _ModelArts_CreateAlgorithm_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/CreateAlgorithm", + FullMethod: ModelArts_CreateAlgorithm_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).CreateAlgorithm(ctx, req.(*CreateAlgorithmReq)) @@ -908,7 +951,7 @@ func _ModelArts_ListAlgorithms_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/ListAlgorithms", + FullMethod: ModelArts_ListAlgorithms_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).ListAlgorithms(ctx, req.(*ListAlgorithmsReq)) @@ -926,7 +969,7 @@ func _ModelArts_DeleteAlgorithms_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/DeleteAlgorithms", + FullMethod: ModelArts_DeleteAlgorithms_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).DeleteAlgorithms(ctx, req.(*DeleteAlgorithmsReq)) @@ -944,7 +987,7 @@ func _ModelArts_ShowAlgorithmByUuid_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/ShowAlgorithmByUuid", + FullMethod: ModelArts_ShowAlgorithmByUuid_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).ShowAlgorithmByUuid(ctx, req.(*ShowAlgorithmByUuidReq)) @@ -962,7 +1005,7 @@ func _ModelArts_GetTrainingJobFlavors_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/GetTrainingJobFlavors", + FullMethod: ModelArts_GetTrainingJobFlavors_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).GetTrainingJobFlavors(ctx, req.(*TrainingJobFlavorsReq)) @@ -980,7 +1023,7 @@ func _ModelArts_GetAiEnginesList_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/GetAiEnginesList", + FullMethod: ModelArts_GetAiEnginesList_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).GetAiEnginesList(ctx, req.(*ListAiEnginesReq)) @@ -998,7 +1041,7 @@ func _ModelArts_ExportTask_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/ExportTask", + FullMethod: ModelArts_ExportTask_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).ExportTask(ctx, req.(*ExportTaskReq)) @@ -1016,7 +1059,7 @@ func _ModelArts_GetExportTasksOfDataset_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/GetExportTasksOfDataset", + FullMethod: ModelArts_GetExportTasksOfDataset_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).GetExportTasksOfDataset(ctx, req.(*GetExportTasksOfDatasetReq)) @@ -1034,7 +1077,7 @@ func _ModelArts_GetExportTaskStatusOfDataset_Handler(srv interface{}, ctx contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/GetExportTaskStatusOfDataset", + FullMethod: ModelArts_GetExportTaskStatusOfDataset_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).GetExportTaskStatusOfDataset(ctx, req.(*GetExportTaskStatusOfDatasetReq)) @@ -1052,7 +1095,7 @@ func _ModelArts_CreateProcessorTask_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/CreateProcessorTask", + FullMethod: ModelArts_CreateProcessorTask_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).CreateProcessorTask(ctx, req.(*CreateProcessorTaskReq)) @@ -1070,7 +1113,7 @@ func _ModelArts_DescribeProcessorTask_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/DescribeProcessorTask", + FullMethod: ModelArts_DescribeProcessorTask_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).DescribeProcessorTask(ctx, req.(*DescribeProcessorTaskReq)) @@ -1088,7 +1131,7 @@ func _ModelArts_CreateModel_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/CreateModel", + FullMethod: ModelArts_CreateModel_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).CreateModel(ctx, req.(*CreateModelReq)) @@ -1106,7 +1149,7 @@ func _ModelArts_DeleteModel_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/DeleteModel", + FullMethod: ModelArts_DeleteModel_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).DeleteModel(ctx, req.(*DeleteModelReq)) @@ -1124,7 +1167,7 @@ func _ModelArts_ListModels_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/ListModels", + FullMethod: ModelArts_ListModels_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).ListModels(ctx, req.(*ListModelReq)) @@ -1142,7 +1185,7 @@ func _ModelArts_ShowModels_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/ShowModels", + FullMethod: ModelArts_ShowModels_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).ShowModels(ctx, req.(*ShowModelReq)) @@ -1160,7 +1203,7 @@ func _ModelArts_CreateService_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/CreateService", + FullMethod: ModelArts_CreateService_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).CreateService(ctx, req.(*CreateServiceReq)) @@ -1178,7 +1221,7 @@ func _ModelArts_ListServices_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/ListServices", + FullMethod: ModelArts_ListServices_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).ListServices(ctx, req.(*ListServicesReq)) @@ -1196,7 +1239,7 @@ func _ModelArts_ShowService_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/ShowService", + FullMethod: ModelArts_ShowService_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).ShowService(ctx, req.(*ShowServiceReq)) @@ -1214,7 +1257,7 @@ func _ModelArts_DeleteService_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/DeleteService", + FullMethod: ModelArts_DeleteService_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).DeleteService(ctx, req.(*DeleteServiceReq)) @@ -1232,7 +1275,7 @@ func _ModelArts_ListClusters_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/ListClusters", + FullMethod: ModelArts_ListClusters_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).ListClusters(ctx, req.(*ListClustersReq)) @@ -1250,7 +1293,7 @@ func _ModelArts_ListNotebook_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/ListNotebook", + FullMethod: ModelArts_ListNotebook_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).ListNotebook(ctx, req.(*ListNotebookReq)) @@ -1268,7 +1311,7 @@ func _ModelArts_CreateNotebook_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/CreateNotebook", + FullMethod: ModelArts_CreateNotebook_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).CreateNotebook(ctx, req.(*CreateNotebookReq)) @@ -1286,7 +1329,7 @@ func _ModelArts_StartNotebook_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/StartNotebook", + FullMethod: ModelArts_StartNotebook_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).StartNotebook(ctx, req.(*StartNotebookReq)) @@ -1304,7 +1347,7 @@ func _ModelArts_StopNotebook_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/StopNotebook", + FullMethod: ModelArts_StopNotebook_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).StopNotebook(ctx, req.(*StopNotebookReq)) @@ -1322,7 +1365,7 @@ func _ModelArts_GetNotebookStorage_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/GetNotebookStorage", + FullMethod: ModelArts_GetNotebookStorage_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).GetNotebookStorage(ctx, req.(*GetNotebookStorageReq)) @@ -1340,7 +1383,7 @@ func _ModelArts_MountNotebookStorage_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/MountNotebookStorage", + FullMethod: ModelArts_MountNotebookStorage_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).MountNotebookStorage(ctx, req.(*MountNotebookStorageReq)) @@ -1358,7 +1401,7 @@ func _ModelArts_GetVisualizationJob_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/GetVisualizationJob", + FullMethod: ModelArts_GetVisualizationJob_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).GetVisualizationJob(ctx, req.(*GetVisualizationJobReq)) @@ -1376,7 +1419,7 @@ func _ModelArts_CreateVisualizationJob_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/modelarts.ModelArts/CreateVisualizationJob", + FullMethod: ModelArts_CreateVisualizationJob_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ModelArtsServer).CreateVisualizationJob(ctx, req.(*CreateVisualizationJobReq)) diff --git a/adaptor/PCM-CORE/api/desc/pcm.api b/adaptor/PCM-CORE/api/desc/pcm.api index a014dc4e..0b7434bc 100644 --- a/adaptor/PCM-CORE/api/desc/pcm.api +++ b/adaptor/PCM-CORE/api/desc/pcm.api @@ -194,6 +194,9 @@ service pcm { @handler imageListHandler get /image/list () returns (imageListResp) - @handler checkHandler - get /image/check/:fileMd5 (checkReq) returns (checkResp) + @handler dataSetCheckHandler + get /dataSet/check/:fileMd5 (checkReq) returns (checkResp) + + @handler uploadDataSetHandler + post /dataSet/upload () returns () } \ No newline at end of file diff --git a/adaptor/PCM-CORE/api/internal/handler/image/checkhandler.go b/adaptor/PCM-CORE/api/internal/handler/image/checkhandler.go deleted file mode 100644 index 663475f2..00000000 --- a/adaptor/PCM-CORE/api/internal/handler/image/checkhandler.go +++ /dev/null @@ -1,28 +0,0 @@ -package image - -import ( - "net/http" - - "PCM/adaptor/PCM-CORE/api/internal/logic/image" - "PCM/adaptor/PCM-CORE/api/internal/svc" - "PCM/adaptor/PCM-CORE/api/internal/types" - "github.com/zeromicro/go-zero/rest/httpx" -) - -func CheckHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - var req types.CheckReq - if err := httpx.Parse(r, &req); err != nil { - httpx.ErrorCtx(r.Context(), w, err) - return - } - - l := image.NewCheckLogic(r.Context(), svcCtx) - resp, err := l.Check(&req) - if err != nil { - httpx.ErrorCtx(r.Context(), w, err) - } else { - httpx.OkJsonCtx(r.Context(), w, resp) - } - } -} diff --git a/adaptor/PCM-CORE/api/internal/handler/image/chunkimagehandler.go b/adaptor/PCM-CORE/api/internal/handler/image/chunkimagehandler.go index 17d1a8f3..75602896 100644 --- a/adaptor/PCM-CORE/api/internal/handler/image/chunkimagehandler.go +++ b/adaptor/PCM-CORE/api/internal/handler/image/chunkimagehandler.go @@ -2,8 +2,15 @@ package image import ( result2 "PCM/common/result" + "bufio" + "context" + "encoding/base64" "fmt" + types2 "github.com/docker/docker/api/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" "io/ioutil" + "k8s.io/apimachinery/pkg/util/json" "net/http" "os" "path/filepath" @@ -11,7 +18,6 @@ import ( "strings" "sync" - "PCM/adaptor/PCM-CORE/api/internal/logic/image" "PCM/adaptor/PCM-CORE/api/internal/svc" ) @@ -60,31 +66,50 @@ func ChunkImageHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { os.RemoveAll(chunksPath) defer fs.Close() - //// 加载镜像文件到docker - //body, err := svcCtx.DockerClient.ImageLoad(context.Background(), multipartFile, false) - //if err != nil { - // httpx.ErrorCtx(r.Context(), w, err) - // return - //} - //bytes, err := ioutil.ReadAll(body.Body) - //loadBody := LoadBody{} - //err = json.Unmarshal(bytes, &loadBody) - //if err != nil { - // httpx.ErrorCtx(r.Context(), w, err) - // return - //} - //imageName := strings.TrimSpace(loadBody.Stream[13:]) - //req.Name = "hub.jcce.dev:18443/repository/docker-hub/jcce/" + imageName - //// 给镜像打上私有仓库的tag - //err = svcCtx.DockerClient.ImageTag(context.Background(), imageName, req.Name) - //if err != nil { - // httpx.ErrorCtx(r.Context(), w, err) - // return - //} - //l := image.NewUploadImageLogic(r.Context(), svcCtx) - //err = l.UploadImage(&req) - l := image.NewChunkImageLogic(r.Context(), svcCtx) - err := l.ChunkImage() + // 加载镜像文件到docker + fileInfo, err := os.Open(filepath.Join(uploadPath, name)) + reader := bufio.NewReader(fileInfo) + if err != nil { + return + } + body, err := svcCtx.DockerClient.ImageLoad(context.Background(), reader, false) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + bytes, err := ioutil.ReadAll(body.Body) + loadBody := LoadBody{} + err = json.Unmarshal(bytes, &loadBody) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + imageName := strings.TrimSpace(loadBody.Stream[13:]) + privateImageName := "hub.jcce.dev:18445/repository/pcm/" + imageName + // 给镜像打上私有仓库的tag + err = svcCtx.DockerClient.ImageTag(context.Background(), imageName, privateImageName) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + // 推送镜像到registry + authConfig := types2.AuthConfig{ + Username: "admin", + Password: "Nudt@123", + } + authConfigBytes, err := json.Marshal(authConfig) + authStr := base64.URLEncoding.EncodeToString(authConfigBytes) + _, err = svcCtx.DockerClient.ImagePush(context.Background(), privateImageName, types2.ImagePushOptions{RegistryAuth: authStr}) + if err != nil { + logx.Error(err.Error()) + return + } + println("传输完成！") + // 删除本地镜像 避免存储资源浪费 + _, err = svcCtx.DockerClient.ImageRemove(context.Background(), privateImageName, types2.ImageRemoveOptions{}) + if err != nil { + return + } result2.HttpResult(r, w, nil, err) } } diff --git a/adaptor/PCM-CORE/api/internal/handler/image/uploadimagehandler.go b/adaptor/PCM-CORE/api/internal/handler/image/uploadimagehandler.go index e72c4fb1..ae92c03a 100644 --- a/adaptor/PCM-CORE/api/internal/handler/image/uploadimagehandler.go +++ b/adaptor/PCM-CORE/api/internal/handler/image/uploadimagehandler.go @@ -36,6 +36,7 @@ func UploadImageHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { } // 检查文件是否存在 exists, err := PathExists(filePath) + // 文件存在 进行断点续传 if exists { fileInfo, _ := os.Stat(filePath) if fileInfo.Size() == fileHeader.Size { @@ -60,6 +61,7 @@ func UploadImageHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { oldFile.Write(data[:total]) } + // 文件不存在 直接上传 } else { destFile, _ := os.OpenFile(filepath.Join(chunksPath, hash+"-"+index), syscall.O_CREAT|syscall.O_WRONLY, 0777) reader := bufio.NewReader(file) @@ -76,7 +78,6 @@ func UploadImageHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { writer.Write(buf[:n]) } } - defer file.Close() defer destFile.Close() } diff --git a/adaptor/PCM-CORE/api/internal/handler/routes.go b/adaptor/PCM-CORE/api/internal/handler/routes.go index a3c5602a..7c999485 100644 --- a/adaptor/PCM-CORE/api/internal/handler/routes.go +++ b/adaptor/PCM-CORE/api/internal/handler/routes.go @@ -288,8 +288,13 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { }, { Method: http.MethodGet, - Path: "/image/check/:fileMd5", - Handler: image.CheckHandler(serverCtx), + Path: "/dataSet/check/:fileMd5", + Handler: image.DataSetCheckHandler(serverCtx), + }, + { + Method: http.MethodPost, + Path: "/dataSet/upload", + Handler: image.UploadDataSetHandler(serverCtx), }, }, rest.WithPrefix("/pcm/v1"), diff --git a/adaptor/PCM-CORE/api/internal/logic/core/tasklistlogic.go b/adaptor/PCM-CORE/api/internal/logic/core/tasklistlogic.go index 2a36a15c..dbc1ae1a 100644 --- a/adaptor/PCM-CORE/api/internal/logic/core/tasklistlogic.go +++ b/adaptor/PCM-CORE/api/internal/logic/core/tasklistlogic.go @@ -31,7 +31,8 @@ func (l *TaskListLogic) TaskList() (resp *types.TaskListResp, err error) { // 查询总运行时长 tx := l.svcCtx.DbEngin.Raw("select sum(running_time)/3600 as total_run_time from (select sum(running_time) as running_time from hpc union all select sum(running_time) as running_time from cloud union all select sum(running_time) as running_time from ai) runtime").Scan(&resp.TotalRunTime) if tx.Error != nil { - + logx.Error(err) + return nil, tx.Error } // 查询任务数据 var tasks []model.Task diff --git a/adaptor/PCM-CORE/api/internal/logic/image/checklogic.go b/adaptor/PCM-CORE/api/internal/logic/image/checklogic.go deleted file mode 100644 index 1c902604..00000000 --- a/adaptor/PCM-CORE/api/internal/logic/image/checklogic.go +++ /dev/null @@ -1,43 +0,0 @@ -package image - -import ( - "PCM/adaptor/PCM-CORE/api/internal/svc" - "PCM/adaptor/PCM-CORE/api/internal/types" - "context" - "io/ioutil" - "os" - "path/filepath" - - "github.com/zeromicro/go-zero/core/logx" -) - -type CheckLogic struct { - logx.Logger - ctx context.Context - svcCtx *svc.ServiceContext -} - -var dir, _ = os.Getwd() -var uploadPath = filepath.Join(dir, "uploads") - -func NewCheckLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CheckLogic { - return &CheckLogic{ - Logger: logx.WithContext(ctx), - ctx: ctx, - svcCtx: svcCtx, - } -} - -func (l *CheckLogic) Check(req *types.CheckReq) (resp *types.CheckResp, err error) { - // todo: add your logic here and delete this line - files, err := ioutil.ReadDir(uploadPath) - if err != nil { - return nil, err - } - for _, file := range files { - if req.FileMd5 == file.Name() { - resp.Exist = true - } - } - return resp, nil -} diff --git a/adaptor/PCM-CORE/api/internal/logic/image/uploadimagelogic.go b/adaptor/PCM-CORE/api/internal/logic/image/uploadimagelogic.go index 1db13504..633a5150 100644 --- a/adaptor/PCM-CORE/api/internal/logic/image/uploadimagelogic.go +++ b/adaptor/PCM-CORE/api/internal/logic/image/uploadimagelogic.go @@ -4,9 +4,6 @@ import ( "PCM/adaptor/PCM-CORE/api/internal/svc" "PCM/adaptor/PCM-CORE/api/internal/types" "context" - "encoding/base64" - "encoding/json" - types2 "github.com/docker/docker/api/types" "github.com/zeromicro/go-zero/core/logx" ) @@ -25,22 +22,6 @@ func NewUploadImageLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Uploa } func (l *UploadImageLogic) UploadImage(req *types.UploadImageReq) error { - // 推送镜像到registry - authConfig := types2.AuthConfig{ - Username: "admin", - Password: "Nudt@123", - } - authConfigBytes, err := json.Marshal(authConfig) - authStr := base64.URLEncoding.EncodeToString(authConfigBytes) - _, err = l.svcCtx.DockerClient.ImagePush(l.ctx, req.Name, types2.ImagePushOptions{RegistryAuth: authStr}) - if err != nil { - logx.Error(err.Error()) - return err - } - // 删除本地镜像 避免存储资源浪费 - _, err = l.svcCtx.DockerClient.ImageRemove(l.ctx, req.Name, types2.ImageRemoveOptions{}) - if err != nil { - return err - } + return nil } diff --git a/adaptor/PCM-CORE/model/dataSetModel.go b/adaptor/PCM-CORE/model/dataSetModel.go new file mode 100644 index 00000000..8119ec0e --- /dev/null +++ b/adaptor/PCM-CORE/model/dataSetModel.go @@ -0,0 +1,34 @@ +package model + +import "time" + +// DataSet 。 +// 说明: +// 表名:data_set +// group: DataSet +// obsolete: +// appliesto:go 1.8+; +// namespace:hongmouer.his.models.DataSet +// assembly: hongmouer.his.models.go +// class:HongMouer.HIS.Models.DataSet +// version:2023-05-06 09:58 +type DataSet struct { + Id *int `gorm:"column:primaryKey;id" json:"Id"` //type:*int comment:id version:2023-05-06 09:58 + Name string `gorm:"column:name" json:"Name"` //type:string comment:文件名称 version:2023-05-06 09:58 + Md5 string `gorm:"column:md5" json:"Md5"` //type:string comment:md5 version:2023-05-06 09:58 + Type string `gorm:"column:type" json:"Type"` //type:string comment: version:2023-05-06 09:58 + Suffix string `gorm:"column:suffix" json:"Suffix"` //type:string comment:后缀名 version:2023-05-06 09:58 + Bucket string `gorm:"column:bucket" json:"Bucket"` //type:string comment:桶 version:2023-05-06 09:58 + Size *int `gorm:"column:size" json:"Size"` //type:*int comment:大小 version:2023-05-06 09:58 + DeletedFlag *int `gorm:"column:deleted_flag" json:"DeletedFlag"` //type:*int comment:是否删除 version:2023-05-06 09:58 + CreatedBy *int `gorm:"column:created_by" json:"CreatedBy"` //type:*int comment:创建人 version:2023-05-06 09:58 + CreatedTime *time.Time `gorm:"column:created_time" json:"CreatedTime"` //type:*time.Time comment:创建时间 version:2023-05-06 09:58 + UpdatedBy *int `gorm:"column:updated_by" json:"UpdatedBy"` //type:*int comment:更新人 version:2023-05-06 09:58 + UpdatedTime *time.Time `gorm:"column:updated_time" json:"UpdatedTime"` //type:*time.Time comment:更新时间 version:2023-05-06 09:58 +} + +// TableName 表名:data_set，。 +// 说明: +func TableName() string { + return "data_set" +} diff --git a/adaptor/PCM-CORE/rpc/pb/pcmCore.proto b/adaptor/PCM-CORE/rpc/pb/pcmCore.proto index 5bdb0e8f..5faaba1f 100644 --- a/adaptor/PCM-CORE/rpc/pb/pcmCore.proto +++ b/adaptor/PCM-CORE/rpc/pb/pcmCore.proto @@ -22,9 +22,9 @@ message AiInfo { string result = 8; string jobId =9; string createTime = 10; - string image_url =11; + string imageUrl =11; string command = 12; - string flavor_id =13; + string flavorId =13; } message CloudInfo { diff --git a/adaptor/PCM-CORE/rpc/pcmCore/pcmCore.pb.go b/adaptor/PCM-CORE/rpc/pcmCore/pcmCore.pb.go index 7368f793..3e247da9 100644 --- a/adaptor/PCM-CORE/rpc/pcmCore/pcmCore.pb.go +++ b/adaptor/PCM-CORE/rpc/pcmCore/pcmCore.pb.go @@ -114,9 +114,9 @@ type AiInfo struct { Result string `protobuf:"bytes,8,opt,name=result,proto3" json:"result,omitempty"` JobId string `protobuf:"bytes,9,opt,name=jobId,proto3" json:"jobId,omitempty"` CreateTime string `protobuf:"bytes,10,opt,name=createTime,proto3" json:"createTime,omitempty"` - ImageUrl string `protobuf:"bytes,11,opt,name=image_url,json=imageUrl,proto3" json:"image_url,omitempty"` + ImageUrl string `protobuf:"bytes,11,opt,name=imageUrl,proto3" json:"imageUrl,omitempty"` Command string `protobuf:"bytes,12,opt,name=command,proto3" json:"command,omitempty"` - FlavorId string `protobuf:"bytes,13,opt,name=flavor_id,json=flavorId,proto3" json:"flavor_id,omitempty"` + FlavorId string `protobuf:"bytes,13,opt,name=flavorId,proto3" json:"flavorId,omitempty"` } func (x *AiInfo) Reset() { @@ -759,7 +759,7 @@ var file_pcmCore_proto_rawDesc = []byte{ 0x6c, 0x6f, 0x75, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2f, 0x0a, 0x0a, 0x41, 0x69, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x69, 0x49, 0x6e, 0x66, - 0x6f, 0x52, 0x0a, 0x41, 0x69, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x22, 0xef, 0x02, + 0x6f, 0x52, 0x0a, 0x41, 0x69, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x22, 0xed, 0x02, 0x0a, 0x06, 0x41, 0x69, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, @@ -777,95 +777,95 @@ var file_pcmCore_proto_rawDesc = []byte{ 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6a, 0x6f, 0x62, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6a, 0x6f, 0x62, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x69, - 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, - 0x69, 0x6d, 0x61, 0x67, 0x65, 0x55, 0x72, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x6d, - 0x61, 0x6e, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x61, - 0x6e, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x66, 0x6c, 0x61, 0x76, 0x6f, 0x72, 0x5f, 0x69, 0x64, 0x18, - 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x6c, 0x61, 0x76, 0x6f, 0x72, 0x49, 0x64, 0x22, - 0xbb, 0x02, 0x0a, 0x09, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x20, 0x0a, - 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, - 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x70, 0x69, 0x56, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x70, 0x69, - 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x6e, - 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, - 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, - 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, - 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, - 0x69, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x54, 0x69, - 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x72, 0x75, 0x6e, 0x6e, 0x69, 0x6e, - 0x67, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, - 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1e, 0x0a, - 0x0a, 0x79, 0x61, 0x6d, 0x6c, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x0b, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0a, 0x79, 0x61, 0x6d, 0x6c, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0xa9, 0x04, - 0x0a, 0x07, 0x48, 0x70, 0x63, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, - 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x74, 0x61, 0x73, - 0x6b, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6a, 0x6f, 0x62, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x05, 0x6a, 0x6f, 0x62, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, - 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, - 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, - 0x69, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x54, 0x69, - 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x72, 0x75, 0x6e, 0x6e, 0x69, 0x6e, - 0x67, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, - 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x18, 0x0a, - 0x07, 0x77, 0x6f, 0x72, 0x6b, 0x44, 0x69, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, - 0x77, 0x6f, 0x72, 0x6b, 0x44, 0x69, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x61, 0x6c, 0x6c, 0x54, - 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x61, 0x6c, 0x6c, 0x54, - 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6d, 0x64, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, - 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6d, 0x64, 0x53, 0x63, 0x72, 0x69, 0x70, - 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x65, 0x72, 0x69, 0x76, 0x65, 0x64, 0x45, 0x73, 0x18, 0x0c, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x64, 0x65, 0x72, 0x69, 0x76, 0x65, 0x64, 0x45, 0x73, 0x12, - 0x18, 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x6c, 0x6f, - 0x63, 0x6b, 0x49, 0x64, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x62, 0x6c, 0x6f, 0x63, - 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x4e, 0x6f, 0x64, 0x65, - 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x4e, 0x6f, - 0x64, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x43, 0x70, 0x75, 0x18, - 0x10, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x43, 0x70, 0x75, 0x12, - 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x78, 0x69, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, - 0x13, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x65, 0x78, 0x69, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, - 0x18, 0x0a, 0x07, 0x61, 0x73, 0x73, 0x6f, 0x63, 0x49, 0x64, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0d, - 0x52, 0x07, 0x61, 0x73, 0x73, 0x6f, 0x63, 0x49, 0x64, 0x22, 0x34, 0x0a, 0x0c, 0x53, 0x79, 0x6e, - 0x63, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, - 0x03, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, - 0x43, 0x0a, 0x0b, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, - 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x69, - 0x6e, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xad, 0x01, 0x0a, 0x0c, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, - 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x32, 0x0a, 0x0b, 0x48, 0x70, 0x63, 0x49, 0x6e, 0x66, 0x6f, - 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x63, 0x6d, - 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x70, 0x63, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0b, 0x48, 0x70, - 0x63, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0d, 0x43, 0x6c, 0x6f, - 0x75, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x12, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x43, 0x6c, 0x6f, 0x75, 0x64, - 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0d, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x4c, - 0x69, 0x73, 0x74, 0x12, 0x2f, 0x0a, 0x0a, 0x41, 0x69, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, - 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, - 0x65, 0x2e, 0x41, 0x69, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x41, 0x69, 0x49, 0x6e, 0x66, 0x6f, - 0x4c, 0x69, 0x73, 0x74, 0x32, 0x7b, 0x0a, 0x07, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x12, - 0x37, 0x0a, 0x08, 0x53, 0x79, 0x6e, 0x63, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x2e, 0x70, 0x63, - 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, - 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x79, 0x6e, 0x63, - 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x37, 0x0a, 0x08, 0x49, 0x6e, 0x66, 0x6f, - 0x4c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x49, - 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x63, 0x6d, - 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, - 0x70, 0x42, 0x0a, 0x5a, 0x08, 0x2f, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, + 0x6d, 0x61, 0x67, 0x65, 0x55, 0x72, 0x6c, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x69, + 0x6d, 0x61, 0x67, 0x65, 0x55, 0x72, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x61, + 0x6e, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, + 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x6c, 0x61, 0x76, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x0d, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x6c, 0x61, 0x76, 0x6f, 0x72, 0x49, 0x64, 0x22, 0xbb, 0x02, + 0x0a, 0x09, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, + 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x74, + 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x70, 0x69, 0x56, 0x65, 0x72, 0x73, + 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x70, 0x69, 0x56, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, + 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, + 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, + 0x74, 0x75, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, + 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, + 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x54, 0x69, 0x6d, 0x65, + 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x72, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x54, + 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0a, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x79, + 0x61, 0x6d, 0x6c, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0a, 0x79, 0x61, 0x6d, 0x6c, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0xa9, 0x04, 0x0a, 0x07, + 0x48, 0x70, 0x63, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, + 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, + 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6a, 0x6f, 0x62, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x05, 0x6a, 0x6f, 0x62, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, + 0x74, 0x75, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, + 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x54, 0x69, 0x6d, 0x65, + 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x72, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x54, + 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x77, + 0x6f, 0x72, 0x6b, 0x44, 0x69, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x77, 0x6f, + 0x72, 0x6b, 0x44, 0x69, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x61, 0x6c, 0x6c, 0x54, 0x69, 0x6d, + 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x61, 0x6c, 0x6c, 0x54, 0x69, 0x6d, + 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6d, 0x64, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x18, 0x0b, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6d, 0x64, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x12, + 0x1c, 0x0a, 0x09, 0x64, 0x65, 0x72, 0x69, 0x76, 0x65, 0x64, 0x45, 0x73, 0x18, 0x0c, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x09, 0x64, 0x65, 0x72, 0x69, 0x76, 0x65, 0x64, 0x45, 0x73, 0x12, 0x18, 0x0a, + 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x6c, 0x6f, 0x63, 0x6b, + 0x49, 0x64, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x49, + 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x18, + 0x0f, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x4e, 0x6f, 0x64, 0x65, + 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x43, 0x70, 0x75, 0x18, 0x10, 0x20, + 0x01, 0x28, 0x0d, 0x52, 0x08, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x43, 0x70, 0x75, 0x12, 0x18, 0x0a, + 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x78, 0x69, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x13, 0x20, + 0x01, 0x28, 0x0d, 0x52, 0x08, 0x65, 0x78, 0x69, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, + 0x07, 0x61, 0x73, 0x73, 0x6f, 0x63, 0x49, 0x64, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, + 0x61, 0x73, 0x73, 0x6f, 0x63, 0x49, 0x64, 0x22, 0x34, 0x0a, 0x0c, 0x53, 0x79, 0x6e, 0x63, 0x49, + 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6d, + 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, 0x43, 0x0a, + 0x0b, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, + 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, + 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, + 0x6d, 0x65, 0x22, 0xad, 0x01, 0x0a, 0x0c, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x32, 0x0a, 0x0b, 0x48, 0x70, 0x63, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, + 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, + 0x72, 0x65, 0x2e, 0x48, 0x70, 0x63, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0b, 0x48, 0x70, 0x63, 0x49, + 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0d, 0x43, 0x6c, 0x6f, 0x75, 0x64, + 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, + 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x49, 0x6e, + 0x66, 0x6f, 0x52, 0x0d, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, + 0x74, 0x12, 0x2f, 0x0a, 0x0a, 0x41, 0x69, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x18, + 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, + 0x41, 0x69, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x41, 0x69, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, + 0x73, 0x74, 0x32, 0x7b, 0x0a, 0x07, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x12, 0x37, 0x0a, + 0x08, 0x53, 0x79, 0x6e, 0x63, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x2e, 0x70, 0x63, 0x6d, 0x43, + 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x1a, + 0x15, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x49, 0x6e, + 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x37, 0x0a, 0x08, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, + 0x73, 0x74, 0x12, 0x14, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x49, 0x6e, 0x66, + 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, + 0x72, 0x65, 0x2e, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x42, + 0x0a, 0x5a, 0x08, 0x2f, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/go.mod b/go.mod index ea114b8f..e2e30c5b 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,10 @@ require ( github.com/JCCE-nudt/zero-contrib/zrpc/registry/nacos v0.0.0-20230419021610-13bbc83fbc3c github.com/Masterminds/squirrel v1.5.4 github.com/aliyun/alibaba-cloud-sdk-go v1.61.1704 + github.com/aws/aws-sdk-go-v2 v1.18.0 + github.com/aws/aws-sdk-go-v2/config v1.18.25 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.67 + github.com/aws/aws-sdk-go-v2/service/s3 v1.33.1 github.com/bitly/go-simplejson v0.5.0 github.com/docker/docker v20.10.24+incompatible github.com/go-redis/redis v6.15.9+incompatible @@ -33,6 +37,21 @@ require ( require ( github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.24 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.25 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.28 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 // indirect + github.com/aws/smithy-go v1.13.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect github.com/buger/jsonparser v1.1.1 // indirect diff --git a/go.sum b/go.sum index 1ab11ab8..fc6a5117 100644 --- a/go.sum +++ b/go.sum @@ -433,6 +433,44 @@ github.com/aliyun/alibaba-cloud-sdk-go v1.61.1704/go.mod h1:RcDobYh8k5VP6TNybz9m github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/aws/aws-sdk-go-v2 v1.18.0 h1:882kkTpSFhdgYRKVZ/VCgf7sd0ru57p2JCxz4/oN5RY= +github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno= +github.com/aws/aws-sdk-go-v2/config v1.18.25 h1:JuYyZcnMPBiFqn87L2cRppo+rNwgah6YwD3VuyvaW6Q= +github.com/aws/aws-sdk-go-v2/config v1.18.25/go.mod h1:dZnYpD5wTW/dQF0rRNLVypB396zWCcPiBIvdvSWHEg4= +github.com/aws/aws-sdk-go-v2/credentials v1.13.24 h1:PjiYyls3QdCrzqUN35jMWtUK1vqVZ+zLfdOa/UPFDp0= +github.com/aws/aws-sdk-go-v2/credentials v1.13.24/go.mod h1:jYPYi99wUOPIFi0rhiOvXeSEReVOzBqFNOX5bXYoG2o= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 h1:jJPgroehGvjrde3XufFIJUZVK5A2L9a3KwSFgKy9n8w= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3/go.mod h1:4Q0UFP0YJf0NrsEuEYHpM9fTSEVnD16Z3uyEF7J9JGM= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.67 h1:fI9/5BDEaAv/pv1VO1X1n3jfP9it+IGqWsCuuBQI8wM= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.67/go.mod h1:zQClPRIwQZfJlZq6WZve+s4Tb4JW+3V6eS+4+KrYeP8= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 h1:kG5eQilShqmJbv11XL1VpyDbaEJzWxd4zRiCG30GSn4= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 h1:vFQlirhuM8lLlpI7imKOMsjdQLuN9CPi+k44F/OFVsk= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 h1:gGLG7yKaXG02/jBlg210R7VgQIotiQntNhsCFejawx8= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34/go.mod h1:Etz2dj6UHYuw+Xw830KfzCfWGMzqvUTCjUj5b76GVDc= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.25 h1:AzwRi5OKKwo4QNqPf7TjeO+tK8AyOK3GVSwmRPo7/Cs= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.25/go.mod h1:SUbB4wcbSEyCvqBxv/O/IBf93RbEze7U7OnoTlpPB+g= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 h1:y2+VQzC6Zh2ojtV2LoC0MNwHWc6qXv/j2vrQtlftkdA= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.28 h1:vGWm5vTpMr39tEZfQeDiDAMgk+5qsnvRny3FjLpnH5w= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.28/go.mod h1:spfrICMD6wCAhjhzHuy6DOZZ+LAIY10UxhUmLzpJTTs= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 h1:0iKliEXAcCa2qVtRs7Ot5hItA2MsufrphbRFlz1Owxo= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27/go.mod h1:EOwBD4J4S5qYszS5/3DpkejfuK+Z5/1uzICfPaZLtqw= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.2 h1:NbWkRxEEIRSCqxhsHQuMiTH7yo+JZW1gp8v3elSVMTQ= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.2/go.mod h1:4tfW5l4IAB32VWCDEBxCRtR9T4BWy4I4kr1spr8NgZM= +github.com/aws/aws-sdk-go-v2/service/s3 v1.33.1 h1:O+9nAy9Bb6bJFTpeNFtd9UfHbgxO1o4ZDAM9rQp5NsY= +github.com/aws/aws-sdk-go-v2/service/s3 v1.33.1/go.mod h1:J9kLNzEiHSeGMyN7238EjJmBpCniVzFda75Gxl/NqB8= +github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 h1:UBQjaMTCKwyUYwiVnUt6toEJwGXsLBI6al083tpjJzY= +github.com/aws/aws-sdk-go-v2/service/sso v1.12.10/go.mod h1:ouy2P4z6sJN70fR3ka3wD3Ro3KezSxU6eKGQI2+2fjI= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 h1:PkHIIJs8qvq0e5QybnZoG1K/9QTrLr9OsqCIo59jOBA= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10/go.mod h1:AFvkxc8xfBe8XA+5St5XIHHrQQtkxqrRincx4hmMHOk= +github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 h1:2DQLAKDteoEDI8zpCzqBMaZlJuoE9iTYD0gFmXVax9E= +github.com/aws/aws-sdk-go-v2/service/sts v1.19.0/go.mod h1:BgQOMsg8av8jset59jelyPW7NoZcZXLVpDsXunGDrk8= +github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= +github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/beanstalkd/go-beanstalk v0.2.0/go.mod h1:/G8YTyChOtpOArwLTQPY1CHB+i212+av35bkPXXj56Y= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= diff --git a/image.tar.REMOVED.git-id b/image.tar.REMOVED.git-id deleted file mode 100644 index 2116dc86..00000000 --- a/image.tar.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -17edd9451df6a98a1b6f6c64e2d5767cf9f35445 \ No newline at end of file