modify sqlserver pub-sub delete subscribe database

Author: cyberHermanwang

tencentcloud/data_source_tc_sqlserver_publish_subscribes.go

@@ -8,6 +8,7 @@ resource "tencentcloud_sqlserver_publish_subscribe" "example" {
 	publish_instance_id             = tencentcloud_sqlserver_instance.publish_instance.id
 	subscribe_instance_id           = tencentcloud_sqlserver_instance.subscribe_instance.id
 	publish_subscribe_name          = "example"
+	delete_subscribe_db             = false
 	database_tuples {
 		publish_database            = tencentcloud_sqlserver_db.test_publish_subscribe.name
 		subscribe_database          = tencentcloud_sqlserver_db.test_publish_subscribe.name
@@ -157,39 +158,41 @@ func dataSourceTencentSqlserverPublishSubscribesRead(d *schema.ResourceData, met
 	logId := getLogId(contextNil)
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 	sqlserverService := SqlserverService{client: meta.(*TencentCloudClient).apiV3Conn}
-	var (
-		instanceId           = d.Get("instance_id").(string)
-		pubOrSubInstanceId   string
-		pubOrSubInstanceIp   string
-		publishSubscribeName string
-		publishSubscribeId   uint64 = 0
-		publishDBName        string
-		subscribeDBName      string
-	)
-
+	paramMap := make(map[string]interface{})
+	paramMap["instanceId"] = d.Get("instance_id").(string)
 	if v, ok := d.GetOk("pub_or_sub_instance_id"); ok {
-		pubOrSubInstanceId = v.(string)
+		paramMap["pubOrSubInstanceId"] = v.(string)
+	} else {
+		paramMap["pubOrSubInstanceId"] = ""
 	}
 	if v, ok := d.GetOk("pub_or_sub_instance_ip"); ok {
-		pubOrSubInstanceIp = v.(string)
+		paramMap["pubOrSubInstanceIp"] = v.(string)
+	} else {
+		paramMap["pubOrSubInstanceIp"] = ""
 	}
 	if v, ok := d.GetOk("publish_subscribe_name"); ok {
-		publishSubscribeName = v.(string)
+		paramMap["publishSubscribeName"] = v.(string)
+	} else {
+		paramMap["publishSubscribeName"] = ""
 	}
 	if v, ok := d.GetOk("publish_subscribe_id"); ok {
 		id := v.(int)
-		if id != 0 {
-			publishSubscribeId = *helper.IntUint64(id)
-		}
+		paramMap["publishSubscribeId"] = *helper.IntUint64(id)
+	} else {
+		paramMap["publishSubscribeId"] = *helper.IntUint64(0)
 	}
 	if v, ok := d.GetOk("publish_database"); ok {
-		publishDBName = v.(string)
+		paramMap["publishDBName"] = v.(string)
+	} else {
+		paramMap["publishDBName"] = ""
 	}
 	if v, ok := d.GetOk("subscribe_database"); ok {
-		subscribeDBName = v.(string)
+		paramMap["subscribeDBName"] = v.(string)
+	} else {
+		paramMap["subscribeDBName"] = ""
 	}
 
-	publishSubscribes, err := sqlserverService.DescribeSqlserverPublishSubscribes(ctx, instanceId, pubOrSubInstanceId, pubOrSubInstanceIp, publishSubscribeName, publishDBName, subscribeDBName, publishSubscribeId)
+	publishSubscribes, err := sqlserverService.DescribeSqlserverPublishSubscribes(ctx, paramMap)
 	if err != nil {
 		return err
 	}
@@ -198,12 +201,12 @@ func dataSourceTencentSqlserverPublishSubscribesRead(d *schema.ResourceData, met
 
 	for _, publishSubscribe := range publishSubscribes {
 		var databaseTupleStatus []map[string]interface{}
-		for _, inst_ := range publishSubscribe.DatabaseTupleSet {
+		for _, inst := range publishSubscribe.DatabaseTupleSet {
 			databaseTuple := map[string]interface{}{
-				"publish_database":   inst_.PublishDatabase,
-				"subscribe_database": inst_.SubscribeDatabase,
-				"last_sync_time":     inst_.LastSyncTime,
-				"status":             inst_.Status,
+				"publish_database":   inst.PublishDatabase,
+				"subscribe_database": inst.SubscribeDatabase,
+				"last_sync_time":     inst.LastSyncTime,
+				"status":             inst.Status,
 			}
 			databaseTupleStatus = append(databaseTupleStatus, databaseTuple)
 		}
@@ -225,7 +228,7 @@ func dataSourceTencentSqlserverPublishSubscribesRead(d *schema.ResourceData, met
 
 	d.SetId(helper.DataResourceIdsHash(ids))
 	if err = d.Set("publish_subscribe_list", instanceList); err != nil {
-		log.Printf("[CRITAL]%s provider set sql server publish subscribe list fail, reason:%s\n ", logId, err.Error())
+		log.Printf("[CRITAL]%s provider set sql server publish and subscribe list fail, reason:%s ", logId, err.Error())
 		return err
 	}
 

tencentcloud/data_source_tc_sqlserver_publish_subscribes_test.go

@@ -35,46 +35,47 @@ func TestAccTencentCloudSqlserverPublishSubscribeDataSource(t *testing.T) {
 
 const testAccTencentCloudSqlServerPublishSubscribeDataSourceConfig = testAccSqlserverInstanceBasic + `
 resource "tencentcloud_sqlserver_instance" "publish_instance" {
-  name = "tf_sqlserver_publish_instance"
-  availability_zone = var.availability_zone
-  charge_type = "POSTPAID_BY_HOUR"
-  vpc_id                   = "` + defaultVpcId + `"
-  subnet_id = "` + defaultSubnetId + `"
-  project_id = 0
-  memory = 2
-  storage = 10
-  maintenance_week_set = [1,2,3]
-  maintenance_start_time = "09:00"
+  name                  = "tf_sqlserver_publish_instance"
+  availability_zone     = var.availability_zone
+  charge_type           = "POSTPAID_BY_HOUR"
+  vpc_id                = "` + defaultVpcId + `"
+  subnet_id             = "` + defaultSubnetId + `"
+  project_id            = 0
+  memory                = 2
+  storage               = 10
+  maintenance_week_set  = [1,2,3]
+  maintenance_start_time= "09:00"
   maintenance_time_span = 3
-  security_groups = ["sg-nltpbqg1"]
+  security_groups       = ["sg-nltpbqg1"]
 }
 
 resource "tencentcloud_sqlserver_instance" "subscribe_instance" {
-  name = "tf_sqlserver_subscribe_instance"
-  availability_zone = var.availability_zone
-  charge_type = "POSTPAID_BY_HOUR"
-  vpc_id                   = "` + defaultVpcId + `"
-  subnet_id = "` + defaultSubnetId + `"
-  project_id = 0
-  memory = 2
-  storage = 10
-  maintenance_week_set = [1,2,3]
-  maintenance_start_time = "09:00"
-  maintenance_time_span = 3
-  security_groups = ["sg-nltpbqg1"]
+  name                      = "tf_sqlserver_subscribe_instance"
+  availability_zone         = var.availability_zone
+  charge_type               = "POSTPAID_BY_HOUR"
+  vpc_id                    = "` + defaultVpcId + `"
+  subnet_id                 = "` + defaultSubnetId + `"
+  project_id                = 0
+  memory                    = 2
+  storage                   = 10
+  maintenance_week_set      = [1,2,3]
+  maintenance_start_time    = "09:00"
+  maintenance_time_span     = 3
+  security_groups           = ["sg-nltpbqg1"]
 }
 
 resource "tencentcloud_sqlserver_db" "test_publish_subscribe" {
-  instance_id = tencentcloud_sqlserver_instance.publish_instance.id
-  name        = "test111"
-  charset     = "Chinese_PRC_BIN"
-  remark      = "testACC-remark"
+  instance_id   = tencentcloud_sqlserver_instance.publish_instance.id
+  name          = "test111"
+  charset       = "Chinese_PRC_BIN"
+  remark        = "testACC-remark"
 }
 
 resource "tencentcloud_sqlserver_publish_subscribe" "example" {
 	publish_instance_id             = tencentcloud_sqlserver_instance.publish_instance.id
 	subscribe_instance_id           = tencentcloud_sqlserver_instance.subscribe_instance.id
 	publish_subscribe_name          = "example"
+	delete_subscribe_db             = false
 	database_tuples {
 		publish_database            = tencentcloud_sqlserver_db.test_publish_subscribe.name
 		subscribe_database          = tencentcloud_sqlserver_db.test_publish_subscribe.name

tencentcloud/extension_sqlserver.go

@@ -72,6 +72,7 @@ const (
 	VPC_NEWORK    = 1
 )
 
-const INTERNALERROR_DBERROR = "InternalError.DBError"
-
-const INSTANCE_STATUS_INVALID = "ResourceUnavailable.InstanceStatusInvalid"
+const (
+	INTERNALERROR_DBERROR   = "InternalError.DBError"
+	INSTANCE_STATUS_INVALID = "ResourceUnavailable.InstanceStatusInvalid"
+)

tencentcloud/resource_tc_sqlserver_publish_subscribe.go

@@ -8,6 +8,7 @@ resource "tencentcloud_sqlserver_publish_subscribe" "example" {
 	publish_instance_id             = tencentcloud_sqlserver_instance.publish_instance.id
 	subscribe_instance_id           = tencentcloud_sqlserver_instance.subscribe_instance.id
 	publish_subscribe_name          = "example"
+	delete_subscribe_db             = false
 	database_tuples {
 		publish_database            = tencentcloud_sqlserver_db.test_publish_subscribe.name
 		subscribe_database          = tencentcloud_sqlserver_db.test_publish_subscribe.name
@@ -17,10 +18,10 @@ resource "tencentcloud_sqlserver_publish_subscribe" "example" {
 
 Import
 
-SQL Server PublishSubscribe can be imported using the id, e.g.
+SQL Server PublishSubscribe can be imported using the publish_sqlserver_id#subscribe_sqlserver_id, e.g.
 
 ```
-$ terraform import tencentcloud_sqlserver_publish_subscribe.foo mssql-3cdq7kx5#db_name
+$ terraform import tencentcloud_sqlserver_publish_subscribe.foo publish_sqlserver_id#subscribe_sqlserver_id
 ```
 */
 package tencentcloud
@@ -63,12 +64,18 @@ func resourceTencentCloudSqlserverPublishSubscribe() *schema.Resource {
 				Default:     "default_name",
 				Description: "The name of the Publish and Subscribe in the SQLServer instance. default is `default_name`.",
 			},
+			"delete_subscribe_db": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "Whether to delete the subscriber database when deleting the Publish and Subscribe in the SQLServer instance. `true` for deletes the subscribe database, `false` for does not delete the subscribe database. default is `false`.",
+			},
 			"database_tuples": {
 				Type:        schema.TypeSet,
 				Required:    true,
 				MinItems:    1,
 				MaxItems:    80,
-				Description: "Database Publish and Publish relationship list. Modify database is not allowed.",
+				Description: "Database Publish and Publish relationship list. The elements inside can be deleted and added individually, but modify is not allowed.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"publish_database": {
@@ -187,6 +194,7 @@ func resourceTencentCloudSqlserverPublishSubscribeUpdate(d *schema.ResourceData,
 		sqlserverService    = SqlserverService{client: meta.(*TencentCloudClient).apiV3Conn}
 		publishInstanceId   = d.Get("publish_instance_id").(string)
 		subscribeInstanceId = d.Get("subscribe_instance_id").(string)
+		deleteSubscribeDb   = d.Get("delete_subscribe_db").(bool)
 	)
 
 	publishSubscribe, _, err := sqlserverService.DescribeSqlserverPublishSubscribeById(ctx, publishInstanceId, subscribeInstanceId)
@@ -202,6 +210,7 @@ func resourceTencentCloudSqlserverPublishSubscribeUpdate(d *schema.ResourceData,
 
 	if d.HasChange("database_tuples") {
 		var deleteDatabaseTupleSet []*sqlserver.DatabaseTuple
+		var subscribeDatabases []*string
 		oldSet, newSet := d.GetChange("database_tuples")
 		//get new DatabaseTupleSet
 		var newDatabaseTupleSet []*sqlserver.DatabaseTuple
@@ -230,6 +239,8 @@ func resourceTencentCloudSqlserverPublishSubscribeUpdate(d *schema.ResourceData,
 					SubscribeDatabase: oldInstance.SubscribeDatabase,
 				}
 				deleteDatabaseTupleSet = append(deleteDatabaseTupleSet, &databaseTuple)
+				subDatabase := *oldInstance.SubscribeDatabase
+				subscribeDatabases = append(subscribeDatabases, &subDatabase)
 			}
 		}
 		if deleteDatabaseTupleSet == nil {
@@ -238,6 +249,12 @@ func resourceTencentCloudSqlserverPublishSubscribeUpdate(d *schema.ResourceData,
 		if err := sqlserverService.DeletePublishSubscribe(ctx, publishSubscribe, deleteDatabaseTupleSet); err != nil {
 			return err
 		}
+		if deleteSubscribeDb {
+			//delete subscribe databases
+			if err = sqlserverService.DeleteSqlserverDB(ctx, subscribeInstanceId, subscribeDatabases); err != nil {
+				return err
+			}
+		}
 	}
 
 	return resourceTencentCloudSqlserverPublishSubscribeRead(d, meta)
@@ -252,6 +269,7 @@ func resourceTencentCloudSqlserverPublishSubscribeDelete(d *schema.ResourceData,
 		sqlserverService    = SqlserverService{client: meta.(*TencentCloudClient).apiV3Conn}
 		publishInstanceId   = d.Get("publish_instance_id").(string)
 		subscribeInstanceId = d.Get("subscribe_instance_id").(string)
+		deleteSubscribeDb   = d.Get("delete_subscribe_db").(bool)
 	)
 	publishSubscribe, has, err := sqlserverService.DescribeSqlserverPublishSubscribeById(ctx, publishInstanceId, subscribeInstanceId)
 	if err != nil {
@@ -263,13 +281,22 @@ func resourceTencentCloudSqlserverPublishSubscribeDelete(d *schema.ResourceData,
 
 	oldDatabaseTuples, _ := d.GetChange("database_tuples")
 	var oldDatabaseTupleSet []*sqlserver.DatabaseTuple
+	var subscribeDatabases []*string
 	for _, inst_ := range oldDatabaseTuples.(*schema.Set).List() {
 		inst := inst_.(map[string]interface{})
+		subDatabase := inst["subscribe_database"].(string)
 		oldDatabaseTupleSet = append(oldDatabaseTupleSet, sqlServerNewDatabaseTuple(inst["publish_database"], inst["subscribe_database"]))
+		subscribeDatabases = append(subscribeDatabases, &subDatabase)
 	}
 
 	if err := sqlserverService.DeletePublishSubscribe(ctx, publishSubscribe, oldDatabaseTupleSet); err != nil {
 		return err
 	}
+	if deleteSubscribeDb {
+		//delete subscribe databases
+		if err = sqlserverService.DeleteSqlserverDB(ctx, subscribeInstanceId, subscribeDatabases); err != nil {
+			return err
+		}
+	}
 	return nil
 }