Skip to content

Commit bde1ab9

Browse files
lyu571lyu571
authored
feat: support css resource (#1386)
* support css watermark, watermark_rule and pull stream task * add pull stream * add pull stream e2e case * pull stream passed e2e case * watermark passed e2e case * 1.live temp passed e2e case 2.adjust helper * 1.live rule attachment passed e2e case. 2.changelog 3.golangci-lint
1 parent 4384da3 commit bde1ab9

27 files changed

+26237
-1
lines changed

‎.changelog/1386.txt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
```release-note:new-resource
2+
tencentcloud_css_watermark
3+
```
4+
5+
```release-note:new-resource
6+
tencentcloud_css_pull_stream_task
7+
```
8+
9+
```release-note:new-resource
10+
tencentcloud_css_live_transcode_template
11+
```
12+
13+
```release-note:new-resource
14+
tencentcloud_css_live_transcode_rule_attachment
15+
```

‎go.mod‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ require (
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap v1.0.514
4949
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.199
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.413
51+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.535
5152
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb v1.0.532
5253
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.199
5354
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.518

‎go.sum‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,13 +503,15 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.518/go.mod
503503
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.519/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
504504
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.520/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
505505
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.524/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
506+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.525/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
506507
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.527/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
507508
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.529 h1:B26Pn9N5O3Mmbh8icZSpZ8kkhcfnapUdU/TBxPDWggA=
508509
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.529/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
509510
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.532 h1:DjnGMxuX49TNNyXp6V18VO+oY9Y5Gs4/+vL0LeZ8YIo=
510511
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.532/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
511-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.533 h1:UBHA9iYBQfkNYAWb6BixA8JCOQPxyMNMIVFdGjdM+1w=
512512
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.533/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
513+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.535/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
514+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.538 h1:z3LR9xqthQT11X0APmAdLpVjH95npnmHcu7FfrQp+PI=
513515
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.538/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
514516
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.539 h1:5lhWDRRpLF1hErX0H/N4CA2VKEZdx4lxf8tGKj0sQAo=
515517
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.539/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
@@ -540,6 +542,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.199 h1:rSDQeqv
540542
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.199/go.mod h1:yrBKWhChnDqNz1xuXdSbWXG56XawEq0G5j1lg4VwBD4=
541543
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.413 h1:9v95vMBfqvBciwagN+ZqP6Ue3iBFYZRVQga4c1yL5Uc=
542544
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.413/go.mod h1:nG/8Iz/MtV4zBxz9ToLJ90O4ocdME9WUKwims/bitr4=
545+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.525 h1:BXXFoizOv43lfZ/Ww8t7jvwiD3RyssckRgWDGIqjDPE=
546+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.525/go.mod h1:Irr11PIq15N1XYyeH2c/RqtDsAbEWY4KXiMxu4BVRfI=
547+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.535 h1:hSwG4ZbcP2Ht+AWHI81EMCvJdDTyTT7zP/qjOe/VcZg=
548+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.535/go.mod h1:mYKqy56uKaI0aPySeUByymvwDerPTmdMJQPQKC/NU1s=
543549
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb v1.0.532 h1:3PCI1M2dvfAWVx+5xTqap+8qIsmG8cQ4lpvGfwmO2NM=
544550
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb v1.0.532/go.mod h1:lb1pdGQn9dzyXmq6+NkpN4avTVRvG+ziqFtOeL5D7y4=
545551
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.199 h1:2jsGprrewRIP3smcTsY5GpEuOuJ+qyV/BN3Py0Ivf1o=

‎tencentcloud/basic_test.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -796,6 +796,18 @@ const (
796796

797797
// End of PTS
798798

799+
// CSS
800+
const (
801+
defaultCSSLiveType = "PullLivePushLive"
802+
defaultCSSDomainName = "177154.push.tlivecloud.com"
803+
defaultCSSStreamName = defaultCSSPrefix + "test_stream_name"
804+
defaultCSSAppName = "live"
805+
defaultCSSOperator = "tf_admin"
806+
defaultCSSPrefix = "tf_css_"
807+
)
808+
809+
// End of CSS
810+
799811
// TAT
800812
const (
801813
defaultInstanceId = "ins-881b1c8w"

‎tencentcloud/connectivity/client.go‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import (
4747
gaap "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529"
4848
kms "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms/v20190118"
4949
lighthouse "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse/v20200324"
50+
css "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live/v20180801"
5051
mariadb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb/v20170312"
5152
mongodb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb/v20190725"
5253
monitor "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor/v20180724"
@@ -132,6 +133,7 @@ type TencentCloudClient struct {
132133
temConn *tem.Client
133134
teoConn *teo.Client
134135
tcmConn *tcm.Client
136+
cssConn *css.Client
135137
sesConn *ses.Client
136138
dcdbConn *dcdb.Client
137139
smsConn *sms.Client
@@ -792,6 +794,19 @@ func (me *TencentCloudClient) UseTcmClient() *tcm.Client {
792794
return me.tcmConn
793795
}
794796

797+
// UseCssClient returns css client for service
798+
func (me *TencentCloudClient) UseCssClient() *css.Client {
799+
if me.cssConn != nil {
800+
return me.cssConn
801+
}
802+
803+
cpf := me.NewClientProfile(300)
804+
me.cssConn, _ = css.NewClient(me.Credential, me.Region, cpf)
805+
me.cssConn.WithHttpTransport(&LogRoundTripper{})
806+
807+
return me.cssConn
808+
}
809+
795810
// UseSesClient returns Ses client for service
796811
func (me *TencentCloudClient) UseSesClient() *ses.Client {
797812
if me.sesConn != nil {

‎tencentcloud/internal/helper/transform.go‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,21 @@ func Int64ToStr(s int64) (i string) {
163163
return
164164
}
165165

166+
func Int64ToStrPoint(s int64) *string {
167+
i := Int64ToStr(s)
168+
return &i
169+
}
170+
166171
func StrToInt64(s string) (i int64) {
167172
i, _ = strconv.ParseInt(s, 10, 64)
168173
return
169174
}
170175

176+
func StrToInt64Point(s string) *int64 {
177+
i := StrToInt64(s)
178+
return &i
179+
}
180+
171181
func UInt64ToStr(s uint64) (i string) {
172182
i = strconv.FormatUint(s, 10)
173183
return
@@ -179,6 +189,11 @@ func StrToUInt64(s string) (i uint64) {
179189
return
180190
}
181191

192+
func StrToUint64Point(s string) *uint64 {
193+
i := StrToUInt64(s)
194+
return &i
195+
}
196+
182197
func StrToBool(s string) (i bool) {
183198
i = false
184199
if s == "true" {

‎tencentcloud/provider.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -748,6 +748,13 @@ TencentDB for MariaDB(MariaDB)
748748
tencentcloud_mariadb_log_file_retention_period
749749
tencentcloud_mariadb_security_groups
750750
751+
Cloud Streaming Services(CSS)
752+
Resource
753+
tencentcloud_css_watermark
754+
tencentcloud_css_pull_stream_task
755+
tencentcloud_css_live_transcode_template
756+
tencentcloud_css_live_transcode_rule_attachment
757+
751758
Performance Testing Service(PTS)
752759
Resource
753760
tencentcloud_pts_project
@@ -1356,6 +1363,10 @@ func Provider() terraform.ResourceProvider {
13561363
"tencentcloud_mariadb_parameters": resourceTencentCloudMariadbParameters(),
13571364
"tencentcloud_mariadb_log_file_retention_period": resourceTencentCloudMariadbLogFileRetentionPeriod(),
13581365
"tencentcloud_mariadb_security_groups": resourceTencentCloudMariadbSecurityGroups(),
1366+
"tencentcloud_css_watermark": resourceTencentCloudCssWatermark(),
1367+
"tencentcloud_css_pull_stream_task": resourceTencentCloudCssPullStreamTask(),
1368+
"tencentcloud_css_live_transcode_template": resourceTencentCloudCssLiveTranscodeTemplate(),
1369+
"tencentcloud_css_live_transcode_rule_attachment": resourceTencentCloudCssLiveTranscodeRuleAttachment(),
13591370
"tencentcloud_pts_project": resourceTencentCloudPtsProject(),
13601371
"tencentcloud_pts_alert_channel": resourceTencentCloudPtsAlertChannel(),
13611372
"tencentcloud_pts_scenario": resourceTencentCloudPtsScenario(),

0 commit comments

Comments
 (0)