feat(tco): add resource_tc_organization_org_manage_policy_config

Author: WeiMengXS

.github/workflows/golangci-lint.yml

@@ -18,7 +18,7 @@ jobs:
   # This workflow contains a single job called "build"
   golangci-lint:
     # The type of runner that the job will run on
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

tencentcloud/services/tco/resource_tc_organization_org_manage_policy.go

@@ -2,13 +2,10 @@ package tco
 
 import (
 	"context"
-	"fmt"
-	"log"
-	"strings"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	organization "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization/v20210331"
+	"log"
 
 	tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
@@ -59,9 +56,8 @@ func resourceTencentCloudOrganizationOrgManagePolicyCreate(d *schema.ResourceDat
 	logId := tccommon.GetLogId(tccommon.ContextNil)
 
 	var (
-		policyType string
-		request    = organization.NewCreatePolicyRequest()
-		response   = organization.NewCreatePolicyResponse()
+		request  = organization.NewCreatePolicyRequest()
+		response = organization.NewCreatePolicyResponse()
 	)
 	if v, ok := d.GetOk("name"); ok {
 		request.Name = helper.String(v.(string))
@@ -72,7 +68,6 @@ func resourceTencentCloudOrganizationOrgManagePolicyCreate(d *schema.ResourceDat
 	}
 
 	if v, ok := d.GetOk("type"); ok {
-		policyType = v.(string)
 		request.Type = helper.String(v.(string))
 	}
 
@@ -95,7 +90,7 @@ func resourceTencentCloudOrganizationOrgManagePolicyCreate(d *schema.ResourceDat
 		return err
 	}
 
-	d.SetId(strings.Join([]string{helper.UInt64ToStr(*response.Response.PolicyId), policyType}, tccommon.FILED_SP))
+	d.SetId(helper.UInt64ToStr(*response.Response.PolicyId))
 
 	return resourceTencentCloudOrganizationOrgManagePolicyRead(d, meta)
 }
@@ -110,12 +105,11 @@ func resourceTencentCloudOrganizationOrgManagePolicyRead(d *schema.ResourceData,
 
 	service := OrganizationService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
 
-	idSplit := strings.Split(d.Id(), tccommon.FILED_SP)
-	if len(idSplit) != 2 {
-		return fmt.Errorf("id is broken,%s", d.Id())
+	policyId := d.Id()
+	var policyType string
+	if v, ok := d.GetOk("type"); ok {
+		policyType = v.(string)
 	}
-	policyId := idSplit[0]
-	policyType := idSplit[1]
 
 	OrgManagePolicy, err := service.DescribeOrganizationOrgManagePolicyById(ctx, policyId, policyType)
 	if err != nil {
@@ -154,11 +148,7 @@ func resourceTencentCloudOrganizationOrgManagePolicyUpdate(d *schema.ResourceDat
 
 	request := organization.NewUpdatePolicyRequest()
 
-	idSplit := strings.Split(d.Id(), tccommon.FILED_SP)
-	if len(idSplit) != 2 {
-		return fmt.Errorf("id is broken,%s", d.Id())
-	}
-	policyId := idSplit[0]
+	policyId := d.Id()
 
 	request.PolicyId = helper.StrToInt64Point(policyId)
 
@@ -211,12 +201,11 @@ func resourceTencentCloudOrganizationOrgManagePolicyDelete(d *schema.ResourceDat
 	ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
 
 	service := OrganizationService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
-	idSplit := strings.Split(d.Id(), tccommon.FILED_SP)
-	if len(idSplit) != 2 {
-		return fmt.Errorf("id is broken,%s", d.Id())
+	policyId := d.Id()
+	var policyType string
+	if v, ok := d.GetOk("type"); ok {
+		policyType = v.(string)
 	}
-	policyId := idSplit[0]
-	policyType := idSplit[1]
 
 	if err := service.DeleteOrganizationOrgManagePolicyById(ctx, policyId, policyType); err != nil {
 		return err

tencentcloud/services/tco/resource_tc_organization_org_manage_policy_target.go

@@ -143,8 +143,16 @@ func resourceTencentCloudOrganizationOrgManagePolicyTargetRead(d *schema.Resourc
 	}
 
 	_ = d.Set("target_id", OrgManagePolicyTarget.Uin)
-	_ = d.Set("target_type", OrgManagePolicyTarget.RelatedType)
-	_ = d.Set("policy_id", policyId)
+	if OrgManagePolicyTarget.RelatedType != nil {
+		switch *OrgManagePolicyTarget.RelatedType {
+		case 1:
+			_ = d.Set("target_type", "NODE")
+		case 2:
+			_ = d.Set("target_type", "MEMBER")
+		}
+
+	}
+	_ = d.Set("policy_id", helper.StrToInt(policyId))
 	_ = d.Set("policy_type", policyType)
 	return nil
 }

tencentcloud/services/tco/resource_tc_organization_org_manage_policy_target_test.go

@@ -31,11 +31,22 @@ func TestAccTencentCloudOrganizationOrgManagePolicyTargetResource_basic(t *testi
 
 const testAccOrganizationOrgManagePolicyTarget = `
 
+resource "tencentcloud_organization_org_manage_policy" "org_manage_policy" {
+  name = "FullAccessPolicy2"
+  content = "{\"tags\":{\"Region\":{\"tag_value\":{\"@@assign\":[\"ap-guangzhou\",\"ap-beijing\"]},\"tag_key\":{\"@@assign\":\"Region\"}}}}"
+  type = "TAG_POLICY"
+  description = "Full access policy"
+  depends_on = [tencentcloud_organization_org_manage_policy_config.org_manage_policy_config]
+}
+resource "tencentcloud_organization_org_manage_policy_config" "org_manage_policy_config" {
+  organization_id = 201408
+  policy_type = "TAG_POLICY"
+}
 resource "tencentcloud_organization_org_manage_policy_target" "org_manage_policy_target" {
-  target_id = 10001
-  target_type = "NODE"
-  policy_id = 100001
-  policy_type = "SERVICE_CONTROL_POLICY"
+  target_id = 100020337821
+  target_type = "MEMBER"
+  policy_id = tencentcloud_organization_org_manage_policy.org_manage_policy.id
+  policy_type = "TAG_POLICY"
 }
 
 `