From 4b7ad9a6b4cadad0c55371ce601498cb0bdb3419 Mon Sep 17 00:00:00 2001 From: nickyinluo Date: Wed, 5 Jul 2023 16:30:37 +0800 Subject: [PATCH 1/4] example readjust: tencentcloud_kubernetes_serverless_node_pool --- ...urce_tc_kubernetes_serverless_node_pool.go | 99 +++++++++++++++++-- ...ernetes_serverless_node_pool.html.markdown | 96 ++++++++++++++++-- 2 files changed, 176 insertions(+), 19 deletions(-) diff --git a/tencentcloud/resource_tc_kubernetes_serverless_node_pool.go b/tencentcloud/resource_tc_kubernetes_serverless_node_pool.go index ec4c145933..87da7059fb 100644 --- a/tencentcloud/resource_tc_kubernetes_serverless_node_pool.go +++ b/tencentcloud/resource_tc_kubernetes_serverless_node_pool.go @@ -2,22 +2,101 @@ Provide a resource to create serverless node pool of cluster. Example Usage + +Add serverless node pool to a cluster + +```hcl +variable "availability_zone" { + default = "ap-guangzhou-3" +} + +variable "example_cluster_cidr" { + default = "10.31.0.0/16" +} + +locals { + vpc_id = data.tencentcloud_vpc_subnets.vpc.instance_list.0.vpc_id + subnet_id = data.tencentcloud_vpc_subnets.vpc.instance_list.0.subnet_id + sg_id = data.tencentcloud_security_groups.sg.security_groups.0.security_group_id +} + +data "tencentcloud_vpc_subnets" "vpc" { + is_default = true + availability_zone = var.availability_zone +} + +data "tencentcloud_security_groups" "sg" { + name = "default" +} + +resource "tencentcloud_kubernetes_cluster" "example" { + vpc_id = local.vpc_id + cluster_cidr = var.example_cluster_cidr + cluster_max_pod_num = 32 + cluster_name = "tf_example_cluster" + cluster_desc = "tf example cluster" + cluster_max_service_num = 32 + cluster_version = "1.18.4" + cluster_deploy_type = "MANAGED_CLUSTER" +} + +resource "tencentcloud_kubernetes_serverless_node_pool" "example" { + cluster_id = tencentcloud_kubernetes_cluster.example.id + name = "tf_example_serverless_node_pool" + + serverless_nodes { + display_name = "tf_example_serverless_node1" + subnet_id = local.subnet_id + } + + serverless_nodes { + display_name = "tf_example_serverless_node2" + subnet_id = local.subnet_id + } + + security_group_ids = [local.sg_id] + labels = { + "label1" : "value1", + "label2" : "value2", + } +} ``` -resource "tencentcloud_kubernetes_serverless_node_pool" "example_serverless_node_pool" { + +Adding taints to the virtual nodes under this node pool + +The pods without appropriate tolerations will not be scheduled on this node. Refer [taint-and-toleration](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for more details. + +```hcl +resource "tencentcloud_kubernetes_serverless_node_pool" "example" { cluster_id = tencentcloud_kubernetes_cluster.example.id - name = "example_node_pool" + name = "tf_example_serverless_node_pool" + serverless_nodes { - display_name = "serverless_node1" - subnet_id = "subnet-xxx" + display_name = "tf_example_serverless_node1" + subnet_id = local.subnet_id } + serverless_nodes { - display_name = "serverless_node2" - subnet_id = "subnet-xxx" + display_name = "tf_example_serverless_node2" + subnet_id = local.subnet_id + } + + security_group_ids = [local.sg_id] + labels = { + "label1" : "value1", + "label2" : "value2", + } + + taints{ + key = "key1" + value = "value1" + effect = "NoSchedule" } - security_group_ids = ["sg-xxx"] - labels = { - "example1" : "test1", - "example2" : "test2", + + taints{ + key = "key1" + value = "value1" + effect = "NoExecute" } } ``` diff --git a/website/docs/r/kubernetes_serverless_node_pool.html.markdown b/website/docs/r/kubernetes_serverless_node_pool.html.markdown index 100c16c96a..a45cfa0ef8 100644 --- a/website/docs/r/kubernetes_serverless_node_pool.html.markdown +++ b/website/docs/r/kubernetes_serverless_node_pool.html.markdown @@ -13,22 +13,100 @@ Provide a resource to create serverless node pool of cluster. ## Example Usage +### Add serverless node pool to a cluster + +```hcl +variable "availability_zone" { + default = "ap-guangzhou-3" +} + +variable "example_cluster_cidr" { + default = "10.31.0.0/16" +} + +locals { + vpc_id = data.tencentcloud_vpc_subnets.vpc.instance_list.0.vpc_id + subnet_id = data.tencentcloud_vpc_subnets.vpc.instance_list.0.subnet_id + sg_id = data.tencentcloud_security_groups.sg.security_groups.0.security_group_id +} + +data "tencentcloud_vpc_subnets" "vpc" { + is_default = true + availability_zone = var.availability_zone +} + +data "tencentcloud_security_groups" "sg" { + name = "default" +} + +resource "tencentcloud_kubernetes_cluster" "example" { + vpc_id = local.vpc_id + cluster_cidr = var.example_cluster_cidr + cluster_max_pod_num = 32 + cluster_name = "tf_example_cluster" + cluster_desc = "tf example cluster" + cluster_max_service_num = 32 + cluster_version = "1.18.4" + cluster_deploy_type = "MANAGED_CLUSTER" +} + +resource "tencentcloud_kubernetes_serverless_node_pool" "example" { + cluster_id = tencentcloud_kubernetes_cluster.example.id + name = "tf_example_serverless_node_pool" + + serverless_nodes { + display_name = "tf_example_serverless_node1" + subnet_id = local.subnet_id + } + + serverless_nodes { + display_name = "tf_example_serverless_node2" + subnet_id = local.subnet_id + } + + security_group_ids = [local.sg_id] + labels = { + "label1" : "value1", + "label2" : "value2", + } +} +``` + +### Adding taints to the virtual nodes under this node pool + +The pods without appropriate tolerations will not be scheduled on this node. Refer [taint-and-toleration](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for more details. + ```hcl -resource "tencentcloud_kubernetes_serverless_node_pool" "example_serverless_node_pool" { +resource "tencentcloud_kubernetes_serverless_node_pool" "example" { cluster_id = tencentcloud_kubernetes_cluster.example.id - name = "example_node_pool" + name = "tf_example_serverless_node_pool" + serverless_nodes { - display_name = "serverless_node1" - subnet_id = "subnet-xxx" + display_name = "tf_example_serverless_node1" + subnet_id = local.subnet_id } + serverless_nodes { - display_name = "serverless_node2" - subnet_id = "subnet-xxx" + display_name = "tf_example_serverless_node2" + subnet_id = local.subnet_id } - security_group_ids = ["sg-xxx"] + + security_group_ids = [local.sg_id] labels = { - "example1" : "test1", - "example2" : "test2", + "label1" : "value1", + "label2" : "value2", + } + + taints { + key = "key1" + value = "value1" + effect = "NoSchedule" + } + + taints { + key = "key1" + value = "value1" + effect = "NoExecute" } } ``` From 9fd5fddf9e5f2793d8f3e971a628ba1c6ac5ccf2 Mon Sep 17 00:00:00 2001 From: nickyinluo Date: Tue, 11 Jul 2023 15:43:34 +0800 Subject: [PATCH 2/4] add pre-commit-local --- .githooks/pre-commit-local | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100755 .githooks/pre-commit-local diff --git a/.githooks/pre-commit-local b/.githooks/pre-commit-local new file mode 100755 index 0000000000..dca120dc69 --- /dev/null +++ b/.githooks/pre-commit-local @@ -0,0 +1,28 @@ +#!/bin/sh +REQUIRED_GO_VERSION="1.18" # use the .go-version later + +printf "==> Step 1: Gofmt Check...\n" +make fmt-faster +if [ $? -ne 0 ]; then + printf "COMMIT FAILED\n" + exit 1 +fi + +printf "==> Step 2: Generating docs...\n" +doc=$(make doc 2>&1) +if [ $? -ne 0 ]; then + echo "$doc" | tail -n 4 | head -n 2 + printf "COMMIT FAILED\n" + exit 1 +fi + +printf "==> Step 2: Generating docs...\n" +go_version=$(go version | awk '{print $3}') +if [ $go_version -ne $REQUIRED_GO_VERSION* ]; then + echo "Go version is not compatible. Expected $REQUIRED_GO_VERSION.x" + printf "COMMIT FAILED\n" + exit 1 +fi + +printf "COMMIT READY\n" +exit 0 From a4cfd300e2255dc03f3e967f72dc8e00a43b94a4 Mon Sep 17 00:00:00 2001 From: nickyinluo Date: Mon, 17 Jul 2023 18:53:24 +0800 Subject: [PATCH 3/4] adjust e2e case --- ...tc_postgresql_backup_download_urls_test.go | 10 ++- ..._tc_postgresql_db_instance_classes_test.go | 4 + ...tc_postgresql_db_instance_versions_test.go | 5 ++ ...e_tc_postgresql_default_parameters_test.go | 5 ++ ...ata_source_tc_postgresql_instances_test.go | 9 ++- .../data_source_tc_postgresql_log_backups.go | 2 +- ...a_source_tc_postgresql_log_backups_test.go | 5 ++ ..._tc_postgresql_parameter_templates_test.go | 5 ++ ...urce_tc_postgresql_readonly_groups_test.go | 1 + ...source_tc_postgresql_recovery_time_test.go | 5 ++ .../data_source_tc_postgresql_regions_test.go | 5 ++ ...ata_source_tc_postgresql_specinfos_test.go | 5 ++ .../data_source_tc_postgresql_xlogs_test.go | 9 ++- .../data_source_tc_postgresql_zones_test.go | 5 ++ ...backup_download_restriction_config_test.go | 19 +++++ ...e_tc_postgresql_backup_plan_config_test.go | 5 ++ ...resql_common_db_instance_operation_test.go | 38 +++++++--- ...gresql_delete_log_backup_operation_test.go | 5 ++ .../resource_tc_postgresql_instance_test.go | 73 ++++++++++++++----- ...ql_modify_account_remark_operation_test.go | 5 ++ ...odify_switch_time_period_operation_test.go | 5 ++ ...e_tc_postgresql_parameter_template_test.go | 17 +++++ ...ource_tc_postgresql_readonly_group_test.go | 19 +++-- ...ce_tc_postgresql_readonly_instance_test.go | 38 +++++++--- ...rebalance_readonly_group_operation_test.go | 5 ++ ...c_postgresql_security_group_config_test.go | 10 +++ 26 files changed, 263 insertions(+), 51 deletions(-) diff --git a/tencentcloud/data_source_tc_postgresql_backup_download_urls_test.go b/tencentcloud/data_source_tc_postgresql_backup_download_urls_test.go index 272a74c60b..be140acbcb 100644 --- a/tencentcloud/data_source_tc_postgresql_backup_download_urls_test.go +++ b/tencentcloud/data_source_tc_postgresql_backup_download_urls_test.go @@ -19,6 +19,10 @@ func TestAccTencentCloudPostgresqlBackupDownloadUrlsDataSource_basic(t *testing. Providers: testAccProviders, Steps: []resource.TestStep{ { + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, // Config: fmt.Sprintf(testAccPostgresqlBackupDownloadUrlsDataSource, startTime, endTime), Config: testAccPostgresqlBackupDownloadUrlsDataSource, Check: resource.ComposeTestCheckFunc( @@ -40,7 +44,7 @@ func TestAccTencentCloudPostgresqlBackupDownloadUrlsDataSource_basic(t *testing. }) } -const testAccPostgresqlBackupDownloadUrlsDataSource = CommonPresetPGSQL + defaultVpcSubnets + ` +const testAccPostgresqlBackupDownloadUrlsDataSource = OperationPresetPGSQL + defaultVpcSubnets + ` data "tencentcloud_postgresql_log_backups" "log_backups" { min_finish_time = "" max_finish_time = "" @@ -55,8 +59,8 @@ data "tencentcloud_postgresql_log_backups" "log_backups" { data "tencentcloud_postgresql_backup_download_urls" "backup_download_urls" { db_instance_id = local.pgsql_id backup_type = "LogBackup" -// backup_id = data.tencentcloud_postgresql_log_backups.log_backups.log_backup_set.0.id - backup_id = "01a57d08-b7f5-584e-b64a-dc2236bb0438" + backup_id = data.tencentcloud_postgresql_log_backups.log_backups.log_backup_set.0.id +// backup_id = "01a57d08-b7f5-584e-b64a-dc2236bb0438" url_expire_time = 12 backup_download_restriction { restriction_type = "NONE" diff --git a/tencentcloud/data_source_tc_postgresql_db_instance_classes_test.go b/tencentcloud/data_source_tc_postgresql_db_instance_classes_test.go index c7302ee854..9f16a89429 100644 --- a/tencentcloud/data_source_tc_postgresql_db_instance_classes_test.go +++ b/tencentcloud/data_source_tc_postgresql_db_instance_classes_test.go @@ -16,6 +16,10 @@ func TestAccTencentCloudPostgresqlDbInstanceClassesDataSource_basic(t *testing.T Steps: []resource.TestStep{ { Config: testAccPostgresqlDbInstanceClassesDataSource, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( testAccCheckTencentCloudDataSourceID("data.tencentcloud_postgresql_db_instance_classes.db_instance_classes"), resource.TestCheckResourceAttr("data.tencentcloud_postgresql_db_instance_classes.db_instance_classes", "zone", "ap-guangzhou-7"), diff --git a/tencentcloud/data_source_tc_postgresql_db_instance_versions_test.go b/tencentcloud/data_source_tc_postgresql_db_instance_versions_test.go index 5abc9e24b3..575a5c6761 100644 --- a/tencentcloud/data_source_tc_postgresql_db_instance_versions_test.go +++ b/tencentcloud/data_source_tc_postgresql_db_instance_versions_test.go @@ -10,12 +10,17 @@ func TestAccTencentCloudPostgresqlDbInstanceVersionsDataSource_basic(t *testing. t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccPostgresqlDbInstanceVersionsDataSource, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( testAccCheckTencentCloudDataSourceID("data.tencentcloud_postgresql_db_instance_versions.db_instance_versions"), resource.TestCheckResourceAttrSet("data.tencentcloud_postgresql_db_instance_versions.db_instance_versions", "version_set.#"), diff --git a/tencentcloud/data_source_tc_postgresql_default_parameters_test.go b/tencentcloud/data_source_tc_postgresql_default_parameters_test.go index 09f33d71cd..8c88fe87a3 100644 --- a/tencentcloud/data_source_tc_postgresql_default_parameters_test.go +++ b/tencentcloud/data_source_tc_postgresql_default_parameters_test.go @@ -10,12 +10,17 @@ func TestAccTencentCloudPostgresqlDefaultParametersDataSource_basic(t *testing.T t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccPostgresqlDefaultParametersDataSource, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( testAccCheckTencentCloudDataSourceID("data.tencentcloud_postgresql_default_parameters.default_parameters"), resource.TestCheckResourceAttr("data.tencentcloud_postgresql_default_parameters.default_parameters", "db_major_version", "13"), diff --git a/tencentcloud/data_source_tc_postgresql_instances_test.go b/tencentcloud/data_source_tc_postgresql_instances_test.go index 6d2e282803..4c72c5fd38 100644 --- a/tencentcloud/data_source_tc_postgresql_instances_test.go +++ b/tencentcloud/data_source_tc_postgresql_instances_test.go @@ -11,12 +11,19 @@ var testDataPostgresqlInstancesName = "data.tencentcloud_postgresql_instances.id func TestAccTencentCloudPostgresqlInstancesDataSource(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, + PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheck(t) + }, Providers: testAccProviders, CheckDestroy: testAccCheckLBDestroy, Steps: []resource.TestStep{ { Config: testAccTencentCloudDataPostgresqlInstanceBasic, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(testDataPostgresqlInstancesName, "instance_list.#", "1"), resource.TestCheckResourceAttrSet(testDataPostgresqlInstancesName, "instance_list.0.id"), diff --git a/tencentcloud/data_source_tc_postgresql_log_backups.go b/tencentcloud/data_source_tc_postgresql_log_backups.go index 7ad2082139..7af65634e4 100644 --- a/tencentcloud/data_source_tc_postgresql_log_backups.go +++ b/tencentcloud/data_source_tc_postgresql_log_backups.go @@ -181,7 +181,7 @@ func dataSourceTencentCloudPostgresqlLogBackupsRead(d *schema.ResourceData, meta } tmpSet = append(tmpSet, &filter) } - paramMap["filters"] = tmpSet + paramMap["Filters"] = tmpSet } if v, ok := d.GetOk("order_by"); ok { diff --git a/tencentcloud/data_source_tc_postgresql_log_backups_test.go b/tencentcloud/data_source_tc_postgresql_log_backups_test.go index be88f37d76..28bfdde794 100644 --- a/tencentcloud/data_source_tc_postgresql_log_backups_test.go +++ b/tencentcloud/data_source_tc_postgresql_log_backups_test.go @@ -15,12 +15,17 @@ func TestAccTencentCloudPostgresqlLogBackupsDataSource_basic(t *testing.T) { endTime := time.Now().AddDate(0, 0, 1).In(loc).Format("2006-01-02 15:04:05") resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: fmt.Sprintf(testAccPostgresqlLogBackupsDataSource, startTime, endTime), + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( testAccCheckTencentCloudDataSourceID("data.tencentcloud_postgresql_log_backups.log_backups"), resource.TestCheckResourceAttr("data.tencentcloud_postgresql_log_backups.log_backups", "min_finish_time", startTime), diff --git a/tencentcloud/data_source_tc_postgresql_parameter_templates_test.go b/tencentcloud/data_source_tc_postgresql_parameter_templates_test.go index 75b5851b39..bf35663dd3 100644 --- a/tencentcloud/data_source_tc_postgresql_parameter_templates_test.go +++ b/tencentcloud/data_source_tc_postgresql_parameter_templates_test.go @@ -10,12 +10,17 @@ func TestAccTencentCloudPostgresqlParameterTemplatesDataSource_basic(t *testing. t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccPostgresqlParameterTemplatesDataSource, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( testAccCheckTencentCloudDataSourceID("data.tencentcloud_postgresql_parameter_templates.parameter_templates"), resource.TestCheckResourceAttr("data.tencentcloud_postgresql_parameter_templates.parameter_templates", "filters.#", "2"), diff --git a/tencentcloud/data_source_tc_postgresql_readonly_groups_test.go b/tencentcloud/data_source_tc_postgresql_readonly_groups_test.go index 8e38df066f..69839caefa 100644 --- a/tencentcloud/data_source_tc_postgresql_readonly_groups_test.go +++ b/tencentcloud/data_source_tc_postgresql_readonly_groups_test.go @@ -12,6 +12,7 @@ func TestAccTencentCloudPostgresqlReadonlyGroupsDataSource_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/tencentcloud/data_source_tc_postgresql_recovery_time_test.go b/tencentcloud/data_source_tc_postgresql_recovery_time_test.go index 3e92fb472f..fdac6e7175 100644 --- a/tencentcloud/data_source_tc_postgresql_recovery_time_test.go +++ b/tencentcloud/data_source_tc_postgresql_recovery_time_test.go @@ -12,12 +12,17 @@ func TestAccTencentCloudPostgresqlRecoveryTimeDataSource_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccPostgresqlRecoveryTimeDataSource, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( testAccCheckTencentCloudDataSourceID(testAccPostgresqlrecoverytimeObject), resource.TestCheckResourceAttrSet(testAccPostgresqlrecoverytimeObject, "db_instance_id"), diff --git a/tencentcloud/data_source_tc_postgresql_regions_test.go b/tencentcloud/data_source_tc_postgresql_regions_test.go index 9ea80e9058..acc84de856 100644 --- a/tencentcloud/data_source_tc_postgresql_regions_test.go +++ b/tencentcloud/data_source_tc_postgresql_regions_test.go @@ -10,12 +10,17 @@ func TestAccTencentCloudPostgresqlRegionsDataSource_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccPostgresqlRegionsDataSource, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( testAccCheckTencentCloudDataSourceID("data.tencentcloud_postgresql_regions.regions"), resource.TestCheckResourceAttrSet("data.tencentcloud_postgresql_regions.regions", "region_set.#"), diff --git a/tencentcloud/data_source_tc_postgresql_specinfos_test.go b/tencentcloud/data_source_tc_postgresql_specinfos_test.go index eb9788d916..99ca796876 100644 --- a/tencentcloud/data_source_tc_postgresql_specinfos_test.go +++ b/tencentcloud/data_source_tc_postgresql_specinfos_test.go @@ -10,12 +10,17 @@ func TestAccTencentCloudPostgresqlSpecinfosDataSource(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccTencentCloudPostgresqlSpecinfosConfigBasic, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( testAccCheckTencentCloudDataSourceID("data.tencentcloud_postgresql_specinfos.foo"), resource.TestCheckResourceAttrSet("data.tencentcloud_postgresql_specinfos.foo", "list.#"), diff --git a/tencentcloud/data_source_tc_postgresql_xlogs_test.go b/tencentcloud/data_source_tc_postgresql_xlogs_test.go index ae103a8c90..9376b4c593 100644 --- a/tencentcloud/data_source_tc_postgresql_xlogs_test.go +++ b/tencentcloud/data_source_tc_postgresql_xlogs_test.go @@ -14,11 +14,18 @@ func TestAccTencentCloudPostgresqlXlogsDataSource(t *testing.T) { startTime := time.Now().AddDate(0, 0, -7).Format("2006-01-02 15:04:05") endTime := time.Now().Format("2006-01-02 15:04:05") resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, + PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheck(t) + }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccDataSourcePostgresqlXlogsBasic(startTime, endTime), + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("data.tencentcloud_postgresql_xlogs.foo", "start_time", startTime), resource.TestCheckResourceAttr("data.tencentcloud_postgresql_xlogs.foo", "end_time", endTime), diff --git a/tencentcloud/data_source_tc_postgresql_zones_test.go b/tencentcloud/data_source_tc_postgresql_zones_test.go index 62141efc95..6808f0b08a 100644 --- a/tencentcloud/data_source_tc_postgresql_zones_test.go +++ b/tencentcloud/data_source_tc_postgresql_zones_test.go @@ -10,12 +10,17 @@ func TestAccTencentCloudPostgresqlZonesDataSource_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccPostgresqlZonesDataSource, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( testAccCheckTencentCloudDataSourceID("data.tencentcloud_postgresql_zones.zones"), resource.TestCheckResourceAttrSet("data.tencentcloud_postgresql_zones.zones", "zone_set.#"), diff --git a/tencentcloud/resource_tc_postgresql_backup_download_restriction_config_test.go b/tencentcloud/resource_tc_postgresql_backup_download_restriction_config_test.go index 3ac84bfa77..19fe41a6d6 100644 --- a/tencentcloud/resource_tc_postgresql_backup_download_restriction_config_test.go +++ b/tencentcloud/resource_tc_postgresql_backup_download_restriction_config_test.go @@ -11,12 +11,17 @@ const TestAccPostgresqlBackupDownloadRestrictionObject = "tencentcloud_postgresq func TestAccTencentCloudPostgresqlBackupDownloadRestrictionConfigResource_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccPostgresqlBackupDownloadRestrictionConfig_NONE, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(TestAccPostgresqlBackupDownloadRestrictionObject, "id"), resource.TestCheckResourceAttr(TestAccPostgresqlBackupDownloadRestrictionObject, "restriction_type", "NONE"), @@ -34,12 +39,17 @@ func TestAccTencentCloudPostgresqlBackupDownloadRestrictionConfigResource_basic( func TestAccTencentCloudPostgresqlBackupDownloadRestrictionConfigResource_CUSTOMIZE(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccPostgresqlBackupDownloadRestrictionConfig_CUSTOMIZE_ALLOW, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(TestAccPostgresqlBackupDownloadRestrictionObject, "id"), resource.TestCheckResourceAttr(TestAccPostgresqlBackupDownloadRestrictionObject, "restriction_type", "CUSTOMIZE"), @@ -51,6 +61,10 @@ func TestAccTencentCloudPostgresqlBackupDownloadRestrictionConfigResource_CUSTOM }, { Config: testAccPostgresqlBackupDownloadRestrictionConfig_CUSTOMIZE_DENY, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(TestAccPostgresqlBackupDownloadRestrictionObject, "id"), resource.TestCheckResourceAttr(TestAccPostgresqlBackupDownloadRestrictionObject, "restriction_type", "CUSTOMIZE"), @@ -72,12 +86,17 @@ func TestAccTencentCloudPostgresqlBackupDownloadRestrictionConfigResource_CUSTOM func TestAccTencentCloudPostgresqlBackupDownloadRestrictionConfigResource_INTRANET(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccPostgresqlBackupDownloadRestrictionConfig_INTRANET, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(TestAccPostgresqlBackupDownloadRestrictionObject, "id"), resource.TestCheckResourceAttr(TestAccPostgresqlBackupDownloadRestrictionObject, "restriction_type", "INTRANET"), diff --git a/tencentcloud/resource_tc_postgresql_backup_plan_config_test.go b/tencentcloud/resource_tc_postgresql_backup_plan_config_test.go index 7d2b5f72ed..cecfa90c1a 100644 --- a/tencentcloud/resource_tc_postgresql_backup_plan_config_test.go +++ b/tencentcloud/resource_tc_postgresql_backup_plan_config_test.go @@ -12,12 +12,17 @@ func TestAccTencentCloudPostgresqlBackupPlanConfigResource_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccPostgresBackupPlanConfig, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(testAccPostgresqlBackupPlanConfigObject, "id"), resource.TestCheckResourceAttrSet(testAccPostgresqlBackupPlanConfigObject, "db_instance_id"), diff --git a/tencentcloud/resource_tc_postgresql_common_db_instance_operation_test.go b/tencentcloud/resource_tc_postgresql_common_db_instance_operation_test.go index abb049db17..a1ce80c9b6 100644 --- a/tencentcloud/resource_tc_postgresql_common_db_instance_operation_test.go +++ b/tencentcloud/resource_tc_postgresql_common_db_instance_operation_test.go @@ -14,28 +14,40 @@ const testAccPostgresqlInstanceOperation_restart = "tencentcloud_postgresql_rest func TestAccTencentCloudPostgresqlCommonDbInstanceOperationResource_all(t *testing.T) { // t.Parallel() resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, + PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheck(t) + }, Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccPostgresqlCommonDbInstanceOperation_restart, - PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) }, + Config: testAccPostgresqlCommonDbInstanceOperation_restart, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(testAccPostgresqlInstanceOperation_restart, "id"), resource.TestCheckResourceAttrSet(testAccPostgresqlInstanceOperation_restart, "db_instance_id"), ), }, { - Config: testAccPostgresqlCommonDbInstanceOperation_isolate, - PreConfig: func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) }, + Config: testAccPostgresqlCommonDbInstanceOperation_isolate, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(testAccPostgresqlInstanceOperation_isolate, "id"), resource.TestCheckResourceAttr(testAccPostgresqlInstanceOperation_isolate, "db_instance_id_set.#", "1"), ), }, { - Config: testAccPostgresqlCommonDbInstanceOperation_disisolate, - PreConfig: func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) }, + Config: testAccPostgresqlCommonDbInstanceOperation_disisolate, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(testAccPostgresqlInstanceOperation_disisolate, "id"), resource.TestCheckResourceAttr(testAccPostgresqlInstanceOperation_disisolate, "db_instance_id_set.#", "1"), @@ -50,12 +62,18 @@ func TestAccTencentCloudPostgresqlCommonDbInstanceOperationResource_all(t *testi func TestAccTencentCloudPostgresqlCommonDbInstanceOperationResource_renew(t *testing.T) { // t.Parallel() resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, + PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheck(t) + }, Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccPostgresqlCommonDbInstanceOperation_renew, - PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_PREPAY) }, + Config: testAccPostgresqlCommonDbInstanceOperation_renew, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_PREPAY) + }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(testAccPostgresqlInstanceOperation_renew, "id"), resource.TestCheckResourceAttrSet(testAccPostgresqlInstanceOperation_renew, "db_instance_id"), diff --git a/tencentcloud/resource_tc_postgresql_delete_log_backup_operation_test.go b/tencentcloud/resource_tc_postgresql_delete_log_backup_operation_test.go index 96195f9519..2eac183ff1 100644 --- a/tencentcloud/resource_tc_postgresql_delete_log_backup_operation_test.go +++ b/tencentcloud/resource_tc_postgresql_delete_log_backup_operation_test.go @@ -10,12 +10,17 @@ func TestAccTencentCloudNeedFixPostgresqlDeleteLogBackupOperationResource_basic( t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccPostgresqlDeleteLogBackupOperation, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("tencentcloud_postgresql_delete_log_backup_operation.delete_log_backup_operation", "id"), resource.TestCheckResourceAttrSet("tencentcloud_postgresql_delete_log_backup_operation.delete_log_backup_operation", "db_instance_id"), diff --git a/tencentcloud/resource_tc_postgresql_instance_test.go b/tencentcloud/resource_tc_postgresql_instance_test.go index aa1cd75ca4..19ef5c0ae5 100644 --- a/tencentcloud/resource_tc_postgresql_instance_test.go +++ b/tencentcloud/resource_tc_postgresql_instance_test.go @@ -91,13 +91,19 @@ func init() { func TestAccTencentCloudPostgresqlInstanceResource_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, + PreCheck: func() { + testAccPreCheck(t) + testAccStepSetRegion(t, "ap-guangzhou") + }, Providers: testAccProviders, CheckDestroy: testAccCheckPostgresqlInstanceDestroy, Steps: []resource.TestStep{ { - PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) }, - Config: testAccPostgresqlInstance, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) + }, + Config: testAccPostgresqlInstance, Check: resource.ComposeTestCheckFunc( testAccCheckPostgresqlInstanceExists(testPostgresqlInstanceResourceKey), resource.TestCheckResourceAttrSet(testPostgresqlInstanceResourceKey, "id"), @@ -132,8 +138,11 @@ func TestAccTencentCloudPostgresqlInstanceResource_basic(t *testing.T) { ImportStateVerifyIgnore: []string{"root_password", "spec_code", "public_access_switch", "charset", "backup_plan"}, }, { - PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) }, - Config: testAccPostgresqlInstanceOpenPublic, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) + }, + Config: testAccPostgresqlInstanceOpenPublic, Check: resource.ComposeTestCheckFunc( testAccCheckPostgresqlInstanceExists(testPostgresqlInstanceResourceKey), resource.TestCheckResourceAttrSet(testPostgresqlInstanceResourceKey, "id"), @@ -146,8 +155,11 @@ func TestAccTencentCloudPostgresqlInstanceResource_basic(t *testing.T) { ), }, { - PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) }, - Config: testAccPostgresqlInstanceUpdate, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) + }, + Config: testAccPostgresqlInstanceUpdate, Check: resource.ComposeTestCheckFunc( testAccCheckPostgresqlInstanceExists(testPostgresqlInstanceResourceKey), resource.TestCheckResourceAttrSet(testPostgresqlInstanceResourceKey, "id"), @@ -170,8 +182,11 @@ func TestAccTencentCloudPostgresqlInstanceResource_basic(t *testing.T) { ), }, { - PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) }, - Config: testAccPostgresqlInstanceUpgradeKernelVersion, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) + }, + Config: testAccPostgresqlInstanceUpgradeKernelVersion, Check: resource.ComposeTestCheckFunc( testAccCheckPostgresqlInstanceExists(testPostgresqlInstanceResourceKey), resource.TestCheckResourceAttrSet(testPostgresqlInstanceResourceKey, "id"), @@ -204,8 +219,11 @@ func TestAccTencentCloudPostgresqlInstanceResource_prepaid(t *testing.T) { CheckDestroy: testAccCheckPostgresqlInstanceDestroy, Steps: []resource.TestStep{ { - PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_PREPAY) }, - Config: testAccPostgresqlInstancePrepaid, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_PREPAY) + }, + Config: testAccPostgresqlInstancePrepaid, Check: resource.ComposeTestCheckFunc( testAccCheckPostgresqlInstanceExists(testPostgresqlInstanceResourceKey), resource.TestCheckResourceAttrSet(testPostgresqlInstanceResourceKey, "id"), @@ -241,8 +259,11 @@ func TestAccTencentCloudPostgresqlInstanceResource_postpaid_to_prepaid(t *testin CheckDestroy: testAccCheckPostgresqlInstanceDestroy, Steps: []resource.TestStep{ { - PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_PREPAY) }, - Config: testAccPostgresqlInstancePostpaid, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_PREPAY) + }, + Config: testAccPostgresqlInstancePostpaid, Check: resource.ComposeTestCheckFunc( testAccCheckPostgresqlInstanceExists(testPostgresqlInstanceResourceKey), resource.TestCheckResourceAttrSet(testPostgresqlInstanceResourceKey, "id"), @@ -252,8 +273,11 @@ func TestAccTencentCloudPostgresqlInstanceResource_postpaid_to_prepaid(t *testin ), }, { - PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_PREPAY) }, - Config: testAccPostgresqlInstancePostpaid_to_Prepaid, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_PREPAY) + }, + Config: testAccPostgresqlInstancePostpaid_to_Prepaid, Check: resource.ComposeTestCheckFunc( testAccCheckPostgresqlInstanceExists(testPostgresqlInstanceResourceKey), resource.TestCheckResourceAttrSet(testPostgresqlInstanceResourceKey, "id"), @@ -275,13 +299,19 @@ func TestAccTencentCloudPostgresqlInstanceResource_postpaid_to_prepaid(t *testin func TestAccTencentCloudPostgresqlInstanceResource_MAZ(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, + PreCheck: func() { + testAccPreCheck(t) + testAccStepSetRegion(t, "ap-guangzhou") + }, Providers: testAccProviders, CheckDestroy: testAccCheckPostgresqlInstanceDestroy, Steps: []resource.TestStep{ { - PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) }, - Config: testAccPostgresqlMAZInstance, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) + }, + Config: testAccPostgresqlMAZInstance, Check: resource.ComposeTestCheckFunc( testAccCheckPostgresqlInstanceExists(testPostgresqlInstanceResourceKey), resource.TestCheckResourceAttrSet(testPostgresqlInstanceResourceKey, "id"), @@ -298,8 +328,11 @@ func TestAccTencentCloudPostgresqlInstanceResource_MAZ(t *testing.T) { }, { - PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) }, - Config: testAccPostgresqlMAZInstanceUpdate, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) + }, + Config: testAccPostgresqlMAZInstanceUpdate, Check: resource.ComposeTestCheckFunc( testAccCheckPostgresqlInstanceExists(testPostgresqlInstanceResourceKey), resource.TestCheckResourceAttrSet(testPostgresqlInstanceResourceKey, "id"), diff --git a/tencentcloud/resource_tc_postgresql_modify_account_remark_operation_test.go b/tencentcloud/resource_tc_postgresql_modify_account_remark_operation_test.go index 8df83447b1..a9eb317298 100644 --- a/tencentcloud/resource_tc_postgresql_modify_account_remark_operation_test.go +++ b/tencentcloud/resource_tc_postgresql_modify_account_remark_operation_test.go @@ -12,12 +12,17 @@ func TestAccTencentCloudPostgresqlModifyAccountRemarkOperationResource_basic(t * t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccPostgresqlModifyAccountRemarkOperation, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(TestObjectPgModifyAccountRemark, "id"), resource.TestCheckResourceAttrSet(TestObjectPgModifyAccountRemark, "db_instance_id"), diff --git a/tencentcloud/resource_tc_postgresql_modify_switch_time_period_operation_test.go b/tencentcloud/resource_tc_postgresql_modify_switch_time_period_operation_test.go index a4ce36cd0d..64e22e14bf 100644 --- a/tencentcloud/resource_tc_postgresql_modify_switch_time_period_operation_test.go +++ b/tencentcloud/resource_tc_postgresql_modify_switch_time_period_operation_test.go @@ -13,12 +13,17 @@ func TestAccTencentCloudNeedFixPostgresqlModifySwitchTimePeriodOperationResource t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccPostgresqlModifySwitchTimePeriodOperation, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(TestObjectPgModifySwitchTimePeriod, "id"), resource.TestCheckResourceAttrSet(TestObjectPgModifySwitchTimePeriod, "db_instance_id"), diff --git a/tencentcloud/resource_tc_postgresql_parameter_template_test.go b/tencentcloud/resource_tc_postgresql_parameter_template_test.go index 0275481623..4378d875b8 100644 --- a/tencentcloud/resource_tc_postgresql_parameter_template_test.go +++ b/tencentcloud/resource_tc_postgresql_parameter_template_test.go @@ -51,6 +51,7 @@ func TestAccTencentCloudPostgresqlParameterTemplateResource_basic(t *testing.T) t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, CheckDestroy: testAccCheckPostgresqlParameterTemplateDestroy, @@ -58,6 +59,10 @@ func TestAccTencentCloudPostgresqlParameterTemplateResource_basic(t *testing.T) Steps: []resource.TestStep{ { Config: testAccPostgresqlParameterTemplate, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( testAccCheckPostgresqlParameterTemplateExists("tencentcloud_postgresql_parameter_template.parameter_template"), resource.TestCheckResourceAttrSet("tencentcloud_postgresql_parameter_template.parameter_template", "id"), @@ -80,6 +85,10 @@ func TestAccTencentCloudPostgresqlParameterTemplateResource_basic(t *testing.T) }, { Config: testAccPostgresqlParameterTemplate_update_desc, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( testAccCheckPostgresqlParameterTemplateExists("tencentcloud_postgresql_parameter_template.parameter_template"), resource.TestCheckResourceAttr("tencentcloud_postgresql_parameter_template.parameter_template", "modify_param_entry_set.#", "2"), @@ -88,6 +97,10 @@ func TestAccTencentCloudPostgresqlParameterTemplateResource_basic(t *testing.T) }, { Config: testAccPostgresqlParameterTemplate_update_name, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( testAccCheckPostgresqlParameterTemplateExists("tencentcloud_postgresql_parameter_template.parameter_template"), resource.TestCheckResourceAttr("tencentcloud_postgresql_parameter_template.parameter_template", "modify_param_entry_set.#", "2"), @@ -96,6 +109,10 @@ func TestAccTencentCloudPostgresqlParameterTemplateResource_basic(t *testing.T) }, { Config: testAccPostgresqlParameterTemplate_update_multiple_attr, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( testAccCheckPostgresqlParameterTemplateExists("tencentcloud_postgresql_parameter_template.parameter_template"), resource.TestCheckResourceAttr("tencentcloud_postgresql_parameter_template.parameter_template", "modify_param_entry_set.#", "2"), diff --git a/tencentcloud/resource_tc_postgresql_readonly_group_test.go b/tencentcloud/resource_tc_postgresql_readonly_group_test.go index 961784e908..dbb8ccc411 100644 --- a/tencentcloud/resource_tc_postgresql_readonly_group_test.go +++ b/tencentcloud/resource_tc_postgresql_readonly_group_test.go @@ -11,12 +11,18 @@ var testPostgresqlReadonlyGroupResourceKey = "tencentcloud_postgresql_readonly_g func TestAccTencentCloudPostgresqlReadonlyGroupResource_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, + PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheck(t) + }, Providers: testAccProviders, Steps: []resource.TestStep{ { - PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) }, - Config: testAccPostgresqlReadonlyGroupInstance, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, + Config: testAccPostgresqlReadonlyGroupInstance, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(testPostgresqlReadonlyGroupResourceKey, "id"), resource.TestCheckResourceAttrSet(testPostgresqlReadonlyGroupResourceKey, "master_db_instance_id"), @@ -32,8 +38,11 @@ func TestAccTencentCloudPostgresqlReadonlyGroupResource_basic(t *testing.T) { ), }, { - PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) }, - Config: testAccPostgresqlReadonlyGroupInstance_update, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, + Config: testAccPostgresqlReadonlyGroupInstance_update, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(testPostgresqlReadonlyGroupResourceKey, "id"), resource.TestCheckResourceAttrSet(testPostgresqlReadonlyGroupResourceKey, "master_db_instance_id"), diff --git a/tencentcloud/resource_tc_postgresql_readonly_instance_test.go b/tencentcloud/resource_tc_postgresql_readonly_instance_test.go index 3a2e949d95..c9c783c4da 100644 --- a/tencentcloud/resource_tc_postgresql_readonly_instance_test.go +++ b/tencentcloud/resource_tc_postgresql_readonly_instance_test.go @@ -11,12 +11,18 @@ var testPostgresqlReadonlyInstanceResourceKey = "tencentcloud_postgresql_readonl func TestAccTencentCloudPostgresqlReadonlyInstanceResource_basic(t *testing.T) { // t.Parallel() resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, + PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheck(t) + }, Providers: testAccProviders, Steps: []resource.TestStep{ { - PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) }, - Config: testAccPostgresqlReadonlyInstanceInstance_basic_without_rogroup, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, + Config: testAccPostgresqlReadonlyInstanceInstance_basic_without_rogroup, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(testPostgresqlReadonlyInstanceResourceKey, "id"), resource.TestCheckResourceAttrSet(testPostgresqlReadonlyInstanceResourceKey, "master_db_instance_id"), @@ -35,8 +41,11 @@ func TestAccTencentCloudPostgresqlReadonlyInstanceResource_basic(t *testing.T) { ), }, { - PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) }, - Config: testAccPostgresqlReadonlyInstanceInstance_basic_update_rogroup, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, + Config: testAccPostgresqlReadonlyInstanceInstance_basic_update_rogroup, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(testPostgresqlReadonlyInstanceResourceKey, "id"), resource.TestCheckResourceAttrSet(testPostgresqlReadonlyInstanceResourceKey, "master_db_instance_id"), @@ -62,12 +71,18 @@ func TestAccTencentCloudPostgresqlReadonlyInstanceResource_basic(t *testing.T) { func TestAccTencentCloudPostgresqlReadonlyInstanceResource_update_ro_group(t *testing.T) { // t.Parallel() resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, + PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheck(t) + }, Providers: testAccProviders, Steps: []resource.TestStep{ { - PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) }, - Config: testAccPostgresqlReadonlyInstanceInstance_with_rogroup, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, + Config: testAccPostgresqlReadonlyInstanceInstance_with_rogroup, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(testPostgresqlReadonlyInstanceResourceKey, "id"), resource.TestCheckResourceAttrSet(testPostgresqlReadonlyInstanceResourceKey, "master_db_instance_id"), @@ -86,8 +101,11 @@ func TestAccTencentCloudPostgresqlReadonlyInstanceResource_update_ro_group(t *te ), }, { - PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) }, - Config: testAccPostgresqlReadonlyInstanceInstance_update_rogroup, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, + Config: testAccPostgresqlReadonlyInstanceInstance_update_rogroup, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(testPostgresqlReadonlyInstanceResourceKey, "id"), resource.TestCheckResourceAttrSet(testPostgresqlReadonlyInstanceResourceKey, "master_db_instance_id"), diff --git a/tencentcloud/resource_tc_postgresql_rebalance_readonly_group_operation_test.go b/tencentcloud/resource_tc_postgresql_rebalance_readonly_group_operation_test.go index d2fed58763..b8dfa4d38a 100644 --- a/tencentcloud/resource_tc_postgresql_rebalance_readonly_group_operation_test.go +++ b/tencentcloud/resource_tc_postgresql_rebalance_readonly_group_operation_test.go @@ -10,12 +10,17 @@ func TestAccTencentCloudPostgresqlRebalanceReadonlyGroupOperationResource_basic( t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccPostgresqlRebalanceReadonlyGroupOperation, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("tencentcloud_postgresql_rebalance_readonly_group_operation.rebalance_readonly_group_operation", "id"), resource.TestCheckResourceAttrSet("tencentcloud_postgresql_rebalance_readonly_group_operation.rebalance_readonly_group_operation", "read_only_group_id"), diff --git a/tencentcloud/resource_tc_postgresql_security_group_config_test.go b/tencentcloud/resource_tc_postgresql_security_group_config_test.go index 0f3175f99b..300dcdba27 100644 --- a/tencentcloud/resource_tc_postgresql_security_group_config_test.go +++ b/tencentcloud/resource_tc_postgresql_security_group_config_test.go @@ -12,12 +12,17 @@ func TestAccTencentCloudPostgresqlSecurityGroupConfigResource_basic(t *testing.T t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccPostgresqlSecurityGroupConfig_ins, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(TestAccPostgresqlSecurityGroupConfigObject, "id"), resource.TestCheckResourceAttr(TestAccPostgresqlSecurityGroupConfigObject, "security_group_id_set.#", "2"), @@ -32,12 +37,17 @@ func TestAccTencentCloudPostgresqlSecurityGroupConfigResource_ro(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { + testAccStepSetRegion(t, "ap-guangzhou") testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccPostgresqlSecurityGroupConfig_ro, + PreConfig: func() { + testAccStepSetRegion(t, "ap-guangzhou") + testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) + }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(TestAccPostgresqlSecurityGroupConfigObject, "id"), resource.TestCheckResourceAttr(TestAccPostgresqlSecurityGroupConfigObject, "security_group_id_set.#", "2"), From 4d24f01befe653760fcc667c27c6af75ac3f7282 Mon Sep 17 00:00:00 2001 From: nickyinluo Date: Fri, 21 Jul 2023 11:42:36 +0800 Subject: [PATCH 4/4] update example --- examples/tencentcloud-sms/main.tf | 8 ++++++++ examples/tencentcloud-sms/variables.tf | 3 +++ examples/tencentcloud-sms/version.tf | 3 +++ ...tcr_replication_instance_create_tasks_test.go | 9 +++++---- tencentcloud/resource_tc_ses_template.go | 12 +++++++----- tencentcloud/resource_tc_sms_sign.go | 16 +++++++++------- tencentcloud/resource_tc_sms_template.go | 12 +++++++----- website/docs/r/ses_template.html.markdown | 14 ++++++++------ website/docs/r/sms_sign.html.markdown | 16 +++++++++------- website/docs/r/sms_template.html.markdown | 12 +++++++----- 10 files changed, 66 insertions(+), 39 deletions(-) create mode 100644 examples/tencentcloud-sms/main.tf create mode 100644 examples/tencentcloud-sms/variables.tf create mode 100644 examples/tencentcloud-sms/version.tf diff --git a/examples/tencentcloud-sms/main.tf b/examples/tencentcloud-sms/main.tf new file mode 100644 index 0000000000..96e2baabf4 --- /dev/null +++ b/examples/tencentcloud-sms/main.tf @@ -0,0 +1,8 @@ +resource "tencentcloud_sms_sign" "example" { + sign_name = "tf_example_sms_sign" + sign_type = 1 # 1：APP, DocumentType can be chosen（0，1，2，3，4） + document_type = 4 # Screenshot of application background management (personally developed APP) + international = 0 # Mainland China SMS + sign_purpose = 0 # personal use + proof_image = "your_proof_image" +} diff --git a/examples/tencentcloud-sms/variables.tf b/examples/tencentcloud-sms/variables.tf new file mode 100644 index 0000000000..300ecfbb76 --- /dev/null +++ b/examples/tencentcloud-sms/variables.tf @@ -0,0 +1,3 @@ +variable "availability_zone" { + default = "ap-guangzhou-3" +} \ No newline at end of file diff --git a/examples/tencentcloud-sms/version.tf b/examples/tencentcloud-sms/version.tf new file mode 100644 index 0000000000..133d0d73e7 --- /dev/null +++ b/examples/tencentcloud-sms/version.tf @@ -0,0 +1,3 @@ +terraform { + required_version = ">= 0.12" +} \ No newline at end of file diff --git a/tencentcloud/data_source_tc_tcr_replication_instance_create_tasks_test.go b/tencentcloud/data_source_tc_tcr_replication_instance_create_tasks_test.go index 6b6aaf259f..672fb1257a 100644 --- a/tencentcloud/data_source_tc_tcr_replication_instance_create_tasks_test.go +++ b/tencentcloud/data_source_tc_tcr_replication_instance_create_tasks_test.go @@ -1,6 +1,7 @@ package tencentcloud import ( + "fmt" "testing" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" @@ -13,8 +14,8 @@ func TestAccTencentCloudTcrReplicationInstanceCreateTasksDataSource_basic(t *tes Providers: testAccProviders, Steps: []resource.TestStep{ { - // Config: fmt.Sprintf(testAccTcrReplicationInstance_create_tasks_and_sync_status_DataSource, "create-tasks-and-sync-status", time.Now().Nanosecond()), - Config: testAccTcrReplicationInstance_create_tasks_and_sync_status_DataSource, + Config: fmt.Sprintf(testAccTcrReplicationInstance_create_tasks_and_sync_status_DataSource, defaultTCRInstanceId, "tcr-aoz8mxoz-1-kkircm"), + // Config: testAccTcrReplicationInstance_create_tasks_and_sync_status_DataSource, PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) @@ -62,8 +63,8 @@ const testAccTcrReplicationInstance_create_tasks_and_sync_status_DataSource = ` // dst_region_id = tencentcloud_tcr_manage_replication_operation.my_replica.destination_region_id // } locals { - src_registry_id = "tcr-800uf6j9" - dst_registry_id = "tcr-800uf6j9-1-cgeafk" + src_registry_id = "%s" + dst_registry_id = "%s" dst_region_id = 1 } diff --git a/tencentcloud/resource_tc_ses_template.go b/tencentcloud/resource_tc_ses_template.go index 5d579c52cb..1b7b8b0d54 100644 --- a/tencentcloud/resource_tc_ses_template.go +++ b/tencentcloud/resource_tc_ses_template.go @@ -1,13 +1,15 @@ /* -Provides a resource to create a ses template +Provides a resource to create a ses template. Example Usage +Create a ses template instance + ```hcl -resource "tencentcloud_ses_template" "template" { - template_name = "sesTemplateName" +resource "tencentcloud_ses_template" "example" { + template_name = "tf_example_ses_temp"" template_content { - text = "This is the content of the test" + text = "example for the ses template" } } @@ -16,7 +18,7 @@ Import ses template can be imported using the id, e.g. ``` -$ terraform import tencentcloud_ses_template.template template_id +$ terraform import tencentcloud_ses_template.example template_id ``` */ package tencentcloud diff --git a/tencentcloud/resource_tc_sms_sign.go b/tencentcloud/resource_tc_sms_sign.go index 41908cf507..1faf2fdabf 100644 --- a/tencentcloud/resource_tc_sms_sign.go +++ b/tencentcloud/resource_tc_sms_sign.go @@ -3,14 +3,16 @@ Provides a resource to create a sms sign Example Usage +Create a sms sign instance + ```hcl -resource "tencentcloud_sms_sign" "sign" { - sign_name = "terraform" - sign_type = 1 - document_type = 4 - international = 0 - sign_purpose = 0 - proof_image = "dGhpcyBpcyBhIGV4YW1wbGU=" +resource "tencentcloud_sms_sign" "example" { + sign_name = "tf_example_sms_sign" + sign_type = 1 # 1：APP, DocumentType can be chosen（0，1，2，3，4） + document_type = 4 # Screenshot of application background management (personally developed APP) + international = 0 # Mainland China SMS + sign_purpose = 0 # personal use + proof_image = "your_proof_image" } ``` diff --git a/tencentcloud/resource_tc_sms_template.go b/tencentcloud/resource_tc_sms_template.go index 0a527bf66d..6e196ec13c 100644 --- a/tencentcloud/resource_tc_sms_template.go +++ b/tencentcloud/resource_tc_sms_template.go @@ -3,13 +3,15 @@ Provides a resource to create a sms template Example Usage +Create a sms template + ```hcl resource "tencentcloud_sms_template" "template" { - template_name = "Template By Terraform" - template_content = "Template Content" - international = 0 - sms_type = 0 - remark = "terraform test" + template_name = "tf_example_sms_template" + template_content = "example for sms template" + international = 0 # Mainland China SMS + sms_type = 0 # regular SMS + remark = "terraform example" } ``` diff --git a/website/docs/r/ses_template.html.markdown b/website/docs/r/ses_template.html.markdown index 1552030a14..c9be71fd7e 100644 --- a/website/docs/r/ses_template.html.markdown +++ b/website/docs/r/ses_template.html.markdown @@ -4,20 +4,22 @@ layout: "tencentcloud" page_title: "TencentCloud: tencentcloud_ses_template" sidebar_current: "docs-tencentcloud-resource-ses_template" description: |- - Provides a resource to create a ses template + Provides a resource to create a ses template. --- # tencentcloud_ses_template -Provides a resource to create a ses template +Provides a resource to create a ses template. ## Example Usage +### Create a ses template instance + ```hcl -resource "tencentcloud_ses_template" "template" { - template_name = "sesTemplateName" +resource "tencentcloud_ses_template" "example" { + template_name = "tf_example_ses_temp" " template_content { - text = "This is the content of the test" + text = " example for the ses template " } } ``` @@ -46,6 +48,6 @@ In addition to all arguments above, the following attributes are exported: ses template can be imported using the id, e.g. ``` -$ terraform import tencentcloud_ses_template.template template_id +$ terraform import tencentcloud_ses_template.example template_id ``` diff --git a/website/docs/r/sms_sign.html.markdown b/website/docs/r/sms_sign.html.markdown index 2d8493088a..ef0c838913 100644 --- a/website/docs/r/sms_sign.html.markdown +++ b/website/docs/r/sms_sign.html.markdown @@ -13,14 +13,16 @@ Provides a resource to create a sms sign ## Example Usage +### Create a sms sign instance + ```hcl -resource "tencentcloud_sms_sign" "sign" { - sign_name = "terraform" - sign_type = 1 - document_type = 4 - international = 0 - sign_purpose = 0 - proof_image = "dGhpcyBpcyBhIGV4YW1wbGU=" +resource "tencentcloud_sms_sign" "example" { + sign_name = "tf_example_sms_sign" + sign_type = 1 # 1：APP, DocumentType can be chosen（0，1，2，3，4） + document_type = 4 # Screenshot of application background management (personally developed APP) + international = 0 # Mainland China SMS + sign_purpose = 0 # personal use + proof_image = "your_proof_image" } ``` diff --git a/website/docs/r/sms_template.html.markdown b/website/docs/r/sms_template.html.markdown index 4c3b2f63f5..8bfdbc823b 100644 --- a/website/docs/r/sms_template.html.markdown +++ b/website/docs/r/sms_template.html.markdown @@ -13,13 +13,15 @@ Provides a resource to create a sms template ## Example Usage +### Create a sms template + ```hcl resource "tencentcloud_sms_template" "template" { - template_name = "Template By Terraform" - template_content = "Template Content" - international = 0 - sms_type = 0 - remark = "terraform test" + template_name = "tf_example_sms_template" + template_content = "example for sms template" + international = 0 # Mainland China SMS + sms_type = 0 # regular SMS + remark = "terraform example" } ```