diff --git a/go.mod b/go.mod index 80d41be000..8d8193ca8e 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.20240228093952-8fe0cab9f903 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240229080300-a5989f4029b0 yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401 yunion.io/x/log v1.0.1-0.20230411060016-feb3f46ab361 diff --git a/go.sum b/go.sum index 97d0531a6d..684e755f4f 100644 --- a/go.sum +++ b/go.sum @@ -1204,8 +1204,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.20240228093952-8fe0cab9f903 h1:dBGEplbtz3+5Vfv7f1El0rlV2u9849no3Lj5uww7ZC4= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240228093952-8fe0cab9f903/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240229080300-a5989f4029b0 h1:scJplFoiYEykGxZF1Eg8CtTTk2vha108PnDHW0n/1Ss= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240229080300-a5989f4029b0/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk= 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 a21be15c52..d191918cfc 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1473,7 +1473,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.20240228093952-8fe0cab9f903 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240229080300-a5989f4029b0 ## 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/dbinstance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/dbinstance.go index 61491d8ed2..c205726eb7 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/dbinstance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/dbinstance.go @@ -166,10 +166,6 @@ func (rds *SDBInstance) GetBillingType() string { return convertChargeType(rds.PayType) } -func (rds *SDBInstance) GetExpiredAt() time.Time { - return rds.ExpireTime -} - func (rds *SDBInstance) GetCreatedAt() time.Time { return rds.CreateTime } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/disk.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/disk.go index 9a191a5310..1fb17642a2 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/disk.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/disk.go @@ -408,10 +408,6 @@ func (self *SDisk) GetCreatedAt() time.Time { return self.CreationTime } -func (self *SDisk) GetExpiredAt() time.Time { - return convertExpiredAt(self.ExpiredTime) -} - func (self *SDisk) GetAccessPath() string { return "" } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/eip.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/eip.go index 2e9774055a..20ebebdcc2 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/eip.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/eip.go @@ -175,10 +175,6 @@ func (self *SEipAddress) GetCreatedAt() time.Time { return self.AllocationTime } -func (self *SEipAddress) GetExpiredAt() time.Time { - return convertExpiredAt(self.ExpiredTime) -} - func (self *SEipAddress) Delete() error { return self.region.DeallocateEIP(self.AllocationId) } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/elasticcache_instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/elasticcache_instance.go index 537d4859d2..f0006fa7d7 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/elasticcache_instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/elasticcache_instance.go @@ -201,10 +201,6 @@ func (self *SElasticcache) GetCreatedAt() time.Time { return self.CreateTime } -func (self *SElasticcache) GetExpiredAt() time.Time { - return convertExpiredAt(self.EndTime) -} - func (self *SElasticcache) GetInstanceType() string { return self.InstanceClass } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/instance.go index 8c2541f409..e9ae0f8237 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/instance.go @@ -901,10 +901,6 @@ func (self *SInstance) GetCreatedAt() time.Time { return self.CreationTime } -func (self *SInstance) GetExpiredAt() time.Time { - return convertExpiredAt(self.ExpiredTime) -} - func (self *SInstance) UpdateUserData(userData string) error { return self.host.zone.region.updateInstance(self.InstanceId, "", "", "", "", userData) } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/natgateway.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/natgateway.go index d99eb11773..5b5ec4a9a2 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/natgateway.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/natgateway.go @@ -110,10 +110,6 @@ func (nat *SNatGetway) GetCreatedAt() time.Time { return nat.CreationTime } -func (nat *SNatGetway) GetExpiredAt() time.Time { - return nat.ExpiredTime -} - func (nat *SNatGetway) GetIEips() ([]cloudprovider.ICloudEIP, error) { eips := []SEipAddress{} for {