Skip to content

Commit 9aadfc2

Browse files
bruceybianbruceybian
committed
update e2e test
1 parent 99e3c0b commit 9aadfc2

File tree

3 files changed

+163
-20
lines changed

3 files changed

+163
-20
lines changed

‎tencentcloud/services/mps/data_source_tc_mps_schedules.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2566,7 +2566,7 @@ func DataSourceTencentCloudMpsSchedules() *schema.Resource {
25662566
Description: "The last updated time in [ISO date format](https://intl.cloud.tencent.com/document/product/862/37710?from_cn_redirect=1#52).Note: This field may return null, indicating that no valid values can be obtained.",
25672567
},
25682568
"resource_id": {
2569-
Type: schema.TypeInt,
2569+
Type: schema.TypeString,
25702570
Computed: true,
25712571
Description: "The resource ID. If there is no associated resource ID, fill it with the account's main resource ID.",
25722572
},

‎tencentcloud/services/mps/data_source_tc_mps_schedules_test.go

Lines changed: 142 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,15 @@ func TestAccTencentCloudMpsSchedulesDataSource_basic(t *testing.T) {
2828
),
2929
},
3030
{
31-
Config: fmt.Sprintf(testAccMpsSchedulesDataSource_specific_one, tcacctest.DefaultMpsScheduleId),
31+
Config: fmt.Sprintf(testAccMpsSchedulesDataSource_specific_one),
3232
Check: resource.ComposeTestCheckFunc(
3333
tcacctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_mps_schedules.schedules"),
3434
resource.TestCheckResourceAttrSet("data.tencentcloud_mps_schedules.schedules", "schedule_ids.#"),
35-
resource.TestCheckTypeSetElemAttr("data.tencentcloud_mps_schedules.schedules", "schedule_ids.*", fmt.Sprint(tcacctest.DefaultMpsScheduleId)),
3635
resource.TestCheckResourceAttr("data.tencentcloud_mps_schedules.schedules", "trigger_type", "CosFileUpload"),
3736
resource.TestCheckResourceAttr("data.tencentcloud_mps_schedules.schedules", "status", "Disabled"),
3837
resource.TestCheckResourceAttrSet("data.tencentcloud_mps_schedules.schedules", "schedule_info_set.#"),
39-
resource.TestCheckResourceAttr("data.tencentcloud_mps_schedules.schedules", "schedule_info_set.0.schedule_id", fmt.Sprint(tcacctest.DefaultMpsScheduleId)),
40-
resource.TestCheckResourceAttr("data.tencentcloud_mps_schedules.schedules", "schedule_info_set.0.schedule_name", tcacctest.DefaultMpsScheduleName),
38+
resource.TestCheckResourceAttrSet("data.tencentcloud_mps_schedules.schedules", "schedule_info_set.0.schedule_id"),
39+
resource.TestCheckResourceAttr("data.tencentcloud_mps_schedules.schedules", "schedule_info_set.0.schedule_name", "tf_test_mps_schedule_001"),
4140
resource.TestCheckResourceAttr("data.tencentcloud_mps_schedules.schedules", "schedule_info_set.0.status", "Disabled"),
4241
resource.TestCheckResourceAttrSet("data.tencentcloud_mps_schedules.schedules", "schedule_info_set.0.trigger.#"),
4342
resource.TestCheckResourceAttrSet("data.tencentcloud_mps_schedules.schedules", "schedule_info_set.0.activities.#"),
@@ -59,12 +58,148 @@ data "tencentcloud_mps_schedules" "schedules" {
5958
6059
`
6160

62-
const testAccMpsSchedulesDataSource_specific_one = `
61+
const testAccMpsSchedulesDataSource_specific_one = tcacctest.UserInfoData + `
62+
resource "tencentcloud_cos_bucket" "output" {
63+
bucket = "tf-bucket-mps-schedule-output-${local.app_id}"
64+
force_clean = true
65+
acl = "public-read"
66+
}
67+
68+
resource "tencentcloud_cos_bucket_object" "object" {
69+
bucket = tencentcloud_cos_bucket.output.bucket
70+
key = "/mps-test/test.mov"
71+
content = "aaaaaaaaaaaaaaaa"
72+
content_type = "binary/octet-stream"
73+
}
74+
75+
resource "tencentcloud_mps_schedule" "schedule" {
76+
schedule_name = "tf_test_mps_schedule_001"
77+
78+
trigger {
79+
type = "CosFileUpload"
80+
cos_file_upload_trigger {
81+
bucket = tencentcloud_cos_bucket_object.object.bucket
82+
region = "ap-guangzhou"
83+
dir = "/upload/"
84+
formats = ["flv", "mov"]
85+
}
86+
}
87+
88+
activities {
89+
activity_type = "input"
90+
reardrive_index = [1, 2]
91+
}
92+
93+
activities {
94+
activity_type = "action-trans"
95+
reardrive_index = [3]
96+
activity_para {
97+
transcode_task {
98+
definition = 10
99+
}
100+
}
101+
}
102+
103+
activities {
104+
activity_type = "action-trans"
105+
reardrive_index = [6, 7]
106+
activity_para {
107+
transcode_task {
108+
definition = 10
109+
}
110+
}
111+
}
112+
113+
activities {
114+
activity_type = "action-trans"
115+
reardrive_index = [4, 5]
116+
activity_para {
117+
transcode_task {
118+
definition = 10
119+
}
120+
}
121+
}
122+
123+
activities {
124+
activity_type = "action-trans"
125+
reardrive_index = [10]
126+
activity_para {
127+
transcode_task {
128+
definition = 10
129+
}
130+
}
131+
}
132+
133+
activities {
134+
activity_type = "action-trans"
135+
reardrive_index = [10]
136+
activity_para {
137+
transcode_task {
138+
definition = 10
139+
}
140+
}
141+
}
142+
143+
activities {
144+
activity_type = "action-trans"
145+
reardrive_index = [10]
146+
activity_para {
147+
transcode_task {
148+
definition = 10
149+
}
150+
}
151+
}
152+
153+
activities {
154+
activity_type = "action-trans"
155+
reardrive_index = [8]
156+
activity_para {
157+
transcode_task {
158+
definition = 10
159+
}
160+
}
161+
}
162+
163+
activities {
164+
activity_type = "action-trans"
165+
reardrive_index = [9]
166+
activity_para {
167+
transcode_task {
168+
definition = 10
169+
}
170+
}
171+
}
172+
173+
activities {
174+
activity_type = "action-trans"
175+
reardrive_index = [10]
176+
activity_para {
177+
transcode_task {
178+
definition = 10
179+
}
180+
}
181+
}
182+
183+
activities {
184+
activity_type = "output"
185+
}
186+
187+
output_storage {
188+
type = "COS"
189+
cos_output_storage {
190+
bucket = tencentcloud_cos_bucket.output.bucket
191+
region = "ap-guangzhou"
192+
}
193+
}
194+
195+
output_dir = "output/"
196+
resource_id = "vts-2600014161-0"
197+
}
63198
64199
data "tencentcloud_mps_schedules" "schedules" {
65-
schedule_ids = [%d]
200+
schedule_ids = [tencentcloud_mps_schedule.schedule.id]
66201
trigger_type = "CosFileUpload"
67202
status = "Disabled"
68-
}
203+
}
69204
70205
`

‎tencentcloud/services/mps/resource_tc_mps_schedule_test.go

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ func TestAccTencentCloudMpsScheduleResource_basic(t *testing.T) {
126126
resource.TestCheckResourceAttr("tencentcloud_mps_schedule.schedule", "output_storage.0.cos_output_storage.0.region", tcacctest.DefaultRegion),
127127

128128
resource.TestCheckResourceAttr("tencentcloud_mps_schedule.schedule", "output_dir", "output/"),
129+
resource.TestCheckResourceAttrSet("tencentcloud_mps_schedule.schedule", "resource_id"),
129130
),
130131
},
131132
{
@@ -184,6 +185,7 @@ func TestAccTencentCloudMpsScheduleResource_basic(t *testing.T) {
184185
resource.TestCheckResourceAttr("tencentcloud_mps_schedule.schedule", "output_storage.0.cos_output_storage.0.region", tcacctest.DefaultRegion),
185186

186187
resource.TestCheckResourceAttr("tencentcloud_mps_schedule.schedule", "output_dir", "output_chagned/"),
188+
resource.TestCheckResourceAttrSet("tencentcloud_mps_schedule.schedule", "resource_id"),
187189
),
188190
},
189191
{
@@ -196,24 +198,26 @@ func TestAccTencentCloudMpsScheduleResource_basic(t *testing.T) {
196198
}
197199

198200
const testAccMpsSchedule = tcacctest.UserInfoData + `
199-
data "tencentcloud_cos_bucket_object" "object" {
200-
bucket = "keep-bucket-${local.app_id}"
201-
key = "/mps-test/test.mov"
202-
}
203-
204201
resource "tencentcloud_cos_bucket" "output" {
205202
bucket = "tf-bucket-mps-schedule-output-${local.app_id}"
206203
force_clean = true
207204
acl = "public-read"
208205
}
209206
207+
resource "tencentcloud_cos_bucket_object" "object" {
208+
bucket = tencentcloud_cos_bucket.output.bucket
209+
key = "/mps-test/test.mov"
210+
content = "aaaaaaaaaaaaaaaa"
211+
content_type = "binary/octet-stream"
212+
}
213+
210214
resource "tencentcloud_mps_schedule" "schedule" {
211215
schedule_name = "tf_test_mps_schedule_%d"
212216
213217
trigger {
214218
type = "CosFileUpload"
215219
cos_file_upload_trigger {
216-
bucket = data.tencentcloud_cos_bucket_object.object.bucket
220+
bucket = tencentcloud_cos_bucket_object.object.bucket
217221
region = "%s"
218222
dir = "/upload/"
219223
formats = ["flv", "mov"]
@@ -328,30 +332,33 @@ resource "tencentcloud_mps_schedule" "schedule" {
328332
}
329333
330334
output_dir = "output/"
335+
resource_id = "vts-2600014161-0"
331336
}
332337
333338
334339
`
335340

336341
const testAccMpsSchedule_update = tcacctest.UserInfoData + `
337-
data "tencentcloud_cos_bucket_object" "object" {
338-
bucket = "keep-bucket-${local.app_id}"
339-
key = "/mps-test/test.mov"
340-
}
341-
342342
resource "tencentcloud_cos_bucket" "output" {
343343
bucket = "tf-bucket-mps-schedule-output-${local.app_id}"
344344
force_clean = true
345345
acl = "public-read"
346346
}
347347
348+
resource "tencentcloud_cos_bucket_object" "object" {
349+
bucket = tencentcloud_cos_bucket.output.bucket
350+
key = "/mps-test/test.mov"
351+
content = "aaaaaaaaaaaaaaaa"
352+
content_type = "binary/octet-stream"
353+
}
354+
348355
resource "tencentcloud_mps_schedule" "schedule" {
349356
schedule_name = "tf_test_mps_schedule_%d_changed"
350357
351358
trigger {
352359
type = "CosFileUpload"
353360
cos_file_upload_trigger {
354-
bucket = data.tencentcloud_cos_bucket_object.object.bucket
361+
bucket = tencentcloud_cos_bucket_object.object.bucket
355362
region = "%s"
356363
dir = "/upload_changed/"
357364
formats = ["mp4", "mov"]
@@ -466,6 +473,7 @@ resource "tencentcloud_mps_schedule" "schedule" {
466473
}
467474
468475
output_dir = "output_chagned/"
476+
resource_id = "vts-2600014161-0"
469477
}
470478
471479

0 commit comments

Comments
 (0)