From 5b83d02f1fa489388282c1b7c57d849af8fbe95f Mon Sep 17 00:00:00 2001 From: zhangwei <894646498@qq.com> Date: Fri, 1 Mar 2024 18:06:25 +0800 Subject: [PATCH] Cyclic dependence Former-commit-id: 9975fdb4d632167b4c7373a4ed2b20d23b157880 --- api/internal/logic/ai/createalgorithmlogic.go | 2 +- api/internal/logic/ai/createdatasetlogic.go | 7 +- .../logic/ai/createexporttasklogic.go | 2 +- api/internal/logic/ai/createnotebooklogic.go | 2 +- .../logic/ai/createprocessortasklogic.go | 2 +- api/internal/logic/ai/createservicelogic.go | 2 +- api/internal/logic/ai/createtasklogic.go | 2 +- .../logic/ai/createtrainingjoblogic.go | 2 +- api/internal/logic/ai/deletealgorithmlogic.go | 2 +- api/internal/logic/ai/deletedatasetlogic.go | 2 +- api/internal/logic/ai/deleteservicelogic.go | 2 +- .../logic/ai/deletetrainingjoblogic.go | 2 +- .../logic/ai/getexporttasksofdatasetlogic.go | 2 +- .../ai/getexporttaskstatusofdatasetlogic.go | 2 +- .../logic/ai/getlisttrainingjobslogic.go | 2 +- api/internal/logic/ai/listalgorithmslogic.go | 2 +- api/internal/logic/ai/listclusterslogic.go | 2 +- api/internal/logic/ai/listdatasetlogic.go | 2 +- api/internal/logic/ai/listimportlogic.go | 2 +- api/internal/logic/ai/listnotebooklogic.go | 2 +- api/internal/logic/ai/listserviceslogic.go | 2 +- .../logic/ai/showalgorithmbyuuidlogic.go | 2 +- api/internal/logic/ai/showservicelogic.go | 2 +- .../logic/core/getcomputingpowerlogic.go | 7 +- .../logic/core/getgeneralinfologic.go | 4 - api/internal/logic/core/submitjoblogic.go | 6 +- .../logic/storage/dailypowerscreenlogic.go | 2 +- .../storage/percentercomputerpowerslogic.go | 2 +- .../logic/storage/screenstoragelogic.go | 2 +- .../logic/vm/bulkcreatenetworkslogic.go | 7 +- api/internal/logic/vm/createimagelogic.go | 2 +- api/internal/logic/vm/createnetworklogic.go | 2 +- api/internal/logic/vm/createnodelogic.go | 2 +- api/internal/logic/vm/createserverlogic.go | 2 +- api/internal/logic/vm/createsubnetlogic.go | 2 +- api/internal/logic/vm/createvolumelogic.go | 2 +- .../logic/vm/createvolumetypeslogic.go | 2 +- api/internal/logic/vm/deleteimagelogic.go | 2 +- api/internal/logic/vm/deletenetworklogic.go | 2 +- api/internal/logic/vm/deletenodelogic.go | 2 +- api/internal/logic/vm/deleteserverlogic.go | 2 +- api/internal/logic/vm/deletevolumelogic.go | 2 +- .../logic/vm/deletevolumetypelogic.go | 2 +- .../logic/vm/getcomputelimitslogic.go | 2 +- .../logic/vm/getserversdetailedbyidlogic.go | 2 +- .../logic/vm/getvolumedetailedbyidlogic.go | 2 +- api/internal/logic/vm/getvolumelimitslogic.go | 2 +- .../logic/vm/listflavorsdetaillogic.go | 2 +- api/internal/logic/vm/listimageslogic.go | 2 +- api/internal/logic/vm/listnetworkslogic.go | 2 +- api/internal/logic/vm/listnodeslogic.go | 2 +- api/internal/logic/vm/listserverlogic.go | 2 +- .../logic/vm/listserversdetailedlogic.go | 2 +- .../logic/vm/listvolumesdetaillogic.go | 2 +- api/internal/logic/vm/listvolumeslogic.go | 2 +- api/internal/logic/vm/listvolumetypeslogic.go | 2 +- api/internal/logic/vm/pauseserverlogic.go | 2 +- api/internal/logic/vm/rebootserverlogic.go | 2 +- .../logic/vm/shownetworkdetailslogic.go | 2 +- api/internal/logic/vm/startserverlogic.go | 2 +- api/internal/logic/vm/stopserverlogic.go | 2 +- api/internal/logic/vm/updatenetworklogic.go | 2 +- api/internal/logic/vm/updateserverlogic.go | 2 +- api/internal/logic/vm/updatevolumelogic.go | 2 +- api/internal/logic/vm/uploadimagelogic.go | 2 +- api/internal/storeLink/modelarts.go | 2 +- api/internal/storeLink/octopus.go | 2 +- api/internal/storeLink/shuguangHpc.go | 2 +- api/internal/storeLink/shuguangai.go | 2 +- api/internal/storeLink/storeLink.go | 6 +- api/internal/svc/servicecontext.go | 18 +-- go.mod | 44 +++---- go.sum | 111 +++++++++--------- 73 files changed, 166 insertions(+), 172 deletions(-) diff --git a/api/internal/logic/ai/createalgorithmlogic.go b/api/internal/logic/ai/createalgorithmlogic.go index 833d88ba..f7efe89a 100644 --- a/api/internal/logic/ai/createalgorithmlogic.go +++ b/api/internal/logic/ai/createalgorithmlogic.go @@ -22,7 +22,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" ) diff --git a/api/internal/logic/ai/createdatasetlogic.go b/api/internal/logic/ai/createdatasetlogic.go index 183a2f1a..9d5741eb 100644 --- a/api/internal/logic/ai/createdatasetlogic.go +++ b/api/internal/logic/ai/createdatasetlogic.go @@ -18,12 +18,11 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" - "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" - "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" + "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" + "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/api/internal/logic/ai/createexporttasklogic.go b/api/internal/logic/ai/createexporttasklogic.go index 043bf934..47390243 100644 --- a/api/internal/logic/ai/createexporttasklogic.go +++ b/api/internal/logic/ai/createexporttasklogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/createnotebooklogic.go b/api/internal/logic/ai/createnotebooklogic.go index fd27a866..3859e58f 100644 --- a/api/internal/logic/ai/createnotebooklogic.go +++ b/api/internal/logic/ai/createnotebooklogic.go @@ -22,7 +22,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/api/internal/logic/ai/createprocessortasklogic.go b/api/internal/logic/ai/createprocessortasklogic.go index c7f0ad5e..b79b4f82 100644 --- a/api/internal/logic/ai/createprocessortasklogic.go +++ b/api/internal/logic/ai/createprocessortasklogic.go @@ -22,7 +22,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/api/internal/logic/ai/createservicelogic.go b/api/internal/logic/ai/createservicelogic.go index 094fb6da..e99acb27 100644 --- a/api/internal/logic/ai/createservicelogic.go +++ b/api/internal/logic/ai/createservicelogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/createtasklogic.go b/api/internal/logic/ai/createtasklogic.go index b0aa7164..1e94d4c4 100644 --- a/api/internal/logic/ai/createtasklogic.go +++ b/api/internal/logic/ai/createtasklogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/createtrainingjoblogic.go b/api/internal/logic/ai/createtrainingjoblogic.go index e33a0ae1..e4565187 100644 --- a/api/internal/logic/ai/createtrainingjoblogic.go +++ b/api/internal/logic/ai/createtrainingjoblogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/deletealgorithmlogic.go b/api/internal/logic/ai/deletealgorithmlogic.go index a5a5397e..1093def0 100644 --- a/api/internal/logic/ai/deletealgorithmlogic.go +++ b/api/internal/logic/ai/deletealgorithmlogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "strings" diff --git a/api/internal/logic/ai/deletedatasetlogic.go b/api/internal/logic/ai/deletedatasetlogic.go index 4ee056ba..6c9fe0b9 100644 --- a/api/internal/logic/ai/deletedatasetlogic.go +++ b/api/internal/logic/ai/deletedatasetlogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/deleteservicelogic.go b/api/internal/logic/ai/deleteservicelogic.go index efaa8d6a..337d1aeb 100644 --- a/api/internal/logic/ai/deleteservicelogic.go +++ b/api/internal/logic/ai/deleteservicelogic.go @@ -19,7 +19,7 @@ import ( "github.com/jinzhu/copier" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/ai/deletetrainingjoblogic.go b/api/internal/logic/ai/deletetrainingjoblogic.go index c12c604e..bf9b62b9 100644 --- a/api/internal/logic/ai/deletetrainingjoblogic.go +++ b/api/internal/logic/ai/deletetrainingjoblogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/getexporttasksofdatasetlogic.go b/api/internal/logic/ai/getexporttasksofdatasetlogic.go index 75b1ce5b..baacd49f 100644 --- a/api/internal/logic/ai/getexporttasksofdatasetlogic.go +++ b/api/internal/logic/ai/getexporttasksofdatasetlogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/getexporttaskstatusofdatasetlogic.go b/api/internal/logic/ai/getexporttaskstatusofdatasetlogic.go index e7f2b83b..a6e74d70 100644 --- a/api/internal/logic/ai/getexporttaskstatusofdatasetlogic.go +++ b/api/internal/logic/ai/getexporttaskstatusofdatasetlogic.go @@ -19,7 +19,7 @@ import ( "github.com/jinzhu/copier" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/ai/getlisttrainingjobslogic.go b/api/internal/logic/ai/getlisttrainingjobslogic.go index 54ea0317..dbe104c8 100644 --- a/api/internal/logic/ai/getlisttrainingjobslogic.go +++ b/api/internal/logic/ai/getlisttrainingjobslogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/listalgorithmslogic.go b/api/internal/logic/ai/listalgorithmslogic.go index df104cc0..1807ac06 100644 --- a/api/internal/logic/ai/listalgorithmslogic.go +++ b/api/internal/logic/ai/listalgorithmslogic.go @@ -19,7 +19,7 @@ import ( "github.com/jinzhu/copier" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/ai/listclusterslogic.go b/api/internal/logic/ai/listclusterslogic.go index d67cbd73..47352fa8 100644 --- a/api/internal/logic/ai/listclusterslogic.go +++ b/api/internal/logic/ai/listclusterslogic.go @@ -20,7 +20,7 @@ import ( "github.com/pkg/errors" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" diff --git a/api/internal/logic/ai/listdatasetlogic.go b/api/internal/logic/ai/listdatasetlogic.go index 42d40ac3..395dfa7f 100644 --- a/api/internal/logic/ai/listdatasetlogic.go +++ b/api/internal/logic/ai/listdatasetlogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/ai/listimportlogic.go b/api/internal/logic/ai/listimportlogic.go index 0d84137d..5b7ecc0b 100644 --- a/api/internal/logic/ai/listimportlogic.go +++ b/api/internal/logic/ai/listimportlogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/listnotebooklogic.go b/api/internal/logic/ai/listnotebooklogic.go index bcba0c9d..76aeaa23 100644 --- a/api/internal/logic/ai/listnotebooklogic.go +++ b/api/internal/logic/ai/listnotebooklogic.go @@ -22,7 +22,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/api/internal/logic/ai/listserviceslogic.go b/api/internal/logic/ai/listserviceslogic.go index a2430c56..305cc52f 100644 --- a/api/internal/logic/ai/listserviceslogic.go +++ b/api/internal/logic/ai/listserviceslogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/showalgorithmbyuuidlogic.go b/api/internal/logic/ai/showalgorithmbyuuidlogic.go index fbe5070d..9e915026 100644 --- a/api/internal/logic/ai/showalgorithmbyuuidlogic.go +++ b/api/internal/logic/ai/showalgorithmbyuuidlogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/ai/showservicelogic.go b/api/internal/logic/ai/showservicelogic.go index 508c5218..cc428154 100644 --- a/api/internal/logic/ai/showservicelogic.go +++ b/api/internal/logic/ai/showservicelogic.go @@ -19,7 +19,7 @@ import ( "github.com/jinzhu/copier" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/core/getcomputingpowerlogic.go b/api/internal/logic/core/getcomputingpowerlogic.go index 0d14573b..8fe735b4 100644 --- a/api/internal/logic/core/getcomputingpowerlogic.go +++ b/api/internal/logic/core/getcomputingpowerlogic.go @@ -16,13 +16,12 @@ package core import ( "context" - "gitlink.org.cn/JointCloud/pcm-ac/hpcAC" + "github.com/zeromicro/go-zero/core/logx" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" - "gitlink.org.cn/JointCloud/pcm-participant-octopus/octopus" + "gitlink.org.cn/jcce-pcm/pcm-ac/hpcAC" + "gitlink.org.cn/jcce-pcm/pcm-participant-octopus/octopus" "log" - - "github.com/zeromicro/go-zero/core/logx" ) type GetComputingPowerLogic struct { diff --git a/api/internal/logic/core/getgeneralinfologic.go b/api/internal/logic/core/getgeneralinfologic.go index 95474029..f4fd7e56 100644 --- a/api/internal/logic/core/getgeneralinfologic.go +++ b/api/internal/logic/core/getgeneralinfologic.go @@ -16,13 +16,9 @@ package core import ( "context" - "gitlink.org.cn/JointCloud/pcm-ac/hpcAC" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" - "gitlink.org.cn/JointCloud/pcm-participant-octopus/octopus" "log" - - "github.com/zeromicro/go-zero/core/logx" ) type GetGeneralInfoLogic struct { diff --git a/api/internal/logic/core/submitjoblogic.go b/api/internal/logic/core/submitjoblogic.go index c0379721..2d699753 100644 --- a/api/internal/logic/core/submitjoblogic.go +++ b/api/internal/logic/core/submitjoblogic.go @@ -18,12 +18,12 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "gitlink.org.cn/JointCloud/pcm-ac/hpcAC" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-slurm/slurmclient" + slurmClient "gitlink.org.cn/JointCloud/pcm-slurm/slurmclient" + "gitlink.org.cn/jcce-pcm/pcm-ac/hpcAC" "strconv" "github.com/zeromicro/go-zero/core/logx" @@ -67,7 +67,7 @@ func (l *SubmitJobLogic) SubmitJob(req *types.SubmitJobReq) (resp *types.SubmitJ coreResp.Data = acResp.Data case "th": - thReq := &slurmclient.SubmitJobReq{} + thReq := &slurmClient.SubmitJobReq{} err = copier.CopyWithOption(thReq, req, copier.Option{Converters: utils.Converters}) tianheResp, err := l.svcCtx.THRpc.SubmitJob(l.ctx, thReq) diff --git a/api/internal/logic/storage/dailypowerscreenlogic.go b/api/internal/logic/storage/dailypowerscreenlogic.go index e19b08e0..e07a8b3a 100644 --- a/api/internal/logic/storage/dailypowerscreenlogic.go +++ b/api/internal/logic/storage/dailypowerscreenlogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-ceph/ceph" + "gitlink.org.cn/jcce-pcm/pcm-participant-ceph/ceph" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/storage/percentercomputerpowerslogic.go b/api/internal/logic/storage/percentercomputerpowerslogic.go index 9f552351..669a3b6c 100644 --- a/api/internal/logic/storage/percentercomputerpowerslogic.go +++ b/api/internal/logic/storage/percentercomputerpowerslogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-ceph/ceph" + "gitlink.org.cn/jcce-pcm/pcm-participant-ceph/ceph" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/storage/screenstoragelogic.go b/api/internal/logic/storage/screenstoragelogic.go index 4c79c689..468a6369 100644 --- a/api/internal/logic/storage/screenstoragelogic.go +++ b/api/internal/logic/storage/screenstoragelogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-ceph/ceph" + "gitlink.org.cn/jcce-pcm/pcm-participant-ceph/ceph" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/vm/bulkcreatenetworkslogic.go b/api/internal/logic/vm/bulkcreatenetworkslogic.go index 3b19f569..a23c55e7 100644 --- a/api/internal/logic/vm/bulkcreatenetworkslogic.go +++ b/api/internal/logic/vm/bulkcreatenetworkslogic.go @@ -18,15 +18,14 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" + "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" + "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" tool "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" - "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" - "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" - "github.com/zeromicro/go-zero/core/logx" ) diff --git a/api/internal/logic/vm/createimagelogic.go b/api/internal/logic/vm/createimagelogic.go index 4947239d..264e9341 100644 --- a/api/internal/logic/vm/createimagelogic.go +++ b/api/internal/logic/vm/createimagelogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/vm/createnetworklogic.go b/api/internal/logic/vm/createnetworklogic.go index 260b5041..8c2a26b2 100644 --- a/api/internal/logic/vm/createnetworklogic.go +++ b/api/internal/logic/vm/createnetworklogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/vm/createnodelogic.go b/api/internal/logic/vm/createnodelogic.go index f15d0d91..ee34c790 100644 --- a/api/internal/logic/vm/createnodelogic.go +++ b/api/internal/logic/vm/createnodelogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" tool "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/vm/createserverlogic.go b/api/internal/logic/vm/createserverlogic.go index c7ce7e24..fec78356 100644 --- a/api/internal/logic/vm/createserverlogic.go +++ b/api/internal/logic/vm/createserverlogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/vm/createsubnetlogic.go b/api/internal/logic/vm/createsubnetlogic.go index 7aec6c68..23767979 100644 --- a/api/internal/logic/vm/createsubnetlogic.go +++ b/api/internal/logic/vm/createsubnetlogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/vm/createvolumelogic.go b/api/internal/logic/vm/createvolumelogic.go index 1e872c32..ce5710ee 100644 --- a/api/internal/logic/vm/createvolumelogic.go +++ b/api/internal/logic/vm/createvolumelogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/vm/createvolumetypeslogic.go b/api/internal/logic/vm/createvolumetypeslogic.go index b3d73b48..763e11c7 100644 --- a/api/internal/logic/vm/createvolumetypeslogic.go +++ b/api/internal/logic/vm/createvolumetypeslogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" tool "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/vm/deleteimagelogic.go b/api/internal/logic/vm/deleteimagelogic.go index 5258e8ac..ead0a488 100644 --- a/api/internal/logic/vm/deleteimagelogic.go +++ b/api/internal/logic/vm/deleteimagelogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/vm/deletenetworklogic.go b/api/internal/logic/vm/deletenetworklogic.go index 2984903c..e3a36fe0 100644 --- a/api/internal/logic/vm/deletenetworklogic.go +++ b/api/internal/logic/vm/deletenetworklogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/vm/deletenodelogic.go b/api/internal/logic/vm/deletenodelogic.go index 2345f397..c23cd5c6 100644 --- a/api/internal/logic/vm/deletenodelogic.go +++ b/api/internal/logic/vm/deletenodelogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" tool "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/vm/deleteserverlogic.go b/api/internal/logic/vm/deleteserverlogic.go index 4f61ec4e..a953e6f1 100644 --- a/api/internal/logic/vm/deleteserverlogic.go +++ b/api/internal/logic/vm/deleteserverlogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/vm/deletevolumelogic.go b/api/internal/logic/vm/deletevolumelogic.go index cc6beca8..c4b0aab7 100644 --- a/api/internal/logic/vm/deletevolumelogic.go +++ b/api/internal/logic/vm/deletevolumelogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/vm/deletevolumetypelogic.go b/api/internal/logic/vm/deletevolumetypelogic.go index 7241cac8..f6b60dd4 100644 --- a/api/internal/logic/vm/deletevolumetypelogic.go +++ b/api/internal/logic/vm/deletevolumetypelogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" tool "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/vm/getcomputelimitslogic.go b/api/internal/logic/vm/getcomputelimitslogic.go index 66159eee..8da14faa 100644 --- a/api/internal/logic/vm/getcomputelimitslogic.go +++ b/api/internal/logic/vm/getcomputelimitslogic.go @@ -24,7 +24,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/api/internal/logic/vm/getserversdetailedbyidlogic.go b/api/internal/logic/vm/getserversdetailedbyidlogic.go index dc748584..22bec7c1 100644 --- a/api/internal/logic/vm/getserversdetailedbyidlogic.go +++ b/api/internal/logic/vm/getserversdetailedbyidlogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" tool "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/vm/getvolumedetailedbyidlogic.go b/api/internal/logic/vm/getvolumedetailedbyidlogic.go index ba252883..0729728b 100644 --- a/api/internal/logic/vm/getvolumedetailedbyidlogic.go +++ b/api/internal/logic/vm/getvolumedetailedbyidlogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" tool "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/vm/getvolumelimitslogic.go b/api/internal/logic/vm/getvolumelimitslogic.go index ac69a793..4f267f23 100644 --- a/api/internal/logic/vm/getvolumelimitslogic.go +++ b/api/internal/logic/vm/getvolumelimitslogic.go @@ -24,7 +24,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/api/internal/logic/vm/listflavorsdetaillogic.go b/api/internal/logic/vm/listflavorsdetaillogic.go index ad483931..1f0d842c 100644 --- a/api/internal/logic/vm/listflavorsdetaillogic.go +++ b/api/internal/logic/vm/listflavorsdetaillogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/vm/listimageslogic.go b/api/internal/logic/vm/listimageslogic.go index 51d1eee5..9665a2d1 100644 --- a/api/internal/logic/vm/listimageslogic.go +++ b/api/internal/logic/vm/listimageslogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/vm/listnetworkslogic.go b/api/internal/logic/vm/listnetworkslogic.go index e25b8c37..19b8af42 100644 --- a/api/internal/logic/vm/listnetworkslogic.go +++ b/api/internal/logic/vm/listnetworkslogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/vm/listnodeslogic.go b/api/internal/logic/vm/listnodeslogic.go index 7e118b6c..01fcfa65 100644 --- a/api/internal/logic/vm/listnodeslogic.go +++ b/api/internal/logic/vm/listnodeslogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" tool "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/vm/listserverlogic.go b/api/internal/logic/vm/listserverlogic.go index f6810b6a..5fb8a4fb 100644 --- a/api/internal/logic/vm/listserverlogic.go +++ b/api/internal/logic/vm/listserverlogic.go @@ -24,7 +24,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" ) diff --git a/api/internal/logic/vm/listserversdetailedlogic.go b/api/internal/logic/vm/listserversdetailedlogic.go index 06992ade..63fdbe80 100644 --- a/api/internal/logic/vm/listserversdetailedlogic.go +++ b/api/internal/logic/vm/listserversdetailedlogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/vm/listvolumesdetaillogic.go b/api/internal/logic/vm/listvolumesdetaillogic.go index 07102941..aca25a5c 100644 --- a/api/internal/logic/vm/listvolumesdetaillogic.go +++ b/api/internal/logic/vm/listvolumesdetaillogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/vm/listvolumeslogic.go b/api/internal/logic/vm/listvolumeslogic.go index 5c0aa922..92dd2ae1 100644 --- a/api/internal/logic/vm/listvolumeslogic.go +++ b/api/internal/logic/vm/listvolumeslogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" tool "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/vm/listvolumetypeslogic.go b/api/internal/logic/vm/listvolumetypeslogic.go index e55ed5b3..9af04764 100644 --- a/api/internal/logic/vm/listvolumetypeslogic.go +++ b/api/internal/logic/vm/listvolumetypeslogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/vm/pauseserverlogic.go b/api/internal/logic/vm/pauseserverlogic.go index 49f7816f..4675dfc0 100644 --- a/api/internal/logic/vm/pauseserverlogic.go +++ b/api/internal/logic/vm/pauseserverlogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" tool "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/vm/rebootserverlogic.go b/api/internal/logic/vm/rebootserverlogic.go index b02f9267..7f41a3ff 100644 --- a/api/internal/logic/vm/rebootserverlogic.go +++ b/api/internal/logic/vm/rebootserverlogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" tool "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/vm/shownetworkdetailslogic.go b/api/internal/logic/vm/shownetworkdetailslogic.go index 3116682c..60e563fa 100644 --- a/api/internal/logic/vm/shownetworkdetailslogic.go +++ b/api/internal/logic/vm/shownetworkdetailslogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" tool "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/vm/startserverlogic.go b/api/internal/logic/vm/startserverlogic.go index f09a19e3..846944f0 100644 --- a/api/internal/logic/vm/startserverlogic.go +++ b/api/internal/logic/vm/startserverlogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" tool "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/vm/stopserverlogic.go b/api/internal/logic/vm/stopserverlogic.go index 1a6aa545..530fd165 100644 --- a/api/internal/logic/vm/stopserverlogic.go +++ b/api/internal/logic/vm/stopserverlogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" tool "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/vm/updatenetworklogic.go b/api/internal/logic/vm/updatenetworklogic.go index 6441a005..48edfef1 100644 --- a/api/internal/logic/vm/updatenetworklogic.go +++ b/api/internal/logic/vm/updatenetworklogic.go @@ -22,7 +22,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" tool "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/vm/updateserverlogic.go b/api/internal/logic/vm/updateserverlogic.go index a294123f..2750e31f 100644 --- a/api/internal/logic/vm/updateserverlogic.go +++ b/api/internal/logic/vm/updateserverlogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" tool "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/vm/updatevolumelogic.go b/api/internal/logic/vm/updatevolumelogic.go index b0b4908b..67c0c9c6 100644 --- a/api/internal/logic/vm/updatevolumelogic.go +++ b/api/internal/logic/vm/updatevolumelogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" tool "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/vm/uploadimagelogic.go b/api/internal/logic/vm/uploadimagelogic.go index 22a5a146..7bf881d7 100644 --- a/api/internal/logic/vm/uploadimagelogic.go +++ b/api/internal/logic/vm/uploadimagelogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstack" + "gitlink.org.cn/JointCloud/pcm-openstack/openstack" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/storeLink/modelarts.go b/api/internal/storeLink/modelarts.go index 98475f8a..b9bf8abe 100644 --- a/api/internal/storeLink/modelarts.go +++ b/api/internal/storeLink/modelarts.go @@ -20,7 +20,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/scheduler/service/collector" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "strconv" "strings" ) diff --git a/api/internal/storeLink/octopus.go b/api/internal/storeLink/octopus.go index bf121402..4bb6cbfb 100644 --- a/api/internal/storeLink/octopus.go +++ b/api/internal/storeLink/octopus.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/scheduler/service/collector" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/JointCloud/pcm-participant-octopus/octopus" + "gitlink.org.cn/jcce-pcm/pcm-participant-octopus/octopus" "math" "strconv" "strings" diff --git a/api/internal/storeLink/shuguangHpc.go b/api/internal/storeLink/shuguangHpc.go index 653db74e..b4a0768d 100644 --- a/api/internal/storeLink/shuguangHpc.go +++ b/api/internal/storeLink/shuguangHpc.go @@ -4,10 +4,10 @@ import ( "context" "errors" "fmt" - "gitlink.org.cn/JointCloud/pcm-ac/hpcAC" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" + "gitlink.org.cn/jcce-pcm/pcm-ac/hpcAC" "strconv" "strings" ) diff --git a/api/internal/storeLink/shuguangai.go b/api/internal/storeLink/shuguangai.go index 7aa5699a..9399cf17 100644 --- a/api/internal/storeLink/shuguangai.go +++ b/api/internal/storeLink/shuguangai.go @@ -17,12 +17,12 @@ package storeLink import ( "context" "errors" - "gitlink.org.cn/JointCloud/pcm-ac/hpcAC" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/scheduler/schedulers/option" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/scheduler/service/collector" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" + "gitlink.org.cn/jcce-pcm/pcm-ac/hpcAC" "strconv" "strings" ) diff --git a/api/internal/storeLink/storeLink.go b/api/internal/storeLink/storeLink.go index 7859879b..8f5df007 100644 --- a/api/internal/storeLink/storeLink.go +++ b/api/internal/storeLink/storeLink.go @@ -17,15 +17,15 @@ package storeLink import ( "context" "github.com/pkg/errors" - "gitlink.org.cn/JointCloud/pcm-ac/hpcAC" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/scheduler/common" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/scheduler/service/collector" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/models" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils/timeutils" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/modelarts" - "gitlink.org.cn/JointCloud/pcm-participant-octopus/octopus" + "gitlink.org.cn/jcce-pcm/pcm-ac/hpcAC" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/jcce-pcm/pcm-participant-octopus/octopus" "gorm.io/gorm" ) diff --git a/api/internal/svc/servicecontext.go b/api/internal/svc/servicecontext.go index 85e2b2d8..19630851 100644 --- a/api/internal/svc/servicecontext.go +++ b/api/internal/svc/servicecontext.go @@ -20,22 +20,22 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/s3/s3manager" "github.com/docker/docker/client" - "github.com/redis/go-redis/v9" + "github.com/go-redis/redis/v8" "github.com/robfig/cron/v3" "github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/zrpc" - "gitlink.org.cn/JointCloud/pcm-ac/hpcacclient" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/config" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/tracker" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" "gitlink.org.cn/JointCloud/pcm-coordinator/rpc/client/participantservice" "gitlink.org.cn/JointCloud/pcm-kubernetes/kubernetesclient" - "gitlink.org.cn/JointCloud/pcm-participant-ceph/cephclient" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/client/imagesservice" - "gitlink.org.cn/JointCloud/pcm-participant-modelarts/client/modelartsservice" - "gitlink.org.cn/JointCloud/pcm-participant-octopus/octopusclient" - "gitlink.org.cn/JointCloud/pcm-participant-openstack/openstackclient" - "gitlink.org.cn/JointCloud/pcm-slurm/slurmclient" + "gitlink.org.cn/JointCloud/pcm-openstack/openstackclient" + slurmClient "gitlink.org.cn/JointCloud/pcm-slurm/slurmclient" + "gitlink.org.cn/jcce-pcm/pcm-ac/hpcacclient" + "gitlink.org.cn/jcce-pcm/pcm-participant-ceph/cephclient" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/client/imagesservice" + "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/client/modelartsservice" + "gitlink.org.cn/jcce-pcm/pcm-participant-octopus/octopusclient" "gorm.io/driver/mysql" "gorm.io/gorm" "gorm.io/gorm/schema" @@ -50,7 +50,7 @@ type ServiceContext struct { ModelArtsImgRpc imagesservice.ImagesService DbEngin *gorm.DB ACRpc hpcacclient.HpcAC - THRpc slurmclient.Slurm + THRpc slurmClient.Slurm OctopusRpc octopusclient.Octopus CephRpc cephclient.Ceph OpenstackRpc openstackclient.Openstack diff --git a/go.mod b/go.mod index b2f1d3af..53fed69f 100644 --- a/go.mod +++ b/go.mod @@ -17,29 +17,28 @@ require ( github.com/json-iterator/go v1.1.12 github.com/nacos-group/nacos-sdk-go/v2 v2.2.4 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.17.0 + github.com/prometheus/client_golang v1.18.0 github.com/prometheus/common v0.45.0 - github.com/redis/go-redis/v9 v9.3.0 github.com/robfig/cron/v3 v3.0.1 github.com/rs/zerolog v1.28.0 github.com/shopspring/decimal v1.3.1 - github.com/zeromicro/go-zero v1.6.0 - gitlink.org.cn/JointCloud/pcm-kubernetes v0.0.0-20240109113817-0c209f435504 - gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240301014547-e6c36af34fe9 - gitlink.org.cn/JointCloud/pcm-slurm v0.0.0-20240118030009-63b62a0bc32d - gitlink.org.cn/jcce-pcm/pcm-participant-ac v0.0.0-20240229022732-b9dc7ea00ddf + github.com/zeromicro/go-zero v1.6.2 + gitlink.org.cn/JointCloud/pcm-kubernetes v0.0.0-20240301071143-347480abff2c + gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240301081832-77a16f4577d9 + gitlink.org.cn/JointCloud/pcm-slurm v0.0.0-20240301080743-8b94bbaf57f5 + gitlink.org.cn/jcce-pcm/pcm-ac v0.0.0-20240301085553-f6ad88fa357a gitlink.org.cn/jcce-pcm/pcm-participant-ceph v0.0.0-20230904090036-24fc730ec87d + gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20231101085149-724c7c4cc090 gitlink.org.cn/jcce-pcm/pcm-participant-octopus v0.0.0-20240222124813-e275cfa342f4 - gitlink.org.cn/jcce-pcm/pcm-participant-slurm v0.0.0-20240111082837-19370f12a067 go.opentelemetry.io/otel/trace v1.21.0 gonum.org/v1/gonum v0.11.0 - google.golang.org/grpc v1.60.0 - google.golang.org/protobuf v1.31.0 + google.golang.org/grpc v1.61.0 + google.golang.org/protobuf v1.32.0 gorm.io/datatypes v1.2.0 gorm.io/driver/mysql v1.5.2 gorm.io/gorm v1.25.5 - k8s.io/apimachinery v0.29.0 - k8s.io/client-go v0.29.0 + k8s.io/apimachinery v0.29.1 + k8s.io/client-go v0.29.1 sigs.k8s.io/yaml v1.4.0 ) @@ -76,7 +75,7 @@ require ( github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.5.0 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect @@ -97,10 +96,11 @@ require ( github.com/pelletier/go-toml/v2 v2.1.1 // indirect github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect + github.com/redis/go-redis/v9 v9.4.0 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect - go.etcd.io/etcd/api/v3 v3.5.11 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.5.11 // indirect - go.etcd.io/etcd/client/v3 v3.5.11 // indirect + go.etcd.io/etcd/api/v3 v3.5.12 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect + go.etcd.io/etcd/client/v3 v3.5.12 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect @@ -114,17 +114,17 @@ require ( go.uber.org/automaxprocs v1.5.3 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect - golang.org/x/crypto v0.16.0 // indirect + golang.org/x/crypto v0.18.0 // indirect golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect golang.org/x/mod v0.14.0 // indirect - golang.org/x/net v0.19.0 // indirect + golang.org/x/net v0.20.0 // indirect golang.org/x/oauth2 v0.15.0 // indirect golang.org/x/sync v0.5.0 // indirect - golang.org/x/sys v0.15.0 // indirect - golang.org/x/term v0.15.0 // indirect + golang.org/x/sys v0.16.0 // indirect + golang.org/x/term v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.15.0 // indirect + golang.org/x/tools v0.16.1 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect @@ -134,7 +134,7 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.29.0 // indirect + k8s.io/api v0.29.1 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231206194836-bf4651e18aa8 // indirect k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect diff --git a/go.sum b/go.sum index a78c235f..e6faa0c8 100644 --- a/go.sum +++ b/go.sum @@ -390,8 +390,9 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg6 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= +github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= +github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= github.com/JCCE-nudt/zero-contrib/zrpc/registry/nacos v0.0.0-20230419021610-13bbc83fbc3c h1:qoPu5FeE6dsvZ7AmH/l3Y5RxrJPNVKvsQSrjQpWUCMQ= github.com/JCCE-nudt/zero-contrib/zrpc/registry/nacos v0.0.0-20230419021610-13bbc83fbc3c/go.mod h1:GuCS4be9IH3bSBTvbzz34nszPQDO33PIOv5nviEaFMw= github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM= @@ -420,8 +421,8 @@ github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGn github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302 h1:uvdUDbHQHO85qeSydJtItA4T55Pw6BtAejd0APRJOCE= github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= github.com/alicebob/miniredis/v2 v2.30.1/go.mod h1:b25qWj4fCEsBeAAR2mlb0ufImGC6uH3VlUfb/HS5zKg= -github.com/alicebob/miniredis/v2 v2.31.0 h1:ObEFUNlJwoIiyjxdrYF0QIDE7qXcLc7D3WpSH4c22PU= -github.com/alicebob/miniredis/v2 v2.31.0/go.mod h1:UB/T2Uztp7MlFSDakaX1sTXUv5CASoprx0wulRT6HBg= +github.com/alicebob/miniredis/v2 v2.31.1 h1:7XAt0uUg3DtwEKW5ZAGa+K7FZV2DdKQo5K/6TTnfX8Y= +github.com/alicebob/miniredis/v2 v2.31.1/go.mod h1:UB/T2Uztp7MlFSDakaX1sTXUv5CASoprx0wulRT6HBg= github.com/aliyun/alibaba-cloud-sdk-go v1.61.1704/go.mod h1:RcDobYh8k5VP6TNybz9m++gL3ijVI5wueVr0EM10VsU= github.com/aliyun/alibaba-cloud-sdk-go v1.61.1800 h1:ie/8RxBOfKZWcrbYSJi2Z8uX8TcOlSMwPlEJh83OeOw= github.com/aliyun/alibaba-cloud-sdk-go v1.61.1800/go.mod h1:RcDobYh8k5VP6TNybz9m++gL3ijVI5wueVr0EM10VsU= @@ -680,8 +681,8 @@ github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8I github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= -github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= @@ -729,9 +730,11 @@ github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5ey github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= github.com/jackc/pgx/v5 v5.3.1/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8= -github.com/jackc/pgx/v5 v5.4.3 h1:cxFyXhxlvAifxnkKKdlxv8XqUf59tDlYjnV5YYfsJJY= -github.com/jackc/pgx/v5 v5.4.3/go.mod h1:Ig06C2Vu0t5qXC60W8sqIthScaEnFvojjj9dSljmHRA= +github.com/jackc/pgx/v5 v5.5.2 h1:iLlpgp4Cp/gC9Xuscl7lFL1PhhW+ZLtXZcrfCt4C3tA= +github.com/jackc/pgx/v5 v5.5.2/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A= github.com/jackc/puddle/v2 v2.2.0/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= +github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk= +github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo= @@ -905,8 +908,8 @@ github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrb github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= -github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q= -github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY= +github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= +github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -931,8 +934,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rabbitmq/amqp091-go v1.5.0/go.mod h1:JsV0ofX5f1nwOGafb8L5rBItt9GyhfQfcJj+oyz0dGg= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/redis/go-redis/v9 v9.3.0 h1:RiVDjmig62jIWp7Kk4XVLs0hzV6pI3PyTnnL0cnn0u0= -github.com/redis/go-redis/v9 v9.3.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= +github.com/redis/go-redis/v9 v9.4.0 h1:Yzoz33UZw9I/mFhx4MNrB6Fk+XHO1VukNcCa1+lwyKk= +github.com/redis/go-redis/v9 v9.4.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= @@ -995,33 +998,31 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t github.com/yuin/gopher-lua v1.1.0 h1:BojcDhfyDWgU2f2TOzYK/g5p2gxMrku8oupLDqlnSqE= github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= github.com/zeromicro/go-zero v1.5.1/go.mod h1:bGYm4XWsGN9GhDsO2O2BngpVoWjf3Eog2a5hUOMhlXs= -github.com/zeromicro/go-zero v1.6.0 h1:UwSOR1lGZ2g7L0S07PM8RoneAcubtd5x//EfbuNucQ0= -github.com/zeromicro/go-zero v1.6.0/go.mod h1:E9GCFPb0SwsTKFBcFr9UynGvXiDMmfc6fI5F15vqvAQ= -gitlink.org.cn/JointCloud/pcm-ac v0.0.0-20240201033409-2d4e27a90c39 h1:xELff00boita+C9qvGM8ci3rnn020VMj+PyJXNEQzI0= -gitlink.org.cn/JointCloud/pcm-ac v0.0.0-20240201033409-2d4e27a90c39/go.mod h1:ySZHK8NpHn4gjbLoOtJbSEUDiYZVwjbnFAcG71gXPgg= -gitlink.org.cn/JointCloud/pcm-kubernetes v0.0.0-20231214084401-de9ac5db7246 h1:VVyI1H3hRv5tDWHt41jIlrucmxF10z3bMqv/hIwCcw0= -gitlink.org.cn/JointCloud/pcm-kubernetes v0.0.0-20231214084401-de9ac5db7246/go.mod h1:LM+XeDayimN6b1AY7AhNbbhq9HJyS0u7tszMCNsNmAo= -gitlink.org.cn/JointCloud/pcm-kubernetes v0.0.0-20240109113817-0c209f435504 h1:cmnkK/Lzkzu3wJn/rdk9aDOROgvVQBbZhiokK4YtZsc= -gitlink.org.cn/JointCloud/pcm-kubernetes v0.0.0-20240109113817-0c209f435504/go.mod h1:W0H6CuRLJr0kF+waYKpuxBnCZkCQvxMZMy3FfFqpD/0= -gitlink.org.cn/JointCloud/pcm-participant-ceph v0.0.0-20230904090036-24fc730ec87d h1:DHjl/rLuH2gKYtY0MKMGNQDHFT12APg25RlMUQo+tHk= -gitlink.org.cn/JointCloud/pcm-participant-ceph v0.0.0-20230904090036-24fc730ec87d/go.mod h1:r/KLzUpupCV5jdxSfgDhc2pVjP0fBi3VhAWRttsBn30= -gitlink.org.cn/JointCloud/pcm-participant-modelarts v0.0.0-20231101085149-724c7c4cc090 h1:jztlHo72bcWM1jUwvG3Hfk2K+AJL0RvlsdIqlktH/MI= -gitlink.org.cn/JointCloud/pcm-participant-modelarts v0.0.0-20231101085149-724c7c4cc090/go.mod h1:pisJKAI8FRFFUcBaH3Gob+ENXWRM97rpuYmv9s1raag= -gitlink.org.cn/JointCloud/pcm-participant-octopus v0.0.0-20240222124813-e275cfa342f4 h1:NrxKAZ5uAzshB9EHcPw+XTOTzpxb5HslNRMYBrFC1Qo= -gitlink.org.cn/JointCloud/pcm-participant-octopus v0.0.0-20240222124813-e275cfa342f4/go.mod h1:uyvpVqG1jHDXX+ubXI0RBwnWXzVykD/mliqGQIDvRoo= -gitlink.org.cn/JointCloud/pcm-participant-openstack v0.0.0-20231102023739-81a3d353c10d h1:hdSxVD+AN7W6j847/GsnNgOAX5IdRQRV1KLz+d4FlS0= -gitlink.org.cn/JointCloud/pcm-participant-openstack v0.0.0-20231102023739-81a3d353c10d/go.mod h1:m75SVNfNa1TUBlQtBfR0CeETQ0ez2RIUqlSCn1Mb/js= -gitlink.org.cn/JointCloud/pcm-slurm v0.0.0-20231107115628-f74106c47dfa h1:U0YV9ju5OPpUe8iUk4OEUtYJlINgpI0vgLC1IfZ2JUY= -gitlink.org.cn/JointCloud/pcm-slurm v0.0.0-20231107115628-f74106c47dfa/go.mod h1:tqj8GWoM2P21agWvJyUwN1U37CqfALwZTkRs9Ekgrbw= +github.com/zeromicro/go-zero v1.6.2 h1:c1gXp6JTO0e+dtfwNZRE7OZgzjipfW8i1iBMoBnDwBI= +github.com/zeromicro/go-zero v1.6.2/go.mod h1:mQKK/c/er/sbIAo7DWyFBZX8oa0eOkc7QJdG15b2GBw= +gitlink.org.cn/JointCloud/pcm-kubernetes v0.0.0-20240301071143-347480abff2c h1:2Wl/hvaSFjh6fmCSIQhjkr9llMRREQeqcXNLZ/HPY18= +gitlink.org.cn/JointCloud/pcm-kubernetes v0.0.0-20240301071143-347480abff2c/go.mod h1:lSRfGs+PxFvw7CcndHWRd6UlLlGrZn0b0hp5cfaMNGw= +gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240301081832-77a16f4577d9 h1:t/ca744622Kzw7GsrwUO+JdxeTc+xWxhJXlnSv+5wAc= +gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240301081832-77a16f4577d9/go.mod h1:i2rrbMQ+Fve345BY9Heh4MUqVTAimZQElQhzzRee5B8= +gitlink.org.cn/JointCloud/pcm-slurm v0.0.0-20240301080743-8b94bbaf57f5 h1:+/5vnzkJBfMRnya1NrhOzlroUtRa5ePiYbPKlHLoLV0= +gitlink.org.cn/JointCloud/pcm-slurm v0.0.0-20240301080743-8b94bbaf57f5/go.mod h1:97AlUXN13g9UN3+9/DzCHpeoU5sbdyv0IQuTEHNexzQ= +gitlink.org.cn/jcce-pcm/pcm-ac v0.0.0-20240301085553-f6ad88fa357a h1:fY1KmyZ6O7wVBvgt2HB+C9e1DncJdk/Wkv8m5Qz7abw= +gitlink.org.cn/jcce-pcm/pcm-ac v0.0.0-20240301085553-f6ad88fa357a/go.mod h1:oMaWf5sEDFKTfCbIlT6/7IFI3f6PsuiRnWzzQruSF5Q= +gitlink.org.cn/jcce-pcm/pcm-participant-ceph v0.0.0-20230904090036-24fc730ec87d h1:DHjl/rLuH2gKYtY0MKMGNQDHFT12APg25RlMUQo+tHk= +gitlink.org.cn/jcce-pcm/pcm-participant-ceph v0.0.0-20230904090036-24fc730ec87d/go.mod h1:r/KLzUpupCV5jdxSfgDhc2pVjP0fBi3VhAWRttsBn30= +gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20231101085149-724c7c4cc090 h1:jztlHo72bcWM1jUwvG3Hfk2K+AJL0RvlsdIqlktH/MI= +gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20231101085149-724c7c4cc090/go.mod h1:pisJKAI8FRFFUcBaH3Gob+ENXWRM97rpuYmv9s1raag= +gitlink.org.cn/jcce-pcm/pcm-participant-octopus v0.0.0-20240222124813-e275cfa342f4 h1:NrxKAZ5uAzshB9EHcPw+XTOTzpxb5HslNRMYBrFC1Qo= +gitlink.org.cn/jcce-pcm/pcm-participant-octopus v0.0.0-20240222124813-e275cfa342f4/go.mod h1:uyvpVqG1jHDXX+ubXI0RBwnWXzVykD/mliqGQIDvRoo= go.etcd.io/etcd/api/v3 v3.5.7/go.mod h1:9qew1gCdDDLu+VwmeG+iFpL+QlpHTo7iubavdVDgCAA= -go.etcd.io/etcd/api/v3 v3.5.11 h1:B54KwXbWDHyD3XYAwprxNzTe7vlhR69LuBgZnMVvS7E= -go.etcd.io/etcd/api/v3 v3.5.11/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4= +go.etcd.io/etcd/api/v3 v3.5.12 h1:W4sw5ZoU2Juc9gBWuLk5U6fHfNVyY1WC5g9uiXZio/c= +go.etcd.io/etcd/api/v3 v3.5.12/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4= go.etcd.io/etcd/client/pkg/v3 v3.5.7/go.mod h1:o0Abi1MK86iad3YrWhgUsbGx1pmTS+hrORWc2CamuhY= -go.etcd.io/etcd/client/pkg/v3 v3.5.11 h1:bT2xVspdiCj2910T0V+/KHcVKjkUrCZVtk8J2JF2z1A= -go.etcd.io/etcd/client/pkg/v3 v3.5.11/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4= +go.etcd.io/etcd/client/pkg/v3 v3.5.12 h1:EYDL6pWwyOsylrQyLp2w+HkQ46ATiOvoEdMarindU2A= +go.etcd.io/etcd/client/pkg/v3 v3.5.12/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4= go.etcd.io/etcd/client/v3 v3.5.7/go.mod h1:sOWmj9DZUMyAngS7QQwCyAXXAL6WhgTOPLNS/NabQgw= -go.etcd.io/etcd/client/v3 v3.5.11 h1:ajWtgoNSZJ1gmS8k+icvPtqsqEav+iUorF7b0qozgUU= -go.etcd.io/etcd/client/v3 v3.5.11/go.mod h1:a6xQUEqFJ8vztO1agJh/KQKOMfFI8og52ZconzcDJwE= +go.etcd.io/etcd/client/v3 v3.5.12 h1:v5lCPXn1pf1Uu3M4laUE2hp/geOTc5uPcYYsNe1lDxg= +go.etcd.io/etcd/client/v3 v3.5.12/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw= go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= @@ -1101,8 +1102,8 @@ golang.org/x/crypto v0.0.0-20221010152910-d6f0a8c073c2/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= -golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1219,8 +1220,8 @@ golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1366,8 +1367,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -1380,8 +1381,8 @@ golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= -golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= +golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= +golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1472,8 +1473,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= -golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= +golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA= +golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1705,8 +1706,8 @@ google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCD google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= -google.golang.org/grpc v1.60.0 h1:6FQAR0kM31P6MRdeluor2w2gPaS4SVNrD/DNTxrQ15k= -google.golang.org/grpc v1.60.0/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= +google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= +google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1725,8 +1726,8 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.2-0.20230222093303-bc1253ad3743/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1785,14 +1786,14 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.26.3/go.mod h1:PXsqwPMXBSBcL1lJ9CYDKy7kIReUydukS5JiRlxC3qE= -k8s.io/api v0.29.0 h1:NiCdQMY1QOp1H8lfRyeEf8eOwV6+0xA6XEE44ohDX2A= -k8s.io/api v0.29.0/go.mod h1:sdVmXoz2Bo/cb77Pxi71IPTSErEW32xa4aXwKH7gfBA= +k8s.io/api v0.29.1 h1:DAjwWX/9YT7NQD4INu49ROJuZAAAP/Ijki48GUPzxqw= +k8s.io/api v0.29.1/go.mod h1:7Kl10vBRUXhnQQI8YR/R327zXC8eJ7887/+Ybta+RoQ= k8s.io/apimachinery v0.26.3/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I= -k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o= -k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis= +k8s.io/apimachinery v0.29.1 h1:KY4/E6km/wLBguvCZv8cKTeOwwOBqFNjwJIdMkMbbRc= +k8s.io/apimachinery v0.29.1/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= k8s.io/client-go v0.26.3/go.mod h1:ZPNu9lm8/dbRIPAgteN30RSXea6vrCpFvq+MateTUuQ= -k8s.io/client-go v0.29.0 h1:KmlDtFcrdUzOYrBhXHgKw5ycWzc3ryPX5mQe0SkG3y8= -k8s.io/client-go v0.29.0/go.mod h1:yLkXH4HKMAywcrD82KMSmfYg2DlE8mepPR4JGSo5n38= +k8s.io/client-go v0.29.1 h1:19B/+2NGEwnFLzt0uB5kNJnfTsbV8w6TgQRz9l7ti7A= +k8s.io/client-go v0.29.1/go.mod h1:TDG/psL9hdet0TI9mGyHJSgRkW3H9JZk2dNEUS7bRks= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=