Fix/sqlserver db sweeper (#1038)

* fix: tke - security group ref uniq

* fix: sqlserver db attach sweeper and remark

Author: Kagashino

tencentcloud/basic_test.go

@@ -182,6 +182,14 @@ variable "subnet_cidr_less" {
 }
 `
 
+const fixedTagVariable = `
+variable "fixed_tags" {
+  default = {
+    fixed_resource: "do_not_remove"
+  }
+}
+`
+
 const defaultInstanceVariable = defaultVpcVariable + `
 data "tencentcloud_availability_zones" "default" {
 }
@@ -233,9 +241,10 @@ locals {
   subnet_id = data.tencentcloud_vpc_subnets.gz3.instance_list.0.subnet_id
 }`
 
-const defaultSecurityGroupData = `
+const defaultSecurityGroupData = fixedTagVariable + `
 data "tencentcloud_security_groups" "internal" {
   name = "default"
+  tags = var.fixed_tags
 }
 
 locals {

tencentcloud/resource_tc_sqlserver_account_db_attachment_test.go

@@ -13,8 +13,48 @@ import (
 var testSqlserverAccountDBAttachmentResourceName = "tencentcloud_sqlserver_account_db_attachment"
 var testSqlserverAccountDBAttachmentResourceKey = testSqlserverAccountDBAttachmentResourceName + ".test"
 
+func init() {
+	// go test -v ./tencentcloud -sweep=ap-guangzhou -sweep-run=tencentcloud_sqlserver_account_db_attachment
+	resource.AddTestSweepers(testSqlserverAccountDBAttachmentResourceName, &resource.Sweeper{
+		Name: testSqlserverAccountDBAttachmentResourceName,
+		F: func(r string) error {
+			logId := getLogId(contextNil)
+			ctx := context.WithValue(context.TODO(), logIdKey, logId)
+			cli, _ := sharedClientForRegion(r)
+			client := cli.(*TencentCloudClient).apiV3Conn
+			service := SqlserverService{client}
+
+			db, err := service.DescribeSqlserverInstances(ctx, "", defaultSQLServerName, -1, "", "", -1)
+
+			if err != nil {
+				return err
+			}
+
+			if len(db) == 0 {
+				return fmt.Errorf("%s not exists", defaultSQLServerName)
+			}
+
+			instanceId := *db[0].InstanceId
+
+			records, err := service.DescribeAccountDBAttachments(ctx, instanceId, defaultSQLServerAccount, defaultSQLServerDB)
+			if err != nil {
+				return err
+			}
+
+			if len(records) > 0 {
+				err = service.ModifyAccountDBAttachment(ctx, instanceId, defaultSQLServerAccount, defaultSQLServerDB, "Delete")
+			}
+
+			if err != nil {
+				return err
+			}
+
+			return nil
+		},
+	})
+}
+
 func TestAccTencentCloudSqlserverAccountDBAttachmentResource(t *testing.T) {
-	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
@@ -119,8 +159,8 @@ func testAccCheckSqlserverAccountDBAttachmentExists(n string) resource.TestCheck
 const testAccSqlserverAccountDBAttachment string = CommonPresetSQLServerAccount + `
 resource "tencentcloud_sqlserver_account_db_attachment" "test" {
   instance_id = local.sqlserver_id
-  account_name = local.sqlserver_account
-  db_name = local.sqlserver_db
+  account_name = local.sqlserver_account # "keep_sqlserver_account"
+  db_name = local.sqlserver_db # "keep_sqlserver_db"
   privilege = "ReadOnly"
 }
 `

tencentcloud/resource_tc_sqlserver_db_test.go

@@ -3,6 +3,7 @@ package tencentcloud
 import (
 	"context"
 	"fmt"
+	"log"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
@@ -22,13 +23,25 @@ func init() {
 			client := cli.(*TencentCloudClient).apiV3Conn
 			service := SqlserverService{client}
 
-			instance, err := service.DescribeSqlserverInstances(ctx, "", defaultSQLServerName, -1, "", "", -1)
+			instances, err := service.DescribeSqlserverInstances(ctx, "", "", -1, "", "", -1)
 
 			if err != nil {
 				return err
 			}
 
-			insId := *instance[0].InstanceId
+			var (
+				insId    string
+				subInsId string
+			)
+
+			for _, v := range instances {
+				if *v.Name == defaultSQLServerName {
+					insId = *v.InstanceId
+				}
+				if *v.Name == defaultSubSQLServerName {
+					subInsId = *v.InstanceId
+				}
+			}
 
 			dbs, err := service.DescribeDBsOfInstance(ctx, insId)
 
@@ -47,6 +60,20 @@ func init() {
 				}
 			}
 
+			// Clear sub instance db
+			subDbs, err := service.DescribeDBsOfInstance(ctx, subInsId)
+
+			for i := range subDbs {
+				db := subDbs[i]
+				if *db.Name == defaultSQLServerPubSubDB {
+					err = service.DeleteSqlserverDB(ctx, subInsId, []*string{db.Name})
+					break
+				}
+			}
+
+			if err != nil {
+				log.Printf("Delete sub instance DB fail: %s", err.Error())
+			}
 			return nil
 		},
 	})

tencentcloud/resource_tc_sqlserver_instance.go

@@ -213,7 +213,10 @@ func resourceTencentCloudSqlserverInstance() *schema.Resource {
 		Update: resourceTencentCloudSqlserverInstanceUpdate,
 		Delete: resourceTencentCLoudSqlserverInstanceDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			State: func(d *schema.ResourceData, i interface{}) ([]*schema.ResourceData, error) {
+				_ = d.Set("auto_voucher", 0)
+				return []*schema.ResourceData{d}, nil
+			},
 		},
 		Schema: specialInfo,
 	}

tencentcloud/resource_tc_sqlserver_instance_test.go

@@ -422,12 +422,12 @@ resource "tencentcloud_sqlserver_instance" "test" {
 }
 `
 
-const testAccSqlserverInstanceMultiCluster string = testAccSqlserverAZ + `
+const testAccSqlserverInstanceMultiCluster string = testAccSqlserverBasicInstanceNetwork + `
 resource "tencentcloud_sqlserver_instance" "test" {
   name                          = "tf_sqlserver_instance_multi"
   engine_version                = "2017"
   charge_type                   = "POSTPAID_BY_HOUR"
-  availability_zone             = local.az
+  availability_zone             = var.default_az
   vpc_id                        = local.vpc_id
   subnet_id                     = local.subnet_id
   security_groups               = [local.sg_id]

tencentcloud/service_tencentcloud_sqlserver.go

@@ -553,7 +553,10 @@ func (me *SqlserverService) CreateSqlserverAccount(ctx context.Context, instance
 	}()
 
 	request.InstanceId = &instanceId
-	account := sqlserver.AccountCreateInfo{UserName: &userName, Password: &password, IsAdmin: &isAdmin, Remark: &remark}
+	account := sqlserver.AccountCreateInfo{UserName: &userName, Password: &password, IsAdmin: &isAdmin}
+	if remark != "" {
+		account.Remark = &remark
+	}
 	request.Accounts = []*sqlserver.AccountCreateInfo{&account}
 
 	ratelimit.Check(request.GetAction())