diff --git a/go.mod b/go.mod index 5b3b8f54d3..11b2bc04af 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index f1694b36f2..efa368dd40 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/pkg/compute/models/secgroups.go b/pkg/compute/models/secgroups.go index 560472f3e9..a1591c00b5 100644 --- a/pkg/compute/models/secgroups.go +++ b/pkg/compute/models/secgroups.go @@ -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 { diff --git a/vendor/modules.txt b/vendor/modules.txt index 0d7465ac65..60ce8d51e6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -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 diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/organizations.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/organizations.go index 4d27333bd4..4116f8869d 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/organizations.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/organizations.go @@ -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)