Modify the problems in mongodb force delete review

Author: cyberHermanwang

tencentcloud/resource_tc_mongodb_instance.go

@@ -513,22 +513,16 @@ func resourceTencentCloudMongodbInstanceDelete(d *schema.ResourceData, meta inte
 	}
 	err = mongodbService.OfflineIsolatedDBInstance(ctx, instanceId)
 	if err != nil {
-		log.Printf("[CRITAL]%s mongodb %s fail, reason:%s\n", logId, "OfflineIsolatedDBInstance", err.Error())
+		log.Printf("[CRITAL]%s mongodb %s fail, reason:%s", logId, "OfflineIsolatedDBInstance", err.Error())
 		return err
 	}
 	//describe and check not exist
-	err = resource.Retry(5*readRetryTimeout, func() *resource.RetryError {
-		instance, _, errRet := mongodbService.DescribeInstanceById(ctx, instanceId)
-		if errRet != nil {
-			return retryError(errRet, InternalError)
-		}
-		if instance == nil {
-			return nil
-		}
-		return resource.NonRetryableError(fmt.Errorf("after OfflineIsolatedDBInstance mongodb Status is %d", *instance.Status))
-	})
-	if err != nil {
-		return err
+	_, has, errRet := mongodbService.DescribeInstanceById(ctx, instanceId)
+	if errRet != nil {
+		return errRet
+	}
+	if !has {
+		return nil
 	}
 	return nil
 }

tencentcloud/resource_tc_mongodb_sharding_instance.go

@@ -508,22 +508,16 @@ func resourceMongodbShardingInstanceDelete(d *schema.ResourceData, meta interfac
 	}
 	err = mongodbService.OfflineIsolatedDBInstance(ctx, instanceId)
 	if err != nil {
-		log.Printf("[CRITAL]%s mongodb %s fail, reason:%s\n", logId, "OfflineIsolatedDBInstance", err.Error())
+		log.Printf("[CRITAL]%s mongodb %s fail, reason:%s", logId, "OfflineIsolatedDBInstance", err.Error())
 		return err
 	}
 	//describe and check not exist
-	err = resource.Retry(5*readRetryTimeout, func() *resource.RetryError {
-		instance, _, errRet := mongodbService.DescribeInstanceById(ctx, instanceId)
-		if errRet != nil {
-			return retryError(errRet, InternalError)
-		}
-		if instance == nil {
-			return nil
-		}
-		return resource.NonRetryableError(fmt.Errorf("after OfflineIsolatedDBInstance mongodb Status is %d", *instance.Status))
-	})
-	if err != nil {
-		return err
+	_, has, errRet := mongodbService.DescribeInstanceById(ctx, instanceId)
+	if errRet != nil {
+		return errRet
+	}
+	if !has {
+		return nil
 	}
 	return nil
 }

tencentcloud/resource_tc_mongodb_standby_instance.go

@@ -558,23 +558,16 @@ func resourceTencentCloudMongodbStandbyInstanceDelete(d *schema.ResourceData, me
 	}
 	err = mongodbService.OfflineIsolatedDBInstance(ctx, instanceId)
 	if err != nil {
-		log.Printf("[CRITAL]%s mongodb %s fail, reason:%s\n", logId, "OfflineIsolatedDBInstance", err.Error())
+		log.Printf("[CRITAL]%s mongodb %s fail, reason:%s", logId, "OfflineIsolatedDBInstance", err.Error())
 		return err
 	}
 	//describe and check not exist
-	err = resource.Retry(5*readRetryTimeout, func() *resource.RetryError {
-		instance, _, errRet := mongodbService.DescribeInstanceById(ctx, instanceId)
-		if errRet != nil {
-			return retryError(errRet, InternalError)
-		}
-		if instance == nil {
-			return nil
-		}
-		return resource.NonRetryableError(fmt.Errorf("after OfflineIsolatedDBInstance mongodb Status is %d", *instance.Status))
-	})
-	if err != nil {
-		return err
+	_, has, errRet := mongodbService.DescribeInstanceById(ctx, instanceId)
+	if errRet != nil {
+		return errRet
+	}
+	if !has {
+		return nil
 	}
-
 	return nil
 }

tencentcloud/service_tencentcloud_mongodb.go

@@ -324,21 +324,21 @@ func (me *MongodbService) OfflineIsolatedDBInstance(ctx context.Context, instanc
 		}
 	}()
 	var response *mongodb.OfflineIsolatedDBInstanceResponse
-	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+	var err error
+	err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 		ratelimit.Check(request.GetAction())
-		result, e := me.client.UseMongodbClient().OfflineIsolatedDBInstance(request)
-		if e != nil {
-			if ee, ok := e.(*sdkErrors.TencentCloudSDKError); ok {
+		response, err = me.client.UseMongodbClient().OfflineIsolatedDBInstance(request)
+		if err != nil {
+			if ee, ok := err.(*sdkErrors.TencentCloudSDKError); ok {
 				if ee.Code == "InvalidParameterValue.LockFailed" {
-					return resource.RetryableError(e)
+					return resource.RetryableError(err)
 				} else {
-					return resource.NonRetryableError(e)
+					return resource.NonRetryableError(err)
 				}
 			}
-			log.Printf("[CRITAL]%s api[%s] fail, reason:%s", logId, request.GetAction(), e.Error())
-			return resource.NonRetryableError(e)
+			log.Printf("[CRITAL]%s api[%s] fail, reason:%s", logId, request.GetAction(), err.Error())
+			return resource.NonRetryableError(err)
 		}
-		response = result
 		return nil
 	})
 	if err != nil {