Add retry to redis and as

tencentcloud/extension_as.go

@@ -129,6 +129,7 @@ const (
 	SCALING_GROUP_ACTIVITY_STATUS_CANCELLED            = "CANCELLED"
 )
 
+const AsScheduleNotFound = "ResourceNotFound.ScheduledActionNotFound"
 const (
 	SCALING_GROUP_IN_ACTIVITY_STATUS     = "IN_ACTIVITY"
 	SCALING_GROUP_NOT_IN_ACTIVITY_STATUS = "NOT_IN_ACTIVITY"

tencentcloud/extension_redis.go

@@ -98,3 +98,6 @@ const (
 	REDIS_TASK_FAILED    = "failed"
 	REDIS_TASK_ERROR     = "error"
 )
+
+//sdk redis not found error
+const RedisInstanceNotFound = "ResourceNotFound.InstanceNotExists"

tencentcloud/resource_tc_as_attachment.go

@@ -15,6 +15,7 @@ package tencentcloud
 import (
 	"context"
 
+	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 )
 
@@ -73,12 +74,17 @@ func resourceTencentCloudAsAttachmentRead(d *schema.ResourceData, meta interface
 	asService := AsService{
 		client: meta.(*TencentCloudClient).apiV3Conn,
 	}
-	instanceIds, err := asService.DescribeAutoScalingAttachment(ctx, scalingGroupId)
+	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
+		instanceIds, e := asService.DescribeAutoScalingAttachment(ctx, scalingGroupId)
+		if e != nil {
+			return retryError(e)
+		}
+		d.Set("instance_ids", instanceIds)
+		return nil
+	})
 	if err != nil {
 		return err
 	}
-	d.Set("instance_ids", instanceIds)
-
 	return nil
 }
 
@@ -126,7 +132,17 @@ func resourceTencentCloudAsAttachmentDelete(d *schema.ResourceData, meta interfa
 	asService := AsService{
 		client: meta.(*TencentCloudClient).apiV3Conn,
 	}
-	instanceIds, err := asService.DescribeAutoScalingAttachment(ctx, scalingGroupId)
+	var (
+		instanceIds []string
+		e           error
+	)
+	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
+		instanceIds, e = asService.DescribeAutoScalingAttachment(ctx, scalingGroupId)
+		if e != nil {
+			return retryError(e)
+		}
+		return nil
+	})
 	if err != nil {
 		return err
 	}
@@ -135,6 +151,5 @@ func resourceTencentCloudAsAttachmentDelete(d *schema.ResourceData, meta interfa
 	if err != nil {
 		return err
 	}
-
 	return nil
 }

tencentcloud/resource_tc_as_lifecycle_hook.go

@@ -23,6 +23,7 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	as "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as/v20180419"
 )
@@ -157,33 +158,41 @@ func resourceTencentCloudAsLifecycleHookRead(d *schema.ResourceData, meta interf
 	asService := AsService{
 		client: meta.(*TencentCloudClient).apiV3Conn,
 	}
-	lifecycleHook, err := asService.DescribeLifecycleHookById(ctx, lifecycleHookId)
-	if err != nil {
-		return err
-	}
-
-	d.Set("scaling_group_id", *lifecycleHook.AutoScalingGroupId)
-	d.Set("lifecycle_hook_name", *lifecycleHook.LifecycleHookName)
-	d.Set("lifecycle_transition", *lifecycleHook.LifecycleTransition)
-	if lifecycleHook.DefaultResult != nil {
-		d.Set("default_result", *lifecycleHook.DefaultResult)
-	}
-	if lifecycleHook.HeartbeatTimeout != nil {
-		d.Set("heartbeat_timeout", *lifecycleHook.HeartbeatTimeout)
-	}
-	if lifecycleHook.NotificationMetadata != nil {
-		d.Set("notification_metadata", *lifecycleHook.NotificationMetadata)
-	}
-	if lifecycleHook.NotificationTarget != nil {
-		d.Set("notification_target_type", *lifecycleHook.NotificationTarget.TargetType)
-		if lifecycleHook.NotificationTarget.QueueName != nil {
-			d.Set("notification_queue_name", *lifecycleHook.NotificationTarget.QueueName)
+	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
+		lifecycleHook, has, e := asService.DescribeLifecycleHookById(ctx, lifecycleHookId)
+		if e != nil {
+			return retryError(e)
+		}
+		if has == 0 {
+			d.SetId("")
+			return nil
 		}
-		if lifecycleHook.NotificationTarget.TopicName != nil {
-			d.Set("notification_topic_name", *lifecycleHook.NotificationTarget.TopicName)
+		d.Set("scaling_group_id", *lifecycleHook.AutoScalingGroupId)
+		d.Set("lifecycle_hook_name", *lifecycleHook.LifecycleHookName)
+		d.Set("lifecycle_transition", *lifecycleHook.LifecycleTransition)
+		if lifecycleHook.DefaultResult != nil {
+			d.Set("default_result", *lifecycleHook.DefaultResult)
 		}
+		if lifecycleHook.HeartbeatTimeout != nil {
+			d.Set("heartbeat_timeout", *lifecycleHook.HeartbeatTimeout)
+		}
+		if lifecycleHook.NotificationMetadata != nil {
+			d.Set("notification_metadata", *lifecycleHook.NotificationMetadata)
+		}
+		if lifecycleHook.NotificationTarget != nil {
+			d.Set("notification_target_type", *lifecycleHook.NotificationTarget.TargetType)
+			if lifecycleHook.NotificationTarget.QueueName != nil {
+				d.Set("notification_queue_name", *lifecycleHook.NotificationTarget.QueueName)
+			}
+			if lifecycleHook.NotificationTarget.TopicName != nil {
+				d.Set("notification_topic_name", *lifecycleHook.NotificationTarget.TopicName)
+			}
+		}
+		return nil
+	})
+	if err != nil {
+		return err
 	}
-
 	return nil
 }
 

tencentcloud/resource_tc_as_lifecycle_hook_test.go

@@ -57,7 +57,7 @@ func testAccCheckAsLifecycleHookExists(n string) resource.TestCheckFunc {
 			return fmt.Errorf("auto scaling lifecycle hook id is not set")
 		}
 		asService := AsService{client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn}
-		_, err := asService.DescribeLifecycleHookById(ctx, rs.Primary.ID)
+		_, _, err := asService.DescribeLifecycleHookById(ctx, rs.Primary.ID)
 		if err != nil {
 			return err
 		}
@@ -77,7 +77,7 @@ func testAccCheckAsLifecycleHookDestroy(s *terraform.State) error {
 			continue
 		}
 
-		_, err := asService.DescribeLifecycleHookById(ctx, rs.Primary.ID)
+		_, _, err := asService.DescribeLifecycleHookById(ctx, rs.Primary.ID)
 		if err == nil {
 			return fmt.Errorf("auto scaling lifecycle hook still exists: %s", rs.Primary.ID)
 		}

tencentcloud/resource_tc_as_notification.go

@@ -18,6 +18,7 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	as "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as/v20180419"
 )
@@ -102,15 +103,23 @@ func resourceTencentCloudAsNotificationRead(d *schema.ResourceData, meta interfa
 	asService := AsService{
 		client: meta.(*TencentCloudClient).apiV3Conn,
 	}
-	notification, err := asService.DescribeNotificationById(ctx, notificationId)
+	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
+		notification, has, e := asService.DescribeNotificationById(ctx, notificationId)
+		if e != nil {
+			return retryError(e)
+		}
+		if has == 0 {
+			d.SetId("")
+			return nil
+		}
+		d.Set("scaling_group_id", *notification.AutoScalingGroupId)
+		d.Set("notification_type", flattenStringList(notification.NotificationTypes))
+		d.Set("notification_user_group_ids", flattenStringList(notification.NotificationUserGroupIds))
+		return nil
+	})
 	if err != nil {
 		return err
 	}
-
-	d.Set("scaling_group_id", *notification.AutoScalingGroupId)
-	d.Set("notification_type", flattenStringList(notification.NotificationTypes))
-	d.Set("notification_user_group_ids", flattenStringList(notification.NotificationUserGroupIds))
-
 	return nil
 }
 

tencentcloud/resource_tc_as_scaling_config.go

@@ -12,7 +12,7 @@ resource "tencentcloud_as_scaling_config" "launch_configuration" {
 	system_disk_type = "CLOUD_PREMIUM"
 	system_disk_size = "50"
 
-	data_disk = {
+	data_disk {
 		disk_type = "CLOUD_PREMIUM"
 		disk_size = 50
 	}
@@ -46,6 +46,7 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	as "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as/v20180419"
 )
@@ -369,29 +370,37 @@ func resourceTencentCloudAsScalingConfigRead(d *schema.ResourceData, meta interf
 	asService := AsService{
 		client: meta.(*TencentCloudClient).apiV3Conn,
 	}
-	config, err := asService.DescribeLaunchConfigurationById(ctx, configurationId)
+	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
+		config, has, e := asService.DescribeLaunchConfigurationById(ctx, configurationId)
+		if e != nil {
+			return retryError(e)
+		}
+		if has == 0 {
+			d.SetId("")
+			return nil
+		}
+		d.Set("configuration_name", *config.LaunchConfigurationName)
+		d.Set("status", *config.LaunchConfigurationStatus)
+		d.Set("image_id", *config.ImageId)
+		d.Set("project_id", *config.ProjectId)
+		d.Set("instance_types", flattenStringList(config.InstanceTypes))
+		d.Set("system_disk_type", *config.SystemDisk.DiskType)
+		d.Set("system_disk_size", *config.SystemDisk.DiskSize)
+		d.Set("data_disk", flattenDataDiskMappings(config.DataDisks))
+		d.Set("internet_charge_type", *config.InternetAccessible.InternetChargeType)
+		d.Set("internet_max_bandwidth_out", *config.InternetAccessible.InternetMaxBandwidthOut)
+		d.Set("public_ip_assigned", *config.InternetAccessible.PublicIpAssigned)
+		d.Set("login_settings.key_ids", flattenStringList(config.LoginSettings.KeyIds))
+		d.Set("security_group_ids", flattenStringList(config.SecurityGroupIds))
+		d.Set("enhanced_security_service", *config.EnhancedService.SecurityService.Enabled)
+		d.Set("enhanced_monitor_service", *config.EnhancedService.MonitorService.Enabled)
+		d.Set("user_data", pointerToString(config.UserData))
+		d.Set("instance_tags", flattenInstanceTagsMapping(config.InstanceTags))
+		return nil
+	})
 	if err != nil {
 		return err
 	}
-
-	d.Set("configuration_name", *config.LaunchConfigurationName)
-	d.Set("status", *config.LaunchConfigurationStatus)
-	d.Set("image_id", *config.ImageId)
-	d.Set("project_id", *config.ProjectId)
-	d.Set("instance_types", flattenStringList(config.InstanceTypes))
-	d.Set("system_disk_type", *config.SystemDisk.DiskType)
-	d.Set("system_disk_size", *config.SystemDisk.DiskSize)
-	d.Set("data_disk", flattenDataDiskMappings(config.DataDisks))
-	d.Set("internet_charge_type", *config.InternetAccessible.InternetChargeType)
-	d.Set("internet_max_bandwidth_out", *config.InternetAccessible.InternetMaxBandwidthOut)
-	d.Set("public_ip_assigned", *config.InternetAccessible.PublicIpAssigned)
-	d.Set("login_settings.key_ids", flattenStringList(config.LoginSettings.KeyIds))
-	d.Set("security_group_ids", flattenStringList(config.SecurityGroupIds))
-	d.Set("enhanced_security_service", *config.EnhancedService.SecurityService.Enabled)
-	d.Set("enhanced_monitor_service", *config.EnhancedService.MonitorService.Enabled)
-	d.Set("user_data", pointerToString(config.UserData))
-	d.Set("instance_tags", flattenInstanceTagsMapping(config.InstanceTags))
-
 	return nil
 }
 

tencentcloud/resource_tc_as_scaling_config_test.go

@@ -103,7 +103,7 @@ func testAccCheckAsScalingConfigExists(n string) resource.TestCheckFunc {
 			return fmt.Errorf("auto scaling configuration id is not set")
 		}
 		asService := AsService{client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn}
-		_, err := asService.DescribeLaunchConfigurationById(ctx, rs.Primary.ID)
+		_, _, err := asService.DescribeLaunchConfigurationById(ctx, rs.Primary.ID)
 		if err != nil {
 			return err
 		}
@@ -123,7 +123,7 @@ func testAccCheckAsScalingConfigDestroy(s *terraform.State) error {
 			continue
 		}
 
-		_, err := asService.DescribeLaunchConfigurationById(ctx, rs.Primary.ID)
+		_, _, err := asService.DescribeLaunchConfigurationById(ctx, rs.Primary.ID)
 		if err == nil {
 			return fmt.Errorf("auto scaling configuration still exists: %s", rs.Primary.ID)
 		}

tencentcloud/resource_tc_as_scaling_group.go

@@ -343,7 +343,7 @@ func resourceTencentCloudAsScalingGroupCreate(d *schema.ResourceData, meta inter
 		client: meta.(*TencentCloudClient).apiV3Conn,
 	}
 	err := resource.Retry(5*time.Minute, func() *resource.RetryError {
-		scalingGroup, errRet := asService.DescribeAutoScalingGroupById(ctx, id)
+		scalingGroup, _, errRet := asService.DescribeAutoScalingGroupById(ctx, id)
 		if errRet != nil {
 			return retryError(errRet, "InternalError")
 		}
@@ -372,17 +372,25 @@ func resourceTencentCloudAsScalingGroupRead(d *schema.ResourceData, meta interfa
 
 	var (
 		scalingGroup *as.AutoScalingGroup
-		err          error
+		e            error
+		has          int
 	)
-	if err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
-		scalingGroup, err = asService.DescribeAutoScalingGroupById(ctx, scalingGroupId)
-		if err != nil {
-			return retryError(err)
+	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
+		scalingGroup, has, e = asService.DescribeAutoScalingGroupById(ctx, scalingGroupId)
+		if e != nil {
+			return retryError(e)
+		}
+		if has == 0 {
+			d.SetId("")
 		}
 		return nil
-	}); err != nil {
+	})
+	if err != nil {
 		return err
 	}
+	if has == 0 {
+		return nil
+	}
 
 	d.Set("scaling_group_name", scalingGroup.AutoScalingGroupName)
 	d.Set("configuration_id", scalingGroup.LaunchConfigurationId)
@@ -627,10 +635,13 @@ func resourceTencentCloudAsScalingGroupDelete(d *schema.ResourceData, meta inter
 
 	// We need read the scaling group in order to check if there are instances.
 	// If so, we need to remove those first.
-	scalingGroup, err := asService.DescribeAutoScalingGroupById(ctx, scalingGroupId)
+	scalingGroup, has, err := asService.DescribeAutoScalingGroupById(ctx, scalingGroupId)
 	if err != nil {
 		return err
 	}
+	if has == 0 {
+		return nil
+	}
 	if *scalingGroup.InstanceCount > 0 || *scalingGroup.DesiredCapacity > 0 {
 		if err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 			return retryError(asService.ClearScalingGroupInstance(ctx, scalingGroupId))

tencentcloud/resource_tc_as_scaling_group_test.go

@@ -139,7 +139,7 @@ func testAccCheckAsScalingGroupExists(n string) resource.TestCheckFunc {
 			return fmt.Errorf("auto scaling group id is not set")
 		}
 		asService := AsService{client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn}
-		_, err := asService.DescribeAutoScalingGroupById(ctx, rs.Primary.ID)
+		_, _, err := asService.DescribeAutoScalingGroupById(ctx, rs.Primary.ID)
 		if err != nil {
 			return err
 		}
@@ -159,7 +159,7 @@ func testAccCheckAsScalingGroupDestroy(s *terraform.State) error {
 			continue
 		}
 
-		_, err := asService.DescribeAutoScalingGroupById(ctx, rs.Primary.ID)
+		_, _, err := asService.DescribeAutoScalingGroupById(ctx, rs.Primary.ID)
 		if err == nil {
 			return fmt.Errorf("auto scaling group still exists: %s", rs.Primary.ID)
 		}