Skip to content

Commit 378931e

Browse files
authored
Merge pull request #1559 from tencentcloudstack/feat/support_watermark
Feat/support watermark
2 parents 4cd1ddf + eacb3c3 commit 378931e

File tree

8 files changed

+715
-6
lines changed

8 files changed

+715
-6
lines changed

.changelog/1559.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
tencentcloud_mps_watermark_template
3+
```

tencentcloud/connectivity/client.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ import (
88
"strconv"
99
"time"
1010

11-
mps "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps/v20190612"
12-
13-
ses "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ses/v20201002"
14-
15-
tcm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcm/v20210413"
16-
1711
"github.com/tencentyun/cos-go-sdk-v5"
1812

1913
"github.com/aws/aws-sdk-go/aws"
@@ -56,13 +50,15 @@ import (
5650
mariadb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb/v20170312"
5751
mongodb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb/v20190725"
5852
monitor "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor/v20180724"
53+
mps "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps/v20190612"
5954
organization "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization/v20210331"
6055
postgre "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres/v20170312"
6156
privatedns "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns/v20201028"
6257
pts "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/pts/v20210728"
6358
redis "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis/v20180412"
6459
rum "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/rum/v20210622"
6560
scf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416"
61+
ses "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ses/v20201002"
6662
sms "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms/v20210111"
6763
sqlserver "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sqlserver/v20180328"
6864
sslCertificate "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205"
@@ -71,6 +67,7 @@ import (
7167
tag "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tag/v20180813"
7268
tat "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tat/v20201028"
7369
tcaplusdb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcaplusdb/v20190823"
70+
tcm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcm/v20210413"
7471
tcr "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr/v20190924"
7572
tdcpg "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdcpg/v20211118"
7673
tdmq "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq/v20200217"

tencentcloud/provider.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -943,6 +943,7 @@ Media Processing Service(MPS)
943943
Resource
944944
tencentcloud_mps_workflow
945945
tencentcloud_mps_transcode_template
946+
tencentcloud_mps_watermark_template
946947
947948
*/
948949
package tencentcloud
@@ -1681,6 +1682,7 @@ func Provider() terraform.ResourceProvider {
16811682
"tencentcloud_tsf_lane_rule": resourceTencentCloudTsfLaneRule(),
16821683
"tencentcloud_mps_workflow": resourceTencentCloudMpsWorkflow(),
16831684
"tencentcloud_mps_transcode_template": resourceTencentCloudMpsTranscodeTemplate(),
1685+
"tencentcloud_mps_watermark_template": resourceTencentCloudMpsWatermarkTemplate(),
16841686
"tencentcloud_cbs_disk_backup": resourceTencentCloudCbsDiskBackup(),
16851687
"tencentcloud_cbs_snapshot_share_permission": resourceTencentCloudCbsSnapshotSharePermission(),
16861688
"tencentcloud_cbs_disk_backup_rollback_operation": resourceTencentCloudCbsDiskBackupRollbackOperation(),

0 commit comments

Comments
 (0)