fix

Author: hellertang

tencentcloud/connectivity/client.go

@@ -8,12 +8,6 @@ import (
 	"strconv"
 	"time"
 
-	mps "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps/v20190612"
-
-	ses "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ses/v20201002"
-
-	tcm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcm/v20210413"
-
 	"github.com/tencentyun/cos-go-sdk-v5"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -56,13 +50,15 @@ import (
 	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"
+	mps "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps/v20190612"
 	organization "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization/v20210331"
 	postgre "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres/v20170312"
 	privatedns "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns/v20201028"
 	pts "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/pts/v20210728"
 	redis "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis/v20180412"
 	rum "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/rum/v20210622"
 	scf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416"
+	ses "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ses/v20201002"
 	sms "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms/v20210111"
 	sqlserver "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sqlserver/v20180328"
 	sslCertificate "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205"
@@ -71,6 +67,7 @@ import (
 	tag "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tag/v20180813"
 	tat "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tat/v20201028"
 	tcaplusdb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcaplusdb/v20190823"
+	tcm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcm/v20210413"
 	tcr "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr/v20190924"
 	tdcpg "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdcpg/v20211118"
 	tdmq "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq/v20200217"

tencentcloud/resource_tc_mps_watermark_template.go

@@ -5,30 +5,17 @@ Example Usage
 
 ```hcl
 resource "tencentcloud_mps_watermark_template" "watermark_template" {
-  type = <nil>
-  name = <nil>
-  comment = <nil>
   coordinate_origin = "TopLeft"
-  x_pos = "0px"
-  y_pos = "0px"
-  image_template {
-		image_content = <nil>
-		width = "10%"
-		height = "0px"
-		repeat_type = "repeat"
-
-  }
-  text_template {
-		font_type = <nil>
-		font_size = <nil>
-		font_color = "0xFFFFFF"
-		font_alpha =
-
-  }
-  svg_template {
-		width = "10W%"
-		height = "0px"
+  name              = "xZxasd"
+  type              = "image"
+  x_pos             = "12%"
+  y_pos             = "21%"
 
+  image_template {
+    height        = "17px"
+    image_content = filebase64("./logo.png")
+    repeat_type   = "repeat"
+    width         = "12px"
   }
 }
 ```
@@ -45,11 +32,15 @@ package tencentcloud
 
 import (
 	"context"
+	"encoding/base64"
+	"io/ioutil"
+	"log"
+	"net/http"
+
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	mps "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps/v20190612"
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
-	"log"
 )
 
 func resourceTencentCloudMpsWatermarkTemplate() *schema.Resource {
@@ -336,9 +327,19 @@ func resourceTencentCloudMpsWatermarkTemplateRead(d *schema.ResourceData, meta i
 	if watermarkTemplate.ImageTemplate != nil {
 		imageTemplateMap := map[string]interface{}{}
 
-		//if watermarkTemplate.ImageTemplate.ImageContent != nil {
-		//	imageTemplateMap["image_content"] = watermarkTemplate.ImageTemplate.ImageContent
-		//}
+		if watermarkTemplate.ImageTemplate.ImageUrl != nil {
+			url := watermarkTemplate.ImageTemplate.ImageUrl
+			res, err := http.Get(*url)
+			if err != nil {
+				return err
+			}
+			content, err := ioutil.ReadAll(res.Body)
+			if err != nil {
+				return err
+			}
+			base64Encode := base64.StdEncoding.EncodeToString(content)
+			imageTemplateMap["image_content"] = base64Encode
+		}
 
 		if watermarkTemplate.ImageTemplate.Width != nil {
 			imageTemplateMap["width"] = watermarkTemplate.ImageTemplate.Width

tencentcloud/resource_tc_mps_watermark_template_test.go

@@ -15,30 +15,17 @@ Provides a resource to create a mps watermark_template
 
 ```hcl
 resource "tencentcloud_mps_watermark_template" "watermark_template" {
-  type              = & lt ; nil & gt ;
-  name              = & lt ; nil & gt ;
-  comment           = & lt ; nil & gt ;
   coordinate_origin = "TopLeft"
-  x_pos             = "0px"
-  y_pos             = "0px"
+  name              = "xZxasd"
+  type              = "image"
+  x_pos             = "12%"
+  y_pos             = "21%"
+
   image_template {
-    image_content = & lt ; nil & gt ;
-    width         = "10%"
-    height        = "0px"
+    height        = "17px"
+    image_content = filebase64("./logo.png")
     repeat_type   = "repeat"
-
-  }
-  text_template {
-    font_type  = & lt ; nil & gt ;
-    font_size  = & lt ; nil & gt ;
-    font_color = "0xFFFFFF"
-    font_alpha =
-
-  }
-  svg_template {
-    width  = "10W%"
-    height = "0px"
-
+    width         = "12px"
   }
 }
 ```