From 808db9d872fb882c241cf1f913c8b33829bfe25e Mon Sep 17 00:00:00 2001 From: ioito Date: Fri, 18 Nov 2022 15:11:06 +0800 Subject: [PATCH] fix(region): hcs storage type width --- go.mod | 2 +- go.sum | 4 ++-- pkg/compute/models/storages.go | 2 +- vendor/modules.txt | 2 +- .../x/cloudmux/pkg/multicloud/hcs/bucket.go | 16 ++++++++++++++++ .../x/cloudmux/pkg/multicloud/hcs/region.go | 12 ------------ 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index e895446d32..09f7c39b81 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,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.20221117091109-7f94a8910b85 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221118075336-64c069b55cce yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 yunion.io/x/jsonutils v1.0.1-0.20220819091305-3bab322ab4fd yunion.io/x/log v1.0.0 diff --git a/go.sum b/go.sum index 146467ea72..527ebe42f4 100644 --- a/go.sum +++ b/go.sum @@ -1176,8 +1176,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.20221117091109-7f94a8910b85 h1:ZmH9nfWPIMiq6Qs9RnzBt7p9hYZdKVXDrnI3hU0rJMo= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221117091109-7f94a8910b85/go.mod h1:drc/WDD65r6wI1tSejk19xcl9QwmzZlgJGXN7a9o2KQ= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221118075336-64c069b55cce h1:TMpMl9KYD0O3ATBnT1tI5qHRSD9iV7qvaEd3Wq+22vo= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221118075336-64c069b55cce/go.mod h1:drc/WDD65r6wI1tSejk19xcl9QwmzZlgJGXN7a9o2KQ= yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 h1:0zlZD5uhZoIHgLVAWCz2aHaYk2ZrNsACCYD7R6EIBII= yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws= yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634= diff --git a/pkg/compute/models/storages.go b/pkg/compute/models/storages.go index 6221a2f5bf..392e766870 100644 --- a/pkg/compute/models/storages.go +++ b/pkg/compute/models/storages.go @@ -81,7 +81,7 @@ type SStorage struct { Reserved int64 `nullable:"true" default:"0" list:"domain" update:"domain"` // 存储类型 // example: local - StorageType string `width:"32" charset:"ascii" nullable:"false" list:"user" create:"domain_required"` + StorageType string `width:"64" charset:"ascii" nullable:"false" list:"user" create:"domain_required"` // 介质类型 // example: ssd MediumType string `width:"32" charset:"ascii" nullable:"false" list:"user" update:"domain" create:"domain_required"` diff --git a/vendor/modules.txt b/vendor/modules.txt index 21ee6b8daa..c4c3e17b4e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1439,7 +1439,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.20221117091109-7f94a8910b85 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221118075336-64c069b55cce ## explicit; go 1.18 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcs/bucket.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcs/bucket.go index 5cb6c0c719..4f864794d0 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcs/bucket.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcs/bucket.go @@ -802,3 +802,19 @@ func (self *SRegion) CreateBucket(name string, storageClassStr string, aclStr st } return nil } + +func (self *SRegion) GetIBuckets() ([]cloudprovider.ICloudBucket, error) { + buckets, err := self.GetBuckets() + if err != nil { + return nil, errors.Wrap(err, "GetBuckets") + } + ret := make([]cloudprovider.ICloudBucket, 0) + for i := range buckets { + ret = append(ret, &buckets[i]) + } + return ret, nil +} + +func (region *SRegion) GetIBucketById(name string) (cloudprovider.ICloudBucket, error) { + return cloudprovider.GetIBucketById(region, name) +} diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcs/region.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcs/region.go index 6bda0fe5bd..1db7bc6529 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcs/region.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcs/region.go @@ -318,15 +318,3 @@ func (self *SRegion) GetBuckets() ([]SBucket, error) { } return ret, nil } - -func (self *SRegion) GetIBuckets() ([]cloudprovider.ICloudBucket, error) { - buckets, err := self.GetBuckets() - if err != nil { - return nil, errors.Wrap(err, "GetBuckets") - } - ret := make([]cloudprovider.ICloudBucket, 0) - for i := range buckets { - ret = append(ret, &buckets[i]) - } - return ret, nil -}