diff --git a/go.mod b/go.mod index 895cdf762d..d611ce0a00 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.20230306104021-eebbddd5e493 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230307064251-071c538f01cc yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 yunion.io/x/jsonutils v1.0.1-0.20220819091305-3bab322ab4fd yunion.io/x/log v1.0.0 diff --git a/go.sum b/go.sum index abb6321433..41d8b88a46 100644 --- a/go.sum +++ b/go.sum @@ -1164,8 +1164,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.20230306104021-eebbddd5e493 h1:5YjYZfwgBYBiwXKiitu4c2pFvFPZgm8f32IXnq1DJE8= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230306104021-eebbddd5e493/go.mod h1:sWqblYRhQCO63xeKdxdAT3wczCCY8Mc+TDa3WD/a5Kg= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230307064251-071c538f01cc h1:tgrZmTo6RNjl8L68WIP8azQrKzkbv6mcAA3xWrpYt+o= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230307064251-071c538f01cc/go.mod h1:sWqblYRhQCO63xeKdxdAT3wczCCY8Mc+TDa3WD/a5Kg= 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= diff --git a/vendor/modules.txt b/vendor/modules.txt index a1e4431044..40babca8b6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1442,7 +1442,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.20230306104021-eebbddd5e493 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230307064251-071c538f01cc ## 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/apsara/organization.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/organization.go index b9965334bf..88bd6deadd 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/organization.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/organization.go @@ -185,11 +185,19 @@ func (self *SProject) GetTags() (map[string]string, error) { } func (self *SApsaraClient) GetIProjects() ([]cloudprovider.ICloudProject, error) { - tree, err := self.GetOrganizationTree(self.organizationId) + ret := []cloudprovider.ICloudProject{} + tree, err := self.GetOrganizationTree("1") + if err == nil { + projects := tree.GetProject([]string{}) + for i := range projects { + ret = append(ret, &projects[i]) + } + return ret, nil + } + tree, err = self.GetOrganizationTree(self.organizationId) if err != nil { return nil, errors.Wrapf(err, "GetOrganizationTree") } - ret := []cloudprovider.ICloudProject{} projects := tree.GetProject([]string{}) for i := range projects { ret = append(ret, &projects[i])