opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): vendor update (#21941)

Browse Source
This commit is contained in:
屈轩
2025-01-08 18:47:33 +08:00
committed by GitHub
parent 5c77ddcf00
commit 3d1befff66
4 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -87,7 +87,7 @@ 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.20241231161248-69e80be853b2
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250108102615-91c94132ea67
yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256
yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91
go.sum
+2 -2
View File
@@ -1274,8 +1274,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.20241231161248-69e80be853b2 h1:stBiPGwQtt0x9mhtXwfanK2viijv7lZkxqVpdDVtQNw=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241231161248-69e80be853b2/go.mod h1:KQ/jWx7bZlmjCE711KEWuvHW/dzpdr/UTlBjjutkj0Y=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250108102615-91c94132ea67 h1:qwsHylZfRz4l/9GxE57nYalsnQ/U7hRiDy00gsaYLds=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250108102615-91c94132ea67/go.mod h1:KQ/jWx7bZlmjCE711KEWuvHW/dzpdr/UTlBjjutkj0Y=
yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256 h1:kLKQ6zbgPDQflRwoHFAjxNChcbhXIFgsUVLkJwiXu/8=
yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
vendor/modules.txt
Vendored
+1 -1
View File
@@ -1576,7 +1576,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.20241231161248-69e80be853b2
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250108102615-91c94132ea67
## explicit; go 1.21
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/region.go
Generated Vendored
+11 -21
View File
@@ -32,21 +32,19 @@ import (
)
var RegionLocations = map[string]string{
"cn-beijing": "中国(北京)",
"cn-shanghai": "中国(上海)",
"cn-guangzhou": "中国(广州)",
}
var RegionLocationsEN = map[string]string{
"cn-beijing": "China (Beijing)",
"cn-shanghai": "China (Shanghai)",
"cn-guangzhou": "China (Guangzhou)",
"cn-beijing": "华东2（北京）",
"cn-shanghai": "华东2（上海）",
"cn-guangzhou": "华东2（广州）",
"ap-southeast-1": "亚太东南（柔佛）",
"cn-hongkong": "中国香港",
}
var RegionEndpoint = map[string]string{
"cn-beijing": "cn-beijing.volces.com",
"cn-shanghai": "cn-shanghai.volces.com",
"cn-guangzhou": "cn-beijing.volces.com",
"cn-beijing": "cn-beijing.volces.com",
"cn-shanghai": "cn-shanghai.volces.com",
"cn-guangzhou": "cn-beijing.volces.com",
"ap-southeast-1": "ap-southeast-1.volces.com",
"cn-hongkong": "cn-hongkong.volces.com",
}
type sStorageType struct {
@@ -100,15 +98,7 @@ func (region *SRegion) GetGlobalId() string {
}
func (region *SRegion) GetI18n() cloudprovider.SModelI18nTable {
var en string
if localName, ok := RegionLocationsEN[region.RegionId]; ok {
en = fmt.Sprintf("%s %s", CLOUD_PROVIDER_VOLCENGINE_EN, localName)
} else {
en = fmt.Sprintf("%s %s", CLOUD_PROVIDER_VOLCENGINE_EN, region.RegionId)
}
table := cloudprovider.SModelI18nTable{}
table["name"] = cloudprovider.NewSModelI18nEntry(region.GetName()).CN(region.GetName()).EN(en)
return table
return cloudprovider.SModelI18nTable{}
}
func (region *SRegion) GetStatus() string {