Merge pull request #2 from terraform-providers/master

syn files with the master.

Author: Himer

CHANGELOG.md

@@ -1,9 +1,15 @@
-## 1.31.0 (Unreleased)
+## 1.30.4 (Unreleased)
+
+BUG FIXES:
+
+* Resource: `tencentcloud_cam_policy` fix read nil issue when the resource is not exist.([#344](https://github.com/terraform-providers/terraform-provider-tencentcloud/issues/#344)).
+* Resource: `tencentcloud_key_pair` will be replaced when the end of `public_key` contains spaces([#343](https://github.com/terraform-providers/terraform-provider-tencentcloud/issues/343)).
 
 ENHANCEMENTS:
 
 * Resource: `tencentcloud_kubernetes_cluster` add new attributes `cluster_os_type`,`cluster_internet`,`cluster_intranet`,`managed_cluster_internet_security_policies` and `cluster_intranet_subnet_id`.
 
+
 ## 1.30.3 (February 24, 2020)
 
 BUG FIXES:

tencentcloud/resource_tc_cam_policy.go

@@ -48,6 +48,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	cam "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam/v20190116"
+	sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
 
@@ -177,6 +178,13 @@ func resourceTencentCloudCamPolicyRead(d *schema.ResourceData, meta interface{})
 	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
 		result, e := meta.(*TencentCloudClient).apiV3Conn.UseCamClient().GetPolicy(request)
 		if e != nil {
+			if ee, ok := e.(*sdkErrors.TencentCloudSDKError); ok {
+				errCode := ee.GetCode()
+				//check if read empty
+				if strings.Contains(errCode, "ResourceNotFound") {
+					return nil
+				}
+			}
 			return retryError(e)
 		}
 		instance = result

tencentcloud/resource_tc_cam_role.go

@@ -41,11 +41,13 @@ import (
 	"fmt"
 	"log"
 	"reflect"
+	"strings"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	cam "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam/v20190116"
+	sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
 
@@ -181,6 +183,13 @@ func resourceTencentCloudCamRoleRead(d *schema.ResourceData, meta interface{}) e
 	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
 		result, e := camService.DescribeRoleById(ctx, roleId)
 		if e != nil {
+			if ee, ok := e.(*sdkErrors.TencentCloudSDKError); ok {
+				errCode := ee.GetCode()
+				//check if read empty
+				if strings.Contains(errCode, "ResourceNotFound") {
+					return nil
+				}
+			}
 			return retryError(e)
 		}
 		instance = result

tencentcloud/resource_tc_cam_saml_provider.go

@@ -24,11 +24,13 @@ package tencentcloud
 import (
 	"fmt"
 	"log"
+	"strings"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	cam "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam/v20190116"
+	sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
 
@@ -132,6 +134,13 @@ func resourceTencentCloudCamSAMLProviderRead(d *schema.ResourceData, meta interf
 	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
 		result, e := meta.(*TencentCloudClient).apiV3Conn.UseCamClient().GetSAMLProvider(request)
 		if e != nil {
+			if ee, ok := e.(*sdkErrors.TencentCloudSDKError); ok {
+				errCode := ee.GetCode()
+				//check if read empty
+				if strings.Contains(errCode, "ResourceNotFound") {
+					return nil
+				}
+			}
 			return retryError(e)
 		}
 		instance = result

tencentcloud/resource_tc_cam_user.go

@@ -31,11 +31,13 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"strings"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	cam "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam/v20190116"
+	sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
 
@@ -223,6 +225,13 @@ func resourceTencentCloudCamUserRead(d *schema.ResourceData, meta interface{}) e
 	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
 		result, e := camService.DescribeUserById(ctx, userId)
 		if e != nil {
+			if ee, ok := e.(*sdkErrors.TencentCloudSDKError); ok {
+				errCode := ee.GetCode()
+				//check if read empty
+				if strings.Contains(errCode, "ResourceNotFound") {
+					return nil
+				}
+			}
 			return retryError(e)
 		}
 		instance = result

tencentcloud/resource_tc_dayu_cc_http_policy.go

@@ -207,7 +207,7 @@ func resourceTencentCloudDayuCCHttpPolicyCreate(d *schema.ResourceData, meta int
 
 	if smode == DAYU_CC_POLICY_SMODE_SPEED_LIMIT {
 		if frequency == 0 {
-			return fmt.Errorf("`speedlimit` should be set when `smode` is `speedlimit`.")
+			return fmt.Errorf("`frequencys` should be set when `smode` is `speedlimit`.")
 		}
 		ccPolicy.Frequency = helper.IntUint64(frequency)
 	} else {

tencentcloud/resource_tc_key_pair.go

@@ -48,9 +48,17 @@ func resourceTencentCloudKeyPair() *schema.Resource {
 				Description:  "The key pair's name. It is the only in one TencentCloud account.",
 			},
 			"public_key": {
-				Type:        schema.TypeString,
-				Required:    true,
-				ForceNew:    true,
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+				StateFunc: func(v interface{}) string {
+					switch value := v.(type) {
+					case string:
+						return strings.TrimSpace(value)
+					default:
+						return ""
+					}
+				},
 				Description: "You can import an existing public key and using TencentCloud key pair to manage it.",
 			},
 			"project_id": {