From 98bd229b330ef29f35cd7ade6700ab589d9789de Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Thu, 22 Oct 2020 15:22:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=81=BF=E5=85=8D=E5=86=B2=E6=8E=89?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=88=B0=E6=9C=9F=E9=87=8A=E6=94=BE?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/dbinstances.go | 8 ++++++-- pkg/compute/models/disks.go | 4 +++- pkg/compute/models/elasticcache_instances.go | 4 +++- pkg/compute/models/elasticips.go | 4 +++- pkg/compute/models/guests.go | 4 +++- pkg/compute/models/natgateways.go | 8 ++++++-- 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/pkg/compute/models/dbinstances.go b/pkg/compute/models/dbinstances.go index 3988c52ac6..99e57cc474 100644 --- a/pkg/compute/models/dbinstances.go +++ b/pkg/compute/models/dbinstances.go @@ -1556,7 +1556,9 @@ func (self *SDBInstance) SyncWithCloudDBInstance(ctx context.Context, userCred m if factory.IsSupportPrepaidResources() { self.BillingType = extInstance.GetBillingType() - self.ExpiredAt = extInstance.GetExpiredAt() + if expired := extInstance.GetExpiredAt(); !expired.IsZero() { + self.ExpiredAt = expired + } self.AutoRenew = extInstance.IsAutoRenew() } @@ -1646,7 +1648,9 @@ func (manager *SDBInstanceManager) newFromCloudDBInstance(ctx context.Context, u if factory.IsSupportPrepaidResources() { instance.BillingType = extInstance.GetBillingType() - instance.ExpiredAt = extInstance.GetExpiredAt() + if expired := extInstance.GetExpiredAt(); !expired.IsZero() { + instance.ExpiredAt = expired + } instance.AutoRenew = extInstance.IsAutoRenew() } diff --git a/pkg/compute/models/disks.go b/pkg/compute/models/disks.go index 7eb87551f5..0f9f0f8b2c 100644 --- a/pkg/compute/models/disks.go +++ b/pkg/compute/models/disks.go @@ -1546,7 +1546,9 @@ func (manager *SDiskManager) newFromCloudDisk(ctx context.Context, userCred mccl if provider.GetFactory().IsSupportPrepaidResources() { disk.BillingType = extDisk.GetBillingType() - disk.ExpiredAt = extDisk.GetExpiredAt() + if expired := extDisk.GetExpiredAt(); !expired.IsZero() { + disk.ExpiredAt = expired + } disk.AutoRenew = extDisk.IsAutoRenew() } diff --git a/pkg/compute/models/elasticcache_instances.go b/pkg/compute/models/elasticcache_instances.go index 8bdedfc10b..615248eec4 100644 --- a/pkg/compute/models/elasticcache_instances.go +++ b/pkg/compute/models/elasticcache_instances.go @@ -649,7 +649,9 @@ func (manager *SElasticcacheManager) newFromCloudElasticcache(ctx context.Contex if factory.IsSupportPrepaidResources() { instance.BillingType = extInstance.GetBillingType() - instance.ExpiredAt = extInstance.GetExpiredAt() + if expired := extInstance.GetExpiredAt(); !expired.IsZero() { + instance.ExpiredAt = expired + } instance.AutoRenew = extInstance.IsAutoRenew() } diff --git a/pkg/compute/models/elasticips.go b/pkg/compute/models/elasticips.go index 6cfa6ce71b..33b4c38551 100644 --- a/pkg/compute/models/elasticips.go +++ b/pkg/compute/models/elasticips.go @@ -478,7 +478,9 @@ func (self *SElasticip) SyncWithCloudEip(ctx context.Context, userCred mcclient. factory, _ := provider.GetProviderFactory() if factory != nil && factory.IsSupportPrepaidResources() { self.BillingType = ext.GetBillingType() - self.ExpiredAt = ext.GetExpiredAt() + if expired := ext.GetExpiredAt(); !expired.IsZero() { + self.ExpiredAt = expired + } self.AutoRenew = ext.IsAutoRenew() } diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index 06632ce41e..a978070ed6 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -2586,7 +2586,9 @@ func (manager *SGuestManager) newCloudVM(ctx context.Context, userCred mcclient. if provider.GetFactory().IsSupportPrepaidResources() { guest.BillingType = extVM.GetBillingType() - guest.ExpiredAt = extVM.GetExpiredAt() + if expired := extVM.GetExpiredAt(); !expired.IsZero() { + guest.ExpiredAt = expired + } if guest.GetDriver().IsSupportSetAutoRenew() { guest.AutoRenew = extVM.IsAutoRenew() } diff --git a/pkg/compute/models/natgateways.go b/pkg/compute/models/natgateways.go index 04b1930a3f..71800de6b5 100644 --- a/pkg/compute/models/natgateways.go +++ b/pkg/compute/models/natgateways.go @@ -363,7 +363,9 @@ func (self *SNatGateway) SyncWithCloudNatGateway(ctx context.Context, userCred m factory, _ := provider.GetProviderFactory() if factory.IsSupportPrepaidResources() { self.BillingType = extNat.GetBillingType() - self.ExpiredAt = extNat.GetExpiredAt() + if expired := extNat.GetExpiredAt(); !expired.IsZero() { + self.ExpiredAt = expired + } self.AutoRenew = extNat.IsAutoRenew() } @@ -407,7 +409,9 @@ func (manager *SNatGatewayManager) newFromCloudNatGateway(ctx context.Context, u factory, _ := provider.GetProviderFactory() if factory.IsSupportPrepaidResources() { nat.BillingType = extNat.GetBillingType() - nat.ExpiredAt = extNat.GetExpiredAt() + if expired := extNat.GetExpiredAt(); !expired.IsZero() { + nat.ExpiredAt = expired + } nat.AutoRenew = extNat.IsAutoRenew() }