Skip to content

Commit aee5819

Browse files
author
hellertang
authored
fix resource related to vod, while user create vod resource use sub app id. (#707)
1 parent c4a110b commit aee5819

10 files changed

+78
-28
lines changed

‎tencentcloud/resource_tc_vod_adaptive_dynamic_streaming_template.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,12 +313,13 @@ func resourceTencentCloudVodAdaptiveDynamicStreamingTemplateRead(d *schema.Resou
313313
logId = getLogId(contextNil)
314314
ctx = context.WithValue(context.TODO(), logIdKey, logId)
315315
id = d.Id()
316+
subAppId = d.Get("sub_app_id").(int)
316317
client = meta.(*TencentCloudClient).apiV3Conn
317318
vodService = VodService{client: client}
318319
)
319320
// waiting for refreshing cache
320321
time.Sleep(30 * time.Second)
321-
template, has, err := vodService.DescribeAdaptiveDynamicStreamingTemplatesById(ctx, id)
322+
template, has, err := vodService.DescribeAdaptiveDynamicStreamingTemplatesById(ctx, id, subAppId)
322323
if err != nil {
323324
return err
324325
}

‎tencentcloud/resource_tc_vod_adaptive_dynamic_streaming_template_test.go‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,17 @@ func testAccCheckVodAdaptiveDynamicStreamingTemplateDestroy(s *terraform.State)
9292
if rs.Type != "tencentcloud_vod_adaptive_dynamic_streaming_template" {
9393
continue
9494
}
95+
var (
96+
filter = map[string]interface{}{
97+
"definitions": []string{rs.Primary.ID},
98+
}
99+
)
95100

96-
_, has, err := vodService.DescribeAdaptiveDynamicStreamingTemplatesById(ctx, rs.Primary.ID)
101+
templates, err := vodService.DescribeAdaptiveDynamicStreamingTemplatesByFilter(ctx, filter)
97102
if err != nil {
98103
return err
99104
}
100-
if !has {
105+
if len(templates) == 0 || len(templates) != 1 {
101106
return nil
102107
}
103108
return fmt.Errorf("vod adaptive dynamic streaming template still exists: %s", rs.Primary.ID)
@@ -120,11 +125,17 @@ func testAccCheckVodAdaptiveDynamicStreamingTemplateExists(n string) resource.Te
120125
vodService := VodService{
121126
client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn,
122127
}
123-
_, has, err := vodService.DescribeAdaptiveDynamicStreamingTemplatesById(ctx, rs.Primary.ID)
128+
var (
129+
filter = map[string]interface{}{
130+
"definitions": []string{rs.Primary.ID},
131+
}
132+
)
133+
134+
templates, err := vodService.DescribeAdaptiveDynamicStreamingTemplatesByFilter(ctx, filter)
124135
if err != nil {
125136
return err
126137
}
127-
if !has {
138+
if len(templates) == 0 || len(templates) != 1 {
128139
return fmt.Errorf("vod adaptive dynamic streaming template doesn't exist: %s", rs.Primary.ID)
129140
}
130141
return nil

‎tencentcloud/resource_tc_vod_image_sprite_template.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,13 @@ func resourceTencentCloudVodImageSpriteTemplateRead(d *schema.ResourceData, meta
184184
logId = getLogId(contextNil)
185185
ctx = context.WithValue(context.TODO(), logIdKey, logId)
186186
id = d.Id()
187+
subAppId = d.Get("sub_app_id").(int)
187188
client = meta.(*TencentCloudClient).apiV3Conn
188189
vodService = VodService{client: client}
189190
)
190191
// waiting for refreshing cache
191192
time.Sleep(30 * time.Second)
192-
template, has, err := vodService.DescribeImageSpriteTemplatesById(ctx, id)
193+
template, has, err := vodService.DescribeImageSpriteTemplatesById(ctx, id, subAppId)
193194
if err != nil {
194195
return err
195196
}

‎tencentcloud/resource_tc_vod_image_sprite_template_test.go‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,17 @@ func testAccCheckVodImageSpriteTemplateDestroy(s *terraform.State) error {
6969
if rs.Type != "tencentcloud_vod_image_sprite_template" {
7070
continue
7171
}
72+
var (
73+
filter = map[string]interface{}{
74+
"definitions": []string{rs.Primary.ID},
75+
}
76+
)
7277

73-
_, has, err := vodService.DescribeImageSpriteTemplatesById(ctx, rs.Primary.ID)
78+
templates, err := vodService.DescribeImageSpriteTemplatesByFilter(ctx, filter)
7479
if err != nil {
7580
return err
7681
}
77-
if !has {
82+
if len(templates) == 0 {
7883
return nil
7984
}
8085
return fmt.Errorf("vod image sprite template still exists: %s", rs.Primary.ID)
@@ -97,11 +102,16 @@ func testAccCheckVodImageSpriteTemplateExists(n string) resource.TestCheckFunc {
97102
vodService := VodService{
98103
client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn,
99104
}
100-
_, has, err := vodService.DescribeImageSpriteTemplatesById(ctx, rs.Primary.ID)
105+
var (
106+
filter = map[string]interface{}{
107+
"definitions": []string{rs.Primary.ID},
108+
}
109+
)
110+
templates, err := vodService.DescribeImageSpriteTemplatesByFilter(ctx, filter)
101111
if err != nil {
102112
return err
103113
}
104-
if !has {
114+
if len(templates) == 0 || len(templates) != 1 {
105115
return fmt.Errorf("vod image sprite template doesn't exist: %s", rs.Primary.ID)
106116
}
107117
return nil

‎tencentcloud/resource_tc_vod_procedure_template.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,10 +664,11 @@ func resourceTencentCloudVodProcedureTemplateRead(d *schema.ResourceData, meta i
664664
logId = getLogId(contextNil)
665665
ctx = context.WithValue(context.TODO(), logIdKey, logId)
666666
id = d.Id()
667+
subAppId = d.Get("sub_app_id").(int)
667668
client = meta.(*TencentCloudClient).apiV3Conn
668669
vodService = VodService{client: client}
669670
)
670-
template, has, err := vodService.DescribeProcedureTemplatesById(ctx, id)
671+
template, has, err := vodService.DescribeProcedureTemplatesById(ctx, id, subAppId)
671672
if err != nil {
672673
return err
673674
}

‎tencentcloud/resource_tc_vod_procedure_template_test.go‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,17 @@ func testAccCheckVodProcedureTemplateDestroy(s *terraform.State) error {
6969
if rs.Type != "tencentcloud_vod_procedure_template" {
7070
continue
7171
}
72+
var (
73+
filter = map[string]interface{}{
74+
"name": []string{rs.Primary.ID},
75+
}
76+
)
7277

73-
_, has, err := vodService.DescribeProcedureTemplatesById(ctx, rs.Primary.ID)
78+
templates, err := vodService.DescribeProcedureTemplatesByFilter(ctx, filter)
7479
if err != nil {
7580
return err
7681
}
77-
if !has {
82+
if len(templates) == 0 {
7883
return nil
7984
}
8085
return fmt.Errorf("vod procedure template still exists: %s", rs.Primary.ID)
@@ -97,11 +102,16 @@ func testAccCheckVodProcedureTemplateExists(n string) resource.TestCheckFunc {
97102
vodService := VodService{
98103
client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn,
99104
}
100-
_, has, err := vodService.DescribeProcedureTemplatesById(ctx, rs.Primary.ID)
105+
var (
106+
filter = map[string]interface{}{
107+
"name": []string{rs.Primary.ID},
108+
}
109+
)
110+
templates, err := vodService.DescribeProcedureTemplatesByFilter(ctx, filter)
101111
if err != nil {
102112
return err
103113
}
104-
if !has {
114+
if len(templates) == 0 || len(templates) != 1 {
105115
return fmt.Errorf("vod procedure template doesn't exist: %s", rs.Primary.ID)
106116
}
107117
return nil

‎tencentcloud/resource_tc_vod_snapshot_by_time_offset_template.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,13 @@ func resourceTencentCloudVodSnapshotByTimeOffsetTemplateRead(d *schema.ResourceD
164164
logId = getLogId(contextNil)
165165
ctx = context.WithValue(context.TODO(), logIdKey, logId)
166166
id = d.Id()
167+
subAppId = d.Get("sub_app_id").(int)
167168
client = meta.(*TencentCloudClient).apiV3Conn
168169
vodService = VodService{client: client}
169170
)
170171
// waiting for refreshing cache
171172
time.Sleep(30 * time.Second)
172-
template, has, err := vodService.DescribeSnapshotByTimeOffsetTemplatesById(ctx, id)
173+
template, has, err := vodService.DescribeSnapshotByTimeOffsetTemplatesById(ctx, id, subAppId)
173174
if err != nil {
174175
return err
175176
}

‎tencentcloud/resource_tc_vod_snapshot_by_time_offset_template_test.go‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,17 @@ func testAccCheckVodSnapshotByTimeOffsetTemplateDestroy(s *terraform.State) erro
6363
if rs.Type != "tencentcloud_vod_snapshot_by_time_offset_template" {
6464
continue
6565
}
66+
var (
67+
filter = map[string]interface{}{
68+
"definitions": []string{rs.Primary.ID},
69+
}
70+
)
6671

67-
_, has, err := vodService.DescribeSnapshotByTimeOffsetTemplatesById(ctx, rs.Primary.ID)
72+
templates, err := vodService.DescribeSnapshotByTimeOffsetTemplatesByFilter(ctx, filter)
6873
if err != nil {
6974
return err
7075
}
71-
if !has {
76+
if len(templates) == 0 || len(templates) != 1 {
7277
return nil
7378
}
7479
return fmt.Errorf("vod snapshot by time offset template still exists: %s", rs.Primary.ID)
@@ -91,11 +96,17 @@ func testAccCheckVodSnapshotByTimeOffsetTemplateExists(n string) resource.TestCh
9196
vodService := VodService{
9297
client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn,
9398
}
94-
_, has, err := vodService.DescribeSnapshotByTimeOffsetTemplatesById(ctx, rs.Primary.ID)
99+
100+
var (
101+
filter = map[string]interface{}{
102+
"definitions": []string{rs.Primary.ID},
103+
}
104+
)
105+
templates, err := vodService.DescribeSnapshotByTimeOffsetTemplatesByFilter(ctx, filter)
95106
if err != nil {
96107
return err
97108
}
98-
if !has {
109+
if len(templates) == 0 || len(templates) != 1 {
99110
return fmt.Errorf("vod snapshot by time offset template doesn't exist: %s", rs.Primary.ID)
100111
}
101112
return nil

‎tencentcloud/service_tencentcloud_vod.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,11 @@ func (me *VodService) DescribeAdaptiveDynamicStreamingTemplatesByFilter(ctx cont
6464
return
6565
}
6666

67-
func (me *VodService) DescribeAdaptiveDynamicStreamingTemplatesById(ctx context.Context, templateId string) (templateInfo *vod.AdaptiveDynamicStreamingTemplate, has bool, errRet error) {
67+
func (me *VodService) DescribeAdaptiveDynamicStreamingTemplatesById(ctx context.Context, templateId string, subAppId int) (templateInfo *vod.AdaptiveDynamicStreamingTemplate, has bool, errRet error) {
6868
var (
6969
filter = map[string]interface{}{
7070
"definitions": []string{templateId},
71+
"sub_appid": subAppId,
7172
}
7273
)
7374

@@ -160,10 +161,11 @@ func (me *VodService) DescribeProcedureTemplatesByFilter(ctx context.Context, fi
160161
return
161162
}
162163

163-
func (me *VodService) DescribeProcedureTemplatesById(ctx context.Context, templateId string) (templateInfo *vod.ProcedureTemplate, has bool, errRet error) {
164+
func (me *VodService) DescribeProcedureTemplatesById(ctx context.Context, templateId string, subAppId int) (templateInfo *vod.ProcedureTemplate, has bool, errRet error) {
164165
var (
165166
filter = map[string]interface{}{
166167
"name": []string{templateId},
168+
"sub_appid": subAppId,
167169
}
168170
)
169171

@@ -256,10 +258,11 @@ func (me *VodService) DescribeSnapshotByTimeOffsetTemplatesByFilter(ctx context.
256258
return
257259
}
258260

259-
func (me *VodService) DescribeSnapshotByTimeOffsetTemplatesById(ctx context.Context, templateId string) (templateInfo *vod.SnapshotByTimeOffsetTemplate, has bool, errRet error) {
261+
func (me *VodService) DescribeSnapshotByTimeOffsetTemplatesById(ctx context.Context, templateId string, subAppId int) (templateInfo *vod.SnapshotByTimeOffsetTemplate, has bool, errRet error) {
260262
var (
261263
filter = map[string]interface{}{
262264
"definitions": []string{templateId},
265+
"sub_appid": subAppId,
263266
}
264267
)
265268

@@ -353,10 +356,11 @@ func (me *VodService) DescribeImageSpriteTemplatesByFilter(ctx context.Context,
353356
return
354357
}
355358

356-
func (me *VodService) DescribeImageSpriteTemplatesById(ctx context.Context, templateId string) (templateInfo *vod.ImageSpriteTemplate, has bool, errRet error) {
359+
func (me *VodService) DescribeImageSpriteTemplatesById(ctx context.Context, templateId string, subAppId int) (templateInfo *vod.ImageSpriteTemplate, has bool, errRet error) {
357360
var (
358361
filter = map[string]interface{}{
359362
"definitions": []string{templateId},
363+
"sub_appid": subAppId,
360364
}
361365
)
362366

‎website/docs/r/eks_cluster.html.markdown‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@ resource "tencentcloud_eks_cluster" "foo" {
5858

5959
The following arguments are supported:
6060

61+
* `cluster_name` - (Required) Name of EKS cluster.
62+
* `k8s_version` - (Required, ForceNew) Kubernetes version of EKS cluster.
63+
* `subnet_ids` - (Required) Subnet Ids for EKS cluster.
64+
* `vpc_id` - (Required, ForceNew) Vpc Id of EKS cluster.
6165
* `cluster_desc` - (Optional) Description of EKS cluster.
62-
* `cluster_name` - (Optional) Name of EKS cluster.
6366
* `dns_servers` - (Optional) List of cluster custom DNS Server info.
6467
* `enable_vpc_core_dns` - (Optional, ForceNew) Indicates whether to enable dns in user cluster, default value is `true`.
6568
* `extra_param` - (Optional, ForceNew) Extend parameters.
66-
* `k8s_version` - (Optional, ForceNew) Kubernetes version of EKS cluster.
6769
* `need_delete_cbs` - (Optional) Delete CBS after EKS cluster remove.
6870
* `service_subnet_id` - (Optional) Subnet id of service.
69-
* `subnet_ids` - (Optional) Subnet Ids for EKS cluster.
7071
* `tags` - (Optional) Tags of EKS cluster.
71-
* `vpc_id` - (Optional, ForceNew) Vpc Id of EKS cluster.
7272

7373
The `dns_servers` object supports the following:
7474

0 commit comments

Comments
 (0)