opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-29 17:58:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: update vendor 20220701 (#14556)

Browse Source 
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
This commit is contained in:
Jian Qiu
2022-07-01 15:50:52 +08:00
committed by GitHub
co-authored by Qiu Jian
parent 898fd2e2c8
commit dfcba16fda
5 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+3 -1
View File
@@ -267,8 +267,10 @@ dep:
@echo "$$depDeprecated"
@$(MAKE) mod
GOPROXY ?= direct
mod:
go get -d $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p'))
GOPROXY=$(GOPROXY) go get -d $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p'))
go mod tidy
go mod vendor -v
go.mod
+1 -1
View File
@@ -105,7 +105,7 @@ require (
yunion.io/x/ovsdb v0.0.0-20200526071744-27bf0940cbc7
yunion.io/x/pkg v1.0.1-0.20220630095420-9925accd7c5e
yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e
yunion.io/x/sqlchemy v1.1.2-0.20220628175437-5e3435d73be5
yunion.io/x/sqlchemy v1.1.2-0.20220701050442-4a04411dc606
yunion.io/x/structarg v0.0.0-20220312084958-9c6c79c7d1c6
)
go.sum
+2 -2
View File
@@ -1152,7 +1152,7 @@ yunion.io/x/pkg v1.0.1-0.20220630095420-9925accd7c5e h1:p/Cb7z6gyJbZKnGMeOPL3pTm
yunion.io/x/pkg v1.0.1-0.20220630095420-9925accd7c5e/go.mod h1:nYOMflWG1wQC6301rGVglQva9bYbJxHThEJUxRAgMFc=
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.2-0.20220628175437-5e3435d73be5 h1:N/HV9NjsThBHUXncUUzBvjeyL62PSNZ5Yxz30CN1bOU=
yunion.io/x/sqlchemy v1.1.2-0.20220628175437-5e3435d73be5/go.mod h1:OoWrAW7qeaJmLlgMtwwMrxV10+91HLngPq0cZFtj9ig=
yunion.io/x/sqlchemy v1.1.2-0.20220701050442-4a04411dc606 h1:pJxI4+XTxna3e+gcGfuX2KNEBPrTqFXGcFLhqiEPqzA=
yunion.io/x/sqlchemy v1.1.2-0.20220701050442-4a04411dc606/go.mod h1:OoWrAW7qeaJmLlgMtwwMrxV10+91HLngPq0cZFtj9ig=
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
+1 -1
View File
@@ -1495,7 +1495,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.20220628175437-5e3435d73be5
# yunion.io/x/sqlchemy v1.1.2-0.20220701050442-4a04411dc606
## explicit; go 1.17
yunion.io/x/sqlchemy
yunion.io/x/sqlchemy/backends
vendor/yunion.io/x/sqlchemy/reflect.go
Generated Vendored
+8 -26
View File
@@ -42,33 +42,15 @@ func getQuoteStringValue(dat interface{}) string {
}
func GetStringValue(dat interface{}) string {
value := reflect.Indirect(reflect.ValueOf(dat))
switch value.Type() {
case tristate.TriStateType:
return dat.(tristate.TriState).String()
case gotypes.TimeType:
tm, ok := dat.(time.Time)
if !ok {
log.Errorf("Fail to convert to time.Time %s", value)
} else {
return timeutils.MysqlTime(tm)
}
/*case jsonutils.JSONStringType, jsonutils.JSONIntType, jsonutils.JSONFloatType, jsonutils.JSONBoolType,
jsonutils.JSONDictType, jsonutils.JSONArrayType:
json, ok := value.Interface().(jsonutils.JSONObject)
if !ok {
log.Errorf("fail to convert to JSONObject", value)
}else {
return json.String()
}*/
case gotypes.Uint8SliceType:
rawBytes, ok := value.Interface().([]byte)
if !ok {
log.Errorf("Fail to convert to bytes %s", value)
} else {
return string(rawBytes)
}
switch g := dat.(type) {
case tristate.TriState:
return g.String()
case time.Time:
return timeutils.MysqlTime(g)
case []byte:
return string(g)
}
value := reflect.Indirect(reflect.ValueOf(dat))
switch value.Kind() {
case reflect.Bool:
if value.Bool() {