Skip to content

feat: support css resource #1386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Nov 17, 2022
Merged

feat: support css resource #1386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
eaabf88
support css watermark, watermark_rule and pull stream task
lyu571 Nov 1, 2022
889bd5d
add pull stream
lyu571 Nov 11, 2022
582ae92
Merge branch 'master' of github.com:tencentcloudstack/terraform-provi…
lyu571 Nov 11, 2022
f13ffcd
merge code from master
lyu571 Nov 15, 2022
70cc990
add pull stream e2e case
lyu571 Nov 16, 2022
c4e54d3
pull stream passed e2e case
lyu571 Nov 16, 2022
54fc223
watermark passed e2e case
lyu571 Nov 16, 2022
cdc30a3
1.live temp passed e2e case
lyu571 Nov 17, 2022
780229f
1.live rule attachment passed e2e case. 2.changelog 3.golangci-lint
lyu571 Nov 17, 2022
81d002d
resolve conflict
lyu571 Nov 17, 2022
40cdb4e
resolve conflict2
lyu571 Nov 17, 2022
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
15 changes: 15 additions & 0 deletions .changelog/1386.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
```release-note:new-resource
tencentcloud_css_watermark
```

```release-note:new-resource
tencentcloud_css_pull_stream_task
```

```release-note:new-resource
tencentcloud_css_live_transcode_template
```

```release-note:new-resource
tencentcloud_css_live_transcode_rule_attachment
```
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap v1.0.514
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.199
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.413
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.535
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb v1.0.532
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.199
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.518
Expand Down
8 changes: 7 additions & 1 deletion go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,13 +503,15 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.518/go.mod
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.519/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.520/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.524/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.525/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.527/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.529 h1:B26Pn9N5O3Mmbh8icZSpZ8kkhcfnapUdU/TBxPDWggA=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.529/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.532 h1:DjnGMxuX49TNNyXp6V18VO+oY9Y5Gs4/+vL0LeZ8YIo=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.532/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.533 h1:UBHA9iYBQfkNYAWb6BixA8JCOQPxyMNMIVFdGjdM+1w=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.533/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.535/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.538 h1:z3LR9xqthQT11X0APmAdLpVjH95npnmHcu7FfrQp+PI=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.538/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.539 h1:5lhWDRRpLF1hErX0H/N4CA2VKEZdx4lxf8tGKj0sQAo=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.539/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
Expand Down Expand Up @@ -540,6 +542,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.199 h1:rSDQeqv
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.199/go.mod h1:yrBKWhChnDqNz1xuXdSbWXG56XawEq0G5j1lg4VwBD4=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.413 h1:9v95vMBfqvBciwagN+ZqP6Ue3iBFYZRVQga4c1yL5Uc=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.413/go.mod h1:nG/8Iz/MtV4zBxz9ToLJ90O4ocdME9WUKwims/bitr4=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.525 h1:BXXFoizOv43lfZ/Ww8t7jvwiD3RyssckRgWDGIqjDPE=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.525/go.mod h1:Irr11PIq15N1XYyeH2c/RqtDsAbEWY4KXiMxu4BVRfI=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.535 h1:hSwG4ZbcP2Ht+AWHI81EMCvJdDTyTT7zP/qjOe/VcZg=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.535/go.mod h1:mYKqy56uKaI0aPySeUByymvwDerPTmdMJQPQKC/NU1s=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb v1.0.532 h1:3PCI1M2dvfAWVx+5xTqap+8qIsmG8cQ4lpvGfwmO2NM=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb v1.0.532/go.mod h1:lb1pdGQn9dzyXmq6+NkpN4avTVRvG+ziqFtOeL5D7y4=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.199 h1:2jsGprrewRIP3smcTsY5GpEuOuJ+qyV/BN3Py0Ivf1o=
Expand Down
12 changes: 12 additions & 0 deletions tencentcloud/basic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,6 +796,18 @@ const (

// End of PTS

// CSS
const (
defaultCSSLiveType = "PullLivePushLive"
defaultCSSDomainName = "177154.push.tlivecloud.com"
defaultCSSStreamName = defaultCSSPrefix + "test_stream_name"
defaultCSSAppName = "live"
defaultCSSOperator = "tf_admin"
defaultCSSPrefix = "tf_css_"
)

// End of CSS

// TAT
const (
defaultInstanceId = "ins-881b1c8w"
Expand Down
15 changes: 15 additions & 0 deletions tencentcloud/connectivity/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import (
gaap "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529"
kms "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms/v20190118"
lighthouse "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse/v20200324"
css "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live/v20180801"
mariadb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb/v20170312"
mongodb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb/v20190725"
monitor "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor/v20180724"
Expand Down Expand Up @@ -132,6 +133,7 @@ type TencentCloudClient struct {
temConn *tem.Client
teoConn *teo.Client
tcmConn *tcm.Client
cssConn *css.Client
sesConn *ses.Client
dcdbConn *dcdb.Client
smsConn *sms.Client
Expand Down Expand Up @@ -792,6 +794,19 @@ func (me *TencentCloudClient) UseTcmClient() *tcm.Client {
return me.tcmConn
}

// UseCssClient returns css client for service
func (me *TencentCloudClient) UseCssClient() *css.Client {
if me.cssConn != nil {
return me.cssConn
}

cpf := me.NewClientProfile(300)
me.cssConn, _ = css.NewClient(me.Credential, me.Region, cpf)
me.cssConn.WithHttpTransport(&LogRoundTripper{})

return me.cssConn
}

// UseSesClient returns Ses client for service
func (me *TencentCloudClient) UseSesClient() *ses.Client {
if me.sesConn != nil {
Expand Down
15 changes: 15 additions & 0 deletions tencentcloud/internal/helper/transform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,21 @@ func Int64ToStr(s int64) (i string) {
return
}

func Int64ToStrPoint(s int64) *string {
i := Int64ToStr(s)
return &i
}

func StrToInt64(s string) (i int64) {
i, _ = strconv.ParseInt(s, 10, 64)
return
}

func StrToInt64Point(s string) *int64 {
i := StrToInt64(s)
return &i
}

func UInt64ToStr(s uint64) (i string) {
i = strconv.FormatUint(s, 10)
return
Expand All @@ -179,6 +189,11 @@ func StrToUInt64(s string) (i uint64) {
return
}

func StrToUint64Point(s string) *uint64 {
i := StrToUInt64(s)
return &i
}

func StrToBool(s string) (i bool) {
i = false
if s == "true" {
Expand Down
11 changes: 11 additions & 0 deletions tencentcloud/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,13 @@ TencentDB for MariaDB(MariaDB)
tencentcloud_mariadb_log_file_retention_period
tencentcloud_mariadb_security_groups

Cloud Streaming Services(CSS)
Resource
tencentcloud_css_watermark
tencentcloud_css_pull_stream_task
tencentcloud_css_live_transcode_template
tencentcloud_css_live_transcode_rule_attachment

Performance Testing Service(PTS)
Resource
tencentcloud_pts_project
Expand Down Expand Up @@ -1356,6 +1363,10 @@ func Provider() terraform.ResourceProvider {
"tencentcloud_mariadb_parameters": resourceTencentCloudMariadbParameters(),
"tencentcloud_mariadb_log_file_retention_period": resourceTencentCloudMariadbLogFileRetentionPeriod(),
"tencentcloud_mariadb_security_groups": resourceTencentCloudMariadbSecurityGroups(),
"tencentcloud_css_watermark": resourceTencentCloudCssWatermark(),
"tencentcloud_css_pull_stream_task": resourceTencentCloudCssPullStreamTask(),
"tencentcloud_css_live_transcode_template": resourceTencentCloudCssLiveTranscodeTemplate(),
"tencentcloud_css_live_transcode_rule_attachment": resourceTencentCloudCssLiveTranscodeRuleAttachment(),
"tencentcloud_pts_project": resourceTencentCloudPtsProject(),
"tencentcloud_pts_alert_channel": resourceTencentCloudPtsAlertChannel(),
"tencentcloud_pts_scenario": resourceTencentCloudPtsScenario(),
Expand Down
Loading