Skip to content

Commit 1abd611

Browse files
committed
fix
1 parent d63aa2f commit 1abd611

File tree

4 files changed

+49
-76
lines changed

4 files changed

+49
-76
lines changed

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/resource_tc_mps_watermark_template.go

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,17 @@ Example Usage
55
66
```hcl
77
resource "tencentcloud_mps_watermark_template" "watermark_template" {
8-
type = <nil>
9-
name = <nil>
10-
comment = <nil>
118
coordinate_origin = "TopLeft"
12-
x_pos = "0px"
13-
y_pos = "0px"
14-
image_template {
15-
image_content = <nil>
16-
width = "10%"
17-
height = "0px"
18-
repeat_type = "repeat"
19-
20-
}
21-
text_template {
22-
font_type = <nil>
23-
font_size = <nil>
24-
font_color = "0xFFFFFF"
25-
font_alpha =
26-
27-
}
28-
svg_template {
29-
width = "10W%"
30-
height = "0px"
9+
name = "xZxasd"
10+
type = "image"
11+
x_pos = "12%"
12+
y_pos = "21%"
3113
14+
image_template {
15+
height = "17px"
16+
image_content = filebase64("./logo.png")
17+
repeat_type = "repeat"
18+
width = "12px"
3219
}
3320
}
3421
```
@@ -45,11 +32,15 @@ package tencentcloud
4532

4633
import (
4734
"context"
35+
"encoding/base64"
36+
"io/ioutil"
37+
"log"
38+
"net/http"
39+
4840
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
4941
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
5042
mps "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps/v20190612"
5143
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
52-
"log"
5344
)
5445

5546
func resourceTencentCloudMpsWatermarkTemplate() *schema.Resource {
@@ -336,9 +327,19 @@ func resourceTencentCloudMpsWatermarkTemplateRead(d *schema.ResourceData, meta i
336327
if watermarkTemplate.ImageTemplate != nil {
337328
imageTemplateMap := map[string]interface{}{}
338329

339-
//if watermarkTemplate.ImageTemplate.ImageContent != nil {
340-
// imageTemplateMap["image_content"] = watermarkTemplate.ImageTemplate.ImageContent
341-
//}
330+
if watermarkTemplate.ImageTemplate.ImageUrl != nil {
331+
url := watermarkTemplate.ImageTemplate.ImageUrl
332+
res, err := http.Get(*url)
333+
if err != nil {
334+
return err
335+
}
336+
content, err := ioutil.ReadAll(res.Body)
337+
if err != nil {
338+
return err
339+
}
340+
base64Encode := base64.StdEncoding.EncodeToString(content)
341+
imageTemplateMap["image_content"] = base64Encode
342+
}
342343

343344
if watermarkTemplate.ImageTemplate.Width != nil {
344345
imageTemplateMap["width"] = watermarkTemplate.ImageTemplate.Width

tencentcloud/resource_tc_mps_watermark_template_test.go

Lines changed: 11 additions & 23 deletions
Large diffs are not rendered by default.

website/docs/r/mps_watermark_template.html.markdown

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,17 @@ Provides a resource to create a mps watermark_template
1515

1616
```hcl
1717
resource "tencentcloud_mps_watermark_template" "watermark_template" {
18-
type = & lt ; nil & gt ;
19-
name = & lt ; nil & gt ;
20-
comment = & lt ; nil & gt ;
2118
coordinate_origin = "TopLeft"
22-
x_pos = "0px"
23-
y_pos = "0px"
19+
name = "xZxasd"
20+
type = "image"
21+
x_pos = "12%"
22+
y_pos = "21%"
23+
2424
image_template {
25-
image_content = & lt ; nil & gt ;
26-
width = "10%"
27-
height = "0px"
25+
height = "17px"
26+
image_content = filebase64("./logo.png")
2827
repeat_type = "repeat"
29-
30-
}
31-
text_template {
32-
font_type = & lt ; nil & gt ;
33-
font_size = & lt ; nil & gt ;
34-
font_color = "0xFFFFFF"
35-
font_alpha =
36-
37-
}
38-
svg_template {
39-
width = "10W%"
40-
height = "0px"
41-
28+
width = "12px"
4229
}
4330
}
4431
```

0 commit comments

Comments
 (0)