diff --git a/go.mod b/go.mod index adac87a141..ca9fa0a135 100644 --- a/go.mod +++ b/go.mod @@ -88,7 +88,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.20240109085609-1157aa30e898 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240111104534-3f329f216a63 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 41001baa8f..eb1bce288d 100644 --- a/go.sum +++ b/go.sum @@ -1201,8 +1201,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.20240109085609-1157aa30e898 h1:3yB3FSpzd9f4YeJRJuZlvT9UfuMYV/aog5pWNN2ZmFs= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240109085609-1157aa30e898/go.mod h1:aj1gR9PPb6eqqKOwvANe26CoZFY8ydmXy0fuvgKYXH0= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240111104534-3f329f216a63 h1:uom1eatMyrMV9eZLmM8enao2vW4zbrt+rrmmpZHajKo= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240111104534-3f329f216a63/go.mod h1:aj1gR9PPb6eqqKOwvANe26CoZFY8ydmXy0fuvgKYXH0= 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/vendor/modules.txt b/vendor/modules.txt index 3bd80eaacc..52f22378df 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1465,7 +1465,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.20240109085609-1157aa30e898 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240111104534-3f329f216a63 ## 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/azure/instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/instance.go index cf274b265c..fdd7d5052d 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/instance.go @@ -220,7 +220,7 @@ func (self *SInstance) GetSecurityGroupIds() ([]string, error) { secgroupIds := []string{} if nics, err := self.getNics(); err == nil { for _, nic := range nics { - if len(nic.Properties.NetworkSecurityGroup.ID) > 0 { + if nic.Properties.NetworkSecurityGroup != nil && len(nic.Properties.NetworkSecurityGroup.ID) > 0 { secgroupIds = append(secgroupIds, strings.ToLower(nic.Properties.NetworkSecurityGroup.ID)) } } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/bingo.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/bingo.go index fdd91e84df..f1462541d1 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/bingo.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/bingo.go @@ -299,6 +299,7 @@ func (self *SBingoCloudClient) GetSubAccounts() ([]cloudprovider.SSubAccount, er var subAccounts []cloudprovider.SSubAccount for i := range tags { subAccount := cloudprovider.SSubAccount{ + Id: tags[i].ResourceId, Account: self.accessKey, Name: tags[i].ResourceId, DefaultProjectId: tags[i].Value, diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/manager.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/manager.go index 76309bb494..41cca1243e 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/manager.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/manager.go @@ -310,6 +310,7 @@ func (cli *SESXiClient) GetSubAccounts() ([]cloudprovider.SSubAccount, error) { return nil, err } subAccount := cloudprovider.SSubAccount{ + Id: cli.GetGlobalId(), Account: cli.account, Name: cli.cpcfg.Name, HealthStatus: api.CLOUD_PROVIDER_HEALTH_NORMAL, diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/huawei.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/huawei.go index cac1636240..c7c4cfcc96 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/huawei.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/huawei.go @@ -371,6 +371,7 @@ func (self *SHuaweiClient) GetSubAccounts() ([]cloudprovider.SSubAccount, error) } s := cloudprovider.SSubAccount{ + Id: project.ID, Name: fmt.Sprintf("%s-%s", self.cpcfg.Name, project.Name), Account: fmt.Sprintf("%s/%s", self.accessKey, project.ID), HealthStatus: project.GetHealthStatus(), diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/dbinstance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/dbinstance.go index 9ba432eced..38a1b82a0d 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/dbinstance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/dbinstance.go @@ -486,6 +486,7 @@ func (region *SRegion) CreateIDBInstance(desc *cloudprovider.SManagedDBInstanceC }, "vpc_id": desc.VpcId, "subnet_id": desc.NetworkId, + "region": region.Id, "security_group_id": desc.SecgroupIds[0], } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/nutanix.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/nutanix.go index a726c0eb35..d03b5b5abb 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/nutanix.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/nutanix.go @@ -330,6 +330,7 @@ func (self *SNutanixClient) get(res string, id string, params url.Values, retVal func (self *SNutanixClient) GetSubAccounts() ([]cloudprovider.SSubAccount, error) { subAccount := cloudprovider.SSubAccount{ + Id: self.GetAccountId(), Account: self.username, Name: self.cpcfg.Name, HealthStatus: api.CLOUD_PROVIDER_HEALTH_NORMAL, diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/objectstore/objectstore.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/objectstore/objectstore.go index a41ac44789..a5f35fbe23 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/objectstore/objectstore.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/objectstore/objectstore.go @@ -147,6 +147,7 @@ func NewObjectStoreClientAndFetch(cfg *ObjectStoreClientConfig, doFetch bool) (* func (cli *SObjectStoreClient) GetSubAccounts() ([]cloudprovider.SSubAccount, error) { subAccount := cloudprovider.SSubAccount{ + Id: cli.GetAccountId(), Account: cli.accessKey, Name: cli.cpcfg.Name, HealthStatus: api.CLOUD_PROVIDER_HEALTH_NORMAL, diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/objectstore/xsky/xsky.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/objectstore/xsky/xsky.go index a4d8fb8946..e011e0f338 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/objectstore/xsky/xsky.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/objectstore/xsky/xsky.go @@ -110,6 +110,7 @@ func (cli *SXskyClient) GetSubAccounts() ([]cloudprovider.SSubAccount, error) { if len(cli.initAccount) > 0 { return []cloudprovider.SSubAccount{ { + Id: fmt.Sprintf("%d", cli.adminUser.Id), Account: cli.initAccount, Name: cli.adminUser.Name, HealthStatus: api.CLOUD_PROVIDER_HEALTH_NORMAL, @@ -125,6 +126,7 @@ func (cli *SXskyClient) GetSubAccounts() ([]cloudprovider.SSubAccount, error) { ak := usrs[i].getMinKey() if len(ak) > 0 { subAccount := cloudprovider.SSubAccount{ + Id: fmt.Sprintf("%d", usrs[i].Id), Account: fmt.Sprintf("%s/%s", cli.adminApi.username, ak), Name: usrs[i].Name, HealthStatus: api.CLOUD_PROVIDER_HEALTH_NORMAL, diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/openstack.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/openstack.go index 249a80dd09..77e869c578 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/openstack.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/openstack.go @@ -145,6 +145,7 @@ func (cli *SOpenStackClient) GetSubAccounts() ([]cloudprovider.SSubAccount, erro subAccount := cloudprovider.SSubAccount{ Account: fmt.Sprintf("%s/%s", cli.project, cli.username), Name: cli.cpcfg.Name, + Id: cli.tokenCredential.GetProjectDomainId(), HealthStatus: api.CLOUD_PROVIDER_HEALTH_NORMAL, } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/proxmox.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/proxmox.go index 86677ceaef..917fa475c0 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/proxmox.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/proxmox.go @@ -370,6 +370,7 @@ func (cli *SProxmoxClient) upload(node, storageName, filename string, reader io. func (self *SProxmoxClient) GetSubAccounts() ([]cloudprovider.SSubAccount, error) { subAccount := cloudprovider.SSubAccount{} + subAccount.Id = self.host subAccount.Name = self.cpcfg.Name subAccount.Account = self.username subAccount.HealthStatus = api.CLOUD_PROVIDER_HEALTH_NORMAL diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/remotefile.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/remotefile.go index feb28b5fb2..b188c1a2b6 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/remotefile.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/remotefile.go @@ -105,6 +105,7 @@ func (cli *SRemoteFileClient) GetSubAccounts() ([]cloudprovider.SSubAccount, err subAccount := cloudprovider.SSubAccount{ Account: cli.cpcfg.Id, Name: cli.cpcfg.Name, + Id: cli.cpcfg.Id, HealthStatus: api.CLOUD_PROVIDER_HEALTH_NORMAL, } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/zstack.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/zstack.go index de616cc42c..d495ce4186 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/zstack.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/zstack.go @@ -136,6 +136,7 @@ func (cli *SZStackClient) GetCloudRegionExternalIdPrefix() string { func (cli *SZStackClient) GetSubAccounts() ([]cloudprovider.SSubAccount, error) { subAccount := cloudprovider.SSubAccount{ + Id: cli.cpcfg.Id, Account: cli.username, Name: cli.cpcfg.Name, HealthStatus: api.CLOUD_PROVIDER_HEALTH_NORMAL,