Merge pull request #58 from aws-solutions/develop

Update to version v1.6.1

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.6.1] - 2022-07-14
+### Updated
+- npm package security patching (minimist, vm2)
+- Gson 2.8.9
+
 ## [1.6.0] - 2021-11-01
 ### Added
 - Support for [dynamic partitioning](https://aws.amazon.com/about-aws/whats-new/2021/08/introducing-dynamic-partitioning-amazon-kinesis-data-firehose/) in option 3 (Amazon Kinesis Data Streams, Amazon Kinesis Data Firehose, and Amazon S3). When enabled, dynamic partitioning allows for easy extraction of keys (for example, _customer_id_ or _transaction_id_) from incoming records and delivery of data grouped by these keys into corresponding S3 prefixes. Partitioning minimizes the amount of data scanned, optimizing performance and reducing costs of your analytics queries (using services such as Amazon Athena, Amazon EMR, or Amazon Redshift Spectrum).

README.md

@@ -50,7 +50,7 @@ To customize the solution, follow the steps below:
 
 ### Prerequisites
 * [AWS Command Line Interface](https://aws.amazon.com/cli/)
-* Node.js 14.x or later
+* Node.js 14.x (or later) and npm 7 (or later)
 * Python 3.8 or later
 * Java 11 (only required if using Apache Flink)
 * Apache Maven 3.1 (only required if using Apache Flink)

deployment/build-s3-dist.sh

@@ -115,7 +115,7 @@ cd $source_dir/kinesis
 
 application_name=amazon-kinesis-replay
 application_version=0.1.0
-wget https://github.com/aws-samples/$application_name/archive/release-$application_version.zip
+wget https://github.com/aws-samples/$application_name/archive/refs/tags/release-$application_version.zip
 unzip -q release-$application_version.zip
 
 cd $application_name-release-$application_version

source/.eslintignore

@@ -0,0 +1,12 @@
+# don't ever lint node_modules
+node_modules
+cdk.out
+# don't lint build output (make sure it's set to your correct build folder name)
+dist
+# don't lint test folders
+test
+# don't lint coverage output
+coverage
+*.config.js
+# dont lint eslint config
+*.eslint*

source/.prettierignore

@@ -0,0 +1 @@
+node_modules

source/.prettierrc.yml

@@ -0,0 +1,8 @@
+# .prettierrc or .prettierrc.yaml
+proseWrap: 'preserve'
+trailingComma: 'none'
+tabWidth: 4
+semi: true
+singleQuote: true
+quoteProps: 'preserve'
+printWidth: 120

source/docs/README-MSK.md

@@ -133,7 +133,20 @@ CREATE TABLE stock_table (
 );
 ```
 
-> **Note**: In order to write records to S3, you need to [enable checkpointing](https://docs.aws.amazon.com/kinesisanalytics/latest/java/how-zeppelin-checkpoint.html).
+> **Note**: If the cluster is configured for IAM access control, you will need to change some properties in the table definition:
+
+```diff
+-'properties.security.protocol' = 'SSL',
+-'properties.ssl.truststore.location' = '/usr/lib/jvm/java-11-amazon-corretto/lib/security/cacerts',
+-'properties.ssl.truststore.password' = 'changeit'
+
++'properties.security.protocol' = 'SASL_SSL',
++'properties.sasl.mechanism' = 'AWS_MSK_IAM',
++'properties.sasl.jaas.config' = 'software.amazon.msk.auth.iam.IAMLoginModule required;',
++'properties.sasl.client.callback.handler.class' = 'software.amazon.msk.auth.iam.IAMClientCallbackHandler'
+```
+
+In order to write records to S3, you need to [enable checkpointing](https://docs.aws.amazon.com/kinesisanalytics/latest/java/how-zeppelin-checkpoint.html):
 
 ```python
 %flink.pyflink

source/kinesis/kda-flink-ml/pom.xml

@@ -73,7 +73,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.6</version>
+            <version>2.8.9</version>
         </dependency>
 
         <dependency>

source/labs/msk-cluster-setup.ts

@@ -25,7 +25,21 @@ export class MskClusterStack extends cdk.Stack {
         const kafkaVersion = new cdk.CfnParameter(this, 'MSKKafkaVersion', {
             type: 'String',
             default: '2.8.1',
-            allowedValues: ['2.8.1', '2.8.0', '2.7.1', '2.7.0', '2.6.2', '2.6.1', '2.6.0', '2.5.1', '2.4.1.1', '2.3.1', '2.2.1']
+            allowedValues: [
+                '2.8.1',
+                '2.8.0',
+                '2.7.2',
+                '2.7.1',
+                '2.7.0',
+                '2.6.3',
+                '2.6.2',
+                '2.6.1',
+                '2.6.0',
+                '2.5.1',
+                '2.4.1.1',
+                '2.3.1',
+                '2.2.1'
+            ]
         });
 
         const tlsMutualAuth = new cdk.CfnParameter(this, 'TLSMutualAuthentication', {

source/lambda/.eslintrc.js

@@ -0,0 +1,14 @@
+module.exports = {
+    root: true,
+    parserOptions: {
+        ecmaVersion: 2021
+    },
+    env: {
+        node: true
+    },
+    extends: ['eslint:recommended'],
+    rules: {
+        indent: ['error', 4],
+        quotes: ['warn', 'single']
+    }
+};