Skip to content

Commit 05634f0

Browse files
SevenEarthSevenEarth
authored
fix/tdmq (#2029)
* fix/tdmq * fix/tdmq * fix/tdmq * fix/tdmq
1 parent 7716930 commit 05634f0

32 files changed

+441
-490
lines changed

‎.changelog/2029.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_namespace: Abandoned parameters: 'ttl', 'retention_time`.
3+
```
4+
5+
```release-note:enhancement
6+
resource/tencentcloud_tdmq_rocketmq_vip_instance: Optimize `storage_size` parameter issue
7+
```

‎tencentcloud/data_source_tc_tdmq_rocketmq_cluster.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@ Use this data source to query detailed information of tdmqRocketmq cluster
44
Example Usage
55
66
```hcl
7-
data "tencentcloud_tdmq_rocketmq_cluster" "cluster" {
8-
name_keyword = "test_rocketmq"
7+
data "tencentcloud_tdmq_rocketmq_cluster" "example" {
8+
name_keyword = tencentcloud_tdmq_rocketmq_cluster.example.cluster_name
9+
}
10+
11+
resource "tencentcloud_tdmq_rocketmq_cluster" "example" {
12+
cluster_name = "tf_example"
13+
remark = "remark."
914
}
1015
```
1116
*/

‎tencentcloud/data_source_tc_tdmq_rocketmq_cluster_test.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
77
)
88

9+
// go test -i; go test -test.run TestAccTencentCloudTdmqRocketmqClusterDataSource -v
910
func TestAccTencentCloudTdmqRocketmqClusterDataSource(t *testing.T) {
1011
t.Parallel()
1112

@@ -16,21 +17,21 @@ func TestAccTencentCloudTdmqRocketmqClusterDataSource(t *testing.T) {
1617
{
1718
Config: testAccDataSourceRocketmqCluster,
1819
Check: resource.ComposeTestCheckFunc(
19-
testAccCheckTencentCloudDataSourceID("data.tencentcloud_tdmq_rocketmq_cluster.cluster"),
20-
resource.TestCheckResourceAttr("data.tencentcloud_tdmq_rocketmq_cluster.cluster", "cluster_list.#", "1"),
20+
testAccCheckTencentCloudDataSourceID("data.tencentcloud_tdmq_rocketmq_cluster.example"),
21+
resource.TestCheckResourceAttrSet("data.tencentcloud_tdmq_rocketmq_cluster.example", "name_keyword"),
2122
),
2223
},
2324
},
2425
})
2526
}
2627

2728
const testAccDataSourceRocketmqCluster = `
28-
resource "tencentcloud_tdmq_rocketmq_cluster" "cluster" {
29-
cluster_name = "test_rocketmq_datasource"
30-
remark = "test recket mq"
29+
data "tencentcloud_tdmq_rocketmq_cluster" "example" {
30+
name_keyword = tencentcloud_tdmq_rocketmq_cluster.example.cluster_name
3131
}
3232
33-
data "tencentcloud_tdmq_rocketmq_cluster" "cluster" {
34-
name_keyword = "test_rocketmq_datasource"
33+
resource "tencentcloud_tdmq_rocketmq_cluster" "example" {
34+
cluster_name = "tf_example"
35+
remark = "remark."
3536
}
3637
`

‎tencentcloud/data_source_tc_tdmq_rocketmq_group.go‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,30 @@ Use this data source to query detailed information of tdmqRocketmq group
44
Example Usage
55
66
```hcl
7-
resource "tencentcloud_tdmq_rocketmq_cluster" "cluster" {
8-
cluster_name = "test_rocketmq_datasource_group"
9-
remark = "test recket mq"
7+
data "tencentcloud_tdmq_rocketmq_group" "example" {
8+
cluster_id = tencentcloud_tdmq_rocketmq_cluster.example.cluster_id
9+
namespace_id = tencentcloud_tdmq_rocketmq_namespace.example.namespace_name
10+
filter_group = tencentcloud_tdmq_rocketmq_group.example.group_name
1011
}
1112
12-
resource "tencentcloud_tdmq_rocketmq_namespace" "namespace" {
13-
cluster_id = tencentcloud_tdmq_rocketmq_cluster.cluster.cluster_id
14-
namespace_name = "test_namespace_datasource"
15-
ttl = 65000
16-
retention_time = 65000
17-
remark = "test namespace"
13+
resource "tencentcloud_tdmq_rocketmq_cluster" "example" {
14+
cluster_name = "tf_example"
15+
remark = "remark."
1816
}
1917
20-
resource "tencentcloud_tdmq_rocketmq_group" "group" {
21-
group_name = "test_rocketmq_group"
22-
namespace = tencentcloud_tdmq_rocketmq_namespace.namespace.namespace_name
23-
read_enable = true
24-
broadcast_enable = true
25-
cluster_id = tencentcloud_tdmq_rocketmq_cluster.cluster.cluster_id
26-
remark = "test rocketmq group"
18+
resource "tencentcloud_tdmq_rocketmq_namespace" "example" {
19+
cluster_id = tencentcloud_tdmq_rocketmq_cluster.example.cluster_id
20+
namespace_name = "tf_example"
21+
remark = "remark."
2722
}
2823
29-
data "tencentcloud_tdmq_rocketmq_group" "group" {
30-
cluster_id = tencentcloud_tdmq_rocketmq_cluster.cluster.cluster_id
31-
namespace_id = tencentcloud_tdmq_rocketmq_namespace.namespace.namespace_name
32-
filter_group = tencentcloud_tdmq_rocketmq_group.group.group_name
24+
resource "tencentcloud_tdmq_rocketmq_group" "example" {
25+
group_name = "tf_example"
26+
namespace = tencentcloud_tdmq_rocketmq_namespace.example.namespace_name
27+
read_enable = true
28+
broadcast_enable = true
29+
cluster_id = tencentcloud_tdmq_rocketmq_cluster.example.cluster_id
30+
remark = "remark."
3331
}
3432
```
3533
*/

‎tencentcloud/data_source_tc_tdmq_rocketmq_group_test.go‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
77
)
88

9+
// go test -i; go test -test.run TestAccTencentCloudTdmqRocketmqGroupDataSource -v
910
func TestAccTencentCloudTdmqRocketmqGroupDataSource(t *testing.T) {
1011
t.Parallel()
1112

@@ -16,40 +17,40 @@ func TestAccTencentCloudTdmqRocketmqGroupDataSource(t *testing.T) {
1617
{
1718
Config: testAccDataSourceTdmqRocketmqGroup,
1819
Check: resource.ComposeTestCheckFunc(
19-
testAccCheckTencentCloudDataSourceID("data.tencentcloud_tdmq_rocketmq_group.group"),
20-
resource.TestCheckResourceAttr("data.tencentcloud_tdmq_rocketmq_group.group", "groups.#", "1"),
20+
testAccCheckTencentCloudDataSourceID("data.tencentcloud_tdmq_rocketmq_group.example"),
21+
resource.TestCheckResourceAttrSet("data.tencentcloud_tdmq_rocketmq_group.example", "cluster_id"),
22+
resource.TestCheckResourceAttrSet("data.tencentcloud_tdmq_rocketmq_group.example", "namespace_id"),
23+
resource.TestCheckResourceAttrSet("data.tencentcloud_tdmq_rocketmq_group.example", "filter_group"),
2124
),
2225
},
2326
},
2427
})
2528
}
2629

2730
const testAccDataSourceTdmqRocketmqGroup = `
28-
resource "tencentcloud_tdmq_rocketmq_cluster" "cluster" {
29-
cluster_name = "test_rocketmq_datasource_group"
30-
remark = "test recket mq"
31-
}
32-
33-
resource "tencentcloud_tdmq_rocketmq_namespace" "namespace" {
34-
cluster_id = tencentcloud_tdmq_rocketmq_cluster.cluster.cluster_id
35-
namespace_name = "test_namespace_datasource"
36-
ttl = 65000
37-
retention_time = 65000
38-
remark = "test namespace"
39-
}
40-
41-
resource "tencentcloud_tdmq_rocketmq_group" "group" {
42-
group_name = "test_rocketmq_group"
43-
namespace = tencentcloud_tdmq_rocketmq_namespace.namespace.namespace_name
44-
read_enable = true
45-
broadcast_enable = true
46-
cluster_id = tencentcloud_tdmq_rocketmq_cluster.cluster.cluster_id
47-
remark = "test rocketmq group"
48-
}
49-
50-
data "tencentcloud_tdmq_rocketmq_group" "group" {
51-
cluster_id = tencentcloud_tdmq_rocketmq_cluster.cluster.cluster_id
52-
namespace_id = tencentcloud_tdmq_rocketmq_namespace.namespace.namespace_name
53-
filter_group = tencentcloud_tdmq_rocketmq_group.group.group_name
54-
}
31+
data "tencentcloud_tdmq_rocketmq_group" "example" {
32+
cluster_id = tencentcloud_tdmq_rocketmq_cluster.example.cluster_id
33+
namespace_id = tencentcloud_tdmq_rocketmq_namespace.example.namespace_name
34+
filter_group = tencentcloud_tdmq_rocketmq_group.example.group_name
35+
}
36+
37+
resource "tencentcloud_tdmq_rocketmq_cluster" "example" {
38+
cluster_name = "tf_example"
39+
remark = "remark."
40+
}
41+
42+
resource "tencentcloud_tdmq_rocketmq_namespace" "example" {
43+
cluster_id = tencentcloud_tdmq_rocketmq_cluster.example.cluster_id
44+
namespace_name = "tf_example"
45+
remark = "remark."
46+
}
47+
48+
resource "tencentcloud_tdmq_rocketmq_group" "example" {
49+
group_name = "tf_example"
50+
namespace = tencentcloud_tdmq_rocketmq_namespace.example.namespace_name
51+
read_enable = true
52+
broadcast_enable = true
53+
cluster_id = tencentcloud_tdmq_rocketmq_cluster.example.cluster_id
54+
remark = "remark."
55+
}
5556
`

‎tencentcloud/data_source_tc_tdmq_rocketmq_namespace.go‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,20 @@ Use this data source to query detailed information of tdmqRocketmq namespace
44
Example Usage
55
66
```hcl
7-
resource "tencentcloud_tdmq_rocketmq_cluster" "cluster" {
8-
cluster_name = "test_rocketmq_namespace_sdatasource"
9-
remark = "test recket mq"
7+
data "tencentcloud_tdmq_rocketmq_namespace" "example" {
8+
cluster_id = tencentcloud_tdmq_rocketmq_cluster.example.cluster_id
9+
name_keyword = tencentcloud_tdmq_rocketmq_namespace.example.namespace_name
1010
}
1111
12-
resource "tencentcloud_tdmq_rocketmq_namespace" "namespacedata" {
13-
cluster_id = tencentcloud_tdmq_rocketmq_cluster.cluster.cluster_id
14-
namespace_name = "test_namespace_datasource"
15-
ttl = 65000
16-
retention_time = 65000
17-
remark = "test namespace"
12+
resource "tencentcloud_tdmq_rocketmq_cluster" "example" {
13+
cluster_name = "tf_example"
14+
remark = "remark."
1815
}
1916
20-
data "tencentcloud_tdmq_rocketmq_namespace" "namespace" {
21-
cluster_id = tencentcloud_tdmq_rocketmq_cluster.cluster.cluster_id
22-
name_keyword = tencentcloud_tdmq_rocketmq_namespace.namespacedata.namespace_name
17+
resource "tencentcloud_tdmq_rocketmq_namespace" "example" {
18+
cluster_id = tencentcloud_tdmq_rocketmq_cluster.example.cluster_id
19+
namespace_name = "tf_example"
20+
remark = "remark."
2321
}
2422
```
2523
*/

‎tencentcloud/data_source_tc_tdmq_rocketmq_namespace_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
77
)
88

9+
// go test -i; go test -test.run TestAccTencentCloudTdmqRocketmqNamespaceDataSource -v
910
func TestAccTencentCloudTdmqRocketmqNamespaceDataSource(t *testing.T) {
1011
t.Parallel()
1112

@@ -16,30 +17,29 @@ func TestAccTencentCloudTdmqRocketmqNamespaceDataSource(t *testing.T) {
1617
{
1718
Config: testAccDataSourceTdmqRocketmqNamespace,
1819
Check: resource.ComposeTestCheckFunc(
19-
testAccCheckTencentCloudDataSourceID("data.tencentcloud_tdmq_rocketmq_namespace.namespace"),
20-
resource.TestCheckResourceAttr("data.tencentcloud_tdmq_rocketmq_namespace.namespace", "namespaces.#", "1"),
20+
testAccCheckTencentCloudDataSourceID("data.tencentcloud_tdmq_rocketmq_namespace.example"),
21+
resource.TestCheckResourceAttrSet("data.tencentcloud_tdmq_rocketmq_namespace.example", "cluster_id"),
22+
resource.TestCheckResourceAttrSet("data.tencentcloud_tdmq_rocketmq_namespace.example", "name_keyword"),
2123
),
2224
},
2325
},
2426
})
2527
}
2628

2729
const testAccDataSourceTdmqRocketmqNamespace = `
28-
resource "tencentcloud_tdmq_rocketmq_cluster" "cluster" {
29-
cluster_name = "test_rocketmq_namespace_sdatasource"
30-
remark = "test recket mq"
30+
data "tencentcloud_tdmq_rocketmq_namespace" "example" {
31+
cluster_id = tencentcloud_tdmq_rocketmq_cluster.example.cluster_id
32+
name_keyword = tencentcloud_tdmq_rocketmq_namespace.example.namespace_name
3133
}
3234
33-
resource "tencentcloud_tdmq_rocketmq_namespace" "namespacedata" {
34-
cluster_id = tencentcloud_tdmq_rocketmq_cluster.cluster.cluster_id
35-
namespace_name = "test_namespace_datasource"
36-
ttl = 65000
37-
retention_time = 65000
38-
remark = "test namespace"
35+
resource "tencentcloud_tdmq_rocketmq_cluster" "example" {
36+
cluster_name = "tf_example"
37+
remark = "remark."
3938
}
4039
41-
data "tencentcloud_tdmq_rocketmq_namespace" "namespace" {
42-
cluster_id = tencentcloud_tdmq_rocketmq_cluster.cluster.cluster_id
43-
name_keyword = tencentcloud_tdmq_rocketmq_namespace.namespacedata.namespace_name
40+
resource "tencentcloud_tdmq_rocketmq_namespace" "example" {
41+
cluster_id = tencentcloud_tdmq_rocketmq_cluster.example.cluster_id
42+
namespace_name = "tf_example"
43+
remark = "remark."
4444
}
4545
`

‎tencentcloud/data_source_tc_tdmq_rocketmq_topic.go‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,29 @@ Use this data source to query detailed information of tdmqRocketmq topic
44
Example Usage
55
66
```hcl
7-
resource "tencentcloud_tdmq_rocketmq_cluster" "cluster" {
8-
cluster_name = "test_rocketmq"
9-
remark = "test recket mq"
7+
data "tencentcloud_tdmq_rocketmq_topic" "example" {
8+
cluster_id = tencentcloud_tdmq_rocketmq_cluster.example.cluster_id
9+
namespace_id = tencentcloud_tdmq_rocketmq_namespace.example.namespace_name
10+
filter_name = tencentcloud_tdmq_rocketmq_topic.example.topic_name
1011
}
1112
12-
resource "tencentcloud_tdmq_rocketmq_namespace" "namespace" {
13-
cluster_id = tencentcloud_tdmq_rocketmq_cluster.cluster.cluster_id
14-
namespace_name = "test_namespace"
15-
ttl = 65000
16-
retention_time = 65000
17-
remark = "test namespace"
13+
resource "tencentcloud_tdmq_rocketmq_cluster" "example" {
14+
cluster_name = "tf_example"
15+
remark = "remark."
1816
}
1917
20-
resource "tencentcloud_tdmq_rocketmq_topic" "topic" {
21-
topic_name = "test_rocketmq_topic"
22-
namespace_name = tencentcloud_tdmq_rocketmq_namespace.namespace.namespace_name
23-
type = "Normal"
24-
cluster_id = tencentcloud_tdmq_rocketmq_cluster.cluster.cluster_id
25-
remark = "test rocketmq topic"
18+
resource "tencentcloud_tdmq_rocketmq_namespace" "example" {
19+
cluster_id = tencentcloud_tdmq_rocketmq_cluster.example.cluster_id
20+
namespace_name = "tf_example"
21+
remark = "remark."
2622
}
2723
28-
data "tencentcloud_tdmq_rocketmq_topic" "topic" {
29-
cluster_id = tencentcloud_tdmq_rocketmq_cluster.cluster.cluster_id
30-
namespace_id = tencentcloud_tdmq_rocketmq_namespace.namespace.namespace_name
31-
filter_name = tencentcloud_tdmq_rocketmq_topic.topic.topic_name
24+
resource "tencentcloud_tdmq_rocketmq_topic" "example" {
25+
topic_name = "tf_example"
26+
namespace_name = tencentcloud_tdmq_rocketmq_namespace.example.namespace_name
27+
cluster_id = tencentcloud_tdmq_rocketmq_cluster.example.cluster_id
28+
type = "Normal"
29+
remark = "remark."
3230
}
3331
```
3432
*/

‎tencentcloud/data_source_tc_tdmq_rocketmq_topic_test.go‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
77
)
88

9+
// go test -i; go test -test.run TestAccTencentCloudTdmqRocketmqTopicDataSource -v
910
func TestAccTencentCloudTdmqRocketmqTopicDataSource(t *testing.T) {
1011
t.Parallel()
1112

@@ -16,40 +17,39 @@ func TestAccTencentCloudTdmqRocketmqTopicDataSource(t *testing.T) {
1617
{
1718
Config: testAccDataSourceTdmqRocketmqTopic,
1819
Check: resource.ComposeTestCheckFunc(
19-
testAccCheckTencentCloudDataSourceID("data.tencentcloud_tdmq_rocketmq_topic.topic"),
20-
resource.TestCheckResourceAttr("data.tencentcloud_tdmq_rocketmq_topic.topic", "topics.#", "1"),
20+
testAccCheckTencentCloudDataSourceID("data.tencentcloud_tdmq_rocketmq_topic.example"),
21+
resource.TestCheckResourceAttrSet("data.tencentcloud_tdmq_rocketmq_topic.example", "cluster_id"),
22+
resource.TestCheckResourceAttrSet("data.tencentcloud_tdmq_rocketmq_topic.example", "namespace_id"),
23+
resource.TestCheckResourceAttrSet("data.tencentcloud_tdmq_rocketmq_topic.example", "filter_name"),
2124
),
2225
},
2326
},
2427
})
2528
}
2629

2730
const testAccDataSourceTdmqRocketmqTopic = `
31+
data "tencentcloud_tdmq_rocketmq_topic" "example" {
32+
cluster_id = tencentcloud_tdmq_rocketmq_cluster.example.cluster_id
33+
namespace_id = tencentcloud_tdmq_rocketmq_namespace.example.namespace_name
34+
filter_name = tencentcloud_tdmq_rocketmq_topic.example.topic_name
35+
}
36+
37+
resource "tencentcloud_tdmq_rocketmq_cluster" "example" {
38+
cluster_name = "tf_example"
39+
remark = "remark."
40+
}
2841
29-
resource "tencentcloud_tdmq_rocketmq_cluster" "cluster" {
30-
cluster_name = "test_rocketmq_datasource_topic"
31-
remark = "test recket mq"
42+
resource "tencentcloud_tdmq_rocketmq_namespace" "example" {
43+
cluster_id = tencentcloud_tdmq_rocketmq_cluster.example.cluster_id
44+
namespace_name = "tf_example"
45+
remark = "remark."
3246
}
3347
34-
resource "tencentcloud_tdmq_rocketmq_namespace" "namespace" {
35-
cluster_id = tencentcloud_tdmq_rocketmq_cluster.cluster.cluster_id
36-
namespace_name = "test_namespace_datasource_topic"
37-
ttl = 65000
38-
retention_time = 65000
39-
remark = "test namespace"
40-
}
41-
42-
resource "tencentcloud_tdmq_rocketmq_topic" "topic" {
43-
topic_name = "test_rocketmq_topic"
44-
namespace_name = tencentcloud_tdmq_rocketmq_namespace.namespace.namespace_name
45-
type = "Normal"
46-
cluster_id = tencentcloud_tdmq_rocketmq_cluster.cluster.cluster_id
47-
remark = "test rocketmq topic"
48-
}
49-
50-
data "tencentcloud_tdmq_rocketmq_topic" "topic" {
51-
cluster_id = tencentcloud_tdmq_rocketmq_cluster.cluster.cluster_id
52-
namespace_id = tencentcloud_tdmq_rocketmq_namespace.namespace.namespace_name
53-
filter_name = tencentcloud_tdmq_rocketmq_topic.topic.topic_name
54-
}
48+
resource "tencentcloud_tdmq_rocketmq_topic" "example" {
49+
topic_name = "tf_example"
50+
namespace_name = tencentcloud_tdmq_rocketmq_namespace.example.namespace_name
51+
cluster_id = tencentcloud_tdmq_rocketmq_cluster.example.cluster_id
52+
type = "Normal"
53+
remark = "remark."
54+
}
5555
`

0 commit comments

Comments
 (0)