8000 fix(mqtt): [124504305] `tencentcloud_mqtt_instance` support `authorization_policy` by SevenEarth · Pull Request #3399 · tencentcloudstack/terraform-provider-tencentcloud · GitHub
[go: up one dir, main page]
Skip to content

fix(mqtt): [124504305] tencentcloud_mqtt_instance support authorization_policy #3399

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 3 commits into from
Jun 6, 2025
Merged

fix(mqtt): [124504305] tencentcloud_mqtt_instance support authorization_policy #3399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb69302
add
SevenEarth Jun 6, 2025
154a916
add
SevenEarth Jun 6, 2025
dac3c00
add
SevenEarth Jun 6, 2025
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
3 changes: 3 additions & 0 deletions .changelog/3399.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/tencentcloud_mqtt_instance: support `authorization_policy`
```
64 changes: 46 additions & 18 deletions tencentcloud/services/mqtt/resource_tc_mqtt_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ func ResourceTencentCloudMqttInstance() *schema.Resource {
"renew_flag": {
Type: schema.TypeInt,
Optional: true,
Computed: true,
Description: "Whether to enable auto-renewal (0: Disabled; 1: Enabled).",
},

Expand Down Expand Up @@ -105,6 +106,13 @@ func ResourceTencentCloudMqttInstance() *schema.Resource {
Description: "Is the automatic registration certificate automatically activated. Default is false.",
},

"authorization_policy": {
Type: schema.TypeBool,
Optional: true,
Computed: true,
Description: "Authorization policy switch. Default is false.",
},

"force_delete": {
Type: schema.TypeBool,
Optional: true,
Expand Down Expand Up @@ -226,27 +234,39 @@ func ResourceTencentCloudMqttInstanceCreate(d *schema.ResourceData, meta interfa
return reqErr
}

// open automatic_activation
var (
isAutomaticActivation bool
isAuthorizationPolicy bool
)

if v, ok := d.GetOkExists("automatic_activation"); ok {
if v.(bool) {
modifyRequest := mqttv20240516.NewModifyInstanceRequest()
modifyRequest.InstanceId = &instanceId
modifyRequest.AutomaticActivation = helper.Bool(v.(bool))
reqErr := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseMqttV20240516Client().ModifyInstanceWithContext(ctx, modifyRequest)
if e != nil {
return tccommon.RetryError(e)
} else {
log.Printf("[DEBUG]%s api[%s] su 10000 ccess, request body [%s], response body [%s]\n", logId, modifyRequest.GetAction(), modifyRequest.ToJsonString(), result.ToJsonString())
}
isAutomaticActivation = v.(bool)
}

return nil
})
if v, ok := d.GetOkExists("authorization_policy"); ok {
isAuthorizationPolicy = v.(bool)
}

if reqErr != nil {
log.Printf("[CRITAL]%s update mqtt failed, reason:%+v", logId, reqErr)
return reqErr
// open automatic_activation or authorization_policy
if isAutomaticActivation || isAuthorizationPolicy {
modifyRequest := mqttv20240516.NewModifyInstanceRequest()
modifyRequest.InstanceId = &instanceId
modifyRequest.AutomaticActivation = helper.Bool(isAutomaticActivation)
modifyRequest.AuthorizationPolicy = helper.Bool(isAuthorizationPolicy)
reqErr := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseMqttV20240516Client().ModifyInstanceWithContext(ctx, modifyRequest)
if e != nil {
return tccommon.RetryError(e)
} else {
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, modifyRequest.GetAction(), modifyRequest.ToJsonString(), result.ToJsonString())
}

return nil
})

if reqErr != nil {
log.Printf("[CRITAL]%s update mqtt failed, reason:%+v", logId, reqErr)
return reqErr
}
}

Expand Down Expand Up @@ -322,6 +342,10 @@ func ResourceTencentCloudMqttInstanceRead(d *schema.ResourceData, meta interface
_ = d.Set("automatic_activation", respData.AutomaticActivation)
}

if respData.AuthorizationPolicy != nil {
_ = d.Set("authorization_policy", respData.AuthorizationPolicy)
}

forceDelete := false
if v, ok := d.GetOkExists("force_delete"); ok {
forceDelete = v.(bool)
Expand Down Expand Up @@ -356,7 +380,7 @@ func ResourceTencentCloudMqttInstanceUpdate(d *schema.ResourceData, meta interfa
}

needChange := false
mutableArgs := []string{"name", "remark", "sku_code", "device_certificate_provision_type", "automatic_activation"}
mutableArgs := []string{"name", "remark", "sku_code", "device_certificate_provision_type", "automatic_activation", "authorization_policy"}
for _, v := range mutableArgs {
if d.HasChange(v) {
needChange = true
Expand All @@ -383,6 +407,10 @@ func ResourceTencentCloudMqttInstanceUpdate(d *schema.ResourceData, meta interfa
request.AutomaticActivation = helper.Bool(v.(bool))
}

if v, ok := d.GetOkExists("authorization_policy"); ok {
request.AuthorizationPolicy = helper.Bool(v.(bool))
}

reqErr := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseMqttV20240516Client().ModifyInstanceWithContext(ctx, request)
if e != nil {
Expand Down
1 change: 1 addition & 0 deletions tencentcloud/services/mqtt/resource_tc_mqtt_instance.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ resource "tencentcloud_mqtt_instance" "example" {
renew_flag = 1
force_delete = false
automatic_activation = true
authorization_policy = true
tags = {
createBy = "Terraform"
}
Expand Down
2 changes: 2 additions & 0 deletions website/docs/r/mqtt_instance.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ resource "tencentcloud_mqtt_instance" "example" {
renew_flag = 1
force_delete = false
automatic_activation = true
authorization_policy = true
tags = {
createBy = "Terraform"
}
Expand All @@ -102,6 +103,7 @@ The following arguments are supported:
* `instance_type` - (Required, String) Instance type. PRO for Professional Edition; PLATINUM for Platinum Edition.
* `name` - (Required, String) Instance name.
* `sku_code` - (Required, String) Product SKU, available SKUs can be queried via the DescribeProductSKUList API.
* `authorization_policy` - (Optional, Bool) Authorization policy switch. Default is false.
* `automatic_activation` - (Optional, Bool) Is the automatic registration certificate automatically activated. Default is false.
* `force_delete` - (Optional, Bool) Indicate whether to force delete the instance. Default is `false`. If set true, the instance will be permanently deleted instead of being moved into the recycle bin. Note: only works for `PREPAID` instance.
* `pay_mode` - (Optional, Int) Payment mode (0: Postpaid; 1: Prepaid).
Expand Down
Loading
0