Add cloudformation support for UserContext (#81)

aws-cloudformation · Nov 17, 2020 · 139c193 · 139c193
1 parent ccf9293
commit 139c193
Show file tree

Hide file tree

Showing 12 changed files with 348 additions and 8 deletions.
diff --git a/aws-kendra-datasource/aws-kendra-datasource.json b/aws-kendra-datasource/aws-kendra-datasource.json
@@ -199,6 +199,9 @@
         "$ref": "#/definitions/DataSourceToIndexFieldMapping"
       }
     },
+    "DisableLocalGroups": {
+      "type": "boolean"
+    },
     "SharePointConfiguration": {
       "description": "SharePoint configuration",
       "type": "object",
@@ -239,6 +242,9 @@
         },
         "DocumentTitleFieldName": {
           "$ref": "#/definitions/DataSourceFieldName"
+        },
+        "DisableLocalGroups": {
+          "$ref": "#/definitions/DisableLocalGroups"
         }
       },
       "required": [
@@ -632,6 +638,9 @@
         },
         "FieldMappings": {
           "$ref": "#/definitions/DataSourceToIndexFieldMappingList"
+        },
+        "DisableLocalGroups": {
+          "$ref": "#/definitions/DisableLocalGroups"
         }
       },
       "required": [

diff --git a/aws-kendra-datasource/pom.xml b/aws-kendra-datasource/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>kendra</artifactId>
-            <version>2.15.22</version>
+            <version>2.15.23</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
         <dependency>

diff --git a/...datasource/src/main/java/software/amazon/kendra/datasource/convert/OneDriveConverter.java b/...datasource/src/main/java/software/amazon/kendra/datasource/convert/OneDriveConverter.java
@@ -17,6 +17,7 @@ public static software.amazon.awssdk.services.kendra.model.OneDriveConfiguration
                 .exclusionPatterns(StringListConverter.toSdk(model.getExclusionPatterns()))
                 .fieldMappings(ListConverter.toSdk(model.getFieldMappings(), FieldMappingConverter::toSdk))
                 .oneDriveUsers(toSdk(model.getOneDriveUsers()))
+                .disableLocalGroups(model.getDisableLocalGroups())
                 .build();
     }
 
@@ -60,6 +61,7 @@ public static OneDriveConfiguration toModel(software.amazon.awssdk.services.kend
                 .inclusionPatterns(StringListConverter.toModel(sdk.inclusionPatterns()))
                 .exclusionPatterns(StringListConverter.toModel(sdk.exclusionPatterns()))
                 .oneDriveUsers(toModel(sdk.oneDriveUsers()))
+                .disableLocalGroups(sdk.disableLocalGroups())
                 .build();
     }
 

diff --git a/...tasource/src/main/java/software/amazon/kendra/datasource/convert/SharePointConverter.java b/...tasource/src/main/java/software/amazon/kendra/datasource/convert/SharePointConverter.java
@@ -21,6 +21,7 @@ public static software.amazon.awssdk.services.kendra.model.SharePointConfigurati
             .vpcConfiguration(sdkVpcConfiguration(model.getVpcConfiguration()))
             .fieldMappings(ListConverter.toSdk(model.getFieldMappings(), FieldMappingConverter::toSdk))
             .documentTitleFieldName(model.getDocumentTitleFieldName())
+            .disableLocalGroups(model.getDisableLocalGroups())
             .build();
   }
 
@@ -46,6 +47,7 @@ private static SharePointConfiguration toModel(software.amazon.awssdk.services.k
             .vpcConfiguration(modelVpcConfiguration(sdk.vpcConfiguration()))
             .fieldMappings(ListConverter.toModel(sdk.fieldMappings(), FieldMappingConverter::toModel))
             .documentTitleFieldName(sdk.documentTitleFieldName())
+            .disableLocalGroups(sdk.disableLocalGroups())
             .build();
   }
 

diff --git a/...ndra-datasource/src/test/java/software/amazon/kendra/datasource/convert/OneDriveTest.java b/...ndra-datasource/src/test/java/software/amazon/kendra/datasource/convert/OneDriveTest.java
@@ -24,6 +24,7 @@ void testToSdkTopLevelFields() {
                 .secretArn(secretArn)
                 .inclusionPatterns(includes)
                 .exclusionPatterns(excludes)
+                .disableLocalGroups(true)
                 .build();
 
         software.amazon.awssdk.services.kendra.model.OneDriveConfiguration sdk =
@@ -32,6 +33,7 @@ void testToSdkTopLevelFields() {
                 .tenantDomain(tenantDomain)
                 .inclusionPatterns(includes)
                 .exclusionPatterns(excludes)
+                .disableLocalGroups(true)
                 .build();
 
         assertThat(OneDriveConverter.toSdkDataSourceConfiguration(model)).isEqualTo(sdk);
@@ -85,6 +87,7 @@ void testToModelTopLevelFields() {
                 .secretArn(secretArn)
                 .inclusionPatterns(includes)
                 .exclusionPatterns(excludes)
+                .disableLocalGroups(false)
                 .build();
 
         software.amazon.awssdk.services.kendra.model.OneDriveConfiguration sdk =
@@ -93,6 +96,7 @@ void testToModelTopLevelFields() {
                         .tenantDomain(tenantDomain)
                         .inclusionPatterns(includes)
                         .exclusionPatterns(excludes)
+                        .disableLocalGroups(false)
                         .build();
 
         assertThat(OneDriveConverter.toModel(sdk)).isEqualTo(model);

diff --git a/...ource/convert/SharePointCoverterTest.java → ...urce/convert/SharePointConverterTest.java b/...ource/convert/SharePointCoverterTest.java → ...urce/convert/SharePointConverterTest.java
@@ -11,7 +11,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SharePointCoverterTest {
+public class SharePointConverterTest {
 
   @Test
   public void testSdkDataSourceConfiguration() {
@@ -28,6 +28,7 @@ public void testSdkDataSourceConfiguration() {
           .securityGroupIds(Arrays.asList("testSecurityGroupId"))
           .subnetIds(Arrays.asList("testSubnetId"))
           .build())
+        .disableLocalGroups(true)
         .fieldMappings(Arrays.asList(DataSourceToIndexFieldMapping.builder()
           .dataSourceFieldName("testDataSourceFieldName")
           .dateFieldFormat("testDateFieldFormat")
@@ -56,6 +57,7 @@ public void testSdkDataSourceConfiguration() {
                         .indexFieldName("testIndexFieldName")
                         .build()))
                 .documentTitleFieldName("testDocumentTitleFieldName")
+                .disableLocalGroups(true)
                 .build();
 
     assertThat(SharePointConverter.toSdkDataSourceConfiguration(dataSourceConfiguration.getSharePointConfiguration()))
@@ -71,6 +73,7 @@ public void testSdkDataSourceConfiguration_withNullVpcConfigurationAndNullFieldM
         .secretArn("secretArn")
         .crawlAttachments(true)
         .useChangeLog(true)
+        .disableLocalGroups(false)
         .inclusionPatterns(Arrays.asList("testInclusionPatterns"))
         .exclusionPatterns(Arrays.asList("testExclusionPatterns"))
         .documentTitleFieldName("testDocumentTitleFieldName")
@@ -84,6 +87,7 @@ public void testSdkDataSourceConfiguration_withNullVpcConfigurationAndNullFieldM
                     .secretArn("secretArn")
                     .crawlAttachments(true)
                     .useChangeLog(true)
+                    .disableLocalGroups(false)
                     .inclusionPatterns(Arrays.asList("testInclusionPatterns"))
                     .exclusionPatterns(Arrays.asList("testExclusionPatterns"))
                     .documentTitleFieldName("testDocumentTitleFieldName")
@@ -103,6 +107,7 @@ public void testModelDataSourceConfiguration() {
           .secretArn("secretArn")
           .crawlAttachments(true)
           .useChangeLog(true)
+          .disableLocalGroups(true)
           .inclusionPatterns(Arrays.asList("testInclusionPatterns"))
           .exclusionPatterns(Arrays.asList("testExclusionPatterns"))
           .vpcConfiguration( software.amazon.awssdk.services.kendra.model.DataSourceVpcConfiguration.builder()
@@ -125,6 +130,7 @@ public void testModelDataSourceConfiguration() {
         .secretArn("secretArn")
         .crawlAttachments(true)
         .useChangeLog(true)
+        .disableLocalGroups(true)
         .inclusionPatterns(Arrays.asList("testInclusionPatterns"))
         .exclusionPatterns(Arrays.asList("testExclusionPatterns"))
         .vpcConfiguration( DataSourceVpcConfiguration.builder()

diff --git a/aws-kendra-index/aws-kendra-index.json b/aws-kendra-index/aws-kendra-index.json
@@ -226,6 +226,108 @@
     "Arn": {
       "type": "string",
       "maxLength": 1000
+    },
+    "UserContextPolicy": {
+      "type": "string",
+      "enum": [
+        "ATTRIBUTE_FILTER",
+        "USER_TOKEN"
+      ]
+    },
+    "UserNameAttributeField": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 100
+    },
+    "GroupAttributeField": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 100
+    },
+    "KeyLocation": {
+      "type": "string",
+      "enum": [
+        "URL",
+        "SECRET_MANAGER"
+      ]
+    },
+    "Issuer": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 65
+    },
+    "ClaimRegex": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 100
+    },
+    "Url": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 2048,
+      "pattern": "^(https?|ftp|file):\\/\\/([^\\s]*)"
+    },
+    "JsonTokenTypeConfiguration": {
+      "type": "object",
+      "properties": {
+        "UserNameAttributeField": {
+          "$ref": "#/definitions/UserNameAttributeField"
+        },
+        "GroupAttributeField": {
+          "$ref": "#/definitions/GroupAttributeField"
+        }
+      },
+      "required": [
+        "UserNameAttributeField",
+        "GroupAttributeField"
+      ]
+    },
+    "JwtTokenTypeConfiguration": {
+      "type": "object",
+      "properties": {
+        "KeyLocation": {
+          "$ref": "#/definitions/KeyLocation"
+        },
+        "URL": {
+          "$ref": "#/definitions/Url"
+        },
+        "SecretManagerArn": {
+          "$ref": "#/definitions/RoleArn"
+        },
+        "UserNameAttributeField": {
+          "$ref": "#/definitions/UserNameAttributeField"
+        },
+        "GroupAttributeField": {
+          "$ref": "#/definitions/GroupAttributeField"
+        },
+        "Issuer": {
+          "$ref": "#/definitions/Issuer"
+        },
+        "ClaimRegex": {
+          "$ref": "#/definitions/ClaimRegex"
+        }
+      },
+      "required": [
+        "KeyLocation"
+      ]
+    },
+    "UserTokenConfiguration": {
+      "type": "object",
+      "properties": {
+        "JwtTokenTypeConfiguration": {
+          "$ref": "#/definitions/JwtTokenTypeConfiguration"
+        },
+        "JsonTokenTypeConfiguration": {
+          "$ref": "#/definitions/JsonTokenTypeConfiguration"
+        }
+      }
+    },
+    "UserTokenConfigurationList": {
+      "type": "array",
+      "maxItems": 1,
+      "items": {
+        "$ref": "#/definitions/UserTokenConfiguration"
+      }
     }
   },
   "properties": {
@@ -263,6 +365,12 @@
     "CapacityUnits": {
       "description": "Capacity units",
       "$ref": "#/definitions/CapacityUnitsConfiguration"
+    },
+    "UserContextPolicy": {
+      "$ref": "#/definitions/UserContextPolicy"
+    },
+    "UserTokenConfigurations": {
+      "$ref": "#/definitions/UserTokenConfigurationList"
     }
   },
   "required": [

diff --git a/aws-kendra-index/pom.xml b/aws-kendra-index/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>kendra</artifactId>
-            <version>2.13.63</version>
+            <version>2.15.23</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
         <dependency>