Skip to content

fix: partial cases 1229 #804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 29, 2021
Merged

fix: partial cases 1229 #804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b717d0
fix: partial cases - sqlserver,cos,tcaplus
Kagashino Dec 29, 2021
df3ec23
fix: test_case - sqlserver
Kagashino Dec 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tencentcloud/data_source_tc_sqlserver_basic_instances_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ resource "tencentcloud_sqlserver_basic_instance" "test" {
memory = 2
storage = 20
cpu = 1
security_groups = ["sg-nltpbqg1"]
security_groups = ["` + defaultSecurityGroup + `"]

tags = {
"test" = "test"
Expand Down
2 changes: 1 addition & 1 deletion tencentcloud/data_source_tc_tcaplus_clusters_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func TestAccTencentCloudDataTcaplusClusters(t *testing.T) {

const testAccTencentCloudDataTcaplusClustersBaic = `
variable "availability_zone" {
default = "ap-shanghai-2"
default = "ap-guangzhou-3"
}

data "tencentcloud_vpc_subnets" "vpc" {
Expand Down
2 changes: 1 addition & 1 deletion tencentcloud/data_source_tc_tcaplus_idls_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func TestAccTencentCloudDataTcaplusIdls(t *testing.T) {

const testAccTencentCloudDataTcaplusIdlsBaic = `
variable "availability_zone" {
default = "ap-shanghai-2"
default = "ap-guangzhou-3"
}

data "tencentcloud_vpc_subnets" "vpc" {
Expand Down
2 changes: 1 addition & 1 deletion tencentcloud/data_source_tc_tcaplus_tablegroups_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestAccTencentCloudDataTcaplusGroups(t *testing.T) {

const testAccTencentCloudDataTcaplusGroupsBaic = `
variable "availability_zone" {
default = "ap-shanghai-2"
default = "ap-guangzhou-3"
}

data "tencentcloud_vpc_subnets" "vpc" {
Expand Down
2 changes: 1 addition & 1 deletion tencentcloud/data_source_tc_tcaplus_tables_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func TestAccTencentCloudDataTcaplusTables(t *testing.T) {

const testAccTencentCloudDataTcaplusTablesBaic = `
variable "availability_zone" {
default = "ap-shanghai-2"
default = "ap-guangzhou-3"
}

data "tencentcloud_vpc_subnets" "vpc" {
Expand Down
10 changes: 5 additions & 5 deletions tencentcloud/resource_tc_cos_bucket_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ resource "tencentcloud_cos_bucket" "bucket_website" {
func testAccBucket_MAZ(appid string) string {
return fmt.Sprintf(`
resource "tencentcloud_cos_bucket" "bucket_maz" {
bucket = "tf-bucket-website-%s"
bucket = "tf-bucket-maz-%s"
acl = "public-read"
multi_az = true
}
Expand All @@ -589,7 +589,7 @@ resource "tencentcloud_cos_bucket" "bucket_maz" {
func testAccBucket_originPull(appid string) string {
return fmt.Sprintf(`
resource "tencentcloud_cos_bucket" "with_origin" {
bucket = "tf-bucket-website-%s"
bucket = "tf-bucket-origin-%s"
acl = "private"
origin_pull_rules {
priority = 1
Expand All @@ -611,7 +611,7 @@ resource "tencentcloud_cos_bucket" "with_origin" {
func testAccBucket_originPullUpdate(appid string) string {
return fmt.Sprintf(`
resource "tencentcloud_cos_bucket" "with_origin" {
bucket = "tf-bucket-website-%s"
bucket = "tf-bucket-origin-%s"
acl = "private"
origin_pull_rules {
priority = 1
Expand All @@ -633,7 +633,7 @@ resource "tencentcloud_cos_bucket" "with_origin" {
func testAccBucket_originDomain(appid string) string {
return fmt.Sprintf(`
resource "tencentcloud_cos_bucket" "with_domain" {
bucket = "tf-bucket-website-%s"
bucket = "tf-bucket-domain-%s"
acl = "private"
origin_domain_rules {
status = "ENABLED"
Expand All @@ -646,7 +646,7 @@ resource "tencentcloud_cos_bucket" "with_domain" {
func testAccBucket_originDomainUpdate(appid string) string {
return fmt.Sprintf(`
resource "tencentcloud_cos_bucket" "with_domain" {
bucket = "tf-bucket-website-%s"
bucket = "tf-bucket-domain-%s"
acl = "private"
origin_domain_rules {
status = "DISABLED"
Expand Down
4 changes: 2 additions & 2 deletions tencentcloud/resource_tc_sqlserver_account_db_attachment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,14 @@ resource "tencentcloud_sqlserver_account" "test" {
}

resource "tencentcloud_sqlserver_db" "test" {
instance_id = "mssql-3cdq7kx5"
instance_id = tencentcloud_sqlserver_instance.test.id
name = "test111"
charset = "Chinese_PRC_BIN"
remark = "testACC-remark"
}

resource "tencentcloud_sqlserver_account_db_attachment" "test" {
instance_id = "mssql-3cdq7kx5"
instance_id = tencentcloud_sqlserver_instance.test.id
account_name = tencentcloud_sqlserver_account.test.name
db_name = tencentcloud_sqlserver_db.test.name
privilege = "ReadOnly"
Expand Down
4 changes: 2 additions & 2 deletions tencentcloud/resource_tc_sqlserver_basic_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ resource "tencentcloud_sqlserver_basic_instance" "test" {
charge_type = "POSTPAID_BY_HOUR"
vpc_id = tencentcloud_vpc.foo.id
subnet_id = tencentcloud_subnet.foo.id
security_groups = ["sg-nltpbqg1"]
security_groups = ["` + defaultSecurityGroup + `"]
project_id = 0
memory = 2
storage = 20
Expand All @@ -174,7 +174,7 @@ resource "tencentcloud_sqlserver_basic_instance" "test" {
charge_type = "POSTPAID_BY_HOUR"
vpc_id = tencentcloud_vpc.foo.id
subnet_id = tencentcloud_subnet.foo.id
security_groups = ["sg-nltpbqg1"]
security_groups = ["` + defaultSecurityGroup + `"]
project_id = 0
memory = 4
storage = 100
Expand Down
12 changes: 6 additions & 6 deletions tencentcloud/resource_tc_sqlserver_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,15 @@ func testAccCheckSqlserverInstanceExists(n string) resource.TestCheckFunc {
}

const testAccSqlserverInstanceBasic = `
variable "availability_zone"{
default = "ap-guangzhou-2"
data "tencentcloud_availability_zones_by_product" "zone" {
product = "sqlserver"
}
`

const testAccSqlserverInstance string = testAccSqlserverInstanceBasic + `
resource "tencentcloud_sqlserver_instance" "test" {
name = "tf_sqlserver_instance"
availability_zone = var.availability_zone
availability_zone = data.tencentcloud_availability_zones_by_product.zone.zones[1].name
charge_type = "POSTPAID_BY_HOUR"
vpc_id = "` + defaultVpcId + `"
subnet_id = "` + defaultSubnetId + `"
Expand All @@ -181,7 +181,7 @@ resource "tencentcloud_sqlserver_instance" "test" {
maintenance_week_set = [1,2,3]
maintenance_start_time = "09:00"
maintenance_time_span = 3
security_groups = ["sg-nltpbqg1"]
security_groups = ["` + defaultSecurityGroup + `"]

tags = {
"test" = "test"
Expand All @@ -192,7 +192,7 @@ resource "tencentcloud_sqlserver_instance" "test" {
const testAccSqlserverInstanceUpdate string = testAccSqlserverInstanceBasic + `
resource "tencentcloud_sqlserver_instance" "test" {
name = "tf_sqlserver_instance_update"
availability_zone = var.availability_zone
availability_zone = data.tencentcloud_availability_zones_by_product.zone.zones[0].name
charge_type = "POSTPAID_BY_HOUR"
vpc_id = "` + defaultVpcId + `"
subnet_id = "` + defaultSubnetId + `"
Expand All @@ -212,7 +212,7 @@ resource "tencentcloud_sqlserver_instance" "test" {
const testAccSqlserverInstanceMultiCluster string = testAccSqlserverInstanceBasic + `
resource "tencentcloud_sqlserver_instance" "test" {
name = "tf_sqlserver_instance_multi"
availability_zone = var.availability_zone
availability_zone = data.tencentcloud_availability_zones_by_product.zone.zones[0].name
charge_type = "POSTPAID_BY_HOUR"
engine_version = "2017"
vpc_id = "` + defaultVpcId + `"
Expand Down
2 changes: 1 addition & 1 deletion tencentcloud/resource_tc_tcaplus_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func testAccCheckTcaplusClusterExists(n string) resource.TestCheckFunc {

const testAccTcaplusClusterBaic = `
variable "availability_zone" {
default = "ap-shanghai-2"
default = "ap-guangzhou-3"
}

data "tencentcloud_vpc_subnets" "vpc" {
Expand Down
2 changes: 1 addition & 1 deletion tencentcloud/resource_tc_tcaplus_idl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func testAccCheckTcaplusIdlExists(n string) resource.TestCheckFunc {
}

const testAccTcaplusIdlBasic = `variable "availability_zone" {
default = "ap-shanghai-2"
default = "ap-guangzhou-3"
}

data "tencentcloud_vpc_subnets" "vpc" {
Expand Down
2 changes: 1 addition & 1 deletion tencentcloud/resource_tc_tcaplus_table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ func testAccCheckTcaplusTableExists(n string) resource.TestCheckFunc {
}

const testAccTcaplusTableBasic = `variable "availability_zone" {
default = "ap-shanghai-2"
default = "ap-guangzhou-3"
}
data "tencentcloud_vpc_subnets" "vpc" {
is_default = true
Expand Down
2 changes: 1 addition & 1 deletion tencentcloud/resource_tc_tcaplus_tablegroup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func testAccCheckTcaplusGroupExists(n string) resource.TestCheckFunc {
}

const testAccTcaplusGroupBasic = `variable "availability_zone" {
default = "ap-shanghai-2"
default = "ap-guangzhou-3"
}
data "tencentcloud_vpc_subnets" "vpc" {
is_default = true
Expand Down