opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17044 from ioito/hotfix/qx-vendor-update

Browse Source 
fix(region): vendor update
This commit is contained in:
Zexi Li
2023-05-15 20:11:42 +08:00
committed by GitHub
parent e0c47dd5df e4817093e6
commit feda93f664
6 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+2 -2
View File
@@ -84,14 +84,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.20230504125407-bc1e1d01d41c
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230515072146-3a7171baa793
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656
yunion.io/x/jsonutils v1.0.1-0.20230428104347-7c2fdff8e8e7
yunion.io/x/log v1.0.1-0.20230411060016-feb3f46ab361
yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900
yunion.io/x/pkg v1.0.1-0.20230504073602-0a74096f836a
yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e
yunion.io/x/sqlchemy v1.1.2-0.20230504021010-f3e76263d633
yunion.io/x/sqlchemy v1.1.2-0.20230512065832-5323af46107e
yunion.io/x/structarg v0.0.0-20220312084958-9c6c79c7d1c6
)
go.sum
+4 -4
View File
@@ -1185,8 +1185,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.20230504125407-bc1e1d01d41c h1:I2/soITFPHV7aAZsaKNmoixcRyAKZcByAqSnm54V6c8=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230504125407-bc1e1d01d41c/go.mod h1:crMeQeaNaZefTXfXbQkoj5SStggqkSNVABHtYBFjM3Y=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230515072146-3a7171baa793 h1:MlMEK/RorFch+yizvlV5QHVevoKLVSxuJc/XhoGOO2o=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230515072146-3a7171baa793/go.mod h1:crMeQeaNaZefTXfXbQkoj5SStggqkSNVABHtYBFjM3Y=
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=
@@ -1209,7 +1209,7 @@ yunion.io/x/pkg v1.0.1-0.20230504073602-0a74096f836a/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.20230504021010-f3e76263d633 h1:llBmGecLpkEw47PwH2mCyiusNfnWZBdtX/ymhWPdbn4=
yunion.io/x/sqlchemy v1.1.2-0.20230504021010-f3e76263d633/go.mod h1:uuPVZEyEq3sWd5vf9VjGSy6lZzof22X87OEHw9sddJQ=
yunion.io/x/sqlchemy v1.1.2-0.20230512065832-5323af46107e h1:BZhnpXqJJbOuEGoXBb3uvsRz3t6dbJyG1otGqxbFtc4=
yunion.io/x/sqlchemy v1.1.2-0.20230512065832-5323af46107e/go.mod h1:uuPVZEyEq3sWd5vf9VjGSy6lZzof22X87OEHw9sddJQ=
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=
vendor/modules.txt
Vendored
+2 -2
View File
@@ -1457,7 +1457,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.20230504125407-bc1e1d01d41c
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230515072146-3a7171baa793
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
@@ -1603,7 +1603,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.20230504021010-f3e76263d633
# yunion.io/x/sqlchemy v1.1.2-0.20230512065832-5323af46107e
## explicit; go 1.17
yunion.io/x/sqlchemy
yunion.io/x/sqlchemy/backends
vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/securitygroup.go
Generated Vendored
+2 -2
View File
@@ -306,9 +306,9 @@ func (region *SRegion) CreateSecurityGroup(opts *cloudprovider.SecurityGroupCrea
}
sortRules := func(rules []cloudprovider.SecurityRule) []SecurityRules {
names := []string{}
securityRules := []SecurityRules{}
offset := (4096-100)/len(rules) - 1
names := []string{}
offset := (4096 - 100) / (len(rules) + 1) //avoid div zero
for i := 0; i < len(rules); i++ {
rules[i].Priority = 4096 - offset*i
rule := convertSecurityGroupRule(rules[i])
vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/instance.go
Generated Vendored
+3 -1
View File
@@ -413,7 +413,9 @@ func (self *SRegion) GetVmAgentNetworkInterfaces(node string, VmId int) (map[str
}
for _, intermediate := range intermediates {
ipMap[intermediate.HardwareAddress] = intermediate.IPAddresses[0].IPAddress
for _, addr := range intermediate.IPAddresses {
ipMap[intermediate.HardwareAddress] = addr.IPAddress
}
}
return ipMap, nil
vendor/yunion.io/x/sqlchemy/reflect.go
Generated Vendored
+10 -1
View File
@@ -137,6 +137,9 @@ func setValueBySQLString(value reflect.Value, val string) error {
if err != nil {
return errors.Wrapf(err, "jsonutils.ParseString %s", val)
}
if jsonV == jsonutils.JSONNull {
return nil
}
jsonA, err := jsonV.GetArray()
if err != nil {
return errors.Wrap(err, "jsonV.GetArray")
@@ -158,9 +161,12 @@ func setValueBySQLString(value reflect.Value, val string) error {
if err != nil {
return errors.Wrapf(err, "jsonutils.ParseString %s", val)
}
if jsonV == jsonutils.JSONNull {
return nil
}
jsonM, err := jsonV.GetMap()
if err != nil {
return errors.Wrapf(err, "jsonV.GetMap")
return errors.Wrapf(err, "jsonV.GetMap val %s json %s", val, jsonV)
}
mapValue := reflect.MakeMap(value.Type())
value.Set(mapValue)
@@ -192,6 +198,9 @@ func setValueBySQLString(value reflect.Value, val string) error {
if err != nil {
return errors.Wrapf(err, "%s not a json string: %s", val, err)
}
if jsonV == jsonutils.JSONNull {
return nil
}
newVal := reflect.New(value.Type())
err = jsonV.Unmarshal(newVal.Interface())
if err != nil {