From 875abe66d673e5a13013ebea56338f3a7cf4bbe0 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Wed, 7 Jul 2021 18:09:54 +0800 Subject: [PATCH] fix(region): validate jdcloud rds err --- pkg/multicloud/jdcloud/rds.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/multicloud/jdcloud/rds.go b/pkg/multicloud/jdcloud/rds.go index 8687fd1b52..88c554b644 100644 --- a/pkg/multicloud/jdcloud/rds.go +++ b/pkg/multicloud/jdcloud/rds.go @@ -17,6 +17,7 @@ package jdcloud import ( "fmt" "strconv" + "strings" "time" commodels "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" @@ -200,8 +201,10 @@ func (self *SRegion) GetDBInstance(id string) (*SDBInstance, error) { if err != nil { return nil, errors.Wrapf(err, "DescribeInstanceAttributes") } - if resp.Error.Code == 404 { + if resp.Error.Code == 404 || strings.Contains(resp.Error.Status, "NotFound") { return nil, errors.Wrapf(cloudprovider.ErrNotFound, jsonutils.Marshal(resp.Error).String()) + } else if resp.Error.Code != 0 { + return nil, errors.Error(jsonutils.Marshal(resp.Error).String()) } ret := SDBInstance{ region: self,