Skip to content

Commit 948b12d

Browse files
authored
fix/tdmq (#2046)
* fix/tdmq * fix/tdmq
1 parent b835d9b commit 948b12d

7 files changed

+26
-13
lines changed

tencentcloud/resource_tc_cls_data_transform.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,12 @@ package tencentcloud
6868
import (
6969
"context"
7070
"fmt"
71+
"log"
72+
7173
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
7274
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
7375
cls "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016"
7476
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
75-
"log"
7677
)
7778

7879
func resourceTencentCloudClsDataTransform() *schema.Resource {

tencentcloud/resource_tc_cls_data_transform_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ package tencentcloud
33
import (
44
"context"
55
"fmt"
6-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
7-
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
86
"testing"
97
"time"
8+
9+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
10+
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
1011
)
1112

1213
// go test -i; go test -test.run TestAccTencentCloudClsDataTransformResource_basic -v

tencentcloud/resource_tc_cls_kafka_recharge.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,13 @@ package tencentcloud
5353
import (
5454
"context"
5555
"fmt"
56+
"log"
57+
"strings"
58+
5659
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
5760
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
5861
cls "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016"
5962
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
60-
"log"
61-
"strings"
6263
)
6364

6465
func resourceTencentCloudClsKafkaRecharge() *schema.Resource {

tencentcloud/resource_tc_cls_kafka_recharge_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ package tencentcloud
33
import (
44
"context"
55
"fmt"
6-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
7-
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
86
"strings"
97
"testing"
8+
9+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
10+
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
1011
)
1112

1213
func TestAccTencentCloudClsKafkaRechargeResource_basic(t *testing.T) {

tencentcloud/resource_tc_cls_scheduled_sql.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,13 @@ package tencentcloud
5858
import (
5959
"context"
6060
"fmt"
61+
"log"
62+
"time"
63+
6164
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
6265
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
6366
cls "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016"
6467
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
65-
"log"
66-
"time"
6768
)
6869

6970
func resourceTencentCloudClsScheduledSql() *schema.Resource {

tencentcloud/resource_tc_cls_scheduled_sql_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ package tencentcloud
33
import (
44
"context"
55
"fmt"
6+
"testing"
7+
68
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
79
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
8-
"testing"
910
)
1011

1112
// go test -i; go test -test.run TestAccTencentCloudClsScheduledSqlResource_basic -v

tencentcloud/resource_tc_tdmq_subscription_attachment_test.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import (
66
"strings"
77
"testing"
88

9+
sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
10+
911
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1012
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
1113
)
@@ -23,11 +25,11 @@ func TestAccTencentCloudTdmqSubscriptionAttachmentResource_basic(t *testing.T) {
2325
{
2426
Config: testAccTdmqSubscriptionAttachment,
2527
Check: resource.ComposeTestCheckFunc(
26-
resource.TestCheckResourceAttrSet("tencentcloud_tdmq_subscription_attachment.subscription_attachment", "id"),
28+
resource.TestCheckResourceAttrSet("tencentcloud_tdmq_subscription_attachment.example", "id"),
2729
),
2830
},
2931
{
30-
ResourceName: "tencentcloud_tdmq_subscription_attachment.subscription_attachment",
32+
ResourceName: "tencentcloud_tdmq_subscription_attachment.example",
3133
ImportState: true,
3234
ImportStateVerify: true,
3335
},
@@ -58,6 +60,11 @@ func testAccCheckTdmqSubscriptionAttachmentDestroy(s *terraform.State) error {
5860
response, err := service.DescribeTdmqSubscriptionAttachmentById(ctx, environmentId, Topic, subscriptionName, clusterId)
5961

6062
if err != nil {
63+
if sdkerr, ok := err.(*sdkErrors.TencentCloudSDKError); ok {
64+
if sdkerr.Code == "ResourceNotFound.Cluster" {
65+
return nil
66+
}
67+
}
6168
return err
6269
}
6370

@@ -93,7 +100,7 @@ resource "tencentcloud_tdmq_topic" "example" {
93100
environ_id = tencentcloud_tdmq_namespace.example.environ_name
94101
cluster_id = tencentcloud_tdmq_instance.example.id
95102
topic_name = "tf-example-topic"
96-
partitions = 6
103+
partitions = 1
97104
pulsar_topic_type = 3
98105
remark = "remark."
99106
}

0 commit comments

Comments
 (0)