diff --git a/go.mod b/go.mod index ea3ba17fa6..3cc163abcc 100644 --- a/go.mod +++ b/go.mod @@ -88,14 +88,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.20240301072022-cd69313f84bb + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240304114827-e51b65fda2b4 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.20230411060016-feb3f46ab361 yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900 - yunion.io/x/pkg v1.10.1-0.20240127153242-cdf9dc071f4f + yunion.io/x/pkg v1.10.1-0.20240303050651-73685b15a96e yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e - yunion.io/x/sqlchemy v1.1.3-0.20240303023826-a40d7fe1f0a9 + yunion.io/x/sqlchemy v1.1.3-0.20240304110946-16faa82225e6 yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c ) diff --git a/go.sum b/go.sum index 5f3cb77e03..b29e2ce5af 100644 --- a/go.sum +++ b/go.sum @@ -1204,8 +1204,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.20240301072022-cd69313f84bb h1:3hqidOcvZ61fMdKcIAixwvsCSF4ThPLAC0yJYH0wzi0= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240301072022-cd69313f84bb/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240304114827-e51b65fda2b4 h1:cJvsamE03yPm7UE/9ReB+i2qFlfUp4RNG9PWOJd7QsI= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240304114827-e51b65fda2b4/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= @@ -1219,11 +1219,11 @@ 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.20240127153242-cdf9dc071f4f h1:nLMBj8S3/ev2pB1wzGSi6hOM0aMK0DS2oyuQFzHbfkI= -yunion.io/x/pkg v1.10.1-0.20240127153242-cdf9dc071f4f/go.mod h1:ksCJVQ+DwKrJ5QBEoU8pzrDFfDaZVAFH/iJ6yQCYxJk= +yunion.io/x/pkg v1.10.1-0.20240303050651-73685b15a96e h1:NuYu+z0dOT93aoNjg3W3PkLidy3E3cdNFZqz2Aua6UE= +yunion.io/x/pkg v1.10.1-0.20240303050651-73685b15a96e/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.20240303023826-a40d7fe1f0a9 h1:xN6mwwOtbeGGMeVb7UC+a26T/jJNsrxyb6gL3rUWwF4= -yunion.io/x/sqlchemy v1.1.3-0.20240303023826-a40d7fe1f0a9/go.mod h1:5W8ghvJ4TNt/r2yDjjD3i4QsZgIiJX45dhRQBGWPHsQ= +yunion.io/x/sqlchemy v1.1.3-0.20240304110946-16faa82225e6 h1:3R34JW8CxuweUn4mCrFMSTwU5Njwh5aCB5x9x6l5GBA= +yunion.io/x/sqlchemy v1.1.3-0.20240304110946-16faa82225e6/go.mod h1:5W8ghvJ4TNt/r2yDjjD3i4QsZgIiJX45dhRQBGWPHsQ= yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c h1:QuLab2kSRECZRxo4Lo2KcYn6XjQFDGaZ1+x0pYDVVwQ= yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c/go.mod h1:EP6NSv2C0zzqBDTKumv8hPWLb3XvgMZDHQRfyuOrQng= diff --git a/vendor/modules.txt b/vendor/modules.txt index 11ed5242de..da7d709884 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1473,7 +1473,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.20240301072022-cd69313f84bb +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240304114827-e51b65fda2b4 ## explicit; go 1.18 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing @@ -1570,7 +1570,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.20240127153242-cdf9dc071f4f +# yunion.io/x/pkg v1.10.1-0.20240303050651-73685b15a96e ## explicit; go 1.18 yunion.io/x/pkg/appctx yunion.io/x/pkg/errors @@ -1626,7 +1626,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.3-0.20240303023826-a40d7fe1f0a9 +# yunion.io/x/sqlchemy v1.1.3-0.20240304110946-16faa82225e6 ## explicit; go 1.17 yunion.io/x/sqlchemy yunion.io/x/sqlchemy/backends diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/eip.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/eip.go index 2952a9e245..3055a42940 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/eip.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/eip.go @@ -189,6 +189,9 @@ func (self *SEipAddress) GetAssociationType() string { if utils.IsInStringArray(resType, []string{"networkinterfaces"}) { return api.EIP_ASSOCIATE_TYPE_SERVER } + if utils.IsInStringArray(resType, []string{"loadbalancers"}) { + return api.EIP_ASSOCIATE_TYPE_LOADBALANCER + } return resType } return "" diff --git a/vendor/yunion.io/x/pkg/util/seclib/seclib.go b/vendor/yunion.io/x/pkg/util/seclib/seclib.go index 37cf1afc4f..e61ed2f564 100644 --- a/vendor/yunion.io/x/pkg/util/seclib/seclib.go +++ b/vendor/yunion.io/x/pkg/util/seclib/seclib.go @@ -37,6 +37,7 @@ const ( ALL_PUNC = "~`!@#$%^&*()-_=+[]{}|:';\",./<>?" ) +var FIRSTCHARS = fmt.Sprintf("%s%s", LETTERS, UPPERS) var CHARS = fmt.Sprintf("%s%s%s", DIGITS, LETTERS, UPPERS) func RandomPassword(width int) string { @@ -49,8 +50,17 @@ func RandomPassword(width int) string { letterCnt := 0 upperCnt := 0 for i := 0; i < width; i += 1 { - index := rand.Intn(len(CHARS)) - ch := CHARS[index] + var ch byte + { + var candidates string + if i == 0 { + candidates = FIRSTCHARS + } else { + candidates = CHARS + } + index := rand.Intn(len(candidates)) + ch = candidates[index] + } if strings.IndexByte(DIGITS, ch) >= 0 { digitsCnt += 1 } else if strings.IndexByte(LETTERS, ch) >= 0 { @@ -105,13 +115,15 @@ func randomPassword2(width int) string { var buf bytes.Buffer for i := 0; i < width; i += 1 { var ch byte - for { - index := rand.Intn(len(CHARS2)) - ch = CHARS2[index] - if i == 0 && ch == '/' { - continue + { + var candidates string + if i == 0 { + candidates = FIRSTCHARS + } else { + candidates = CHARS2 } - break + index := rand.Intn(len(candidates)) + ch = CHARS2[index] } if strings.IndexByte(DIGITS, ch) >= 0 { ps.Digits += 1 diff --git a/vendor/yunion.io/x/sqlchemy/functions.go b/vendor/yunion.io/x/sqlchemy/functions.go index 50dabf1ae0..8f784a9cfa 100644 --- a/vendor/yunion.io/x/sqlchemy/functions.go +++ b/vendor/yunion.io/x/sqlchemy/functions.go @@ -142,7 +142,9 @@ func (ff *sExprFunction) database() *SDatabase { return db } } - log.Debugf("no fields function? %s", ff.expression()) + if ff.function != "COUNT(*)" { + log.Debugf("no fields function? %s", ff.expression()) + } return nil }