From 8fd53d0db5b208308dbbcb0d6a6a418ba237f8d7 Mon Sep 17 00:00:00 2001 From: tangbin Date: Thu, 18 Jun 2020 14:26:55 +0800 Subject: [PATCH] replace err with errors.cause --- pkg/compute/regiondrivers/aliyun.go | 2 +- pkg/compute/regiondrivers/aws.go | 8 ++--- pkg/compute/regiondrivers/huawei.go | 18 +++++----- pkg/compute/regiondrivers/managedvirtual.go | 38 ++++++++++----------- pkg/compute/regiondrivers/qcloud.go | 2 +- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pkg/compute/regiondrivers/aliyun.go b/pkg/compute/regiondrivers/aliyun.go index 3532c3c8cc..5e24de6ef4 100644 --- a/pkg/compute/regiondrivers/aliyun.go +++ b/pkg/compute/regiondrivers/aliyun.go @@ -1523,7 +1523,7 @@ func (self *SAliyunRegionDriver) RequestElasticcacheAccountResetPassword(ctx con ec := _ec.(*models.SElasticcache) iec, err := iregion.GetIElasticcacheById(ec.GetExternalId()) - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil } else if err != nil { return errors.Wrap(err, "aliyunRegionDriver.RequestElasticcacheAccountResetPassword.GetIElasticcacheById") diff --git a/pkg/compute/regiondrivers/aws.go b/pkg/compute/regiondrivers/aws.go index 591cdea84e..03c97c6919 100644 --- a/pkg/compute/regiondrivers/aws.go +++ b/pkg/compute/regiondrivers/aws.go @@ -1174,7 +1174,7 @@ func (self *SAwsRegionDriver) RequestDeleteLoadbalancerBackendGroup(ctx context. } iLoadbalancer, err := iRegion.GetILoadBalancerById(loadbalancer.ExternalId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil, nil } return nil, errors.Wrap(err, "AwsRegionDriver.RequestDeleteLoadbalancerBackendGroup.GetILoadBalancerById") @@ -1193,7 +1193,7 @@ func (self *SAwsRegionDriver) RequestDeleteLoadbalancerBackendGroup(ctx context. iLoadbalancerBackendGroup, err := iLoadbalancer.GetILoadBalancerBackendGroupById(cachedLbbg.ExternalId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil, nil } return nil, errors.Wrap(err, "AwsRegionDriver.RequestDeleteLoadbalancerBackendGroup.GetILoadBalancerBackendGroupById") @@ -1232,7 +1232,7 @@ func (self *SAwsRegionDriver) RequestDeleteLoadbalancer(ctx context.Context, use iLoadbalancer, err := iRegion.GetILoadBalancerById(lb.ExternalId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil, nil } return nil, errors.Wrap(err, "AwsRegionDriver.RequestDeleteLoadbalancer.GetILoadBalancerById") @@ -1260,7 +1260,7 @@ func (self *SAwsRegionDriver) RequestDeleteLoadbalancer(ctx context.Context, use iLoadbalancerBackendGroup, err := iLoadbalancer.GetILoadBalancerBackendGroupById(cachedLbbg.ExternalId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil, nil } return nil, errors.Wrap(err, "AwsRegionDriver.RequestDeleteLoadbalancerBackendGroup.GetILoadBalancerBackendGroupById") diff --git a/pkg/compute/regiondrivers/huawei.go b/pkg/compute/regiondrivers/huawei.go index 525dbf84ce..9595df2e47 100644 --- a/pkg/compute/regiondrivers/huawei.go +++ b/pkg/compute/regiondrivers/huawei.go @@ -1451,7 +1451,7 @@ func (self *SHuaWeiRegionDriver) RequestSyncLoadbalancerListener(ctx context.Con func deleteHuaweiLoadbalancerListenerRule(ctx context.Context, userCred mcclient.TokenCredential, ilb cloudprovider.ICloudLoadbalancer, irule cloudprovider.ICloudLoadbalancerListenerRule) error { err := irule.Refresh() if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil } @@ -1469,7 +1469,7 @@ func deleteHuaweiLoadbalancerListenerRule(ctx context.Context, userCred mcclient if len(lbbgId) > 0 { ilbbg, err := ilb.GetILoadBalancerBackendGroupById(lbbgId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil } @@ -1488,7 +1488,7 @@ func deleteHuaweiLoadbalancerListenerRule(ctx context.Context, userCred mcclient func deleteHuaweiLoadbalancerBackendGroup(ctx context.Context, userCred mcclient.TokenCredential, ilb cloudprovider.ICloudLoadbalancer, ilbbg cloudprovider.ICloudLoadbalancerBackendGroup) error { err := ilbbg.Refresh() if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil } @@ -1635,7 +1635,7 @@ func (self *SHuaWeiRegionDriver) RequestDeleteLoadbalancerListener(ctx context.C iLoadbalancer, err := iRegion.GetILoadBalancerById(loadbalancer.ExternalId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil, nil } @@ -1643,7 +1643,7 @@ func (self *SHuaWeiRegionDriver) RequestDeleteLoadbalancerListener(ctx context.C } iListener, err := iLoadbalancer.GetILoadBalancerListenerById(lblis.ExternalId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil, nil } return nil, err @@ -1750,7 +1750,7 @@ func (self *SHuaWeiRegionDriver) RequestDeleteLoadbalancerBackendGroup(ctx conte } iLoadbalancer, err := iRegion.GetILoadBalancerById(loadbalancer.ExternalId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil, nil } @@ -1769,7 +1769,7 @@ func (self *SHuaWeiRegionDriver) RequestDeleteLoadbalancerBackendGroup(ctx conte iLoadbalancerBackendGroup, err := iLoadbalancer.GetILoadBalancerBackendGroupById(cachedLbbg.ExternalId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { if err := deleteHuaweiCachedLbbg(ctx, userCred, cachedLbbg.AssociatedId); err != nil { return nil, errors.Wrap(err, "huaweiRegionDriver.RequestDeleteLoadbalancerBackendGroup.deleteHuaweiCachedLbbg") } @@ -2040,7 +2040,7 @@ func (self *SHuaWeiRegionDriver) RequestCreateLoadbalancerBackend(ctx context.Co for _, cachedLbbg := range cachedlbbgs { iLoadbalancerBackendGroup, err := cachedLbbg.GetICloudLoadbalancerBackendGroup() if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { if err := deleteHuaweiCachedLbbg(ctx, userCred, cachedLbbg.AssociatedId); err != nil { return nil, errors.Wrap(err, "huaweiRegionDriver.RequestCreateLoadbalancerBackend.deleteHuaweiCachedLbbg") } @@ -2545,7 +2545,7 @@ func (self *SHuaWeiRegionDriver) RequestElasticcacheAccountResetPassword(ctx con ec := _ec.(*models.SElasticcache) iec, err := iregion.GetIElasticcacheById(ec.GetExternalId()) - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil } else if err != nil { return errors.Wrap(err, "huaweiRegionDriver.RequestElasticcacheAccountResetPassword.GetIElasticcacheById") diff --git a/pkg/compute/regiondrivers/managedvirtual.go b/pkg/compute/regiondrivers/managedvirtual.go index c8f2cbf11e..f26ed39c00 100644 --- a/pkg/compute/regiondrivers/managedvirtual.go +++ b/pkg/compute/regiondrivers/managedvirtual.go @@ -276,7 +276,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestDeleteLoadbalancer(ctx co } iLoadbalancer, err := iRegion.GetILoadBalancerById(lb.ExternalId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil, nil } return nil, err @@ -382,7 +382,7 @@ func (self *SManagedVirtualizationRegionDriver) deleteLoadbalancerAcl(ctx contex iLoadbalancerAcl, err := iRegion.GetILoadBalancerAclById(lbacl.ExternalId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil, nil } return nil, err @@ -455,7 +455,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestDeleteLoadbalancerCertifi } iLoadbalancerCert, err := iRegion.GetILoadBalancerCertificateById(lbcert.ExternalId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil, nil } return nil, err @@ -522,7 +522,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestDeleteLoadbalancerBackend } iLoadbalancer, err := iRegion.GetILoadBalancerById(loadbalancer.ExternalId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil, nil } return nil, err @@ -534,7 +534,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestDeleteLoadbalancerBackend iLoadbalancerBackendGroup, err := iLoadbalancer.GetILoadBalancerBackendGroupById(lbbg.ExternalId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil, nil } return nil, err @@ -634,7 +634,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestDeleteLoadbalancerBackend } _, err = guest.GetIVM() if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil, nil } return nil, err @@ -807,7 +807,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestDeleteLoadbalancerListene iLoadbalancer, err := iRegion.GetILoadBalancerById(loadbalancer.ExternalId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil, nil } return nil, errors.Wrap(err, "RegionDriver.RequestDeleteLoadbalancerListener.GetILoadBalancerById") @@ -815,7 +815,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestDeleteLoadbalancerListene iListener, err := iLoadbalancer.GetILoadBalancerListenerById(lblis.ExternalId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil, nil } return nil, errors.Wrap(err, "RegionDriver.RequestDeleteLoadbalancerListener.GetILoadBalancerListenerById") @@ -1085,7 +1085,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestDeleteLoadbalancerListene } iListenerRule, err := iListener.GetILoadBalancerListenerRuleById(lbr.ExternalId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil, nil } return nil, err @@ -1230,7 +1230,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestCancelSnapshotPolicy(ctx data := jsonutils.NewDict() data.Add(jsonutils.NewString(sp.GetId()), "snapshotpolicy_id") err = iRegion.CancelSnapshotPolicyToDisks(spcache.GetExternalId(), disk.GetExternalId()) - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return data, nil } if err != nil { @@ -1253,7 +1253,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestDeleteSnapshot(ctx contex } cloudSnapshot, err := cloudRegion.GetISnapshotById(snapshot.ExternalId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil, nil } return nil, err @@ -1752,7 +1752,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestSyncElasticcache(ctx cont iec, err := iregion.GetIElasticcacheById(ec.ExternalId) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { ec.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_UNKNOWN, "") return nil } @@ -2396,14 +2396,14 @@ func (self *SManagedVirtualizationRegionDriver) RequestDeleteElasticcacheAccount ec := _ec.(*models.SElasticcache) iec, err := iregion.GetIElasticcacheById(ec.GetExternalId()) - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil } else if err != nil { return errors.Wrap(err, "managedVirtualizationRegionDriver.RequestDeleteElasticcacheAccount.GetIElasticcacheById") } iea, err := iec.GetICloudElasticcacheAccount(ea.GetExternalId()) - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil } else if err != nil { return errors.Wrap(err, "managedVirtualizationRegionDriver.RequestDeleteElasticcacheAccount.GetICloudElasticcacheAccount") @@ -2436,7 +2436,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestDeleteElasticcacheAcl(ctx ec := _ec.(*models.SElasticcache) iec, err := iregion.GetIElasticcacheById(ec.GetExternalId()) - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil } else if err != nil { return errors.Wrap(err, "managedVirtualizationRegionDriver.RequestDeleteElasticcacheAcl.GetIElasticcacheById") @@ -2444,7 +2444,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestDeleteElasticcacheAcl(ctx iea, err := iec.GetICloudElasticcacheAcl(ea.GetExternalId()) if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil } @@ -2472,7 +2472,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestDeleteElasticcacheBackup( ec := _ec.(*models.SElasticcache) iec, err := iregion.GetIElasticcacheById(ec.GetExternalId()) - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil } else if err != nil { return errors.Wrap(err, "managedVirtualizationRegionDriver.RequestDeleteElasticcacheBackup.GetIElasticcacheById") @@ -2504,7 +2504,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestElasticcacheAccountResetP ec := _ec.(*models.SElasticcache) iec, err := iregion.GetIElasticcacheById(ec.GetExternalId()) - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil } else if err != nil { return errors.Wrap(err, "managedVirtualizationRegionDriver.RequestElasticcacheAccountResetPassword.GetIElasticcacheById") @@ -2584,7 +2584,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestElasticcacheBackupRestore ec := _ec.(*models.SElasticcache) iec, err := iregion.GetIElasticcacheById(ec.GetExternalId()) - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { return nil } else if err != nil { return errors.Wrap(err, "managedVirtualizationRegionDriver.RequestElasticcacheBackupRestoreInstance.GetIElasticcacheById") diff --git a/pkg/compute/regiondrivers/qcloud.go b/pkg/compute/regiondrivers/qcloud.go index 05acfd54ed..b52fc2caf1 100644 --- a/pkg/compute/regiondrivers/qcloud.go +++ b/pkg/compute/regiondrivers/qcloud.go @@ -304,7 +304,7 @@ func (self *SQcloudRegionDriver) RequestCreateLoadbalancerBackend(ctx context.Co for _, cachedLbbg := range cachedlbbgs { iLoadbalancerBackendGroup, err := cachedLbbg.GetICloudLoadbalancerBackendGroup() if err != nil { - if err == cloudprovider.ErrNotFound { + if errors.Cause(err) == cloudprovider.ErrNotFound { continue }