Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions tencentcloud/data_source_tc_vod_procedure_templates_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestAccDataSourceTencentCloudVodProcedureTemplates(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID("data.tencentcloud_vod_procedure_templates.foo"),
resource.TestCheckResourceAttr("data.tencentcloud_vod_procedure_templates.foo", "template_list.#", "1"),
resource.TestCheckResourceAttr("data.tencentcloud_vod_procedure_templates.foo", "template_list.0.name", "tf-procedure"),
resource.TestCheckResourceAttr("data.tencentcloud_vod_procedure_templates.foo", "template_list.0.name", "tf-procedure1"),
resource.TestCheckResourceAttr("data.tencentcloud_vod_procedure_templates.foo", "template_list.0.comment", "test"),
resource.TestCheckResourceAttr("data.tencentcloud_vod_procedure_templates.foo", "template_list.0.media_process_task.#", "1"),
resource.TestCheckResourceAttr("data.tencentcloud_vod_procedure_templates.foo", "template_list.0.media_process_task.0.adaptive_dynamic_streaming_task_list.#", "1"),
Expand All @@ -37,7 +37,28 @@ func TestAccDataSourceTencentCloudVodProcedureTemplates(t *testing.T) {
})
}

const testAccVodProcedureTemplates = testAccVodProcedureTemplate + `
const testAccDataSourceVodProcedureTemplate = testAccVodAdaptiveDynamicStreamingTemplate + testAccVodSnapshotByTimeOffsetTemplate + testAccVodImageSpriteTemplate + `
resource "tencentcloud_vod_procedure_template" "foo" {
name = "tf-procedure1"
comment = "test"
media_process_task {
adaptive_dynamic_streaming_task_list {
definition = tencentcloud_vod_adaptive_dynamic_streaming_template.foo.id
}
snapshot_by_time_offset_task_list {
definition = tencentcloud_vod_snapshot_by_time_offset_template.foo.id
ext_time_offset_list = [
"3.5s"
]
}
image_sprite_task_list {
definition = tencentcloud_vod_image_sprite_template.foo.id
}
}
}
`

const testAccVodProcedureTemplates = testAccDataSourceVodProcedureTemplate + `
data "tencentcloud_vod_procedure_templates" "foo" {
type = "Custom"
name = tencentcloud_vod_procedure_template.foo.id
Expand Down
26 changes: 24 additions & 2 deletions tencentcloud/data_source_tc_vod_super_player_configs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestAccDataSourceTencentCloudVodSuperPlayerConfigs(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID("data.tencentcloud_vod_super_player_configs.foo"),
resource.TestCheckResourceAttr("data.tencentcloud_vod_super_player_configs.foo", "config_list.#", "1"),
resource.TestCheckResourceAttr("data.tencentcloud_vod_super_player_configs.foo", "config_list.0.name", "tf-super-player"),
resource.TestCheckResourceAttr("data.tencentcloud_vod_super_player_configs.foo", "config_list.0.name", "tf-super-player1"),
resource.TestCheckResourceAttr("data.tencentcloud_vod_super_player_configs.foo", "config_list.0.drm_switch", "true"),
resource.TestCheckResourceAttr("data.tencentcloud_vod_super_player_configs.foo", "config_list.0.drm_streaming_info.#", "1"),
resource.TestCheckResourceAttr("data.tencentcloud_vod_super_player_configs.foo", "config_list.0.resolution_names.#", "2"),
Expand All @@ -39,7 +39,29 @@ func TestAccDataSourceTencentCloudVodSuperPlayerConfigs(t *testing.T) {
})
}

const testAccVodSuperPlayerConfigs = testAccVodSuperPlayerConfig + `
const testAccDataSourceVodSuperPlayerConfig = testAccVodAdaptiveDynamicStreamingTemplate + testAccVodImageSpriteTemplate + `
resource "tencentcloud_vod_super_player_config" "foo" {
name = "tf-super-player1"
drm_switch = true
drm_streaming_info {
simple_aes_definition = tencentcloud_vod_adaptive_dynamic_streaming_template.foo.id
}
image_sprite_definition = tencentcloud_vod_image_sprite_template.foo.id
resolution_names {
min_edge_length = 889
name = "test1"
}
resolution_names {
min_edge_length = 890
name = "test2"
}
domain = "Default"
scheme = "Default"
comment = "test"
}
`

const testAccVodSuperPlayerConfigs = testAccDataSourceVodSuperPlayerConfig + `
data "tencentcloud_vod_super_player_configs" "foo" {
type = "Custom"
name = tencentcloud_vod_super_player_config.foo.id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,44 @@ package tencentcloud
import (
"context"
"fmt"
"strconv"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
)

func init() {
// go test -v ./tencentcloud -sweep=ap-guangzhou -sweep-run=tencentcloud_vod_adaptive_dynamic_streaming_template
resource.AddTestSweepers("tencentcloud_vod_adaptive_dynamic_streaming_template", &resource.Sweeper{
Name: "tencentcloud_vod_adaptive_dynamic_streaming_template",
F: func(r string) error {
logId := getLogId(contextNil)
ctx := context.WithValue(context.TODO(), logIdKey, logId)
sharedClient, err := sharedClientForRegion(r)
if err != nil {
return fmt.Errorf("getting tencentcloud client error: %s", err.Error())
}
client := sharedClient.(*TencentCloudClient)
vodService := VodService{
client: client.apiV3Conn,
}
filter := make(map[string]interface{})
templates, e := vodService.DescribeAdaptiveDynamicStreamingTemplatesByFilter(ctx, filter)
if e != nil {
return nil
}
for _, template := range templates {
ee := vodService.DeleteAdaptiveDynamicStreamingTemplate(ctx, strconv.FormatUint(*template.Definition, 10), uint64(0))
if ee != nil {
continue
}
}
return nil
},
})
}

func TestAccTencentCloudVodAdaptiveDynamicStreamingTemplateResource(t *testing.T) {
t.Parallel()
resource.Test(t, resource.TestCase{
Expand Down
6 changes: 3 additions & 3 deletions tencentcloud/resource_tc_vod_procedure_template_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestAccTencentCloudVodProcedureTemplateResource(t *testing.T) {
Config: testAccVodProcedureTemplate,
Check: resource.ComposeTestCheckFunc(
testAccCheckVodProcedureTemplateExists("tencentcloud_vod_procedure_template.foo"),
resource.TestCheckResourceAttr("tencentcloud_vod_procedure_template.foo", "name", "tf-procedure"),
resource.TestCheckResourceAttr("tencentcloud_vod_procedure_template.foo", "name", "tf-procedure0"),
resource.TestCheckResourceAttr("tencentcloud_vod_procedure_template.foo", "comment", "test"),
resource.TestCheckResourceAttr("tencentcloud_vod_procedure_template.foo", "media_process_task.#", "1"),
resource.TestCheckResourceAttr("tencentcloud_vod_procedure_template.foo", "media_process_task.0.adaptive_dynamic_streaming_task_list.#", "1"),
Expand Down Expand Up @@ -121,7 +121,7 @@ func testAccCheckVodProcedureTemplateExists(n string) resource.TestCheckFunc {

const testAccVodProcedureTemplate = testAccVodAdaptiveDynamicStreamingTemplate + testAccVodSnapshotByTimeOffsetTemplate + testAccVodImageSpriteTemplate + `
resource "tencentcloud_vod_procedure_template" "foo" {
name = "tf-procedure"
name = "tf-procedure0"
comment = "test"
media_process_task {
adaptive_dynamic_streaming_task_list {
Expand All @@ -142,7 +142,7 @@ resource "tencentcloud_vod_procedure_template" "foo" {

const testAccVodProcedureTemplateUpdate = testAccVodAdaptiveDynamicStreamingTemplate + testAccVodSnapshotByTimeOffsetTemplate + testAccVodImageSpriteTemplate + `
resource "tencentcloud_vod_procedure_template" "foo" {
name = "tf-procedure"
name = "tf-procedure0"
comment = "test-update"
media_process_task {
adaptive_dynamic_streaming_task_list {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,55 @@ package tencentcloud
import (
"context"
"fmt"
"strconv"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
)

func init() {
// go test -v ./tencentcloud -sweep=ap-guangzhou -sweep-run=tencentcloud_vod_snapshot_template
resource.AddTestSweepers("tencentcloud_vod_snapshot_template", &resource.Sweeper{
Name: "tencentcloud_vod_snapshot_template",
F: func(r string) error {
logId := getLogId(contextNil)
ctx := context.WithValue(context.TODO(), logIdKey, logId)
sharedClient, err := sharedClientForRegion(r)
if err != nil {
return fmt.Errorf("getting tencentcloud client error: %s", err.Error())
}
client := sharedClient.(*TencentCloudClient)
vodService := VodService{
client: client.apiV3Conn,
}
filter := make(map[string]interface{})
templates, e := vodService.DescribeSnapshotByTimeOffsetTemplatesByFilter(ctx, filter)
if e != nil {
return nil
}
for _, template := range templates {
ee := vodService.DeleteSnapshotByTimeOffsetTemplate(ctx, strconv.FormatUint(*template.Definition, 10), uint64(0))
if ee != nil {
continue
}
}

spriteTemplates, spriteErr := vodService.DescribeImageSpriteTemplatesByFilter(ctx, filter)
if spriteErr != nil {
return nil
}
for _, spriteTemplate := range spriteTemplates {
ee := vodService.DeleteImageSpriteTemplate(ctx, strconv.FormatUint(*spriteTemplate.Definition, 10), uint64(0))
if ee != nil {
continue
}
}
return nil
},
})
}

func TestAccTencentCloudVodSnapshotByTimeOffsetTemplateResource(t *testing.T) {
t.Parallel()
resource.Test(t, resource.TestCase{
Expand Down
36 changes: 33 additions & 3 deletions tencentcloud/resource_tc_vod_super_player_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,36 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/terraform"
)

func init() {
// go test -v ./tencentcloud -sweep=ap-guangzhou -sweep-run=tencentcloud_vod_super_player_config
resource.AddTestSweepers("tencentcloud_vod_super_player_config", &resource.Sweeper{
Name: "tencentcloud_vod_super_player_config",
F: func(r string) error {
logId := getLogId(contextNil)
ctx := context.WithValue(context.TODO(), logIdKey, logId)
sharedClient, err := sharedClientForRegion(r)
if err != nil {
return fmt.Errorf("getting tencentcloud client error: %s", err.Error())
}
client := sharedClient.(*TencentCloudClient)
vodService := VodService{
client: client.apiV3Conn,
}
filter := make(map[string]interface{})
configs, e := vodService.DescribeSuperPlayerConfigsByFilter(ctx, filter)
if e != nil {
return nil
}
for _, config := range configs {
ee := vodService.DeleteSuperPlayerConfig(ctx, *config.Name, uint64(0))
if ee != nil {
continue
}
}
return nil
},
})
}
func TestAccTencentCloudVodSuperPlayerConfigResource(t *testing.T) {
t.Parallel()
resource.Test(t, resource.TestCase{
Expand All @@ -20,7 +50,7 @@ func TestAccTencentCloudVodSuperPlayerConfigResource(t *testing.T) {
Config: testAccVodSuperPlayerConfig,
Check: resource.ComposeTestCheckFunc(
testAccCheckVodSuperPlayerConfigExists("tencentcloud_vod_super_player_config.foo"),
resource.TestCheckResourceAttr("tencentcloud_vod_super_player_config.foo", "name", "tf-super-player"),
resource.TestCheckResourceAttr("tencentcloud_vod_super_player_config.foo", "name", "tf-super-player-0"),
resource.TestCheckResourceAttr("tencentcloud_vod_super_player_config.foo", "drm_switch", "true"),
resource.TestCheckResourceAttr("tencentcloud_vod_super_player_config.foo", "drm_streaming_info.#", "1"),
resource.TestCheckResourceAttr("tencentcloud_vod_super_player_config.foo", "resolution_names.#", "2"),
Expand Down Expand Up @@ -113,7 +143,7 @@ func testAccCheckVodSuperPlayerConfigExists(n string) resource.TestCheckFunc {

const testAccVodSuperPlayerConfig = testAccVodAdaptiveDynamicStreamingTemplate + testAccVodImageSpriteTemplate + `
resource "tencentcloud_vod_super_player_config" "foo" {
name = "tf-super-player"
name = "tf-super-player-0"
drm_switch = true
drm_streaming_info {
simple_aes_definition = tencentcloud_vod_adaptive_dynamic_streaming_template.foo.id
Expand All @@ -135,7 +165,7 @@ resource "tencentcloud_vod_super_player_config" "foo" {

const testAccVodSuperPlayerConfigUpdate = testAccVodAdaptiveDynamicStreamingTemplate + testAccVodImageSpriteTemplate + `
resource "tencentcloud_vod_super_player_config" "foo" {
name = "tf-super-player"
name = "tf-super-player-0"
drm_switch = false
adaptive_dynamic_streaming_definition = tencentcloud_vod_adaptive_dynamic_streaming_template.foo.id
image_sprite_definition = tencentcloud_vod_image_sprite_template.foo.id
Expand Down