From ecbcc2b4333dc09f33e54240734dba499ab7e380 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Thu, 30 May 2024 16:54:57 +0800 Subject: [PATCH 1/7] add --- .../trocket/resource_tc_tdmq_rocketmq_vip_instance.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance.go b/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance.go index e18843107f..93b6c595ce 100644 --- a/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance.go +++ b/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance.go @@ -293,6 +293,10 @@ func resourceTencentCloudTdmqRocketmqVipInstanceRead(d *schema.ResourceData, met _ = d.Set("storage_size", storageSize) } + if rocketmqVipInstances != nil { + _ = d.Set("spec", rocketmqVipInstances.SpecName) + } + return nil } From 6f04fcd3484b346ff371e01ed63be46edfeb7ca0 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Thu, 30 May 2024 17:01:30 +0800 Subject: [PATCH 2/7] add --- .../trocket/resource_tc_tdmq_rocketmq_vip_instance.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance.go b/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance.go index 93b6c595ce..e18843107f 100644 --- a/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance.go +++ b/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance.go @@ -293,10 +293,6 @@ func resourceTencentCloudTdmqRocketmqVipInstanceRead(d *schema.ResourceData, met _ = d.Set("storage_size", storageSize) } - if rocketmqVipInstances != nil { - _ = d.Set("spec", rocketmqVipInstances.SpecName) - } - return nil } From 1f91f208ecf555c84f9e12799fed84912fce4c9d Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Fri, 31 May 2024 11:34:20 +0800 Subject: [PATCH 3/7] add --- .../resource_tc_tdmq_rocketmq_vip_instance_test.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance_test.go b/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance_test.go index 3ada3467e0..5e6953c6aa 100644 --- a/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance_test.go +++ b/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance_test.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "testing" + "time" tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common" @@ -14,8 +15,8 @@ import ( sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors" ) -// go test -i; go test -test.run TestAccTencentCloudNeedFixTdmqRocketmqVipInstanceResource_basic -v -func TestAccTencentCloudNeedFixTdmqRocketmqVipInstanceResource_basic(t *testing.T) { +// go test -i; go test -test.run TestAccTencentCloudTdmqRocketmqVipInstanceResource_basic -v -timeout=0 +func TestAccTencentCloudTdmqRocketmqVipInstanceResource_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { @@ -33,6 +34,7 @@ func TestAccTencentCloudNeedFixTdmqRocketmqVipInstanceResource_basic(t *testing. resource.TestCheckResourceAttrSet("tencentcloud_tdmq_rocketmq_vip_instance.example", "spec"), resource.TestCheckResourceAttrSet("tencentcloud_tdmq_rocketmq_vip_instance.example", "node_count"), resource.TestCheckResourceAttrSet("tencentcloud_tdmq_rocketmq_vip_instance.example", "storage_size"), + sleepBetweenSteps(1*time.Minute), ), }, { @@ -44,12 +46,20 @@ func TestAccTencentCloudNeedFixTdmqRocketmqVipInstanceResource_basic(t *testing. resource.TestCheckResourceAttrSet("tencentcloud_tdmq_rocketmq_vip_instance.example", "spec"), resource.TestCheckResourceAttrSet("tencentcloud_tdmq_rocketmq_vip_instance.example", "node_count"), resource.TestCheckResourceAttrSet("tencentcloud_tdmq_rocketmq_vip_instance.example", "storage_size"), + sleepBetweenSteps(1*time.Minute), ), }, }, }) } +func sleepBetweenSteps(d time.Duration) resource.TestCheckFunc { + return func(s *terraform.State) error { + time.Sleep(d) + return nil + } +} + func testAccCheckTdmqRocketmqVipInstanceDestroy(s *terraform.State) error { logId := tccommon.GetLogId(tccommon.ContextNil) ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId) From 00616806c835195eeb235be9ccf4c160f462f987 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Tue, 4 Jun 2024 09:46:54 +0800 Subject: [PATCH 4/7] add --- .changelog/2666.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/2666.txt diff --git a/.changelog/2666.txt b/.changelog/2666.txt new file mode 100644 index 0000000000..8ce781a800 --- /dev/null +++ b/.changelog/2666.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/tencentcloud_tdmq_rocketmq_vip_instance: add e2e time sleep +``` From 32736006716efd45c22aaae3b721d7aa89c96260 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Tue, 4 Jun 2024 10:33:59 +0800 Subject: [PATCH 5/7] add --- .changelog/2666.txt | 3 --- tencentcloud/common/common.go | 8 ++++++++ .../resource_tc_tdmq_rocketmq_vip_instance_test.go | 11 ++--------- 3 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 .changelog/2666.txt diff --git a/.changelog/2666.txt b/.changelog/2666.txt deleted file mode 100644 index 8ce781a800..0000000000 --- a/.changelog/2666.txt +++ /dev/null @@ -1,3 +0,0 @@ -```release-note:enhancement -resource/tencentcloud_tdmq_rocketmq_vip_instance: add e2e time sleep -``` diff --git a/tencentcloud/common/common.go b/tencentcloud/common/common.go index f9f5d6726f..ea406f2a59 100644 --- a/tencentcloud/common/common.go +++ b/tencentcloud/common/common.go @@ -18,6 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" "github.com/mitchellh/go-homedir" "github.com/pkg/errors" sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors" @@ -610,3 +611,10 @@ func ShortRegionNameParse(shortRegion string) string { } return regionMap[shortRegion] } + +func E2eTimeSleepBetweenSteps(d time.Duration) resource.TestCheckFunc { + return func(s *terraform.State) error { + time.Sleep(d) + return nil + } +} diff --git a/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance_test.go b/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance_test.go index 5e6953c6aa..a55d87f02f 100644 --- a/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance_test.go +++ b/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance_test.go @@ -34,7 +34,7 @@ func TestAccTencentCloudTdmqRocketmqVipInstanceResource_basic(t *testing.T) { resource.TestCheckResourceAttrSet("tencentcloud_tdmq_rocketmq_vip_instance.example", "spec"), resource.TestCheckResourceAttrSet("tencentcloud_tdmq_rocketmq_vip_instance.example", "node_count"), resource.TestCheckResourceAttrSet("tencentcloud_tdmq_rocketmq_vip_instance.example", "storage_size"), - sleepBetweenSteps(1*time.Minute), + tccommon.E2eTimeSleepBetweenSteps(1*time.Minute), ), }, { @@ -46,20 +46,13 @@ func TestAccTencentCloudTdmqRocketmqVipInstanceResource_basic(t *testing.T) { resource.TestCheckResourceAttrSet("tencentcloud_tdmq_rocketmq_vip_instance.example", "spec"), resource.TestCheckResourceAttrSet("tencentcloud_tdmq_rocketmq_vip_instance.example", "node_count"), resource.TestCheckResourceAttrSet("tencentcloud_tdmq_rocketmq_vip_instance.example", "storage_size"), - sleepBetweenSteps(1*time.Minute), + tccommon.E2eTimeSleepBetweenSteps(1*time.Minute), ), }, }, }) } -func sleepBetweenSteps(d time.Duration) resource.TestCheckFunc { - return func(s *terraform.State) error { - time.Sleep(d) - return nil - } -} - func testAccCheckTdmqRocketmqVipInstanceDestroy(s *terraform.State) error { logId := tccommon.GetLogId(tccommon.ContextNil) ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId) From dc3b318f265c1faa2a768dc16ef584e7b5b62350 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Wed, 5 Jun 2024 16:30:23 +0800 Subject: [PATCH 6/7] add --- .../trocket/resource_tc_tdmq_rocketmq_vip_instance_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance_test.go b/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance_test.go index a55d87f02f..99dd6c64d8 100644 --- a/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance_test.go +++ b/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance_test.go @@ -103,7 +103,7 @@ func testAccCheckTdmqRocketmqVipInstanceExists(r string) resource.TestCheckFunc } } -const testAccTdmqRocketmqVipInstance = tcacctest.DefaultVpcSubnets + ` +const testAccTdmqRocketmqVipInstance = ` data "tencentcloud_availability_zones" "zones" {} # create vpc From 39ea1aced67a58e6ff0e8da04dd8aa575428280f Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Wed, 5 Jun 2024 20:45:02 +0800 Subject: [PATCH 7/7] add --- tencentcloud/acctest/test_util.go | 8 ++++++++ tencentcloud/common/common.go | 8 -------- .../services/cvm/resource_tc_reserved_instance_test.go | 3 ++- .../resource_tc_tdmq_rocketmq_vip_instance_test.go | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/tencentcloud/acctest/test_util.go b/tencentcloud/acctest/test_util.go index b0a75821d5..a844b5ebf2 100644 --- a/tencentcloud/acctest/test_util.go +++ b/tencentcloud/acctest/test_util.go @@ -5,6 +5,7 @@ import ( "log" "os" "testing" + "time" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -251,3 +252,10 @@ func SharedClientForRegion(region string) (interface{}, error) { return &tcClient, nil } + +func AccStepTimeSleepDuration(d time.Duration) resource.TestCheckFunc { + return func(s *terraform.State) error { + time.Sleep(d) + return nil + } +} diff --git a/tencentcloud/common/common.go b/tencentcloud/common/common.go index ea406f2a59..f9f5d6726f 100644 --- a/tencentcloud/common/common.go +++ b/tencentcloud/common/common.go @@ -18,7 +18,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" "github.com/mitchellh/go-homedir" "github.com/pkg/errors" sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors" @@ -611,10 +610,3 @@ func ShortRegionNameParse(shortRegion string) string { } return regionMap[shortRegion] } - -func E2eTimeSleepBetweenSteps(d time.Duration) resource.TestCheckFunc { - return func(s *terraform.State) error { - time.Sleep(d) - return nil - } -} diff --git a/tencentcloud/services/cvm/resource_tc_reserved_instance_test.go b/tencentcloud/services/cvm/resource_tc_reserved_instance_test.go index 24ca685c9a..cd10e3a45a 100644 --- a/tencentcloud/services/cvm/resource_tc_reserved_instance_test.go +++ b/tencentcloud/services/cvm/resource_tc_reserved_instance_test.go @@ -1,9 +1,10 @@ package cvm_test import ( - tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" "testing" + tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance_test.go b/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance_test.go index 99dd6c64d8..5455445039 100644 --- a/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance_test.go +++ b/tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance_test.go @@ -34,7 +34,7 @@ func TestAccTencentCloudTdmqRocketmqVipInstanceResource_basic(t *testing.T) { resource.TestCheckResourceAttrSet("tencentcloud_tdmq_rocketmq_vip_instance.example", "spec"), resource.TestCheckResourceAttrSet("tencentcloud_tdmq_rocketmq_vip_instance.example", "node_count"), resource.TestCheckResourceAttrSet("tencentcloud_tdmq_rocketmq_vip_instance.example", "storage_size"), - tccommon.E2eTimeSleepBetweenSteps(1*time.Minute), + tcacctest.AccStepTimeSleepDuration(1*time.Minute), ), }, { @@ -46,7 +46,7 @@ func TestAccTencentCloudTdmqRocketmqVipInstanceResource_basic(t *testing.T) { resource.TestCheckResourceAttrSet("tencentcloud_tdmq_rocketmq_vip_instance.example", "spec"), resource.TestCheckResourceAttrSet("tencentcloud_tdmq_rocketmq_vip_instance.example", "node_count"), resource.TestCheckResourceAttrSet("tencentcloud_tdmq_rocketmq_vip_instance.example", "storage_size"), - tccommon.E2eTimeSleepBetweenSteps(1*time.Minute), + tcacctest.AccStepTimeSleepDuration(1*time.Minute), ), }, },