Updates: Q app and fix for datasource configuration (#56)

* Add Q App configuration to application schema * Parse "true" and "false" strings as boolean values for DataSource Configuration. * Update qbusiness version
aws-cloudformation · Jul 3, 2024 · 47cc991 · 47cc991
1 parent cf3e7f0
commit 47cc991
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 6 deletions.
diff --git a/aws-qbusiness-application/aws-qbusiness-application.json b/aws-qbusiness-application/aws-qbusiness-application.json
@@ -42,6 +42,25 @@
       },
       "additionalProperties": false
     },
+    "QAppsConfiguration": {
+      "type": "object",
+      "properties": {
+        "QAppsControlMode": {
+          "$ref": "#/definitions/QAppsControlMode"
+        }
+      },
+      "required": [
+        "QAppsControlMode"
+      ],
+      "additionalProperties": false
+    },
+    "QAppsControlMode": {
+      "type": "string",
+      "enum": [
+        "ENABLED",
+        "DISABLED"
+      ]
+    },
     "Tag": {
       "type": "object",
       "properties": {
@@ -104,6 +123,9 @@
       "minLength": 10,
       "pattern": "^arn:(aws|aws-us-gov|aws-cn|aws-iso|aws-iso-b):sso::\\d{12}:application/(sso)?ins-[a-zA-Z0-9-.]{16}/apl-[a-zA-Z0-9]{16}$"
     },
+    "QAppsConfiguration": {
+      "$ref": "#/definitions/QAppsConfiguration"
+    },
     "IdentityCenterInstanceArn": {
       "type": "string",
       "maxLength": 1224,

diff --git a/aws-qbusiness-application/pom.xml b/aws-qbusiness-application/pom.xml
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>qbusiness</artifactId>
-            <version>2.25.42</version>
+            <version>2.26.14</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/aws-core -->
         <dependency>

diff --git a/...qbusiness-application/src/main/java/software/amazon/qbusiness/application/Translator.java b/...qbusiness-application/src/main/java/software/amazon/qbusiness/application/Translator.java
@@ -18,6 +18,7 @@
 import software.amazon.awssdk.services.qbusiness.model.TagResourceRequest;
 import software.amazon.awssdk.services.qbusiness.model.UntagResourceRequest;
 import software.amazon.awssdk.services.qbusiness.model.UpdateApplicationRequest;
+import software.amazon.cloudformation.exceptions.CfnInvalidRequestException;
 import software.amazon.cloudformation.proxy.ResourceHandlerRequest;
 
 /**
@@ -45,6 +46,7 @@ static CreateApplicationRequest translateToCreateRequest(final String idempotent
         .encryptionConfiguration(toServiceEncryptionConfig(model.getEncryptionConfiguration()))
         .attachmentsConfiguration(toServiceAttachmentConfiguration(model.getAttachmentsConfiguration()))
         .tags(TagHelper.serviceTagsFromCfnTags(model.getTags()))
+        .qAppsConfiguration(toServiceQAppsConfiguration(model.getQAppsConfiguration()))
         .build();
   }
 
@@ -87,6 +89,7 @@ static ResourceModel translateFromReadResponse(final GetApplicationResponse awsR
         .updatedAt(instantToString(awsResponse.updatedAt()))
         .encryptionConfiguration(fromServiceEncryptionConfig(awsResponse.encryptionConfiguration()))
         .attachmentsConfiguration(fromServiceAttachmentConfiguration(awsResponse.attachmentsConfiguration()))
+        .qAppsConfiguration(fromServiceQAppsConfiguration(awsResponse.qAppsConfiguration()))
         .build();
   }
 
@@ -144,6 +147,30 @@ static software.amazon.awssdk.services.qbusiness.model.AttachmentsConfiguration
         .build();
   }
 
+  static QAppsConfiguration fromServiceQAppsConfiguration(
+      software.amazon.awssdk.services.qbusiness.model.QAppsConfiguration serviceConfig
+  ) {
+    if (serviceConfig == null) {
+      return null;
+    }
+
+    return QAppsConfiguration.builder()
+        .qAppsControlMode(serviceConfig.qAppsControlModeAsString())
+        .build();
+  }
+
+  static software.amazon.awssdk.services.qbusiness.model.QAppsConfiguration toServiceQAppsConfiguration(
+      QAppsConfiguration modelConfig
+  ) {
+    if (modelConfig == null) {
+      return null;
+    }
+
+    return software.amazon.awssdk.services.qbusiness.model.QAppsConfiguration.builder()
+        .qAppsControlMode(modelConfig.getQAppsControlMode())
+        .build();
+  }
+
   static ResourceModel translateFromReadResponseWithTags(final ListTagsForResourceResponse listTagsResponse, final ResourceModel model) {
     if (listTagsResponse == null || !listTagsResponse.hasTags()) {
       return model;
@@ -180,6 +207,7 @@ static UpdateApplicationRequest translateToUpdateRequest(final ResourceModel mod
         .roleArn(model.getRoleArn())
         .identityCenterInstanceArn(model.getIdentityCenterInstanceArn())
         .attachmentsConfiguration(toServiceAttachmentConfiguration(model.getAttachmentsConfiguration()))
+        .qAppsConfiguration(toServiceQAppsConfiguration(model.getQAppsConfiguration()))
         .build();
   }
 

diff --git a/aws-qbusiness-datasource/pom.xml b/aws-qbusiness-datasource/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>qbusiness</artifactId>
-            <version>2.25.42</version>
+            <version>2.26.14</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/sdk-core -->
         <dependency>

diff --git a/...rce/src/main/java/software/amazon/qbusiness/datasource/translators/DocumentConverter.java b/...rce/src/main/java/software/amazon/qbusiness/datasource/translators/DocumentConverter.java
@@ -54,6 +54,12 @@ private static Document objectToDocument(Object value) {
     if (value instanceof Boolean bool) {
       return Document.fromBoolean(bool);
     } else if (value instanceof String string) {
+      // Due to how yaml handles values, we'll receive boolean values as strings.
+      // Parse "true"/"false" as booleans to allow creating datasources like webcrawler: https://docs.aws.amazon.com/amazonq/latest/qbusiness-ug/web-crawler-api.html
+      if ("true".equals(string) || "false".equals(string)) {
+        var boolValue = Boolean.parseBoolean(string);
+        return Document.fromBoolean(boolValue);
+      }
       return Document.fromString(string);
     } else if (value instanceof Number) {
       if (value instanceof Integer integer) {

diff --git a/...ness-datasource/src/test/java/software/amazon/qbusiness/datasource/CreateHandlerTest.java b/...ness-datasource/src/test/java/software/amazon/qbusiness/datasource/CreateHandlerTest.java
@@ -104,6 +104,8 @@ public void setup() {
                     "Type", "WebcrawlerV2",
                     "Links", List.of("link1", "link2"),
                     "depth", 50,
+                    "crawlEverything", "false",
+                    "doTheThing", "true",
                     "overrides", Map.of(
                         "a", 10
                     )
@@ -184,6 +186,8 @@ proxy, testRequest, new CallbackContext(), proxyClient, logger
         "Type", Document.fromString("WebcrawlerV2"),
         "Links", Document.fromList(List.of(Document.fromString("link1"), Document.fromString("link2"))),
         "depth", Document.fromNumber(50),
+        "crawlEverything", Document.fromBoolean(false),
+        "doTheThing", Document.fromBoolean(true),
         "overrides", Document.fromMap(Map.of(
             "a", Document.fromNumber(10)
         ))

diff --git a/aws-qbusiness-index/pom.xml b/aws-qbusiness-index/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>qbusiness</artifactId>
-            <version>2.25.42</version>
+            <version>2.26.14</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/sdk-core -->
         <dependency>

diff --git a/aws-qbusiness-plugin/pom.xml b/aws-qbusiness-plugin/pom.xml
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>qbusiness</artifactId>
-            <version>2.25.42</version>
+            <version>2.26.14</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
         <dependency>

diff --git a/aws-qbusiness-retriever/pom.xml b/aws-qbusiness-retriever/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>qbusiness</artifactId>
-            <version>2.25.42</version>
+            <version>2.26.14</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/sdk-core -->
         <dependency>

diff --git a/aws-qbusiness-webexperience/pom.xml b/aws-qbusiness-webexperience/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>qbusiness</artifactId>
-            <version>2.25.42</version>
+            <version>2.26.14</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/sdk-core -->
         <dependency>