From 297611d01e4548aed06b645525be6771b7d6f31b Mon Sep 17 00:00:00 2001 From: gouqi11 <66834753+gouqi11@users.noreply.github.com> Date: Tue, 9 Apr 2024 19:47:26 +0800 Subject: [PATCH] update vendor (#19915) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 马鸿飞 --- go.mod | 4 ++-- go.sum | 8 ++++---- vendor/modules.txt | 4 ++-- vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go | 6 +++++- vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/zone.go | 6 +++--- vendor/yunion.io/x/pkg/util/imagetools/imagetools.go | 3 +++ 6 files changed, 19 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 14187d1543..f1d81ff2fe 100644 --- a/go.mod +++ b/go.mod @@ -89,12 +89,12 @@ require ( k8s.io/cluster-bootstrap v0.19.3 k8s.io/cri-api v0.22.17 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240409024937-1c58cb7de60a + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240409110446-f1b95a3b39d6 yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401 yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900 - yunion.io/x/pkg v1.10.1-0.20240407074633-3b5e6127232f + yunion.io/x/pkg v1.10.1-0.20240409095939-7c75358eb776 yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e yunion.io/x/sqlchemy v1.1.3-0.20240326090913-96da8bf92408 yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c diff --git a/go.sum b/go.sum index 7671a4e0de..6e84e25ce5 100644 --- a/go.sum +++ b/go.sum @@ -1210,8 +1210,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.20240409024937-1c58cb7de60a h1:/2cG8vQUToTwOOHD3fB4rYgh6hCuxAd4Q7VGArxPpsg= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240409024937-1c58cb7de60a/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240409110446-f1b95a3b39d6 h1:84MvoZaVLf0YagRPa1ddOR/FCb8yKMxtgoJay040QFM= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240409110446-f1b95a3b39d6/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk= 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= @@ -1225,8 +1225,8 @@ yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900 h1:Hu/4ERvoWaN6aiFs4h4/yvVB yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900/go.mod h1:0vLkNEhlmA64HViPBAnSTUMrx5QP1CLsxXmxDKQ80tc= yunion.io/x/pkg v0.0.0-20190620104149-945c25821dbf/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E= yunion.io/x/pkg v0.0.0-20190628082551-f4033ba2ea30/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E= -yunion.io/x/pkg v1.10.1-0.20240407074633-3b5e6127232f h1:5ER9TICQiiLA0klflIRkEuhTUpGaEKaSDKur8BJ96Vg= -yunion.io/x/pkg v1.10.1-0.20240407074633-3b5e6127232f/go.mod h1:ksCJVQ+DwKrJ5QBEoU8pzrDFfDaZVAFH/iJ6yQCYxJk= +yunion.io/x/pkg v1.10.1-0.20240409095939-7c75358eb776 h1:X6JCO6CRIB+4FKpVfvKb80em6+qyxNRCZMA6Lgtzu14= +yunion.io/x/pkg v1.10.1-0.20240409095939-7c75358eb776/go.mod h1:ksCJVQ+DwKrJ5QBEoU8pzrDFfDaZVAFH/iJ6yQCYxJk= yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e h1:v+EzIadodSwkdZ/7bremd7J8J50Cise/HCylsOJngmo= yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e/go.mod h1:0iFKpOs1y4lbCxeOmq3Xx/0AcQoewVPwj62eRluioEo= yunion.io/x/sqlchemy v1.1.3-0.20240326090913-96da8bf92408 h1:TmkgsnVG/KsUfxaFxaYEhQs0o4nXc9fFFlqZv6mwZ/E= diff --git a/vendor/modules.txt b/vendor/modules.txt index fae1d6c49c..2efd41e69c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1476,7 +1476,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.20240409024937-1c58cb7de60a +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240409110446-f1b95a3b39d6 ## explicit; go 1.18 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing @@ -1573,7 +1573,7 @@ yunion.io/x/log/hooks yunion.io/x/ovsdb/cli_util yunion.io/x/ovsdb/schema/ovn_nb yunion.io/x/ovsdb/types -# yunion.io/x/pkg v1.10.1-0.20240407074633-3b5e6127232f +# yunion.io/x/pkg v1.10.1-0.20240409095939-7c75358eb776 ## explicit; go 1.18 yunion.io/x/pkg/appctx yunion.io/x/pkg/errors diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go index 3075a2de99..bd78b955e5 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go @@ -247,7 +247,11 @@ func (self *SImage) GetSizeByte() int64 { func (self *SImage) getNormalizedImageInfo() *imagetools.ImageInfo { if self.imgInfo == nil { - imgInfo := imagetools.NormalizeImageInfo(self.ImageName, self.Architecture, getImageOSType(*self), getImageOSDist(*self), getImageOSVersion(*self)) + name := self.ImageName + if len(self.Description) > 0 { + name = self.Description + } + imgInfo := imagetools.NormalizeImageInfo(name, self.Architecture, getImageOSType(*self), getImageOSDist(*self), getImageOSVersion(*self)) self.imgInfo = &imgInfo } return self.imgInfo diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/zone.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/zone.go index 86f109972f..d71201faf5 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/zone.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/zone.go @@ -100,9 +100,9 @@ func (zone *SZone) GetIStorages() ([]cloudprovider.ICloudStorage, error) { return nil, errors.Wrap(err, "GetStorages") } istorages := []cloudprovider.ICloudStorage{} - for _, storage := range storages { - storage.zone = zone - istorages = append(istorages, &storage) + for i := range storages { + storages[i].zone = zone + istorages = append(istorages, &storages[i]) } return istorages, nil } diff --git a/vendor/yunion.io/x/pkg/util/imagetools/imagetools.go b/vendor/yunion.io/x/pkg/util/imagetools/imagetools.go index b7f38e0b29..90058214cd 100644 --- a/vendor/yunion.io/x/pkg/util/imagetools/imagetools.go +++ b/vendor/yunion.io/x/pkg/util/imagetools/imagetools.go @@ -110,6 +110,8 @@ func normalizeOsDistribution(osDist string, imageName string) string { return "Fedora" } else if strings.Contains(osDist, "alma") { return "AlmaLinux" + } else if strings.Contains(osDist, "amazon linux") { + return "Amazon Linux" } else if strings.Contains(osDist, "windows") { for _, ver := range []string{"2003", "2008", "2012", "2016", "2019", "2022"} { if strings.Contains(osDist, ver) { @@ -144,6 +146,7 @@ var imageVersions = map[string][]string{ "Rocky Linux": {"8.5", "8.6", "8.7", "8.8", "8.9", "9.0", "9.1", "9.2"}, "Fedora": {"33", "34", "35"}, "AlmaLinux": {"8.5"}, + "Amazon Linux": {"2023", "2"}, "Windows Server": {"2003", "2008", "2012", "2016", "2019", "2022"}, "Windows": {"XP", "7", "8", "Vista", "10", "11"},