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_base_backups_test.go b/tencentcloud/data_source_tc_postgresql_base_backups_test.go index ec199b8248..461f2e0077 100644 --- a/tencentcloud/data_source_tc_postgresql_base_backups_test.go +++ b/tencentcloud/data_source_tc_postgresql_base_backups_test.go @@ -18,6 +18,7 @@ func TestAccTencentCloudPostgresqlBaseBackupsDataSource_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) + testAccStepSetRegion(t, "ap-chengdu") }, Providers: testAccProviders, Steps: []resource.TestStep{ 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_base_backup_test.go b/tencentcloud/resource_tc_postgresql_base_backup_test.go index e525a7f8fb..2e32d01ff9 100644 --- a/tencentcloud/resource_tc_postgresql_base_backup_test.go +++ b/tencentcloud/resource_tc_postgresql_base_backup_test.go @@ -16,6 +16,7 @@ func TestAccTencentCloudPostgresqlBaseBackupResource_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) + testAccStepSetRegion(t, "ap-chengdu") }, Providers: testAccProviders, Steps: []resource.TestStep{ 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..af25d26d54 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"), @@ -113,15 +131,10 @@ data "tencentcloud_security_groups" "sg" { availability_zone = var.default_az is_default = true } - - locals { - vpc_id = data.tencentcloud_vpc_subnets.gz3.instance_list.0.vpc_id - subnet_id = data.tencentcloud_vpc_subnets.gz3.instance_list.0.subnet_id - } locals { - my_vpc_id = tencentcloud_subnet.subnet.vpc_id - my_subnet_id = tencentcloud_subnet.subnet.id + my_vpc_id = data.tencentcloud_vpc_subnets.gz3.instance_list.0.vpc_id + my_subnet_id = data.tencentcloud_vpc_subnets.gz3.instance_list.0.subnet_id my_sg_id = data.tencentcloud_security_groups.sg.security_groups.0.security_group_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"),