lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-06-08 23:45:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): vendor update (#18425)

Browse Source
This commit is contained in:
屈轩
2023-10-25 18:24:57 +08:00
committed by GitHub
parent 025b5fc289
commit d728a2bef3
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
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.20231025082024-ea24588e7245
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231025100130-8c9943d8b3f3
yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32
yunion.io/x/jsonutils v1.0.1-0.20230613121553-0f3b41e2ef19
yunion.io/x/log v1.0.1-0.20230411060016-feb3f46ab361

4
go.sum
View File

@@ -1179,8 +1179,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.20231025082024-ea24588e7245 h1:fvPqSf6afBEa1oqCoYsmADY3Gg9Hi92TlF9skTfNloE=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231025082024-ea24588e7245/go.mod h1:McRjoG2gaOUisB+Qa41kLCNZhr0lsCu4apEjTiphXVY=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231025100130-8c9943d8b3f3 h1:MAxOjOujD0ggie96x7QyrDWR6hIasiiusAC2QP5lOkY=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231025100130-8c9943d8b3f3/go.mod h1:McRjoG2gaOUisB+Qa41kLCNZhr0lsCu4apEjTiphXVY=
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=

1
pkg/compute/models/secgroups.go
View File

@@ -852,7 +852,6 @@ func (manager *SSecurityGroupManager) InitializeData() error {
sqlchemy.NotIn(q.Field("id"), ElasticcachesecgroupManager.Query("secgroup_id").IsNotNull("secgroup_id").SubQuery()),
),
)
q.DebugQuery()
secgroups := []SSecurityGroup{}
err := db.FetchModelObjects(SecurityGroupManager, q, &secgroups)
if err != nil {

2
vendor/modules.txt vendored
View File

@@ -1438,7 +1438,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.20231025082024-ea24588e7245
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231025100130-8c9943d8b3f3
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing

5
vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/organizations.go generated vendored
View File

@@ -256,7 +256,10 @@ func (self *SAwsClient) GetSubAccounts() ([]cloudprovider.SSubAccount, error) {
log.Warningf("Cannot access non-master account with root account!!")
subAccount.HealthStatus = api.CLOUD_PROVIDER_HEALTH_NO_PERMISSION
}
subAccount.Name = fmt.Sprintf("%s/%s", account.Name, account.ID)
subAccount.Name = account.ID
if len(account.Name) > 0 {
subAccount.Name = fmt.Sprintf("%s/%s", account.Name, account.ID)
}
subAccount.Account = fmt.Sprintf("%s/%s", self.accessKey, account.ID)
}
subAccounts = append(subAccounts, subAccount)