From 8443d4077f8dcabcdd5ee6e05cc105a65ec82671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Mon, 27 Feb 2023 22:28:33 +0800 Subject: [PATCH] fix(region): azure rebuild root error (#16049) --- go.mod | 6 +++--- go.sum | 8 ++++---- vendor/modules.txt | 4 ++-- .../cloudmux/pkg/multicloud/azure/instance.go | 3 +++ vendor/yunion.io/x/sqlchemy/query.go | 19 ++++++++++++++++++- 5 files changed, 30 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 4d1ad49e2b..2354c462c9 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( github.com/360EntSecGroup-Skylar/excelize v1.4.0 github.com/LeeEirc/terminalparser v0.0.0-20220328021224-de16b7643ea4 github.com/Masterminds/sprig v2.22.0+incompatible + github.com/aliyun/alibaba-cloud-sdk-go v1.61.684 github.com/anacrolix/torrent v0.0.0-20181129073333-cc531b8c4a80 github.com/benbjohnson/clock v1.0.0 github.com/bitly/go-simplejson v0.5.0 @@ -82,14 +83,14 @@ 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.20230222084258-da453fa38129 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230224103233-7b0e7e7e76b6 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 yunion.io/x/ovsdb v0.0.0-20200526071744-27bf0940cbc7 yunion.io/x/pkg v1.0.1-0.20230102060551-df05ccecb71c yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e - yunion.io/x/sqlchemy v1.1.2-0.20230209140205-3ee293d3963b + yunion.io/x/sqlchemy v1.1.2-0.20230223125758-76ea06389ac5 yunion.io/x/structarg v0.0.0-20220312084958-9c6c79c7d1c6 ) @@ -116,7 +117,6 @@ require ( github.com/Shopify/toxiproxy v2.1.4+incompatible // indirect github.com/StackExchange/wmi v1.2.1 // indirect github.com/VividCortex/ewma v1.1.1 // indirect - github.com/aliyun/alibaba-cloud-sdk-go v1.61.684 // indirect github.com/aliyun/aliyun-oss-go-sdk v2.0.4+incompatible // indirect github.com/anacrolix/dht v0.0.0-20181129074040-b09db78595aa // indirect github.com/anacrolix/go-libutp v0.0.0-20180808010927-aebbeb60ea05 // indirect diff --git a/go.sum b/go.sum index ea02e54fac..c2e50dc012 100644 --- a/go.sum +++ b/go.sum @@ -1164,8 +1164,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.20230222084258-da453fa38129 h1:JF2IOoPDeOg5oGcM7px3IVp06YVtGJfN7BnLLGFmfMs= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230222084258-da453fa38129/go.mod h1:yEMFtIKPyIdIfPzsw7oTcH41JXc8G5StUAQw3ZoGj5I= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230224103233-7b0e7e7e76b6 h1:z6WheXgjKgjvdjKHUFqlju1xLGtHujIN3Q+2rhcg9nQ= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230224103233-7b0e7e7e76b6/go.mod h1:yEMFtIKPyIdIfPzsw7oTcH41JXc8G5StUAQw3ZoGj5I= 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= @@ -1187,7 +1187,7 @@ yunion.io/x/pkg v1.0.1-0.20230102060551-df05ccecb71c/go.mod h1:ksCJVQ+DwKrJ5QBEo 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.0.1/go.mod h1:FTdwPdGhMgh4E+UFXc9klI1Ok34fMuybTT+jLhOaIjI= -yunion.io/x/sqlchemy v1.1.2-0.20230209140205-3ee293d3963b h1:9lr4gBVkp8ijn8h9/XV3699822iZ9DE0fdWt2bTTjCE= -yunion.io/x/sqlchemy v1.1.2-0.20230209140205-3ee293d3963b/go.mod h1:xXVfJLIxxTRTnPEaVIIoRZXqWyO8+takIOYhc+zO5KE= +yunion.io/x/sqlchemy v1.1.2-0.20230223125758-76ea06389ac5 h1:7+m2F8B8eKJ4ELtIWpEEnEhL3WsIjpLocAaMx+83U5o= +yunion.io/x/sqlchemy v1.1.2-0.20230223125758-76ea06389ac5/go.mod h1:xXVfJLIxxTRTnPEaVIIoRZXqWyO8+takIOYhc+zO5KE= yunion.io/x/structarg v0.0.0-20220312084958-9c6c79c7d1c6 h1:WuWXhY3DvhdRTzWCJ/kwt3Ss6KIq7+KqJwb+esvNGwU= yunion.io/x/structarg v0.0.0-20220312084958-9c6c79c7d1c6/go.mod h1:EP6NSv2C0zzqBDTKumv8hPWLb3XvgMZDHQRfyuOrQng= diff --git a/vendor/modules.txt b/vendor/modules.txt index f1df8bf449..c4d3975db1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1442,7 +1442,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.20230222084258-da453fa38129 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230224103233-7b0e7e7e76b6 ## explicit; go 1.18 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing @@ -1591,7 +1591,7 @@ yunion.io/x/pkg/utils # yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e ## explicit; go 1.12 yunion.io/x/s3cli -# yunion.io/x/sqlchemy v1.1.2-0.20230209140205-3ee293d3963b +# yunion.io/x/sqlchemy v1.1.2-0.20230223125758-76ea06389ac5 ## explicit; go 1.17 yunion.io/x/sqlchemy yunion.io/x/sqlchemy/backends diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/instance.go index 37b269cac8..3c56d23787 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/instance.go @@ -721,6 +721,9 @@ func (region *SRegion) ReplaceSystemDisk(instance *SInstance, cpu int, memoryMb } newInstance, err := region.CreateInstanceSimple(instance.Name+"-rebuild", imageId, osType, cpu, memoryMb, sysSizeGB, storageType, []int{}, nic.ID, passwd, publicKey) + if err != nil { + return "", errors.Wrapf(err, "CreateInstanceSimple") + } newInstance.host = instance.host cloudprovider.Wait(time.Second*10, time.Minute*5, func() (bool, error) { err = newInstance.WaitVMAgentReady() diff --git a/vendor/yunion.io/x/sqlchemy/query.go b/vendor/yunion.io/x/sqlchemy/query.go index 3f7c92e827..5c273ee645 100644 --- a/vendor/yunion.io/x/sqlchemy/query.go +++ b/vendor/yunion.io/x/sqlchemy/query.go @@ -75,9 +75,26 @@ func (tq *SQuery) IsGroupBy() bool { return len(tq.groupBy) > 0 } +func (tq *SQuery) HasField(f IQueryField) bool { + if len(tq.fields) == 0 { + return false + } + for i := range tq.fields { + fi := tq.fields[i] + if fi.Name() == f.Name() { + return true + } + } + return false +} + // AppendField appends query field to a query func (tq *SQuery) AppendField(f ...IQueryField) *SQuery { - tq.fields = append(tq.fields, f...) + for i := range f { + if !tq.HasField(f[i]) { + tq.fields = append(tq.fields, f[i]) + } + } return tq }