Merge pull request #31669 from GlennChia/b-aws_kendra_index-user_grou…

…p_resolution_configuration b/aws_kendra_index-user_group_resolution_configuration
hashicorp · May 31, 2023 · 2586385 · 2586385
2 parents ec0977c + e9b8654
commit 2586385
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 1 deletion.
diff --git a/.changelog/31669.txt b/.changelog/31669.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_kendra_index: Persist `user_group_resolution_mode` value to state after creation
+```
diff --git a/internal/service/kendra/index.go b/internal/service/kendra/index.go
@@ -1065,7 +1065,7 @@ func flattenUserGroupResolutionConfiguration(userGroupResolutionConfiguration *t
 	}
 
 	values := map[string]interface{}{
-		"user_group_resolution_configuration": userGroupResolutionConfiguration.UserGroupResolutionMode,
+		"user_group_resolution_mode": userGroupResolutionConfiguration.UserGroupResolutionMode,
 	}
 
 	return []interface{}{values}

diff --git a/internal/service/kendra/index_test.go b/internal/service/kendra/index_test.go
@@ -396,6 +396,48 @@ func TestAccKendraIndex_updateRoleARN(t *testing.T) {
 	})
 }
 
+func TestAccKendraIndex_updateUserGroupResolutionConfigurationMode(t *testing.T) {
+	ctx := acctest.Context(t)
+	var index kendra.DescribeIndexOutput
+
+	rName := sdkacctest.RandomWithPrefix("resource-test-terraform")
+	rName2 := sdkacctest.RandomWithPrefix("resource-test-terraform")
+	rName3 := sdkacctest.RandomWithPrefix("resource-test-terraform")
+	originalUserGroupResolutionMode := types.UserGroupResolutionModeAwsSso
+	updatedUserGroupResolutionMode := types.UserGroupResolutionModeNone
+	resourceName := "aws_kendra_index.test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.PreCheck(ctx, t); testAccPreCheck(ctx, t) },
+		ErrorCheck:               acctest.ErrorCheck(t, names.KendraEndpointID),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
+		CheckDestroy:             testAccCheckIndexDestroy(ctx),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccIndexConfig_userGroupResolutionMode(rName, rName2, rName3, string(originalUserGroupResolutionMode)),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckIndexExists(ctx, resourceName, &index),
+					resource.TestCheckResourceAttr(resourceName, "user_group_resolution_configuration.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "user_group_resolution_configuration.0.user_group_resolution_mode", string(originalUserGroupResolutionMode)),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAccIndexConfig_userGroupResolutionMode(rName, rName2, rName3, string(updatedUserGroupResolutionMode)),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckIndexExists(ctx, resourceName, &index),
+					resource.TestCheckResourceAttr(resourceName, "user_group_resolution_configuration.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "user_group_resolution_configuration.0.user_group_resolution_mode", string(updatedUserGroupResolutionMode)),
+				),
+			},
+		},
+	})
+}
+
 func TestAccKendraIndex_addDocumentMetadataConfigurationUpdates(t *testing.T) {
 	ctx := acctest.Context(t)
 	var index kendra.DescribeIndexOutput
@@ -1555,6 +1597,21 @@ resource "aws_kendra_index" "test" {
 `, rName3, groupAttributeField, userNameAttributeField))
 }
 
+func testAccIndexConfig_userGroupResolutionMode(rName, rName2, rName3, UserGroupResolutionMode string) string {
+	return acctest.ConfigCompose(
+		testAccIndexConfigBase(rName, rName2),
+		fmt.Sprintf(`
+resource "aws_kendra_index" "test" {
+  name     = %[1]q
+  role_arn = aws_iam_role.access_cw.arn
+
+  user_group_resolution_configuration {
+    user_group_resolution_mode = %[2]q
+  }
+}
+`, rName3, UserGroupResolutionMode))
+}
+
 func testAccIndexConfig_tags(rName, rName2, rName3, description string) string {
 	return acctest.ConfigCompose(
 		testAccIndexConfigBase(rName, rName2),

diff --git a/website/docs/r/kendra_index.html.markdown b/website/docs/r/kendra_index.html.markdown
@@ -55,6 +55,19 @@ resource "aws_kendra_index" "example" {
 }
 ```
 
+### With user group resolution configuration
+
+```terraform
+resource "aws_kendra_index" "example" {
+  name     = "example"
+  role_arn = aws_iam_role.this.arn
+
+  user_group_resolution_configuration {
+    user_group_resolution_mode = "AWS_SSO"
+  }
+}
+```
+
 ### With Document Metadata Configuration Updates
 
 #### Specifying the predefined elements