From 257b2ea1ead7d86a85c51f07b1a07964add1a4ff Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Wed, 12 Jul 2023 21:31:48 +0800 Subject: [PATCH 1/2] fix/sqlserver --- .../data_source_tc_sqlserver_backups.go | 8 +-- .../resource_tc_api_gateway_api_doc_test.go | 4 +- ...ource_tc_api_gateway_custom_domain_test.go | 4 +- ...source_tc_cynosdb_upgrade_proxy_version.go | 5 +- ...ce_tc_sqlserver_complete_expansion_test.go | 59 ++++++++++--------- ...resource_tc_sqlserver_database_tde_test.go | 14 +++++ ...resource_tc_sqlserver_publish_subscribe.go | 14 ++--- ...rce_tc_sqlserver_publish_subscribe_test.go | 36 +++++------ ...urce_tc_sqlserver_restore_instance_test.go | 16 ++++- .../sqlserver_publish_subscribe.html.markdown | 6 +- 10 files changed, 97 insertions(+), 69 deletions(-) diff --git a/tencentcloud/data_source_tc_sqlserver_backups.go b/tencentcloud/data_source_tc_sqlserver_backups.go index 91985ed340..52e93ea86e 100644 --- a/tencentcloud/data_source_tc_sqlserver_backups.go +++ b/tencentcloud/data_source_tc_sqlserver_backups.go @@ -4,10 +4,10 @@ Use this data source to query the list of SQL Server backups. Example Usage ```hcl -data "tencentcloud_sqlserver_backups" "foo" { - instance_id = "mssql-3cdq7kx5" - start_time = "2020-06-17 00:00:00" - end_time = "2020-06-22 00:00:00" +data "tencentcloud_sqlserver_backups" "example" { + instance_id = "mssql-qelbzgwf" + start_time = "2020-06-17 00:00:00" + end_time = "2020-06-22 00:00:00" } ``` */ diff --git a/tencentcloud/resource_tc_api_gateway_api_doc_test.go b/tencentcloud/resource_tc_api_gateway_api_doc_test.go index bf2025925d..46dd5994ab 100644 --- a/tencentcloud/resource_tc_api_gateway_api_doc_test.go +++ b/tencentcloud/resource_tc_api_gateway_api_doc_test.go @@ -106,7 +106,7 @@ func testAccCheckAPIGatewayAPIDocExists(r string) resource.TestCheckFunc { const testAccAPIGatewayAPIDoc = ` resource "tencentcloud_api_gateway_api_doc" "test" { api_doc_name = "doc_test1" - service_id = "service-7lybgojo" + service_id = "service-nxz6yync" environment = "release" api_ids = ["api-2bntitvw"] } @@ -115,7 +115,7 @@ resource "tencentcloud_api_gateway_api_doc" "test" { const testAccAPIGatewayAPIDocUpdate = ` resource "tencentcloud_api_gateway_api_doc" "test" { api_doc_name = "update_doc_name_test" - service_id = "service-7lybgojo" + service_id = "service-nxz6yync" environment = "release" api_ids = ["api-2bntitvw"] } diff --git a/tencentcloud/resource_tc_api_gateway_custom_domain_test.go b/tencentcloud/resource_tc_api_gateway_custom_domain_test.go index 8db89cfb22..48cabe36c9 100644 --- a/tencentcloud/resource_tc_api_gateway_custom_domain_test.go +++ b/tencentcloud/resource_tc_api_gateway_custom_domain_test.go @@ -113,7 +113,7 @@ func testAccCheckCustomDomainExists(n string) resource.TestCheckFunc { const testAccCustomDomain = ` resource "tencentcloud_api_gateway_custom_domain" "foo" { - service_id = "service-7lybgojo" + service_id = "service-nxz6yync" sub_domain = "tic-test.dnsv1.com" protocol = "http" net_type = "OUTER" @@ -125,7 +125,7 @@ resource "tencentcloud_api_gateway_custom_domain" "foo" { const testAccCustomDomainUpdate = ` resource "tencentcloud_api_gateway_custom_domain" "foo" { - service_id = "service-7lybgojo" + service_id = "service-nxz6yync" sub_domain = "tic-test.dnsv1.com" protocol = "http" net_type = "OUTER" diff --git a/tencentcloud/resource_tc_cynosdb_upgrade_proxy_version.go b/tencentcloud/resource_tc_cynosdb_upgrade_proxy_version.go index a305bec980..fc9ac4e100 100644 --- a/tencentcloud/resource_tc_cynosdb_upgrade_proxy_version.go +++ b/tencentcloud/resource_tc_cynosdb_upgrade_proxy_version.go @@ -15,13 +15,14 @@ package tencentcloud import ( "context" "fmt" + "log" + "strings" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors" cynosdb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb/v20190107" "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper" - "log" - "strings" ) func resourceTencentCloudCynosdbUpgradeProxyVersion() *schema.Resource { diff --git a/tencentcloud/resource_tc_sqlserver_complete_expansion_test.go b/tencentcloud/resource_tc_sqlserver_complete_expansion_test.go index 11b7f852e7..4916be5abe 100644 --- a/tencentcloud/resource_tc_sqlserver_complete_expansion_test.go +++ b/tencentcloud/resource_tc_sqlserver_complete_expansion_test.go @@ -7,6 +7,7 @@ import ( ) // go test -i; go test -test.run TestAccTencentCloudSqlserverCompleteExpansionResource_basic -v +// go test -v -run TestAccTencentCloudSqlserverCompleteExpansionResource_basic -timeout=0 ./tencentcloud/ func TestAccTencentCloudSqlserverCompleteExpansionResource_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ @@ -36,41 +37,41 @@ func TestAccTencentCloudSqlserverCompleteExpansionResource_basic(t *testing.T) { const testAccNewSqlserverInstance string = testAccSqlserverBasicInstanceNetwork + ` resource "tencentcloud_sqlserver_instance" "test" { - name = "tf_sqlserver_instance" - availability_zone = "ap-guangzhou-7" - charge_type = "POSTPAID_BY_HOUR" - vpc_id = "vpc-1yg5ua6l" - subnet_id = "subnet-h7av55g8" - security_groups = ["sg-mayqdlt1"] - project_id = 0 - memory = 2 - storage = 10 - maintenance_week_set = [1,2,3] - maintenance_start_time = "09:00" - maintenance_time_span = 3 - tags = { - "test" = "test" + name = "tf_sqlserver_instance" + availability_zone = "ap-guangzhou-7" + charge_type = "POSTPAID_BY_HOUR" + vpc_id = "vpc-1yg5ua6l" + subnet_id = "subnet-h7av55g8" + security_groups = ["sg-mayqdlt1"] + project_id = 0 + memory = 2 + storage = 20 + maintenance_week_set = [1, 2, 3] + maintenance_start_time = "09:00" + maintenance_time_span = 3 + tags = { + "test" = "test" } } ` const testAccUpdateNewSqlserverInstance string = testAccSqlserverBasicInstanceNetwork + ` resource "tencentcloud_sqlserver_instance" "test" { - name = "tf_sqlserver_instance" - availability_zone = "ap-guangzhou-7" - charge_type = "POSTPAID_BY_HOUR" - vpc_id = "vpc-1yg5ua6l" - subnet_id = "subnet-h7av55g8" - security_groups = ["sg-mayqdlt1"] - project_id = 0 - memory = 2 - storage = 20 - maintenance_week_set = [1,2,3] - maintenance_start_time = "09:00" - maintenance_time_span = 3 - wait_switch = 1 - tags = { - "test" = "test" + name = "tf_sqlserver_instance" + availability_zone = "ap-guangzhou-7" + charge_type = "POSTPAID_BY_HOUR" + vpc_id = "vpc-1yg5ua6l" + subnet_id = "subnet-h7av55g8" + security_groups = ["sg-mayqdlt1"] + project_id = 0 + memory = 2 + storage = 40 + maintenance_week_set = [1, 2, 3] + maintenance_start_time = "09:00" + maintenance_time_span = 3 + wait_switch = 1 + tags = { + "test" = "test" } } diff --git a/tencentcloud/resource_tc_sqlserver_database_tde_test.go b/tencentcloud/resource_tc_sqlserver_database_tde_test.go index dc9ea315a0..e85ff44016 100644 --- a/tencentcloud/resource_tc_sqlserver_database_tde_test.go +++ b/tencentcloud/resource_tc_sqlserver_database_tde_test.go @@ -25,6 +25,12 @@ func TestAccTencentCloudSqlserverDatabaseTDEResource_basic(t *testing.T) { ImportState: true, ImportStateVerify: true, }, + { + Config: testAccSqlserverDatabaseTDEUpdate, + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrSet("tencentcloud_sqlserver_database_tde.database_tde", "id"), + ), + }, }, }) } @@ -36,3 +42,11 @@ resource "tencentcloud_sqlserver_database_tde" "database_tde" { encryption = "enable" } ` + +const testAccSqlserverDatabaseTDEUpdate = ` +resource "tencentcloud_sqlserver_database_tde" "database_tde" { + instance_id = "mssql-qelbzgwf" + db_names = ["keep_tde_db", "keep_tde_db2"] + encryption = "disable" +} +` diff --git a/tencentcloud/resource_tc_sqlserver_publish_subscribe.go b/tencentcloud/resource_tc_sqlserver_publish_subscribe.go index 43c5fe8c43..f2a72e37cf 100644 --- a/tencentcloud/resource_tc_sqlserver_publish_subscribe.go +++ b/tencentcloud/resource_tc_sqlserver_publish_subscribe.go @@ -5,13 +5,13 @@ Example Usage ```hcl 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 - } + publish_instance_id = "mssql-qelbzgwf" + subscribe_instance_id = "mssql-jdk2pwld" + publish_subscribe_name = "example" + delete_subscribe_db = false + database_tuples { + publish_database = "sqlserver_pubsub_db" + } } ``` diff --git a/tencentcloud/resource_tc_sqlserver_publish_subscribe_test.go b/tencentcloud/resource_tc_sqlserver_publish_subscribe_test.go index 6148c7050f..1544a72956 100644 --- a/tencentcloud/resource_tc_sqlserver_publish_subscribe_test.go +++ b/tencentcloud/resource_tc_sqlserver_publish_subscribe_test.go @@ -122,6 +122,7 @@ func testAccUnsubscribePubDB(ctx context.Context, service *SqlserverService, ins } } +// go test -i; go test -test.run TestAccTencentCloudSqlserverPublishSubscribeResource -v func TestAccTencentCloudSqlserverPublishSubscribeResource(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { @@ -213,24 +214,25 @@ func testAccCheckSqlserverPublishSubscribeExists(n string) resource.TestCheckFun } const testAccSqlserverPublishSubscribe_basic = CommonPubSubSQLServer + ` - resource "tencentcloud_sqlserver_publish_subscribe" "example" { - publish_instance_id = local.pub_sqlserver_id - subscribe_instance_id = local.sub_sqlserver_id - publish_subscribe_name = "example" - delete_subscribe_db = false - database_tuples { - publish_database = local.sqlserver_pubsub_db - } -}` + publish_instance_id = "mssql-qelbzgwf" + subscribe_instance_id = "mssql-jdk2pwld" + publish_subscribe_name = "example" + delete_subscribe_db = false + database_tuples { + publish_database = local.sqlserver_pubsub_db + } +} +` const testAccSqlserverPublishSubscribe_basic_update_name = CommonPubSubSQLServer + ` resource "tencentcloud_sqlserver_publish_subscribe" "example" { - publish_instance_id = local.pub_sqlserver_id - subscribe_instance_id = local.sub_sqlserver_id - publish_subscribe_name = "example1" - delete_subscribe_db = false - database_tuples { - publish_database = local.sqlserver_pubsub_db - } -}` + publish_instance_id = "mssql-qelbzgwf" + subscribe_instance_id = "mssql-jdk2pwld" + publish_subscribe_name = "example1" + delete_subscribe_db = false + database_tuples { + publish_database = local.sqlserver_pubsub_db + } +} +` diff --git a/tencentcloud/resource_tc_sqlserver_restore_instance_test.go b/tencentcloud/resource_tc_sqlserver_restore_instance_test.go index 150a9ccca1..e42ccabdbd 100644 --- a/tencentcloud/resource_tc_sqlserver_restore_instance_test.go +++ b/tencentcloud/resource_tc_sqlserver_restore_instance_test.go @@ -5,6 +5,7 @@ import ( "fmt" "strings" "testing" + "time" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" @@ -12,6 +13,9 @@ import ( // go test -i; go test -test.run TestAccTencentCloudSqlserverRestoreInstanceResource_basic -v func TestAccTencentCloudSqlserverRestoreInstanceResource_basic(t *testing.T) { + loc, _ := time.LoadLocation("Asia/Shanghai") + startTime := time.Now().AddDate(0, 0, -3).In(loc).Format("2006-01-02 15:04:05") + endTime := time.Now().In(loc).Format("2006-01-02 15:04:05") resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) @@ -20,7 +24,7 @@ func TestAccTencentCloudSqlserverRestoreInstanceResource_basic(t *testing.T) { Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccSqlserverRestoreInstance, + Config: fmt.Sprintf(testAccSqlserverRestoreInstance, startTime, endTime), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("tencentcloud_sqlserver_restore_instance.restore_instance", "id"), ), @@ -68,9 +72,15 @@ func testAccCheckSqlserverRestoreDBDestroy(s *terraform.State) error { } const testAccSqlserverRestoreInstance = ` -resource "tencentcloud_sqlserver_restore_instance" "restore_instance" { +data "tencentcloud_sqlserver_backups" "example" { instance_id = "mssql-qelbzgwf" - backup_id = 3482091273 + start_time = "%s" + end_time = "%s" +} + +resource "tencentcloud_sqlserver_restore_instance" "restore_instance" { + instance_id = data.tencentcloud_sqlserver_backups.example.instance_id + backup_id = data.tencentcloud_sqlserver_backups.example.list.0.id rename_restore { old_name = "keep_pubsub_db2" new_name = "restore_keep_pubsub_db2" diff --git a/website/docs/r/sqlserver_publish_subscribe.html.markdown b/website/docs/r/sqlserver_publish_subscribe.html.markdown index e0a95be2e7..6fb00b3eac 100644 --- a/website/docs/r/sqlserver_publish_subscribe.html.markdown +++ b/website/docs/r/sqlserver_publish_subscribe.html.markdown @@ -15,12 +15,12 @@ Provides a SQL Server PublishSubscribe resource belongs to SQL Server instance. ```hcl 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_instance_id = "mssql-qelbzgwf" + subscribe_instance_id = "mssql-jdk2pwld" publish_subscribe_name = "example" delete_subscribe_db = false database_tuples { - publish_database = tencentcloud_sqlserver_db.test_publish_subscribe.name + publish_database = "sqlserver_pubsub_db" } } ``` From bd7f455dcb6aef1c04d22835a9fc3986b3a48535 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Wed, 12 Jul 2023 22:02:03 +0800 Subject: [PATCH 2/2] fix/sqlserver --- tencentcloud/resource_tc_api_gateway_api_doc_test.go | 4 ++-- tencentcloud/resource_tc_api_gateway_custom_domain_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tencentcloud/resource_tc_api_gateway_api_doc_test.go b/tencentcloud/resource_tc_api_gateway_api_doc_test.go index 46dd5994ab..47b81c4bf4 100644 --- a/tencentcloud/resource_tc_api_gateway_api_doc_test.go +++ b/tencentcloud/resource_tc_api_gateway_api_doc_test.go @@ -108,7 +108,7 @@ resource "tencentcloud_api_gateway_api_doc" "test" { api_doc_name = "doc_test1" service_id = "service-nxz6yync" environment = "release" - api_ids = ["api-2bntitvw"] + api_ids = ["api-jvqlzolk"] } ` @@ -117,6 +117,6 @@ resource "tencentcloud_api_gateway_api_doc" "test" { api_doc_name = "update_doc_name_test" service_id = "service-nxz6yync" environment = "release" - api_ids = ["api-2bntitvw"] + api_ids = ["api-jvqlzolk"] } ` diff --git a/tencentcloud/resource_tc_api_gateway_custom_domain_test.go b/tencentcloud/resource_tc_api_gateway_custom_domain_test.go index 48cabe36c9..94d0702237 100644 --- a/tencentcloud/resource_tc_api_gateway_custom_domain_test.go +++ b/tencentcloud/resource_tc_api_gateway_custom_domain_test.go @@ -22,7 +22,7 @@ func TestAccTencentCloudAPIGateWayCustomDomain_basic(t *testing.T) { Config: testAccCustomDomain, Check: resource.ComposeTestCheckFunc( testAccCheckCustomDomainExists("tencentcloud_api_gateway_custom_domain.foo"), - resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "service_id", "service-7lybgojo"), + resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "service_id", "service-nxz6yync"), resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "sub_domain", "tic-test.dnsv1.com"), resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "protocol", "http"), resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "net_type", "OUTER"), @@ -35,7 +35,7 @@ func TestAccTencentCloudAPIGateWayCustomDomain_basic(t *testing.T) { Config: testAccCustomDomainUpdate, Check: resource.ComposeTestCheckFunc( testAccCheckCustomDomainExists("tencentcloud_api_gateway_custom_domain.foo"), - resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "service_id", "service-7lybgojo"), + resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "service_id", "service-nxz6yync"), resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "sub_domain", "tic-test.dnsv1.com"), resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "protocol", "http"), resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "net_type", "OUTER"),