From e102d90486ba2c3da04037ef608e0abc409a1268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Thu, 14 Nov 2024 20:32:23 +0800 Subject: [PATCH] fix(region): remove dstack (#21601) --- cmd/climc/shell/compute/usages.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- pkg/apis/compute/cloudaccount.go | 8 +------- pkg/apis/compute/cloudaccount_const.go | 1 - pkg/compute/models/cloudaccounts.go | 1 - pkg/mcclient/options/compute/cloudaccounts.go | 2 +- vendor/modules.txt | 2 +- .../x/cloudmux/pkg/apis/compute/cloudaccount_const.go | 2 -- .../x/cloudmux/pkg/multicloud/zstack/provider/provider.go | 2 +- 10 files changed, 8 insertions(+), 18 deletions(-) diff --git a/cmd/climc/shell/compute/usages.go b/cmd/climc/shell/compute/usages.go index 1b6274e2b5..b2f5913567 100644 --- a/cmd/climc/shell/compute/usages.go +++ b/cmd/climc/shell/compute/usages.go @@ -33,7 +33,7 @@ import ( type GeneralUsageOptions struct { HostType []string `help:"Host types" choices:"hypervisor|baremetal|esxi|xen|kubelet|hyperv|aliyun|azure|aws|huawei|qcloud|openstack|ucloud|zstack|google|ctyun"` Provider []string `help:"Provider" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|VolcEngine|ZStack|Google|Ctyun"` - Brand []string `help:"Brands" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|VolcEngine|ZStack|DStack|Google|Ctyun"` + Brand []string `help:"Brands" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|VolcEngine|ZStack|Google|Ctyun"` Project string `help:"show usage of specified project"` ProjectDomain string `help:"show usage of specified domain"` diff --git a/go.mod b/go.mod index 1e8327905b..70fbd3365e 100644 --- a/go.mod +++ b/go.mod @@ -87,7 +87,7 @@ require ( k8s.io/client-go v0.19.3 k8s.io/cluster-bootstrap v0.19.3 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241107063324-12e4e04c9238 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241114121105-d753b5ce0ce2 yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 diff --git a/go.sum b/go.sum index 667bfc3fca..5caf8cad82 100644 --- a/go.sum +++ b/go.sum @@ -1274,8 +1274,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241107063324-12e4e04c9238 h1:L5SDrUPg+pgFO8CPuaTlODjeGL3/ZsLCMMC0H6qWWtg= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241107063324-12e4e04c9238/go.mod h1:rj/pb3DitJlQaQD8UW1oxx/KD+PzDZqoywzqRJaFE9A= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241114121105-d753b5ce0ce2 h1:PedtXnK/DgPpKq90V81nQpLXtUr2OONmbIFsB5bS1To= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241114121105-d753b5ce0ce2/go.mod h1:rj/pb3DitJlQaQD8UW1oxx/KD+PzDZqoywzqRJaFE9A= yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 h1:v7POYkQwo1XzOxBoIoRVr/k0V9Y5JyjpshlIFa9raug= yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws= yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634= diff --git a/pkg/apis/compute/cloudaccount.go b/pkg/apis/compute/cloudaccount.go index 5cba5da9d1..c564c2d86c 100644 --- a/pkg/apis/compute/cloudaccount.go +++ b/pkg/apis/compute/cloudaccount.go @@ -72,12 +72,6 @@ type CloudenvResourceListInput struct { // Deprecated Provider []string `json:"provider" yunion-deprecated-by:"providers"` - // 列出指定云平台品牌的资源，一般来说brand和provider相同，除了以上支持的provider之外，还支持以下band - // - // | Brand | Provider | 说明 | - // |----------|----------|------------| - // | DStack | ZStack | 滴滴云私有云 | - // Brands []string `json:"brands"` // swagger:ignore // Deprecated @@ -169,7 +163,7 @@ type CloudaccountCreateInput struct { // | Huawei | Huawei | // | OpenStack | OpenStack | // | Ucloud | Ucloud | - // | ZStack | ZStack, DStack | + // | ZStack | ZStack | // | Google | Google | // | Ctyun | Ctyun | Brand string `json:"brand"` diff --git a/pkg/apis/compute/cloudaccount_const.go b/pkg/apis/compute/cloudaccount_const.go index 4932309453..a19f7e3948 100644 --- a/pkg/apis/compute/cloudaccount_const.go +++ b/pkg/apis/compute/cloudaccount_const.go @@ -83,7 +83,6 @@ const ( CLOUD_PROVIDER_HEALTH_UNKNOWN = compute.CLOUD_PROVIDER_HEALTH_UNKNOWN // 未知状态，查询失败 CLOUD_PROVIDER_HEALTH_NO_PERMISSION = compute.CLOUD_PROVIDER_HEALTH_NO_PERMISSION // 没有权限获取账单信息 - ZSTACK_BRAND_DSTACK = compute.ZSTACK_BRAND_DSTACK ONECLOUD_BRAND_ONECLOUD = "OneCloud" CLOUD_ACCOUNT_WIRE_LEVEL_VCENTER = "vcenter" diff --git a/pkg/compute/models/cloudaccounts.go b/pkg/compute/models/cloudaccounts.go index 97eba7e28a..ddcad96323 100644 --- a/pkg/compute/models/cloudaccounts.go +++ b/pkg/compute/models/cloudaccounts.go @@ -145,7 +145,6 @@ type SCloudaccount struct { Sysinfo jsonutils.JSONObject `get:"domain"` // 品牌信息, 一般和provider相同 - // example: DStack Brand string `width:"64" charset:"utf8" nullable:"true" list:"domain" create:"optional"` // 额外信息 diff --git a/pkg/mcclient/options/compute/cloudaccounts.go b/pkg/mcclient/options/compute/cloudaccounts.go index 82137ee31a..e901565d87 100644 --- a/pkg/mcclient/options/compute/cloudaccounts.go +++ b/pkg/mcclient/options/compute/cloudaccounts.go @@ -118,7 +118,7 @@ type SCloudAccountCreateBaseOptions struct { Name string `help:"Name of cloud account" positional:"true"` // PROVIDER string `help:"Driver for cloud account" choices:"VMware|Aliyun|Azure|Qcloud|OpenStack|Huawei|Aws"` Desc string `help:"Description" token:"desc" json:"description"` - Brand string `help:"Brand of cloud account" choices:"DStack"` + Brand string `help:"Brand of cloud account"` AutoCreateProject bool `help:"Enable the account with same name project"` AutoCreateProjectForProvider bool `help:"Is Auto Create Project For Provider"` diff --git a/vendor/modules.txt b/vendor/modules.txt index 4528dec6e0..6fb0aff969 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1576,7 +1576,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.2.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241107063324-12e4e04c9238 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241114121105-d753b5ce0ce2 ## explicit; go 1.21 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/apis/compute/cloudaccount_const.go b/vendor/yunion.io/x/cloudmux/pkg/apis/compute/cloudaccount_const.go index 7b8e35a8a4..f850f0c90b 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/apis/compute/cloudaccount_const.go +++ b/vendor/yunion.io/x/cloudmux/pkg/apis/compute/cloudaccount_const.go @@ -57,8 +57,6 @@ const ( CLOUD_PROVIDER_HEALTH_ARREARS = "arrears" // 远端处于欠费状态 CLOUD_PROVIDER_HEALTH_UNKNOWN = "unknown" // 未知状态，查询失败 CLOUD_PROVIDER_HEALTH_NO_PERMISSION = "no permission" // 没有权限获取账单信息 - - ZSTACK_BRAND_DSTACK = "DStack" ) const ( diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/provider/provider.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/provider/provider.go index 46b0b07374..dc6b95664f 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/provider/provider.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/provider/provider.go @@ -38,7 +38,7 @@ func (self *SZStackProviderFactory) GetName() string { } func (self *SZStackProviderFactory) GetSupportedBrands() []string { - return []string{api.ZSTACK_BRAND_DSTACK} + return []string{} } func (self *SZStackProviderFactory) ValidateCreateCloudaccountData(ctx context.Context, input cloudprovider.SCloudaccountCredential) (cloudprovider.SCloudaccount, error) {