Merge pull request #2163 from tencentcloudstack/feat/support-mps-feature

feat:support mps withdraw wm operation
tencentcloudstack · Sep 28, 2023 · c475655 · c475655
2 parents ca7d23f + 36d1566
commit c475655
Show file tree

Hide file tree

Showing 15 changed files with 6,761 additions and 2,458 deletions.
diff --git a/.changelog/2163.txt b/.changelog/2163.txt
@@ -0,0 +1,3 @@
+```release-note:new-resource
+tencentcloud_mps_withdraws_watermark_operation
+```
diff --git a/go.mod b/go.mod
@@ -64,7 +64,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb v1.0.672
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.651
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.734
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.584
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.758
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization v1.0.540
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.676
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns v1.0.751

diff --git a/go.sum b/go.sum
@@ -914,6 +914,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.734 h1:VJl
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.734/go.mod h1:H2gtCj02D5k7h0JttS9RMoRgkJ8m9qia/9RlMjbvT0o=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.584 h1:FJxYOAolkBhXjQMWoiTek9Ag0bslcKFHyrM7w2Jsxos=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.584/go.mod h1:CY/hEcXbaOZBU9Qm/MMIctafi8FFJaMIGTlGUjnymW0=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.758 h1:lsuwM6CNu1aKpHOmsA7dizDxd4gCOBNvT25+yQNPGx8=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.758/go.mod h1:OklPo0yw4wKOYDAtXgmtUJCzGdvYooaqKchviSg84Ro=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization v1.0.540 h1:gUVuwcjt9baj+/5LFafjdR53/xSdQxfA45Vp6E65rXU=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization v1.0.540/go.mod h1:jHcHwlsdNL9ycLwNtqYZVjLKJILA1xuODMeMDMOxCrA=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.676 h1:KDt87M2b8j/Xo/9o+kaVtJ46fOtPctCpMDa1CJpSlkY=

diff --git a/tencentcloud/provider.go b/tencentcloud/provider.go
@@ -1567,6 +1567,7 @@ Media Processing Service(MPS)
 	tencentcloud_mps_ai_analysis_template
 	tencentcloud_mps_adaptive_dynamic_streaming_template
 	tencentcloud_mps_person_sample
+	tencentcloud_mps_withdraws_watermark_operation
 
 Cloud HDFS(CHDFS)
   Data Source
@@ -3029,6 +3030,7 @@ func Provider() *schema.Provider {
 			"tencentcloud_mps_ai_analysis_template":                            resourceTencentCloudMpsAiAnalysisTemplate(),
 			"tencentcloud_mps_adaptive_dynamic_streaming_template":             resourceTencentCloudMpsAdaptiveDynamicStreamingTemplate(),
 			"tencentcloud_mps_person_sample":                                   resourceTencentCloudMpsPersonSample(),
+			"tencentcloud_mps_withdraws_watermark_operation":                   resourceTencentCloudMpsWithdrawsWatermarkOperation(),
 			"tencentcloud_cbs_disk_backup":                                     resourceTencentCloudCbsDiskBackup(),
 			"tencentcloud_cbs_snapshot_share_permission":                       resourceTencentCloudCbsSnapshotSharePermission(),
 			"tencentcloud_cbs_disk_backup_rollback_operation":                  resourceTencentCloudCbsDiskBackupRollbackOperation(),

diff --git a/tencentcloud/resource_tc_mps_adaptive_dynamic_streaming_template.go b/tencentcloud/resource_tc_mps_adaptive_dynamic_streaming_template.go
@@ -254,10 +254,10 @@ func resourceTencentCloudMpsAdaptiveDynamicStreamingTemplateCreate(d *schema.Res
 					videoTemplateInfo.Codec = helper.String(v.(string))
 				}
 				if v, ok := videoMap["fps"]; ok {
-					videoTemplateInfo.Fps = helper.IntUint64(v.(int))
+					videoTemplateInfo.Fps = helper.IntInt64(v.(int))
 				}
 				if v, ok := videoMap["bitrate"]; ok {
-					videoTemplateInfo.Bitrate = helper.IntUint64(v.(int))
+					videoTemplateInfo.Bitrate = helper.IntInt64(v.(int))
 				}
 				if v, ok := videoMap["resolution_adaptive"]; ok {
 					videoTemplateInfo.ResolutionAdaptive = helper.String(v.(string))
@@ -285,7 +285,7 @@ func resourceTencentCloudMpsAdaptiveDynamicStreamingTemplateCreate(d *schema.Res
 					audioTemplateInfo.Codec = helper.String(v.(string))
 				}
 				if v, ok := audioMap["bitrate"]; ok {
-					audioTemplateInfo.Bitrate = helper.IntUint64(v.(int))
+					audioTemplateInfo.Bitrate = helper.IntInt64(v.(int))
 				}
 				if v, ok := audioMap["sample_rate"]; ok {
 					audioTemplateInfo.SampleRate = helper.IntUint64(v.(int))
@@ -511,10 +511,10 @@ func resourceTencentCloudMpsAdaptiveDynamicStreamingTemplateUpdate(d *schema.Res
 						videoTemplateInfo.Codec = helper.String(v.(string))
 					}
 					if v, ok := videoMap["fps"]; ok {
-						videoTemplateInfo.Fps = helper.IntUint64(v.(int))
+						videoTemplateInfo.Fps = helper.IntInt64(v.(int))
 					}
 					if v, ok := videoMap["bitrate"]; ok {
-						videoTemplateInfo.Bitrate = helper.IntUint64(v.(int))
+						videoTemplateInfo.Bitrate = helper.IntInt64(v.(int))
 					}
 					if v, ok := videoMap["resolution_adaptive"]; ok {
 						videoTemplateInfo.ResolutionAdaptive = helper.String(v.(string))
@@ -542,7 +542,7 @@ func resourceTencentCloudMpsAdaptiveDynamicStreamingTemplateUpdate(d *schema.Res
 						audioTemplateInfo.Codec = helper.String(v.(string))
 					}
 					if v, ok := audioMap["bitrate"]; ok {
-						audioTemplateInfo.Bitrate = helper.IntUint64(v.(int))
+						audioTemplateInfo.Bitrate = helper.IntInt64(v.(int))
 					}
 					if v, ok := audioMap["sample_rate"]; ok {
 						audioTemplateInfo.SampleRate = helper.IntUint64(v.(int))

diff --git a/tencentcloud/resource_tc_mps_transcode_template.go b/tencentcloud/resource_tc_mps_transcode_template.go
@@ -485,10 +485,10 @@ func resourceTencentCloudMpsTranscodeTemplateCreate(d *schema.ResourceData, meta
 			videoTemplateInfo.Codec = helper.String(v.(string))
 		}
 		if v, ok := dMap["fps"]; ok {
-			videoTemplateInfo.Fps = helper.IntUint64(v.(int))
+			videoTemplateInfo.Fps = helper.IntInt64(v.(int))
 		}
 		if v, ok := dMap["bitrate"]; ok {
-			videoTemplateInfo.Bitrate = helper.IntUint64(v.(int))
+			videoTemplateInfo.Bitrate = helper.IntInt64(v.(int))
 		}
 		if v, ok := dMap["resolution_adaptive"]; ok {
 			videoTemplateInfo.ResolutionAdaptive = helper.String(v.(string))
@@ -517,7 +517,7 @@ func resourceTencentCloudMpsTranscodeTemplateCreate(d *schema.ResourceData, meta
 			audioTemplateInfo.Codec = helper.String(v.(string))
 		}
 		if v, ok := dMap["bitrate"]; ok {
-			audioTemplateInfo.Bitrate = helper.IntUint64(v.(int))
+			audioTemplateInfo.Bitrate = helper.IntInt64(v.(int))
 		}
 		if v, ok := dMap["sample_rate"]; ok {
 			audioTemplateInfo.SampleRate = helper.IntUint64(v.(int))
@@ -534,7 +534,7 @@ func resourceTencentCloudMpsTranscodeTemplateCreate(d *schema.ResourceData, meta
 			tEHDConfig.Type = helper.String(v.(string))
 		}
 		if v, ok := dMap["max_video_bitrate"]; ok {
-			tEHDConfig.MaxVideoBitrate = helper.IntUint64(v.(int))
+			tEHDConfig.MaxVideoBitrate = helper.IntInt64(v.(int))
 		}
 		request.TEHDConfig = &tEHDConfig
 	}
@@ -1025,10 +1025,10 @@ func resourceTencentCloudMpsTranscodeTemplateUpdate(d *schema.ResourceData, meta
 				videoTemplateInfo.Codec = helper.String(v.(string))
 			}
 			if v, ok := dMap["fps"]; ok {
-				videoTemplateInfo.Fps = helper.IntUint64(v.(int))
+				videoTemplateInfo.Fps = helper.IntInt64(v.(int))
 			}
 			if v, ok := dMap["bitrate"]; ok {
-				videoTemplateInfo.Bitrate = helper.IntUint64(v.(int))
+				videoTemplateInfo.Bitrate = helper.IntInt64(v.(int))
 			}
 			if v, ok := dMap["resolution_adaptive"]; ok {
 				videoTemplateInfo.ResolutionAdaptive = helper.String(v.(string))
@@ -1059,7 +1059,7 @@ func resourceTencentCloudMpsTranscodeTemplateUpdate(d *schema.ResourceData, meta
 				audioTemplateInfo.Codec = helper.String(v.(string))
 			}
 			if v, ok := dMap["bitrate"]; ok {
-				audioTemplateInfo.Bitrate = helper.IntUint64(v.(int))
+				audioTemplateInfo.Bitrate = helper.IntInt64(v.(int))
 			}
 			if v, ok := dMap["sample_rate"]; ok {
 				audioTemplateInfo.SampleRate = helper.IntUint64(v.(int))
@@ -1078,7 +1078,7 @@ func resourceTencentCloudMpsTranscodeTemplateUpdate(d *schema.ResourceData, meta
 				tEHDConfig.Type = helper.String(v.(string))
 			}
 			if v, ok := dMap["max_video_bitrate"]; ok {
-				tEHDConfig.MaxVideoBitrate = helper.IntUint64(v.(int))
+				tEHDConfig.MaxVideoBitrate = helper.IntInt64(v.(int))
 			}
 			request.TEHDConfig = &tEHDConfig
 		}