From 179d0d4487cbef1de4f10343ebecae9957cc72f7 Mon Sep 17 00:00:00 2001 From: ioito Date: Tue, 24 Oct 2023 13:23:49 +0800 Subject: [PATCH] fix(region): aws eip not found error --- go.mod | 2 +- go.sum | 4 +- vendor/modules.txt | 2 +- .../x/cloudmux/pkg/multicloud/apsara/doc.go | 171 ++++++++++++++++++ .../x/cloudmux/pkg/multicloud/aws/eip.go | 4 +- .../x/cloudmux/pkg/multicloud/hcso/doc.go | 6 + 6 files changed, 183 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 7a788e5e67..a440bf20c8 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.20231022061951-27b9156cda43 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231024052127-016e22c73e9f 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 40d6b86156..41f3218213 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.20231022061951-27b9156cda43 h1:etsCg3viqK6jQRZacIjqxIxekPVPHhP8c61jiTYNd8I= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231022061951-27b9156cda43/go.mod h1:McRjoG2gaOUisB+Qa41kLCNZhr0lsCu4apEjTiphXVY= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231024052127-016e22c73e9f h1:Ly28cvpMTrJRMFgHBrU/NU0mALJyePlNG0hQdGalth4= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231024052127-016e22c73e9f/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/vendor/modules.txt b/vendor/modules.txt index 7393b3a0cd..c25b5b1454 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.20231022061951-27b9156cda43 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231024052127-016e22c73e9f ## 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/doc.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/doc.go index 10d9b8ea2b..ed03701425 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/doc.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/doc.go @@ -13,3 +13,174 @@ // limitations under the License. package apsara // import "yunion.io/x/cloudmux/pkg/multicloud/apsara" + +/* +接口相关调用 +ecs相关: +ApplyAutoSnapshotPolicy +AssociateEipAddress +AttachDisk +AttachKeyPair +AuthorizeSecurityGroup +AuthorizeSecurityGroupEgress +CancelAutoSnapshotPolicy +CancelTask +ConvertNatPublicIpToEip +CreateAutoSnapshotPolicy +CreateDisk +CreateImage +CreateInstance +CreateSecurityGroup +CreateSnapshot +CreateVpc +DeleteAutoSnapshotPolicy +DeleteDisk +DeleteImage +DeleteSecurityGroup +DeleteSnapshot +DeleteVpc +DescribeAccountAttributes +DescribeAutoSnapshotPolicyEx +DescribeDisks +DescribeImages +DescribeInstanceAutoRenewAttribute +DescribeInstanceVncUrl +DescribeInstances +DescribeKeyPairs +DescribeNetworkInterfaces +DescribeRegions +DescribeRouteTables +DescribeSecurityGroupAttribute +DescribeSecurityGroups +DescribeSnapshots +DescribeTaskAttribute +DescribeTasks +DescribeVRouters +DescribeVpcs +DescribeZones +DetachDisk +DetachKeyPair +ExportImage +ImportImage +ImportKeyPair +JoinSecurityGroup +LeaveSecurityGroup +ModifyAutoSnapshotPolicyEx +ModifyEipAddressAttribute +ModifyInstanceAttribute +ModifyInstanceAutoRenewAttribute +ModifyInstanceVncPasswd +ModifySecurityGroupAttribute +ModifySecurityGroupRule +ReInitDisk +ReleaseEipAddress +RenewInstance +ReplaceSystemDisk +ResetDisk +ResizeDisk +RevokeSecurityGroup +RevokeSecurityGroupEgress +UnassociateEipAddress + +vpc相关: +AllocateEipAddress +AssociateRouteTable +CreateForwardEntry +CreateSnatEntry +CreateVSwitch +DeleteForwardEntry +DeleteSnatEntry +DeleteVSwitch +DescribeEipAddresses +DescribeForwardTableEntries +DescribeIpv6GatewayAttribute +DescribeIpv6Gateways +DescribeNatGateways +DescribeRouteTableList +DescribeSnatTableEntries +DescribeVSwitchAttributes +DescribeVSwitches +UnassociateRouteTable + +oss相关: +GetBucketAcl +GetBucketStorageCapacity +GetService +GetBucketInfo + +elb相关: +AddBackendServers +AddVServerGroupBackendServers +CreateAccessControlList +CreateLoadBalancer +CreateLoadBalancerHTTPListener +CreateLoadBalancerHTTPSListener +CreateLoadBalancerTCPListener +CreateLoadBalancerUDPListener +CreateMasterSlaveServerGroup +CreateRules +CreateVServerGroup +DeleteAccessControlList +DeleteLoadBalancer +DeleteLoadBalancerListener +DeleteMasterSlaveServerGroup +DeleteRules +DeleteServerCertificate +DeleteVServerGroup +DescribeAccessControlListAttribute +DescribeAccessControlLists +DescribeLoadBalancerAttribute +DescribeLoadBalancerHTTPListenerAttribute +DescribeLoadBalancerHTTPSListenerAttribute +DescribeLoadBalancerTCPListenerAttribute +DescribeLoadBalancerUDPListenerAttribute +DescribeLoadBalancers +DescribeMasterSlaveServerGroupAttribute +DescribeMasterSlaveServerGroups +DescribeRuleAttribute +DescribeRules +DescribeServerCertificates +DescribeVServerGroupAttribute +DescribeVServerGroups +RemoveAccessControlListEntry +RemoveBackendServers +RemoveVServerGroupBackendServers +SetAccessControlListAttribute +SetBackendServers +SetLoadBalancerHTTPListenerAttribute +SetLoadBalancerHTTPSListenerAttribute +SetLoadBalancerStatus +SetLoadBalancerTCPListenerAttribute +SetLoadBalancerUDPListenerAttribute +SetServerCertificateName +SetVServerGroupAttribute +StartLoadBalancerListener +StopLoadBalancerListener +UploadServerCertificate + +rds相关: +AllocateInstancePublicConnection +CreateAccount +CreateBackup +CreateDatabase +DeleteAccount +DeleteBackup +DeleteDBInstance +DeleteDatabase +DescribeAccounts +DescribeBackupTasks +DescribeBackups +DescribeDBInstanceAttribute +DescribeDBInstanceNetInfo +DescribeDBInstances +DescribeDatabases +DescribeParameters +GrantAccountPrivilege +ModifyDBInstanceDescription +ModifyDBInstanceSpec +RecoveryDBInstance +ReleaseInstancePublicConnection +RenewInstance +RestartDBInstance +RevokeAccountPrivilege +*/ diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/eip.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/eip.go index 08e3740eba..5566fc3251 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/eip.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/eip.go @@ -209,8 +209,8 @@ func (self *SRegion) GetEips(id, ip, associateId string) ([]SEipAddress, error) if err == nil { return result.AddressesSet, nil } - if e, ok := err.(*sAwsError); ok && e.Errors.Code == "InvalidAllocationID.NotFound" { - time.Sleep(time.Second * 30) + if errors.Cause(err) == cloudprovider.ErrNotFound { + time.Sleep(time.Second * 10) continue } return nil, errors.Wrapf(err, "DescribeAddresses") diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/doc.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/doc.go index aaaba680c2..4acff05473 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/doc.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/doc.go @@ -13,3 +13,9 @@ // limitations under the License. package hcso // import huawei "yunion.io/x/cloudmux/pkg/multicloud/hcso" + +/* +接口调用 +ecs相关 + +*/