lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-07-01 02:24:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): vendor update for huawei rds create (#19231)

Browse Source
This commit is contained in:
屈轩
2024-01-11 19:04:24 +08:00
committed by GitHub
parent 43d7668ee5
commit 43b0609bac
15 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@@ -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

4
go.sum
View File

@@ -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=

2
vendor/modules.txt vendored
View File

@@ -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

2
vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/instance.go generated vendored
View File

@@ -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))
}
}

1
vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/bingo.go generated vendored
View File

@@ -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,

1
vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/manager.go generated vendored
View File

@@ -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,

1
vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/huawei.go generated vendored
View File

@@ -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(),

1
vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/dbinstance.go generated vendored
View File

@@ -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],
}

1
vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/nutanix.go generated vendored
View File

@@ -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,

1
vendor/yunion.io/x/cloudmux/pkg/multicloud/objectstore/objectstore.go generated vendored
View File

@@ -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,

2
vendor/yunion.io/x/cloudmux/pkg/multicloud/objectstore/xsky/xsky.go generated vendored
View File

@@ -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,

1
vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/openstack.go generated vendored
View File

@@ -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,
}

1
vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/proxmox.go generated vendored
View File

@@ -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

1
vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/remotefile.go generated vendored
View File

@@ -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,
}

1
vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/zstack.go generated vendored
View File

@@ -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,