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

Merge pull request #17377 from ioito/hotfix/qx-vendor-update-openstack-snapshot

Browse Source 
fix(region): vendor update
This commit is contained in:
Zexi Li
2023-06-27 11:03:19 +08:00
committed by GitHub
parent b8a1451cce 2604671211
commit 0d2163eadf
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -83,7 +83,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.20230626115505-93e01cfd0711
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230627023024-a5d9d998e793
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656
yunion.io/x/jsonutils v1.0.1-0.20230613121553-0f3b41e2ef19
yunion.io/x/log v1.0.1-0.20230411060016-feb3f46ab361
go.sum
+2 -2
View File
@@ -1173,8 +1173,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.20230626115505-93e01cfd0711 h1:RWNJAc2CceTicTcVONLZB+NtaJAWjk+OdjmEohvPQvI=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230626115505-93e01cfd0711/go.mod h1:crMeQeaNaZefTXfXbQkoj5SStggqkSNVABHtYBFjM3Y=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230627023024-a5d9d998e793 h1:743vsYYy7PoEV0ksv9dWtPfzaoNSLQI5phOuTu3efPQ=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230627023024-a5d9d998e793/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=
vendor/modules.txt
Vendored
+1 -1
View File
@@ -1440,7 +1440,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.20230626115505-93e01cfd0711
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230627023024-a5d9d998e793
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/snapshot.go
Generated Vendored
+9 -1
View File
@@ -60,6 +60,14 @@ type SSnapshot struct {
}
func (region *SRegion) GetISnapshotById(snapshotId string) (cloudprovider.ICloudSnapshot, error) {
snapshot, err := region.GetSnapshot(snapshotId)
if err != nil {
return nil, err
}
return snapshot, nil
}
func (region *SRegion) GetSnapshot(snapshotId string) (*SSnapshot, error) {
resource := "/snapshots/" + snapshotId
resp, err := region.bsGet(resource)
if err != nil {
@@ -93,7 +101,7 @@ func (snapshot *SSnapshot) IsEmulated() bool {
}
func (snapshot *SSnapshot) Refresh() error {
_snapshot, err := snapshot.region.GetISnapshotById(snapshot.Id)
_snapshot, err := snapshot.region.GetSnapshot(snapshot.Id)
if err != nil {
return err
}