add

Author: SevenEarth

go.mod

@@ -46,15 +46,15 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.23
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.35
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1206
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1161
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dbbrain v1.0.652
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dc v1.0.633
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dcdb v1.0.673
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dlc v1.1.23
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dlc v1.1.35
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.1056
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/domain v1.0.414
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dts v1.0.628

go.sum

@@ -963,6 +963,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.22 h1:1unTm
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.22/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.23 h1:YZOxepoaH/yNaD1sYpCXR6PuFd22hbKdlXAGXWre8aM=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.23/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.25 h1:bTN1RYwKti9GX4qdI/yd+ybh0QY/BkoGSG+wgArS0L8=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.25/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.35 h1:gcnqnP30UeTFn1Jm1yMiAOlX7x1r12KAQ3cNIQTg/Gc=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.35/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
@@ -991,6 +995,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dlc v1.1.5 h1:0GJ2seyiC
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dlc v1.1.5/go.mod h1:vipcBjuWWiD8NgkeDdflpmTAHFf/zH+chcpW4ADnwi4=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dlc v1.1.23 h1:E2hkbinLJ2FDMjpX/RpWpqpwNbOTV4hnTmdeJm2Vj4k=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dlc v1.1.23/go.mod h1:uR34lQsblkhjuZ68wkSsKw2uHJ7MG5aUoOdWPe3ILdw=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dlc v1.1.25 h1:QdwCXRsSroZNFq+yYhT38LhFKoM0pSPycUoM4Xm5kyI=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dlc v1.1.25/go.mod h1:9XFynyALKk12v5qu8Z49cOmRLQd/SlVZxLMfb/goarY=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dlc v1.1.35 h1:YBartSeOD6M1hFzVytGXcILAlXfzzrCxdjcAAbcHi5U=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dlc v1.1.35/go.mod h1:Hb8V1r7scNF9Zjk0fiEavzW2dx+Lr2FEYrXDPa9f0TE=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.1056 h1:kvJuKukDqbt1nKzaVRdcbvs3w9CoMz3V1oQp6jo3rSw=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.1056/go.mod h1:TLTlcL7Dr1p0vPg0NvOi1CJEx2xG1zTlP+4k+ggxnZE=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/domain v1.0.414 h1:egwjvOEUKBaxsoRVn/YSEhp2E8qdh77Ous9A/wftDo0=

tencentcloud/services/dlc/resource_tc_dlc_attach_data_mask_policy.go

@@ -54,30 +54,12 @@ func ResourceTencentCloudDlcAttachDataMaskPolicy() *schema.Resource {
 										ForceNew:    true,
 										Description: "The name of the table to be authorized. Use * to represent all tables under the current Database. For administrator-level authorization, only * is allowed. For data connection-level and database-level authorization, leave it empty. For other types, specify the table name.",
 									},
-									"operation": {
-										Type:        schema.TypeString,
-										Required:    true,
-										ForceNew:    true,
-										Description: "The permission operation to be granted, varying by authorization level. Administrator-level: ALL (default). Data connection-level: CREATE. Database-level: ALL, CREATE, ALTER, DROP. Table-level: ALL, SELECT, INSERT, ALTER, DELETE, DROP, UPDATE. Note: For table-level permissions, only SELECT is supported if the data source is not COSDataCatalog.",
-									},
-									"policy_type": {
-										Type:        schema.TypeString,
-										Optional:    true,
-										ForceNew:    true,
-										Description: "The type of authorization. Currently supports eight types: ADMIN (administrator-level), DATASOURCE (data connection-level), DATABASE (database-level), TABLE (table-level), VIEW (view-level), FUNCTION (function-level), COLUMN (column-level), ENGINE (data engine-level). Defaults to administrator-level.",
-									},
 									"column": {
 										Type:        schema.TypeString,
 										Optional:    true,
 										ForceNew:    true,
 										Description: "The name of the column to be authorized. Use * to represent all columns. For administrator-level authorization, only * is allowed.",
 									},
-									"mode": {
-										Type:        schema.TypeString,
-										Optional:    true,
-										ForceNew:    true,
-										Description: "The authorization mode. Do not fill in this parameter. COMMON: Normal mode. SENIOR: Advanced mode.",
-									},
 								},
 							},
 						},
@@ -136,23 +118,13 @@ func resourceTencentCloudDlcAttachDataMaskPolicyCreate(d *schema.ResourceData, m
 					table = v
 				}
 
-				if v, ok := policyInfoMap["operation"].(string); ok && v != "" {
-					policy.Operation = helper.String(v)
-				}
-
-				if v, ok := policyInfoMap["policy_type"].(string); ok && v != "" {
-					policy.PolicyType = helper.String(v)
-				}
-
 				if v, ok := policyInfoMap["column"].(string); ok && v != "" {
 					policy.Column = helper.String(v)
 					column = v
 				}
 
-				if v, ok := policyInfoMap["mode"].(string); ok && v != "" {
-					policy.Mode = helper.String(v)
-				}
-
+				policy.Operation = helper.String("SELECT")
+				policy.PolicyType = helper.String("DATAMASK")
 				dataMaskStrategyPolicy.PolicyInfo = &policy
 			}
 
@@ -237,6 +209,7 @@ func resourceTencentCloudDlcAttachDataMaskPolicyRead(d *schema.ResourceData, met
 				policyInfoMap["database"] = dataBase
 				policyInfoMap["table"] = table
 				policyInfoMap["column"] = column
+
 				policyInfoList = append(policyInfoList, policyInfoMap)
 				dMap["policy_info"] = policyInfoList
 
@@ -287,42 +260,15 @@ func resourceTencentCloudDlcAttachDataMaskPolicyDelete(d *schema.ResourceData, m
 		for _, item := range v.([]interface{}) {
 			dataMaskStrategyPolicySetMap := item.(map[string]interface{})
 			dataMaskStrategyPolicy := dlcv20210125.DataMaskStrategyPolicy{}
-			if policyInfoMap, ok := helper.ConvertInterfacesHeadToMap(dataMaskStrategyPolicySetMap["policy_info"]); ok {
-				policy := dlcv20210125.Policy{}
-				if v, ok := policyInfoMap["database"].(string); ok && v != "" {
-					policy.Database = &dataBase
-				}
-
-				if v, ok := policyInfoMap["catalog"].(string); ok && v != "" {
-					policy.Catalog = &catalog
-				}
-
-				if v, ok := policyInfoMap["table"].(string); ok && v != "" {
-					policy.Table = &table
-				}
-
-				if v, ok := policyInfoMap["operation"].(string); ok && v != "" {
-					policy.Operation = helper.String(v)
-				}
-
-				if v, ok := policyInfoMap["policy_type"].(string); ok && v != "" {
-					policy.PolicyType = helper.String(v)
-				}
-
-				if v, ok := policyInfoMap["column"].(string); ok && v != "" {
-					policy.Column = &column
-				}
-
-				if v, ok := policyInfoMap["mode"].(string); ok && v != "" {
-					policy.Mode = helper.String(v)
-				}
-
-				dataMaskStrategyPolicy.PolicyInfo = &policy
-			}
-
-			if v, ok := dataMaskStrategyPolicySetMap["data_mask_strategy_id"].(string); ok && v != "" {
-				dataMaskStrategyPolicy.DataMaskStrategyId = helper.String(v)
-			}
+			policy := dlcv20210125.Policy{}
+			policy.Database = &dataBase
+			policy.Catalog = &catalog
+			policy.Table = &table
+			policy.Column = &column
+			policy.Operation = helper.String("SELECT")
+			policy.PolicyType = helper.String("DATAMASK")
+			dataMaskStrategyPolicy.PolicyInfo = &policy
+			dataMaskStrategyPolicy.DataMaskStrategyId = helper.String("-1")
 
 			if v, ok := dataMaskStrategyPolicySetMap["column_type"].(string); ok && v != "" {
 				dataMaskStrategyPolicy.ColumnType = helper.String(v)

tencentcloud/services/dlc/resource_tc_dlc_attach_data_mask_policy.md

@@ -1,22 +1,30 @@
-Provides a resource to create a DLC dlc attach data mask policy
+Provides a resource to create a DLC attach data mask policy
 
 Example Usage
 
 ```hcl
+resource "tencentcloud_dlc_data_mask_strategy" "example" {
+  strategy {
+    strategy_name = "tf-example"
+    strategy_desc = "description."
+    groups {
+      work_group_id = 70220
+      strategy_type = "MASK"
+    }
+  }
+}
+
 resource "tencentcloud_dlc_attach_data_mask_policy" "example" {
   data_mask_strategy_policy_set {
     policy_info {
-      database    = ""
-      catalog     = ""
-      table       = ""
-      operation   = ""
-      policy_type = ""
-      column      = ""
-      mode        = ""
+      database    = "tf-example"
+      catalog     = "DataLakeCatalog"
+      table       = "tf-example"
+      column      = "id"
     }
 
-    data_mask_strategy_id = ""
-    column_type           = ""
+    data_mask_strategy_id = tencentcloud_dlc_data_mask_strategy.example.id
+    column_type           = "string"
   }
 }
 ```

tencentcloud/services/dlc/resource_tc_dlc_attach_data_mask_policy_test.go

@@ -28,20 +28,28 @@ func TestAccTencentCloudDlcAttachDataMaskPolicyResource_basic(t *testing.T) {
 }
 
 const testAccDlcAttachDataMaskPolicy = `
+resource "tencentcloud_dlc_data_mask_strategy" "example" {
+  strategy {
+    strategy_name = "tf-example"
+    strategy_desc = "description."
+    groups {
+      work_group_id = 70220
+      strategy_type = "MASK"
+    }
+  }
+}
+
 resource "tencentcloud_dlc_attach_data_mask_policy" "example" {
   data_mask_strategy_policy_set {
     policy_info {
-      database    = ""
-      catalog     = ""
-      table       = ""
-      operation   = ""
-      policy_type = ""
-      column      = ""
-      mode        = ""
+      database    = "test"
+      catalog     = "DataLakeCatalog"
+      table       = "test"
+      column      = "id"
     }
 
-    data_mask_strategy_id = ""
-    column_type           = ""
+    data_mask_strategy_id = tencentcloud_dlc_data_mask_strategy.example.id
+    column_type           = "string"
   }
 }
 `

tencentcloud/services/dlc/resource_tc_dlc_data_mask_strategy.go

@@ -150,7 +150,7 @@ func resourceTencentCloudDlcDataMaskStrategyRead(d *schema.ResourceData, meta in
 		logId      = tccommon.GetLogId(tccommon.ContextNil)
 		ctx        = tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta)
 		service    = DlcService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
-		strategyId string
+		strategyId = d.Id()
 	)
 
 	respData, err := service.DescribeDlcDataMaskStrategyById(ctx, strategyId)
@@ -164,43 +164,41 @@ func resourceTencentCloudDlcDataMaskStrategyRead(d *schema.ResourceData, meta in
 		return nil
 	}
 
-	if respData != nil {
-		strategiesList := make([]map[string]interface{}, 0, 1)
-		strategiesMap := map[string]interface{}{}
-		if respData.StrategyName != nil {
-			strategiesMap["strategy_name"] = respData.StrategyName
-		}
-
-		if respData.StrategyDesc != nil {
-			strategiesMap["strategy_desc"] = respData.StrategyDesc
-		}
+	strategiesList := make([]map[string]interface{}, 0, 1)
+	strategiesMap := map[string]interface{}{}
+	if respData.StrategyName != nil {
+		strategiesMap["strategy_name"] = respData.StrategyName
+	}
 
-		if respData.Groups != nil {
-			groupsList := make([]map[string]interface{}, 0, len(respData.Groups))
-			for _, groups := range respData.Groups {
-				groupsMap := map[string]interface{}{}
-				if groups.WorkGroupId != nil {
-					groupsMap["work_group_id"] = groups.WorkGroupId
-				}
+	if respData.StrategyDesc != nil {
+		strategiesMap["strategy_desc"] = respData.StrategyDesc
+	}
 
-				if groups.StrategyType != nil {
-					groupsMap["strategy_type"] = groups.StrategyType
-				}
+	if respData.Groups != nil {
+		groupsList := make([]map[string]interface{}, 0, len(respData.Groups))
+		for _, groups := range respData.Groups {
+			groupsMap := map[string]interface{}{}
+			if groups.WorkGroupId != nil {
+				groupsMap["work_group_id"] = groups.WorkGroupId
+			}
 
-				groupsList = append(groupsList, groupsMap)
+			if groups.StrategyType != nil {
+				groupsMap["strategy_type"] = groups.StrategyType
 			}
 
-			strategiesMap["groups"] = groupsList
+			groupsList = append(groupsList, groupsMap)
 		}
 
-		if respData.StrategyId != nil {
-			strategiesMap["strategy_id"] = respData.StrategyId
-		}
+		strategiesMap["groups"] = groupsList
+	}
 
-		strategiesList = append(strategiesList, strategiesMap)
-		_ = d.Set("strategies", strategiesList)
+	if respData.StrategyId != nil {
+		strategiesMap["strategy_id"] = respData.StrategyId
 	}
 
+	strategiesList = append(strategiesList, strategiesMap)
+	_ = d.Set("strategy", strategiesList)
+
 	return nil
 }
 
@@ -211,7 +209,7 @@ func resourceTencentCloudDlcDataMaskStrategyUpdate(d *schema.ResourceData, meta
 	var (
 		logId      = tccommon.GetLogId(tccommon.ContextNil)
 		ctx        = tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta)
-		strategyId string
+		strategyId = d.Id()
 	)
 
 	needChange := false
@@ -283,7 +281,7 @@ func resourceTencentCloudDlcDataMaskStrategyDelete(d *schema.ResourceData, meta
 		logId      = tccommon.GetLogId(tccommon.ContextNil)
 		ctx        = tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta)
 		request    = dlcv20210125.NewDeleteDataMaskStrategyRequest()
-		strategyId string
+		strategyId = d.Id()
 	)
 
 	request.StrategyId = &strategyId

tencentcloud/services/dlc/resource_tc_dlc_data_mask_strategy.md

@@ -6,13 +6,11 @@ Example Usage
 resource "tencentcloud_dlc_data_mask_strategy" "example" {
   strategy {
     strategy_name = "tf-example"
-    strategy_type = "tf-example"
     strategy_desc = "description."
-    groups = {
-      work_group_id = 221498
+    groups {
+      work_group_id = 70220
       strategy_type = "MASK"
     }
-    users = ""
   }
 }
 ```
@@ -22,5 +20,5 @@ Import
 DLC data mask strategy can be imported using the id, e.g.
 
 ```
-terraform import tencentcloud_dlc_data_mask_strategy.example strategyId
+terraform import tencentcloud_dlc_data_mask_strategy.example 2fcab650-11a8-44ef-bf58-19c22af601b6
 ```

tencentcloud/services/dlc/resource_tc_dlc_data_mask_strategy_test.go

@@ -44,8 +44,8 @@ resource "tencentcloud_dlc_data_mask_strategy" "example" {
   strategy {
     strategy_name = "tf-example"
     strategy_desc = "description."
-    groups = {
-      work_group_id = 221498
+    groups {
+      work_group_id = 70220
       strategy_type = "MASK"
     }
   }
@@ -57,9 +57,9 @@ resource "tencentcloud_dlc_data_mask_strategy" "example" {
   strategy {
     strategy_name = "tf-example-update"
     strategy_desc = "description update."
-    groups = {
-      work_group_id = 221498
-      strategy_type = "MASK"
+    groups {
+      work_group_id = 70219
+      strategy_type = "MASK_NONE"
     }
   }
 }

tencentcloud/services/dlc/service_tencentcloud_dlc.go

@@ -1353,7 +1353,7 @@ func (me *DlcService) DescribeDlcDataMaskStrategyById(ctx context.Context, strat
 	request := dlc.NewDescribeDataMaskStrategiesRequest()
 	response := dlc.NewDescribeDataMaskStrategiesResponse()
 	request.Filters = []*dlc.Filter{
-		&dlc.Filter{
+		{
 			Name:   helper.String("strategy-id"),
 			Values: helper.Strings([]string{strategyId}),
 		},