Skip to content

fix/sqlserver #1960

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
Jul 19, 2023
Merged

fix/sqlserver #1960

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
257b2ea
fix/sqlserver
SevenEarth Jul 12, 2023
bd7f455
fix/sqlserver
SevenEarth Jul 12, 2023
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
8 changes: 4 additions & 4 deletions tencentcloud/data_source_tc_sqlserver_backups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ Use this data source to query the list of SQL Server backups.
Example Usage

```hcl
data "tencentcloud_sqlserver_backups" "foo" {
instance_id = "mssql-3cdq7kx5"
start_time = "2020-06-17 00:00:00"
end_time = "2020-06-22 00:00:00"
data "tencentcloud_sqlserver_backups" "example" {
instance_id = "mssql-qelbzgwf"
start_time = "2020-06-17 00:00:00"
end_time = "2020-06-22 00:00:00"
}
```
*/
Expand Down
8 changes: 4 additions & 4 deletions tencentcloud/resource_tc_api_gateway_api_doc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,17 @@ func testAccCheckAPIGatewayAPIDocExists(r string) resource.TestCheckFunc {
const testAccAPIGatewayAPIDoc = `
resource "tencentcloud_api_gateway_api_doc" "test" {
api_doc_name = "doc_test1"
service_id = "service-7lybgojo"
service_id = "service-nxz6yync"
environment = "release"
api_ids = ["api-2bntitvw"]
api_ids = ["api-jvqlzolk"]
}
`

const testAccAPIGatewayAPIDocUpdate = `
resource "tencentcloud_api_gateway_api_doc" "test" {
api_doc_name = "update_doc_name_test"
service_id = "service-7lybgojo"
service_id = "service-nxz6yync"
environment = "release"
api_ids = ["api-2bntitvw"]
api_ids = ["api-jvqlzolk"]
}
`
8 changes: 4 additions & 4 deletions tencentcloud/resource_tc_api_gateway_custom_domain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func TestAccTencentCloudAPIGateWayCustomDomain_basic(t *testing.T) {
Config: testAccCustomDomain,
Check: resource.ComposeTestCheckFunc(
testAccCheckCustomDomainExists("tencentcloud_api_gateway_custom_domain.foo"),
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "service_id", "service-7lybgojo"),
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "service_id", "service-nxz6yync"),
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "sub_domain", "tic-test.dnsv1.com"),
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "protocol", "http"),
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "net_type", "OUTER"),
Expand All @@ -35,7 +35,7 @@ func TestAccTencentCloudAPIGateWayCustomDomain_basic(t *testing.T) {
Config: testAccCustomDomainUpdate,
Check: resource.ComposeTestCheckFunc(
testAccCheckCustomDomainExists("tencentcloud_api_gateway_custom_domain.foo"),
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "service_id", "service-7lybgojo"),
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "service_id", "service-nxz6yync"),
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "sub_domain", "tic-test.dnsv1.com"),
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "protocol", "http"),
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "net_type", "OUTER"),
Expand Down Expand Up @@ -113,7 +113,7 @@ func testAccCheckCustomDomainExists(n string) resource.TestCheckFunc {

const testAccCustomDomain = `
resource "tencentcloud_api_gateway_custom_domain" "foo" {
service_id = "service-7lybgojo"
service_id = "service-nxz6yync"
sub_domain = "tic-test.dnsv1.com"
protocol = "http"
net_type = "OUTER"
Expand All @@ -125,7 +125,7 @@ resource "tencentcloud_api_gateway_custom_domain" "foo" {

const testAccCustomDomainUpdate = `
resource "tencentcloud_api_gateway_custom_domain" "foo" {
service_id = "service-7lybgojo"
service_id = "service-nxz6yync"
sub_domain = "tic-test.dnsv1.com"
protocol = "http"
net_type = "OUTER"
Expand Down
5 changes: 3 additions & 2 deletions tencentcloud/resource_tc_cynosdb_upgrade_proxy_version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@ package tencentcloud
import (
"context"
"fmt"
"log"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
cynosdb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb/v20190107"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
"log"
"strings"
)

func resourceTencentCloudCynosdbUpgradeProxyVersion() *schema.Resource {
Expand Down
59 changes: 30 additions & 29 deletions tencentcloud/resource_tc_sqlserver_complete_expansion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
)

// go test -i; go test -test.run TestAccTencentCloudSqlserverCompleteExpansionResource_basic -v
// go test -v -run TestAccTencentCloudSqlserverCompleteExpansionResource_basic -timeout=0 ./tencentcloud/
func TestAccTencentCloudSqlserverCompleteExpansionResource_basic(t *testing.T) {
t.Parallel()
resource.Test(t, resource.TestCase{
Expand Down Expand Up @@ -36,41 +37,41 @@ func TestAccTencentCloudSqlserverCompleteExpansionResource_basic(t *testing.T) {

const testAccNewSqlserverInstance string = testAccSqlserverBasicInstanceNetwork + `
resource "tencentcloud_sqlserver_instance" "test" {
name = "tf_sqlserver_instance"
availability_zone = "ap-guangzhou-7"
charge_type = "POSTPAID_BY_HOUR"
vpc_id = "vpc-1yg5ua6l"
subnet_id = "subnet-h7av55g8"
security_groups = ["sg-mayqdlt1"]
project_id = 0
memory = 2
storage = 10
maintenance_week_set = [1,2,3]
maintenance_start_time = "09:00"
maintenance_time_span = 3
tags = {
"test" = "test"
name = "tf_sqlserver_instance"
availability_zone = "ap-guangzhou-7"
charge_type = "POSTPAID_BY_HOUR"
vpc_id = "vpc-1yg5ua6l"
subnet_id = "subnet-h7av55g8"
security_groups = ["sg-mayqdlt1"]
project_id = 0
memory = 2
storage = 20
maintenance_week_set = [1, 2, 3]
maintenance_start_time = "09:00"
maintenance_time_span = 3
tags = {
"test" = "test"
}
}
`

const testAccUpdateNewSqlserverInstance string = testAccSqlserverBasicInstanceNetwork + `
resource "tencentcloud_sqlserver_instance" "test" {
name = "tf_sqlserver_instance"
availability_zone = "ap-guangzhou-7"
charge_type = "POSTPAID_BY_HOUR"
vpc_id = "vpc-1yg5ua6l"
subnet_id = "subnet-h7av55g8"
security_groups = ["sg-mayqdlt1"]
project_id = 0
memory = 2
storage = 20
maintenance_week_set = [1,2,3]
maintenance_start_time = "09:00"
maintenance_time_span = 3
wait_switch = 1
tags = {
"test" = "test"
name = "tf_sqlserver_instance"
availability_zone = "ap-guangzhou-7"
charge_type = "POSTPAID_BY_HOUR"
vpc_id = "vpc-1yg5ua6l"
subnet_id = "subnet-h7av55g8"
security_groups = ["sg-mayqdlt1"]
project_id = 0
memory = 2
storage = 40
maintenance_week_set = [1, 2, 3]
maintenance_start_time = "09:00"
maintenance_time_span = 3
wait_switch = 1
tags = {
"test" = "test"
}
}

Expand Down
14 changes: 14 additions & 0 deletions tencentcloud/resource_tc_sqlserver_database_tde_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ func TestAccTencentCloudSqlserverDatabaseTDEResource_basic(t *testing.T) {
ImportState: true,
ImportStateVerify: true,
},
{
Config: testAccSqlserverDatabaseTDEUpdate,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet("tencentcloud_sqlserver_database_tde.database_tde", "id"),
),
},
},
})
}
Expand All @@ -36,3 +42,11 @@ resource "tencentcloud_sqlserver_database_tde" "database_tde" {
encryption = "enable"
}
`

const testAccSqlserverDatabaseTDEUpdate = `
resource "tencentcloud_sqlserver_database_tde" "database_tde" {
instance_id = "mssql-qelbzgwf"
db_names = ["keep_tde_db", "keep_tde_db2"]
encryption = "disable"
}
`
14 changes: 7 additions & 7 deletions tencentcloud/resource_tc_sqlserver_publish_subscribe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ Example Usage

```hcl
resource "tencentcloud_sqlserver_publish_subscribe" "example" {
publish_instance_id = tencentcloud_sqlserver_instance.publish_instance.id
subscribe_instance_id = tencentcloud_sqlserver_instance.subscribe_instance.id
publish_subscribe_name = "example"
delete_subscribe_db = false
database_tuples {
publish_database = tencentcloud_sqlserver_db.test_publish_subscribe.name
}
publish_instance_id = "mssql-qelbzgwf"
subscribe_instance_id = "mssql-jdk2pwld"
publish_subscribe_name = "example"
delete_subscribe_db = false
database_tuples {
publish_database = "sqlserver_pubsub_db"
}
}
```

Expand Down
36 changes: 19 additions & 17 deletions tencentcloud/resource_tc_sqlserver_publish_subscribe_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ func testAccUnsubscribePubDB(ctx context.Context, service *SqlserverService, ins
}
}

// go test -i; go test -test.run TestAccTencentCloudSqlserverPublishSubscribeResource -v
func TestAccTencentCloudSqlserverPublishSubscribeResource(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() {
Expand Down Expand Up @@ -213,24 +214,25 @@ func testAccCheckSqlserverPublishSubscribeExists(n string) resource.TestCheckFun
}

const testAccSqlserverPublishSubscribe_basic = CommonPubSubSQLServer + `

resource "tencentcloud_sqlserver_publish_subscribe" "example" {
publish_instance_id = local.pub_sqlserver_id
subscribe_instance_id = local.sub_sqlserver_id
publish_subscribe_name = "example"
delete_subscribe_db = false
database_tuples {
publish_database = local.sqlserver_pubsub_db
}
}`
publish_instance_id = "mssql-qelbzgwf"
subscribe_instance_id = "mssql-jdk2pwld"
publish_subscribe_name = "example"
delete_subscribe_db = false
database_tuples {
publish_database = local.sqlserver_pubsub_db
}
}
`

const testAccSqlserverPublishSubscribe_basic_update_name = CommonPubSubSQLServer + `
resource "tencentcloud_sqlserver_publish_subscribe" "example" {
publish_instance_id = local.pub_sqlserver_id
subscribe_instance_id = local.sub_sqlserver_id
publish_subscribe_name = "example1"
delete_subscribe_db = false
database_tuples {
publish_database = local.sqlserver_pubsub_db
}
}`
publish_instance_id = "mssql-qelbzgwf"
subscribe_instance_id = "mssql-jdk2pwld"
publish_subscribe_name = "example1"
delete_subscribe_db = false
database_tuples {
publish_database = local.sqlserver_pubsub_db
}
}
`
16 changes: 13 additions & 3 deletions tencentcloud/resource_tc_sqlserver_restore_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ import (
"fmt"
"strings"
"testing"
"time"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
)

// go test -i; go test -test.run TestAccTencentCloudSqlserverRestoreInstanceResource_basic -v
func TestAccTencentCloudSqlserverRestoreInstanceResource_basic(t *testing.T) {
loc, _ := time.LoadLocation("Asia/Shanghai")
startTime := time.Now().AddDate(0, 0, -3).In(loc).Format("2006-01-02 15:04:05")
endTime := time.Now().In(loc).Format("2006-01-02 15:04:05")
resource.Test(t, resource.TestCase{
PreCheck: func() {
testAccPreCheck(t)
Expand All @@ -20,7 +24,7 @@ func TestAccTencentCloudSqlserverRestoreInstanceResource_basic(t *testing.T) {
Providers: testAccProviders,
Steps: []resource.TestStep{
{
Config: testAccSqlserverRestoreInstance,
Config: fmt.Sprintf(testAccSqlserverRestoreInstance, startTime, endTime),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet("tencentcloud_sqlserver_restore_instance.restore_instance", "id"),
),
Expand Down Expand Up @@ -68,9 +72,15 @@ func testAccCheckSqlserverRestoreDBDestroy(s *terraform.State) error {
}

const testAccSqlserverRestoreInstance = `
resource "tencentcloud_sqlserver_restore_instance" "restore_instance" {
data "tencentcloud_sqlserver_backups" "example" {
instance_id = "mssql-qelbzgwf"
backup_id = 3482091273
start_time = "%s"
end_time = "%s"
}

resource "tencentcloud_sqlserver_restore_instance" "restore_instance" {
instance_id = data.tencentcloud_sqlserver_backups.example.instance_id
backup_id = data.tencentcloud_sqlserver_backups.example.list.0.id
rename_restore {
old_name = "keep_pubsub_db2"
new_name = "restore_keep_pubsub_db2"
Expand Down
6 changes: 3 additions & 3 deletions website/docs/r/sqlserver_publish_subscribe.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ Provides a SQL Server PublishSubscribe resource belongs to SQL Server instance.

```hcl
resource "tencentcloud_sqlserver_publish_subscribe" "example" {
publish_instance_id = tencentcloud_sqlserver_instance.publish_instance.id
subscribe_instance_id = tencentcloud_sqlserver_instance.subscribe_instance.id
publish_instance_id = "mssql-qelbzgwf"
subscribe_instance_id = "mssql-jdk2pwld"
publish_subscribe_name = "example"
delete_subscribe_db = false
database_tuples {
publish_database = tencentcloud_sqlserver_db.test_publish_subscribe.name
publish_database = "sqlserver_pubsub_db"
}
}
```
Expand Down