Skip to content

Commit 297937f

Browse files
authored
enhance rocketmq (#2078)
* enhance rocketmq * add changelog
1 parent 9419096 commit 297937f

File tree

5 files changed

+19
-47
lines changed

5 files changed

+19
-47
lines changed

.changelog/2078.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_tdmq_rocketmq_group: change `cluster_id`, `namespaces` and `group_id` to `ForceNew`
3+
```
4+
5+
```release-note:enhancement
6+
resource/tencentcloud_tdmq_rocketmq_environment_role: change `cluster_id`, `environment_name` and `role_name` to `ForceNew`
7+
```

tencentcloud/resource_tc_tdmq_rocketmq_environment_role.go

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,14 @@ func resourceTencentCloudTdmqRocketmqEnvironmentRole() *schema.Resource {
6262
"environment_name": {
6363
Type: schema.TypeString,
6464
Required: true,
65+
ForceNew: true,
6566
Description: "Environment (namespace) name.",
6667
},
6768

6869
"role_name": {
6970
Type: schema.TypeString,
7071
Required: true,
72+
ForceNew: true,
7173
Description: "Role Name.",
7274
},
7375

@@ -83,6 +85,7 @@ func resourceTencentCloudTdmqRocketmqEnvironmentRole() *schema.Resource {
8385
"cluster_id": {
8486
Type: schema.TypeString,
8587
Required: true,
88+
ForceNew: true,
8689
Description: "Cluster ID (required).",
8790
},
8891
},
@@ -205,18 +208,6 @@ func resourceTencentCloudTdmqRocketmqEnvironmentRoleUpdate(d *schema.ResourceDat
205208
request.RoleName = &roleName
206209
request.EnvironmentId = &environmentId
207210

208-
if d.HasChange("environment_id") {
209-
210-
return fmt.Errorf("`environment_id` do not support change now.")
211-
212-
}
213-
214-
if d.HasChange("role_name") {
215-
216-
return fmt.Errorf("`role_name` do not support change now.")
217-
218-
}
219-
220211
if d.HasChange("permissions") {
221212
if v, ok := d.GetOk("permissions"); ok {
222213
permissionsSet := v.(*schema.Set).List()
@@ -225,13 +216,6 @@ func resourceTencentCloudTdmqRocketmqEnvironmentRoleUpdate(d *schema.ResourceDat
225216
request.Permissions = append(request.Permissions, &permissions)
226217
}
227218
}
228-
229-
}
230-
231-
if d.HasChange("cluster_id") {
232-
233-
return fmt.Errorf("`cluster_id` do not support change now.")
234-
235219
}
236220

237221
err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {

tencentcloud/resource_tc_tdmq_rocketmq_group.go

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,14 @@ func resourceTencentCloudTdmqRocketmqGroup() *schema.Resource {
5757
Schema: map[string]*schema.Schema{
5858
"group_name": {
5959
Type: schema.TypeString,
60+
ForceNew: true,
6061
Required: true,
6162
Description: "Group name (8-64 characters).",
6263
},
6364

6465
"namespace": {
6566
Type: schema.TypeString,
67+
ForceNew: true,
6668
Required: true,
6769
Description: "Namespace. Currently, only one namespace is supported.",
6870
},
@@ -82,6 +84,7 @@ func resourceTencentCloudTdmqRocketmqGroup() *schema.Resource {
8284
"cluster_id": {
8385
Type: schema.TypeString,
8486
Required: true,
87+
ForceNew: true,
8588
Description: "Cluster ID.",
8689
},
8790

@@ -185,7 +188,6 @@ func resourceTencentCloudTdmqRocketmqGroupCreate(d *schema.ResourceData, meta in
185188
}
186189

187190
if v, ok := d.GetOk("remark"); ok {
188-
189191
request.Remark = helper.String(v.(string))
190192
}
191193

@@ -276,43 +278,22 @@ func resourceTencentCloudTdmqRocketmqGroupUpdate(d *schema.ResourceData, meta in
276278
request.NamespaceId = &namespaceId
277279
request.GroupId = &groupId
278280

279-
if d.HasChange("group_id") {
280-
281-
return fmt.Errorf("`group_id` do not support change now.")
282-
283-
}
284-
285-
if d.HasChange("namespaces") {
286-
287-
return fmt.Errorf("`namespaces` do not support change now.")
288-
289-
}
290-
291281
if d.HasChange("read_enable") {
292282
if v, ok := d.GetOk("read_enable"); ok {
293283
request.ReadEnable = helper.Bool(v.(bool))
294284
}
295-
296285
}
297286

298287
if d.HasChange("broadcast_enable") {
299288
if v, ok := d.GetOk("broadcast_enable"); ok {
300289
request.BroadcastEnable = helper.Bool(v.(bool))
301290
}
302-
303-
}
304-
305-
if d.HasChange("cluster_id") {
306-
307-
return fmt.Errorf("`cluster_id` do not support change now.")
308-
309291
}
310292

311293
if d.HasChange("remark") {
312294
if v, ok := d.GetOk("remark"); ok {
313295
request.Remark = helper.String(v.(string))
314296
}
315-
316297
}
317298

318299
err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {

website/docs/r/tdmq_rocketmq_environment_role.html.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ resource "tencentcloud_tdmq_rocketmq_environment_role" "example" {
4343

4444
The following arguments are supported:
4545

46-
* `cluster_id` - (Required, String) Cluster ID (required).
47-
* `environment_name` - (Required, String) Environment (namespace) name.
46+
* `cluster_id` - (Required, String, ForceNew) Cluster ID (required).
47+
* `environment_name` - (Required, String, ForceNew) Environment (namespace) name.
4848
* `permissions` - (Required, Set: [`String`]) Permissions, which is a non-empty string array of `produce` and `consume` at the most.
49-
* `role_name` - (Required, String) Role Name.
49+
* `role_name` - (Required, String, ForceNew) Role Name.
5050

5151
## Attributes Reference
5252

website/docs/r/tdmq_rocketmq_group.html.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ resource "tencentcloud_tdmq_rocketmq_group" "example" {
4040
The following arguments are supported:
4141

4242
* `broadcast_enable` - (Required, Bool) Whether to enable broadcast consumption.
43-
* `cluster_id` - (Required, String) Cluster ID.
44-
* `group_name` - (Required, String) Group name (8-64 characters).
45-
* `namespace` - (Required, String) Namespace. Currently, only one namespace is supported.
43+
* `cluster_id` - (Required, String, ForceNew) Cluster ID.
44+
* `group_name` - (Required, String, ForceNew) Group name (8-64 characters).
45+
* `namespace` - (Required, String, ForceNew) Namespace. Currently, only one namespace is supported.
4646
* `read_enable` - (Required, Bool) Whether to enable consumption.
4747
* `remark` - (Optional, String) Remarks (up to 128 characters).
4848

0 commit comments

Comments
 (0)