From 1c98b3637ddedfe445f57ea82ac6757dfc0f9ad2 Mon Sep 17 00:00:00 2001 From: mikatong Date: Tue, 3 Dec 2024 15:38:52 +0800 Subject: [PATCH 1/2] group_type support optional --- .../services/tco/resource_tc_identity_center_group.go | 7 ++++++- .../services/tco/resource_tc_identity_center_group_test.go | 4 +++- website/docs/r/identity_center_group.html.markdown | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tencentcloud/services/tco/resource_tc_identity_center_group.go b/tencentcloud/services/tco/resource_tc_identity_center_group.go index 67431f00fd..9c937620e0 100644 --- a/tencentcloud/services/tco/resource_tc_identity_center_group.go +++ b/tencentcloud/services/tco/resource_tc_identity_center_group.go @@ -43,6 +43,7 @@ func ResourceTencentCloudIdentityCenterGroup() *schema.Resource { }, "group_type": { Type: schema.TypeString, + Optional: true, Computed: true, Description: "Type of user group. `Manual`: manual creation, `Synchronized`: external import.", }, @@ -104,6 +105,10 @@ func resourceTencentCloudIdentityCenterGroupCreate(d *schema.ResourceData, meta request.Description = helper.String(v.(string)) } + if v, ok := d.GetOk("group_type"); ok { + request.GroupType = helper.String(v.(string)) + } + err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseOrganizationClient().CreateGroupWithContext(ctx, request) if e != nil { @@ -194,7 +199,7 @@ func resourceTencentCloudIdentityCenterGroupUpdate(d *schema.ResourceData, meta ctx := tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta) - immutableArgs := []string{"zone_id"} + immutableArgs := []string{"zone_id", "group_type"} for _, v := range immutableArgs { if d.HasChange(v) { return fmt.Errorf("argument `%s` cannot be changed", v) diff --git a/tencentcloud/services/tco/resource_tc_identity_center_group_test.go b/tencentcloud/services/tco/resource_tc_identity_center_group_test.go index fa747f0c4b..bbc41e0604 100644 --- a/tencentcloud/services/tco/resource_tc_identity_center_group_test.go +++ b/tencentcloud/services/tco/resource_tc_identity_center_group_test.go @@ -23,7 +23,7 @@ func TestAccTencentCloudIdentityCenterGroupResource_basic(t *testing.T) { resource.TestCheckResourceAttr("tencentcloud_identity_center_group.identity_center_group", "zone_id", "z-s64jh54hbcra"), resource.TestCheckResourceAttr("tencentcloud_identity_center_group.identity_center_group", "group_name", "tf-test-group"), resource.TestCheckResourceAttrSet("tencentcloud_identity_center_group.identity_center_group", "create_time"), - resource.TestCheckResourceAttrSet("tencentcloud_identity_center_group.identity_center_group", "group_type"), + resource.TestCheckResourceAttr("tencentcloud_identity_center_group.identity_center_group", "group_type", "Manual"), resource.TestCheckResourceAttrSet("tencentcloud_identity_center_group.identity_center_group", "update_time"), resource.TestCheckResourceAttrSet("tencentcloud_identity_center_group.identity_center_group", "group_id"), resource.TestCheckResourceAttrSet("tencentcloud_identity_center_group.identity_center_group", "member_count"), @@ -51,6 +51,7 @@ resource "tencentcloud_identity_center_group" "identity_center_group" { zone_id = "z-s64jh54hbcra" group_name = "tf-test-group" description = "test" + group_type = "Manual" } ` @@ -59,5 +60,6 @@ resource "tencentcloud_identity_center_group" "identity_center_group" { zone_id = "z-s64jh54hbcra" group_name = "tf-test-group" description = "test_update" + group_type = "Manual" } ` diff --git a/website/docs/r/identity_center_group.html.markdown b/website/docs/r/identity_center_group.html.markdown index f09f2c4bc9..ad3dfbd628 100644 --- a/website/docs/r/identity_center_group.html.markdown +++ b/website/docs/r/identity_center_group.html.markdown @@ -28,6 +28,7 @@ The following arguments are supported: * `group_name` - (Required, String) The name of the user group. Format: Allow English letters, numbers and special characters-. Length: Maximum 128 characters. * `zone_id` - (Required, String) Zone id. * `description` - (Optional, String) A description of the user group. Length: Maximum 1024 characters. +* `group_type` - (Optional, String) Type of user group. `Manual`: manual creation, `Synchronized`: external import. ## Attributes Reference @@ -36,7 +37,6 @@ In addition to all arguments above, the following attributes are exported: * `id` - ID of the resource. * `create_time` - Creation time of the user group. * `group_id` - ID of the user group. -* `group_type` - Type of user group. `Manual`: manual creation, `Synchronized`: external import. * `member_count` - Number of team members. * `update_time` - Modification time for the user group. From 9749ae5281e1457861427844c6b6770dfd83243a Mon Sep 17 00:00:00 2001 From: mikatong Date: Tue, 3 Dec 2024 15:44:01 +0800 Subject: [PATCH 2/2] update --- .changelog/2992.txt | 3 +++ .../tco/resource_tc_identity_center_group_test.go | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 .changelog/2992.txt diff --git a/.changelog/2992.txt b/.changelog/2992.txt new file mode 100644 index 0000000000..137d8724c0 --- /dev/null +++ b/.changelog/2992.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/tencentcloud_identity_center_group: `group_type` support optional +``` \ No newline at end of file diff --git a/tencentcloud/services/tco/resource_tc_identity_center_group_test.go b/tencentcloud/services/tco/resource_tc_identity_center_group_test.go index bbc41e0604..52a26447e8 100644 --- a/tencentcloud/services/tco/resource_tc_identity_center_group_test.go +++ b/tencentcloud/services/tco/resource_tc_identity_center_group_test.go @@ -48,18 +48,18 @@ func TestAccTencentCloudIdentityCenterGroupResource_basic(t *testing.T) { const testAccIdentityCenterGroup = ` resource "tencentcloud_identity_center_group" "identity_center_group" { - zone_id = "z-s64jh54hbcra" + zone_id = "z-s64jh54hbcra" group_name = "tf-test-group" description = "test" - group_type = "Manual" + group_type = "Manual" } ` const testAccIdentityCenterGroupUpdate = ` resource "tencentcloud_identity_center_group" "identity_center_group" { - zone_id = "z-s64jh54hbcra" + zone_id = "z-s64jh54hbcra" group_name = "tf-test-group" description = "test_update" - group_type = "Manual" + group_type = "Manual" } `