v1.17.1

.github/workflows/deployment.yml

@@ -143,3 +143,15 @@ jobs:
         aws s3 cp vpc.yaml s3://formkiq-core-distribution-ap-northeast-1/1.17.0/vpc.yaml
         aws s3 cp vpc-import.yaml s3://formkiq-core-distribution-ap-northeast-1/1.17.0/vpc-import.yaml
         aws s3 cp opensearch-bastion.yaml s3://formkiq-core-distribution-ap-northeast-1/1.17.0/opensearch-bastion.yaml
+
+        sam package --s3-prefix 1.17.0 --s3-bucket formkiq-core-distribution-me-south-1 --template-file template.yaml --region me-south-1 --output-template-file template-1.17.0.yaml --profile formkiqtest
+        aws s3 cp template-1.17.0.yaml s3://formkiq-core-distribution-me-south-1/1.17.0/template.yaml --profile formkiqtest
+        aws s3 cp vpc.yaml s3://formkiq-core-distribution-me-south-1/1.17.0/vpc.yaml --profile formkiqtest
+        aws s3 cp vpc-import.yaml s3://formkiq-core-distribution-me-south-1/1.17.0/vpc-import.yaml --profile formkiqtest
+        aws s3 cp opensearch-bastion.yaml s3://formkiq-core-distribution-me-south-1/1.17.0/opensearch-bastion.yaml --profile formkiqtest
+
+        sam package --s3-prefix 1.17.0 --s3-bucket formkiq-core-distribution-me-central-1 --template-file template.yaml --region me-central-1 --output-template-file template-1.17.0.yaml --profile formkiqtest
+        aws s3 cp template-1.17.0.yaml s3://formkiq-core-distribution-me-central-1/1.17.0/template.yaml --profile formkiqtest
+        aws s3 cp vpc.yaml s3://formkiq-core-distribution-me-central-1/1.17.0/vpc.yaml --profile formkiqtest
+        aws s3 cp vpc-import.yaml s3://formkiq-core-distribution-me-central-1/1.17.0/vpc-import.yaml --profile formkiqtest
+        aws s3 cp opensearch-bastion.yaml s3://formkiq-core-distribution-me-central-1/1.17.0/opensearch-bastion.yaml --profile formkiqtest

actions/build.gradle

@@ -17,7 +17,7 @@ dependencies {
 	testImplementation project(':fkq-test-utils')
 	testImplementation project(':fkq-plugins')
 	testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version:'5.11.4'
-	testImplementation group: 'org.testcontainers', name: 'testcontainers', version: '1.20.4'
+	testImplementation group: 'org.testcontainers', name: 'testcontainers', version: '1.20.6'
 }
 
 test {

aws-cognito-identity/build.gradle

@@ -2,9 +2,9 @@
 description = "AWS Cognito Identity"
 
 dependencies {
-	api group: 'software.amazon.awssdk', name: 'cognitoidentity', version: '2.29.51'
-	implementation group: 'software.amazon.awssdk', name: 'cognitoidentityprovider', version: '2.29.51'
-	implementation group: 'software.amazon.awssdk', name: 'url-connection-client', version: '2.29.51'
+	api group: 'software.amazon.awssdk', name: 'cognitoidentity', version: '2.31.25'
+	implementation group: 'software.amazon.awssdk', name: 'cognitoidentityprovider', version: '2.31.25'
+	implementation group: 'software.amazon.awssdk', name: 'url-connection-client', version: '2.31.25'
 
 	configurations.all {
    		exclude group: 'software.amazon.awssdk', module: 'apache-client'

aws-cognito-identityprovider/build.gradle

@@ -2,8 +2,8 @@
 description = "AWS Cognito Identity Provider"
 
 dependencies {
-	api group: 'software.amazon.awssdk', name: 'cognitoidentityprovider', version: '2.29.51'
-	implementation group: 'software.amazon.awssdk', name: 'url-connection-client', version: '2.29.51'
+	api group: 'software.amazon.awssdk', name: 'cognitoidentityprovider', version: '2.31.25'
+	implementation group: 'software.amazon.awssdk', name: 'url-connection-client', version: '2.31.25'
 	implementation project(':fkq-lambda-services')
 
 	configurations.all {

aws-dynamodb/build.gradle

@@ -5,10 +5,10 @@ dependencies {
 
 	annotationProcessor group: 'com.formkiq', name: 'graalvm-annotations-processor', version: '1.4.2'
 
-	api group: 'software.amazon.awssdk', name: 'dynamodb', version: '2.29.51'
+	api group: 'software.amazon.awssdk', name: 'dynamodb', version: '2.31.25'
 	implementation project(':fkq-lambda-services')
 	//implementation project(':aws-xray')
-	implementation group: 'software.amazon.awssdk', name: 'url-connection-client', version: '2.29.51'
+	implementation group: 'software.amazon.awssdk', name: 'url-connection-client', version: '2.31.25'
     implementation group: 'com.formkiq', name: 'graalvm-annotations', version: '1.2.0'
 
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version:'5.11.4'

aws-dynamodb/config/checkstyle/import-control.xml

@@ -10,13 +10,16 @@
 		<allow pkg="com.formkiq.aws.dynamodb" />
 		<allow pkg="com.formkiq.graalvm.annotations" />
 		<allow pkg="com.formkiq.module.lambdaservices" />
-		
+
 		<allow pkg="java.io" />
 		<allow pkg="java.net" />
 		<allow pkg="java.text" />
 		<allow pkg="java.time" />
 		<allow pkg="java.util" />
-
+
+		<allow pkg="software.amazon.awssdk.http" />
+		<allow pkg="software.amazon.awssdk.awscore.exception" />
+		<allow pkg="software.amazon.awssdk.http.urlconnection" />
 		<allow pkg="software.amazon.awssdk.auth.credentials" />
 		<allow pkg="software.amazon.awssdk.core.client.config" />
 		<allow pkg="software.amazon.awssdk.regions" />
@@ -27,6 +30,10 @@
 			<allow pkg="java.time" />
 			<allow pkg="java.security" />
 		</subpackage>
+
+		<subpackage name="base64">
+			<allow pkg="java.nio.charset" />
+		</subpackage>
 	</subpackage>
 
 </import-control>

aws-dynamodb/src/main/java/com/formkiq/aws/dynamodb/DynamoDbAttributeMapBuilder.java

@@ -0,0 +1,129 @@
+/**
+ * MIT License
+ * 
+ * Copyright (c) 2018 - 2020 FormKiQ
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.formkiq.aws.dynamodb;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * Builder for assembling a DynamoDB item attribute map.
+ * <p>
+ * Only non-null values are added. Supports String, Number, and Boolean types.
+ */
+public class DynamoDbAttributeMapBuilder {
+
+  /** Attribute {@link Map}. */
+  private final Map<String, AttributeValue> attributes = new HashMap<>();
+
+  /**
+   * constructor.
+   */
+  private DynamoDbAttributeMapBuilder() {}
+
+  /**
+   * Static factory method to create a new builder instance.
+   *
+   * @return a new DynamoDbAttributeMapBuilder
+   */
+  public static DynamoDbAttributeMapBuilder builder() {
+    return new DynamoDbAttributeMapBuilder();
+  }
+
+  /**
+   * Adds a String attribute if the value is non-null.
+   *
+   * @param name the attribute name
+   * @param value the String value
+   * @return this builder
+   */
+  public DynamoDbAttributeMapBuilder withString(final String name, final String value) {
+    if (value != null) {
+      attributes.put(name, AttributeValue.builder().s(value).build());
+    }
+    return this;
+  }
+
+  /**
+   * Adds a Number attribute if the value is non-null.
+   *
+   * @param name the attribute name
+   * @param value the numeric value
+   * @return this builder
+   */
+  public DynamoDbAttributeMapBuilder withNumber(final String name, final Number value) {
+    if (value != null) {
+      attributes.put(name, AttributeValue.builder().n(value.toString()).build());
+    }
+    return this;
+  }
+
+  /**
+   * Adds a Boolean attribute if the value is non-null.
+   *
+   * @param name the attribute name
+   * @param value the Boolean value
+   * @return this builder
+   */
+  public DynamoDbAttributeMapBuilder withBoolean(final String name, final Boolean value) {
+    if (value != null) {
+      attributes.put(name, AttributeValue.builder().bool(value).build());
+    }
+    return this;
+  }
+
+  /**
+   * Builds the attribute map to be used in a DynamoDB Put/Update operation.
+   *
+   * @return a map of attribute names to AttributeValue
+   */
+  public Map<String, AttributeValue> build() {
+    return attributes;
+  }
+
+  /**
+   * Adds a {@link Date} attribute if the value is non-null.
+   *
+   * @param name the attribute name
+   * @param value the Boolean value
+   * @return this builder
+   */
+  public DynamoDbAttributeMapBuilder withDate(final String name, final Date value) {
+    if (value != null) {
+      String val = DynamoDbTypes.fromDate(value);
+      attributes.put(name, AttributeValue.builder().s(val).build());
+    }
+
+    return this;
+  }
+
+  public void withAttributeValue(final String name, final AttributeValue value) {
+    if (value != null) {
+      attributes.put(name, value);
+    }
+  }
+}
+

aws-dynamodb/src/main/java/com/formkiq/aws/dynamodb/DynamoDbConnectionBuilder.java

@@ -28,6 +28,8 @@
 import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration.Builder;
+import software.amazon.awssdk.http.SdkHttpClient;
+import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
 import software.amazon.awssdk.services.dynamodb.DynamoDbClientBuilder;
@@ -50,15 +52,10 @@ public class DynamoDbConnectionBuilder {
    * @param enableAwsXray Enables AWS X-Ray
    */
   public DynamoDbConnectionBuilder(final boolean enableAwsXray) {
-    System.setProperty("software.amazon.awssdk.http.service.impl",
-        "software.amazon.awssdk.http.urlconnection.UrlConnectionSdkHttpService");
     Builder clientConfig = ClientOverrideConfiguration.builder();
-
-    // if (enableAwsXray) {
-    // clientConfig.addExecutionInterceptor(new TracingInterceptor());
-    // }
-
-    this.builder = DynamoDbClient.builder().overrideConfiguration(clientConfig.build());
+    SdkHttpClient c = UrlConnectionHttpClient.builder().build();
+    this.builder =
+        DynamoDbClient.builder().httpClient(c).overrideConfiguration(clientConfig.build());
   }
 
   /**

aws-dynamodb/src/main/java/com/formkiq/aws/dynamodb/DynamoDbError.java

@@ -0,0 +1,40 @@
+/**
+ * MIT License
+ * 
+ * Copyright (c) 2018 - 2020 FormKiQ
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.formkiq.aws.dynamodb;
+
+/**
+ * Enumeration of DynamoDB query error categories.
+ */
+public enum DynamoDbError {
+
+  /**
+   * Occurs when an ExclusiveStartKey is invalid or malformed.
+   */
+  INVALID_START_KEY,
+
+  /**
+   * Any other error not specifically categorized.
+   */
+  OTHER;
+}