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

fix(region): vendor update (#23858)

Browse Source
This commit is contained in:
屈轩
2025-11-27 20:35:30 +08:00
committed by GitHub
parent ec08f2b07b
commit 8778a2d83c
6 changed files with 96 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -98,7 +98,7 @@ require (
k8s.io/cri-api v0.28.15
k8s.io/klog/v2 v2.20.0
moul.io/http2curl/v2 v2.3.0
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251125125822-dc71531a513e
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251127081629-9d8a6d1fe822
yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0
yunion.io/x/jsonutils v1.0.1-0.20250507052344-1abcf4f443b1
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91
go.sum
+2 -2
View File
@@ -1672,8 +1672,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.20251125125822-dc71531a513e h1:XS4TBzD7G7sbxMO60nRNkjVRJnIO2FAwpdnq/4KMHd4=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251125125822-dc71531a513e/go.mod h1:JlmQ8iuGdaAlUkivFVcUAJgi6QYr5jz1vKv7pQ5m7p8=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251127081629-9d8a6d1fe822 h1:RV4teBoWPnlzeZfSMDqm2fWR+aysnv5QweXvYlRWXm4=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251127081629-9d8a6d1fe822/go.mod h1:JlmQ8iuGdaAlUkivFVcUAJgi6QYr5jz1vKv7pQ5m7p8=
yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 h1:msG4SiDSVU7CrXH06WuHlNEZXIooTcmNbfrIGHuIHBU=
yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0/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
@@ -2264,7 +2264,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.20251125125822-dc71531a513e
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251127081629-9d8a6d1fe822
## explicit; go 1.24
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/instance.go
Generated Vendored
+12 -1
View File
@@ -117,7 +117,15 @@ func (self *SRegion) GetInstances(zoneId string) ([]SInstance, error) {
if err != nil {
return nil, errors.Wrapf(err, "Unmarshal")
}
return ret, nil
result := []SInstance{}
for i := range ret {
// 过滤掉已删除的实例
if ret[i].LifecycleState == "TERMINATED" {
continue
}
result = append(result, ret[i])
}
return result, nil
}
func (self *SRegion) GetInstance(id string) (*SInstance, error) {
@@ -130,6 +138,9 @@ func (self *SRegion) GetInstance(id string) (*SInstance, error) {
if err != nil {
return nil, err
}
if ret.LifecycleState == "TERMINATED" {
return nil, errors.Wrapf(cloudprovider.ErrNotFound, "instance %s is terminated", id)
}
return ret, nil
}
vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/oracle.go
Generated Vendored
+9 -6
View File
@@ -230,16 +230,19 @@ type sOracleError struct {
Message string
}
func (self *sOracleError) Error() string {
return jsonutils.Marshal(self).String()
func (e *sOracleError) Error() string {
return jsonutils.Marshal(e).String()
}
func (self *sOracleError) ParseErrorFromJsonResponse(statusCode int, status string, body jsonutils.JSONObject) error {
func (e *sOracleError) ParseErrorFromJsonResponse(statusCode int, status string, body jsonutils.JSONObject) error {
if body != nil {
body.Unmarshal(self)
body.Unmarshal(e)
}
self.StatusCode = statusCode
return self
e.StatusCode = statusCode
if statusCode == 404 {
return errors.Wrapf(cloudprovider.ErrNotFound, "%s", e.Error())
}
return e
}
func (self *SOracleClient) TenancyOCID() (string, error) {
vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/region.go
Generated Vendored
+71 -51
View File
@@ -37,84 +37,84 @@ type SRegion struct {
Status string `json:"status"`
}
func (self *SRegion) GetId() string {
return self.RegionName
func (region *SRegion) GetId() string {
return region.RegionName
}
func (self *SRegion) GetGlobalId() string {
return fmt.Sprintf("%s/%s", api.CLOUD_PROVIDER_ORACLE, self.RegionName)
func (region *SRegion) GetGlobalId() string {
return fmt.Sprintf("%s/%s", api.CLOUD_PROVIDER_ORACLE, region.RegionName)
}
func (self *SRegion) GetProvider() string {
func (region *SRegion) GetProvider() string {
return api.CLOUD_PROVIDER_ORACLE
}
func (self *SRegion) GetCloudEnv() string {
func (region *SRegion) GetCloudEnv() string {
return api.CLOUD_PROVIDER_ORACLE
}
func (self *SRegion) GetGeographicInfo() cloudprovider.SGeographicInfo {
func (region *SRegion) GetGeographicInfo() cloudprovider.SGeographicInfo {
geo, ok := map[string]cloudprovider.SGeographicInfo{
"ap-singapore-1": api.RegionSingapore,
}[self.RegionName]
}[region.RegionName]
if ok {
return geo
}
return cloudprovider.SGeographicInfo{}
}
func (self *SRegion) GetName() string {
return self.RegionName
func (region *SRegion) GetName() string {
return region.RegionName
}
func (self *SRegion) GetI18n() cloudprovider.SModelI18nTable {
func (region *SRegion) GetI18n() cloudprovider.SModelI18nTable {
table := cloudprovider.SModelI18nTable{}
table["name"] = cloudprovider.NewSModelI18nEntry(self.GetName()).CN(self.GetName()).EN(self.RegionName)
table["name"] = cloudprovider.NewSModelI18nEntry(region.GetName()).CN(region.GetName()).EN(region.RegionName)
return table
}
func (self *SRegion) GetStatus() string {
if self.Status != "READY" {
func (region *SRegion) GetStatus() string {
if region.Status != "READY" {
return api.CLOUD_REGION_STATUS_OUTOFSERVICE
}
return api.CLOUD_REGION_STATUS_INSERVER
}
func (self *SRegion) GetClient() *SOracleClient {
return self.client
func (region *SRegion) GetClient() *SOracleClient {
return region.client
}
func (self *SRegion) CreateEIP(opts *cloudprovider.SEip) (cloudprovider.ICloudEIP, error) {
func (region *SRegion) CreateEIP(opts *cloudprovider.SEip) (cloudprovider.ICloudEIP, error) {
return nil, cloudprovider.ErrNotImplemented
}
func (region *SRegion) CreateISecurityGroup(conf *cloudprovider.SecurityGroupCreateInput) (cloudprovider.ICloudSecurityGroup, error) {
func (region *SRegion) CreateISecurityGroup(opts *cloudprovider.SecurityGroupCreateInput) (cloudprovider.ICloudSecurityGroup, error) {
return nil, cloudprovider.ErrNotImplemented
}
func (region *SRegion) GetISecurityGroupById(secgroupId string) (cloudprovider.ICloudSecurityGroup, error) {
func (region *SRegion) GetISecurityGroupById(id string) (cloudprovider.ICloudSecurityGroup, error) {
return nil, cloudprovider.ErrNotImplemented
}
func (self *SRegion) CreateIVpc(opts *cloudprovider.VpcCreateOptions) (cloudprovider.ICloudVpc, error) {
func (region *SRegion) CreateIVpc(opts *cloudprovider.VpcCreateOptions) (cloudprovider.ICloudVpc, error) {
return nil, cloudprovider.ErrNotImplemented
}
func (self *SRegion) GetIVpcs() ([]cloudprovider.ICloudVpc, error) {
vpcs, err := self.GetVpcs()
func (region *SRegion) GetIVpcs() ([]cloudprovider.ICloudVpc, error) {
vpcs, err := region.GetVpcs()
if err != nil {
return nil, err
}
ret := []cloudprovider.ICloudVpc{}
for i := range vpcs {
vpcs[i].region = self
vpcs[i].region = region
ret = append(ret, &vpcs[i])
}
return ret, nil
}
func (self *SRegion) GetIVpcById(id string) (cloudprovider.ICloudVpc, error) {
vpc, err := self.GetVpc(id)
func (region *SRegion) GetIVpcById(id string) (cloudprovider.ICloudVpc, error) {
vpc, err := region.GetVpc(id)
if err != nil {
return nil, err
}
@@ -125,42 +125,42 @@ func (region *SRegion) GetCapabilities() []string {
return region.client.GetCapabilities()
}
func (self *SRegion) GetIEipById(id string) (cloudprovider.ICloudEIP, error) {
eip, err := self.GetEip(id)
func (region *SRegion) GetIEipById(id string) (cloudprovider.ICloudEIP, error) {
eip, err := region.GetEip(id)
if err != nil {
return nil, err
}
return eip, nil
}
func (self *SRegion) GetIEips() ([]cloudprovider.ICloudEIP, error) {
eips, err := self.GetEips("RESERVED")
func (region *SRegion) GetIEips() ([]cloudprovider.ICloudEIP, error) {
eips, err := region.GetEips("RESERVED")
if err != nil {
return nil, err
}
ret := []cloudprovider.ICloudEIP{}
for i := range eips {
eips[i].region = self
eips[i].region = region
ret = append(ret, &eips[i])
}
return ret, nil
}
func (self *SRegion) GetIZones() ([]cloudprovider.ICloudZone, error) {
zones, err := self.GetZones()
func (region *SRegion) GetIZones() ([]cloudprovider.ICloudZone, error) {
zones, err := region.GetZones()
if err != nil {
return nil, err
}
ret := []cloudprovider.ICloudZone{}
for i := range zones {
zones[i].region = self
zones[i].region = region
ret = append(ret, &zones[i])
}
return ret, nil
}
func (self *SRegion) GetIZoneById(id string) (cloudprovider.ICloudZone, error) {
zones, err := self.GetIZones()
func (region *SRegion) GetIZoneById(id string) (cloudprovider.ICloudZone, error) {
zones, err := region.GetIZones()
if err != nil {
return nil, err
}
@@ -172,16 +172,16 @@ func (self *SRegion) GetIZoneById(id string) (cloudprovider.ICloudZone, error) {
return nil, cloudprovider.ErrNotFound
}
func (self *SRegion) list(service, resource string, query url.Values) (jsonutils.JSONObject, error) {
return self.client.list(service, self.RegionName, resource, query)
func (region *SRegion) list(service, resource string, query url.Values) (jsonutils.JSONObject, error) {
return region.client.list(service, region.RegionName, resource, query)
}
func (self *SRegion) get(service, resource, id string, query url.Values) (jsonutils.JSONObject, error) {
return self.client.get(service, self.RegionName, resource, id, query)
func (region *SRegion) get(service, resource, id string, query url.Values) (jsonutils.JSONObject, error) {
return region.client.get(service, region.RegionName, resource, id, query)
}
func (self *SRegion) GetIStoragecacheById(id string) (cloudprovider.ICloudStoragecache, error) {
caches, err := self.GetIStoragecaches()
func (region *SRegion) GetIStoragecacheById(id string) (cloudprovider.ICloudStoragecache, error) {
caches, err := region.GetIStoragecaches()
if err != nil {
return nil, err
}
@@ -193,12 +193,12 @@ func (self *SRegion) GetIStoragecacheById(id string) (cloudprovider.ICloudStorag
return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id)
}
func (self *SRegion) GetIStoragecaches() ([]cloudprovider.ICloudStoragecache, error) {
return []cloudprovider.ICloudStoragecache{self.GetStoragecache()}, nil
func (region *SRegion) GetIStoragecaches() ([]cloudprovider.ICloudStoragecache, error) {
return []cloudprovider.ICloudStoragecache{region.GetStoragecache()}, nil
}
func (self *SRegion) GetIHostById(id string) (cloudprovider.ICloudHost, error) {
izones, err := self.GetIZones()
func (region *SRegion) GetIHostById(id string) (cloudprovider.ICloudHost, error) {
izones, err := region.GetIZones()
if err != nil {
return nil, err
}
@@ -213,10 +213,10 @@ func (self *SRegion) GetIHostById(id string) (cloudprovider.ICloudHost, error) {
return nil, cloudprovider.ErrNotFound
}
func (self *SRegion) GetIHosts() ([]cloudprovider.ICloudHost, error) {
func (region *SRegion) GetIHosts() ([]cloudprovider.ICloudHost, error) {
iHosts := make([]cloudprovider.ICloudHost, 0)
izones, err := self.GetIZones()
izones, err := region.GetIZones()
if err != nil {
return nil, err
}
@@ -230,10 +230,10 @@ func (self *SRegion) GetIHosts() ([]cloudprovider.ICloudHost, error) {
return iHosts, nil
}
func (self *SRegion) GetIStorages() ([]cloudprovider.ICloudStorage, error) {
func (region *SRegion) GetIStorages() ([]cloudprovider.ICloudStorage, error) {
iStores := make([]cloudprovider.ICloudStorage, 0)
izones, err := self.GetIZones()
izones, err := region.GetIZones()
if err != nil {
return nil, err
}
@@ -247,8 +247,8 @@ func (self *SRegion) GetIStorages() ([]cloudprovider.ICloudStorage, error) {
return iStores, nil
}
func (self *SRegion) GetIStorageById(id string) (cloudprovider.ICloudStorage, error) {
izones, err := self.GetIZones()
func (region *SRegion) GetIStorageById(id string) (cloudprovider.ICloudStorage, error) {
izones, err := region.GetIZones()
if err != nil {
return nil, err
}
@@ -262,3 +262,23 @@ func (self *SRegion) GetIStorageById(id string) (cloudprovider.ICloudStorage, er
}
return nil, cloudprovider.ErrNotFound
}
func (region *SRegion) GetIVMById(id string) (cloudprovider.ICloudVM, error) {
return region.GetInstance(id)
}
func (region *SRegion) GetIVMs() ([]cloudprovider.ICloudVM, error) {
hosts, err := region.GetIHosts()
if err != nil {
return nil, err
}
ret := []cloudprovider.ICloudVM{}
for i := range hosts {
vms, err := hosts[i].GetIVMs()
if err != nil {
return nil, err
}
ret = append(ret, vms...)
}
return ret, nil
}