Skip to content

feat(sqlserver): [122322345] support time_zone #3228

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.

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
Mar 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions .changelog/3228.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
```release-note:enhancement
resource/tencentcloud_sqlserver_instance: Support time_zone field.
```

```release-note:enhancement
resource/tencentcloud_sqlserver_readonly_instance: Support time_zone field.
```

```release-note:new-data-source
tencentcloud_sqlserver_collation_time_zone
```
1 change: 1 addition & 0 deletions tencentcloud/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,7 @@ func Provider() *schema.Provider {
"tencentcloud_sqlserver_backup_upload_size": sqlserver.DataSourceTencentCloudSqlserverBackupUploadSize(),
"tencentcloud_sqlserver_cross_region_zone": sqlserver.DataSourceTencentCloudSqlserverCrossRegionZone(),
"tencentcloud_sqlserver_db_charsets": sqlserver.DataSourceTencentCloudSqlserverDBCharsets(),
"tencentcloud_sqlserver_collation_time_zone": sqlserver.DataSourceTencentCloudSqlserverCollationTimeZone(),
"tencentcloud_ckafka_users": ckafka.DataSourceTencentCloudCkafkaUsers(),
"tencentcloud_ckafka_acls": ckafka.DataSourceTencentCloudCkafkaAcls(),
"tencentcloud_ckafka_topics": ckafka.DataSourceTencentCloudCkafkaTopics(),
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Use this data source to query detailed information of sqlserver datasource_collation_time_zone

Example Usage

```hcl
data "tencentcloud_sqlserver_collation_time_zone" "sqlserver_collation_time_zone" {
machine_type = "CLOUD_PREMIUM"
}
```
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package sqlserver
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package sqlserver_test

import (
"testing"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
)

var testAccSqlserverCollationTimeZoneDataSourceName = "data.tencentcloud_sqlserver_collation_time_zone.sqlserver_collation_time_zone"

func TestAccTencentCloudSqlserverCollationTimeZoneDataSource_basic(t *testing.T) {
t.Parallel()
resource.Test(t, resource.TestCase{
PreCheck: func() {
tcacctest.AccPreCheck(t)
},
Providers: tcacctest.AccProviders,
Steps: []resource.TestStep{
{
Config: testAccTencentCloudDataSqlserverBasicInstancesBasic,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet(testAccSqlserverCollationTimeZoneDataSourceName, "name"),
resource.TestCheckResourceAttrSet(testAccSqlserverCollationTimeZoneDataSourceName, "collation.#"),
resource.TestCheckResourceAttrSet(testAccSqlserverCollationTimeZoneDataSourceName, "time_zone.#"),
),
},
},
})
}

const testAccSqlserverCollationTimeZoneDataSource = `

Check failure on line 32 in tencentcloud/services/sqlserver/data_source_tc_sqlserver_collation_time_zone_test.go

View workflow job for this annotation

GitHub Actions / golangci-lint

const `testAccSqlserverCollationTimeZoneDataSource` is unused (unused)

data "tencentcloud_sqlserver_collation_time_zone" "sqlserver_collation_time_zone" {
}
`
21 changes: 21 additions & 0 deletions tencentcloud/services/sqlserver/resource_tc_sqlserver_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ func TencentSqlServerBasicInfo(isROInstance bool) map[string]*schema.Schema {
},
Description: "Security group bound to the instance.",
},
"time_zone": {
Type: schema.TypeString,
Computed: true,
Optional: true,
Description: "System time zone, default: `China Standard Time`.",
},
//Computed values
"ro_flag": {
Type: schema.TypeString,
Expand Down Expand Up @@ -317,6 +323,10 @@ func resourceTencentCloudSqlserverInstanceCreate(d *schema.ResourceData, meta in
request.SecurityGroupList = append(request.SecurityGroupList, &v)
}

if v, ok := d.GetOk("time_zone"); ok {
request.TimeZone = helper.String(v.(string))
}

request.GoodsNum = helper.IntInt64(1)
request.Zone = &zone

Expand Down Expand Up @@ -511,6 +521,13 @@ func resourceTencentCloudSqlserverInstanceUpdate(d *schema.ResourceData, meta in
ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
d.Partial(true)

immutableArgs := []string{"time_zone"}
for _, v := range immutableArgs {
if d.HasChange(v) {
return fmt.Errorf("argument `%s` cannot be changed", v)
}
}

//basic info update
if err := sqlServerAllInstanceRoleUpdate(ctx, d, meta); err != nil {
return err
Expand Down Expand Up @@ -655,6 +672,10 @@ func tencentSqlServerBasicInfoRead(ctx context.Context, d *schema.ResourceData,
_ = d.Set("vip", instance.Vip)
_ = d.Set("vport", instance.Vport)
_ = d.Set("security_groups", securityGroup)

if instance.TimeZone != nil {
_ = d.Set("time_zone", instance.TimeZone)
}
return
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,10 @@ func resourceTencentCloudSqlserverReadonlyInstanceCreate(d *schema.ResourceData,
request.VoucherIds = helper.InterfacesStringsPoint(v)
}

if v, ok := d.GetOk("time_zone"); ok {
request.TimeZone = helper.String(v.(string))
}

var instanceId string
var outErr, inErr error

Expand Down Expand Up @@ -299,6 +303,10 @@ func resourceTencentCloudSqlserverReadonlyInstanceRead(d *schema.ResourceData, m
}
}

if instance.TimeZone != nil {
_ = d.Set("time_zone", instance.TimeZone)
}

tcClient := meta.(tccommon.ProviderMeta).GetAPIV3Conn()
tagService := svctag.NewTagService(tcClient)
tags, err := tagService.DescribeResourceTags(ctx, "sqlserver", "instance", tcClient.Region, d.Id())
Expand All @@ -316,6 +324,13 @@ func resourceTencentCloudSqlserverReadonlyInstanceUpdate(d *schema.ResourceData,
logId := tccommon.GetLogId(tccommon.ContextNil)
ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)

immutableArgs := []string{"time_zone"}
for _, v := range immutableArgs {
if d.HasChange(v) {
return fmt.Errorf("argument `%s` cannot be changed", v)
}
}

//basic info update
if err := sqlServerAllInstanceRoleUpdate(ctx, d, meta); err != nil {
return err
Expand Down
39 changes: 39 additions & 0 deletions tencentcloud/services/sqlserver/service_tencentcloud_sqlserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/pkg/errors"
SDKErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
sqlserver "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sqlserver/v20180328"
sqlserverv20180328 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sqlserver/v20180328"

"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/connectivity"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
Expand Down Expand Up @@ -3458,3 +3459,41 @@ func (me *SqlserverService) DescribeSqlserverDescHaLogByFilter(ctx context.Conte
descHaLog = response.Response.SwitchLog
return
}

func (me *SqlserverService) DescribeSqlserverCollationTimeZoneByFilter(ctx context.Context, param map[string]interface{}) (ret *sqlserverv20180328.DescribeCollationTimeZoneResponseParams, errRet error) {
var (
logId = tccommon.GetLogId(ctx)
request = sqlserver.NewDescribeCollationTimeZoneRequest()
)

defer func() {
if errRet != nil {
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())
}
}()

for k, v := range param {
if k == "MachineType" {
request.MachineType = v.(*string)
}
if k == "DBVersion" {
request.DBVersion = v.(*string)
}
}

ratelimit.Check(request.GetAction())

response, err := me.client.UseSqlserverClient().DescribeCollationTimeZone(request)
if err != nil {
errRet = err
return
}
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())

if response == nil || response.Response == nil {
return
}

ret = response.Response
return
}
1 change: 1 addition & 0 deletions website/docs/r/sqlserver_instance.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ The following arguments are supported:
* `security_groups` - (Optional, Set: [`String`]) Security group bound to the instance.
* `subnet_id` - (Optional, String) ID of subnet.
* `tags` - (Optional, Map) The tags of the SQL Server.
* `time_zone` - (Optional, String) System time zone, default: `China Standard Time`.
* `voucher_ids` - (Optional, Set: [`String`]) An array of voucher IDs, currently only one can be used for a single order.
* `vpc_id` - (Optional, String) ID of VPC.
* `wait_switch` - (Optional, Int, **Deprecated**) It has been deprecated from version 1.81.2. The way to execute the allocation. Supported values include: 0 - execute immediately, 1 - execute in maintenance window.
Expand Down
1 change: 1 addition & 0 deletions website/docs/r/sqlserver_readonly_instance.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ The following arguments are supported:
* `security_groups` - (Optional, Set: [`String`]) Security group bound to the instance.
* `subnet_id` - (Optional, String) ID of subnet.
* `tags` - (Optional, Map) The tags of the SQL Server.
* `time_zone` - (Optional, String) System time zone, default: `China Standard Time`.
* `voucher_ids` - (Optional, Set: [`String`]) An array of voucher IDs, currently only one can be used for a single order.
* `vpc_id` - (Optional, String) ID of VPC.
* `wait_switch` - (Optional, Int, **Deprecated**) It has been deprecated from version 1.81.2. The way to execute the allocation. Supported values include: 0 - execute immediately, 1 - execute in maintenance window.
Expand Down
Loading