fix(tco): [119840258] support organization name (#2844)

* support organization name

* add changelog

* update

---------

Co-authored-by: mikatong <[email protected]>

Author: tongyiming

.changelog/2844.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_organization_instance: support param `root_node_name`.
+```

tencentcloud/services/tco/resource_tc_organization_instance.go

@@ -17,6 +17,7 @@ func ResourceTencentCloudOrganizationOrganization() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceTencentCloudOrganizationOrganizationCreate,
 		Read:   resourceTencentCloudOrganizationOrganizationRead,
+		Update: resourceTencentCloudOrganizationOrganizationUpdate,
 		Delete: resourceTencentCloudOrganizationOrganizationDelete,
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
@@ -28,6 +29,13 @@ func ResourceTencentCloudOrganizationOrganization() *schema.Resource {
 				Description: "Enterprise organization ID.Note: This field may return NULL, indicating that the valid value cannot be obtained.",
 			},
 
+			"root_node_name": {
+				Optional:    true,
+				Computed:    true,
+				Type:        schema.TypeString,
+				Description: "Root node name.",
+			},
+
 			"host_uin": {
 				Computed:    true,
 				Type:        schema.TypeInt,
@@ -140,6 +148,7 @@ func resourceTencentCloudOrganizationOrganizationCreate(d *schema.ResourceData,
 	defer tccommon.InconsistentCheck(d, meta)()
 
 	logId := tccommon.GetLogId(tccommon.ContextNil)
+	ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
 
 	var (
 		request  = organization.NewCreateOrganizationRequest()
@@ -162,6 +171,15 @@ func resourceTencentCloudOrganizationOrganizationCreate(d *schema.ResourceData,
 	}
 
 	orgId = *response.Response.OrgId
+
+	if v, ok := d.GetOk("root_node_name"); ok {
+		service := OrganizationService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
+		innerErr := service.UpdateOrganizationRootNodeName(ctx, orgId, v.(string))
+		if innerErr != nil {
+			return innerErr
+		}
+	}
+
 	d.SetId(helper.UInt64ToStr(orgId))
 
 	return resourceTencentCloudOrganizationOrganizationRead(d, meta)
@@ -268,9 +286,37 @@ func resourceTencentCloudOrganizationOrganizationRead(d *schema.ResourceData, me
 		_ = d.Set("is_auth_manager", organization.IsAuthManager)
 	}
 
+	if organization.RootNodeId != nil {
+		orgNode, err := service.DescribeOrganizationOrgNode(ctx, helper.Int64ToStr(*organization.RootNodeId))
+		if err != nil {
+			return err
+		}
+		_ = d.Set("root_node_name", orgNode.Name)
+	}
 	return nil
 }
 
+func resourceTencentCloudOrganizationOrganizationUpdate(d *schema.ResourceData, meta interface{}) error {
+	defer tccommon.LogElapsed("resource.tencentcloud_organization_instance.update")()
+	defer tccommon.InconsistentCheck(d, meta)()
+
+	logId := tccommon.GetLogId(tccommon.ContextNil)
+	ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
+	orgIdString := d.Id()
+	orgId := helper.StrToUInt64(orgIdString)
+	if d.HasChange("root_node_name") {
+		if v, ok := d.GetOk("root_node_name"); ok {
+			service := OrganizationService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
+			innerErr := service.UpdateOrganizationRootNodeName(ctx, orgId, v.(string))
+			if innerErr != nil {
+				return innerErr
+			}
+		}
+	}
+
+	return resourceTencentCloudOrganizationOrganizationRead(d, meta)
+}
+
 func resourceTencentCloudOrganizationOrganizationDelete(d *schema.ResourceData, meta interface{}) error {
 	defer tccommon.LogElapsed("resource.tencentcloud_organization_instance.delete")()
 	defer tccommon.InconsistentCheck(d, meta)()

tencentcloud/services/tco/resource_tc_organization_instance_test.go

@@ -9,7 +9,6 @@ import (
 )
 
 func TestAccTencentCloudOrganizationOrganizationResource_basic(t *testing.T) {
-	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
 			tcacctest.AccPreCheck(t)
@@ -29,9 +28,51 @@ func TestAccTencentCloudOrganizationOrganizationResource_basic(t *testing.T) {
 	})
 }
 
+func TestAccTencentCloudOrganizationOrganizationResource_rootNodeName(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			tcacctest.AccPreCheck(t)
+		},
+		Providers: tcacctest.AccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccOrganizationOrganizationWithRootNodeName,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("tencentcloud_organization_instance.organization", "id"),
+					resource.TestCheckResourceAttr("tencentcloud_organization_instance.organization", "root_node_name", "root_node_name"),
+				),
+			},
+			{
+				Config: testAccOrganizationOrganizationWithRootNodeNameUpdate,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("tencentcloud_organization_instance.organization", "id"),
+					resource.TestCheckResourceAttr("tencentcloud_organization_instance.organization", "root_node_name", "root_node_name_update"),
+				),
+			},
+			{
+				ResourceName:      "tencentcloud_organization_instance.organization",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 const testAccOrganizationOrganization = `
 
 resource "tencentcloud_organization_instance" "organization" {
 }
 
 `
+
+const testAccOrganizationOrganizationWithRootNodeName = `
+resource "tencentcloud_organization_instance" "organization" {
+	root_node_name = "root_node_name"
+}
+`
+
+const testAccOrganizationOrganizationWithRootNodeNameUpdate = `
+resource "tencentcloud_organization_instance" "organization" {
+	root_node_name = "root_node_name_update"
+}
+`

tencentcloud/services/tco/service_tencentcloud_organization.go

@@ -1621,3 +1621,37 @@ func (me *OrganizationService) AssignmentTaskStatusStateRefreshFunc(zoneId, task
 		return object, *object.Status, nil
 	}
 }
+
+func (me *OrganizationService) UpdateOrganizationRootNodeName(ctx context.Context, orgId uint64, name string) (errRet error) {
+	logId := tccommon.GetLogId(ctx)
+	organizationResponseParams, err := me.DescribeOrganizationOrganizationById(ctx)
+	if err != nil {
+		return err
+	}
+	if organizationResponseParams == nil {
+		return fmt.Errorf("organization is nil")
+	}
+	rootNodeId := organizationResponseParams.RootNodeId
+
+	request := organization.NewUpdateOrganizationNodeRequest()
+	request.NodeId = helper.Int64Uint64(*rootNodeId)
+	request.Name = &name
+
+	err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+		result, e := me.client.UseOrganizationClient().UpdateOrganizationNode(request)
+		if e != nil {
+			return tccommon.RetryError(e)
+		} else {
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
+				logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+		}
+		return nil
+	})
+
+	if err != nil {
+		log.Printf("[CRITAL]%s update organization orgNode name failed, reason:%+v", logId, err)
+		return err
+	}
+
+	return nil
+}

website/docs/r/organization_instance.html.markdown

@@ -22,7 +22,7 @@ resource "tencentcloud_organization_instance" "organization" {
 
 The following arguments are supported:
 
-
+* `root_node_name` - (Optional, String) Root node name.
 
 ## Attributes Reference