Merge pull request #6 from aws-solutions/release/v2.0.2

v2.0.2 release

CHANGELOG.md

@@ -4,6 +4,12 @@ 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).
 
+## [2.0.2] - 2024-01-03
+### Added
+- Added timestamps to processed file names for prevention of accidental overwrites
+- Fixed null values casting as -1
+- Updated state machine to only trigger on successful file uploads
+
 ## [2.0.1] - 2023-10-25
 ### Added
 - Update urllib to v1.26.18

NOTICE.txt

@@ -1,6 +1,11 @@
 Amazon Marketing Cloud Insights on AWS
 
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except
+in compliance with the License. A copy of the License is located at http://www.apache.org/licenses/
+or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied. See the License for the
+specific language governing permissions and limitations under the License.
 
 **********************
 THIRD PARTY COMPONENTS

solution-manifest.yaml

@@ -0,0 +1,8 @@
+id: SO0193
+name: amazon-marketing-cloud-insights-on-aws
+version: v2.0.2
+cloudformation_templates:
+  - template: amazon-marketing-cloud-insights.template
+    main_template: true
+build_environment:
+  build_image: 'aws/codebuild/standard:6.0'

source/cdk_solution_helper_py/helpers_cdk/aws_solutions/cdk/scripts/build_s3_cdk_dist.py

@@ -246,6 +246,7 @@ def source_code_package(ctx, ignore, solution_name):
         "CONTRIBUTING.md",
         "CHANGELOG.md",
         ".gitignore",
+        "solution-manifest.yaml"
     ]
 
     # copy source directory

source/infrastructure/amc_insights/custom_resource/tenant_provisioning_service/lambdas/scripts/amc-initialize.yaml

@@ -284,21 +284,17 @@ Resources:
     Type: AWS::Events::Rule
     Condition: DeployStandardRule
     Properties:
-      Description: "Trigger SDLF data lake process"
+      Description: !Sub "(Standard) Trigger data lake for bucket: ${pBucketName}"
       State: "ENABLED"
       EventPattern:
         source:
           - aws.s3
+        detail-type:
+          - "Object Created"
+          - "Object Deleted"
         detail:
-          eventSource:
-            - s3.amazonaws.com
-          eventName:
-            - CopyObject
-            - PutObject
-            - CompleteMultipartUpload
-            - DeleteObject
-          requestParameters:
-            bucketName:
+          bucket:
+            name:
               - !Ref pBucketName
       Targets:
         - Arn: !Ref pRoutingQueueArn
@@ -344,33 +340,29 @@ Resources:
     Type: AWS::Events::Rule
     Condition: DeployCrossRegionEvents
     Properties:
-      Description: "Trigger cross region event"
+      Description: !Sub "(Cross Region) Trigger data lake for bucket: ${pBucketName}"
       State: "ENABLED"
       EventPattern:
         source:
           - aws.s3
+        detail-type:
+          - "Object Created"
+          - "Object Deleted"
         detail:
-          eventSource:
-            - s3.amazonaws.com
-          eventName:
-            - CopyObject
-            - PutObject
-            - CompleteMultipartUpload
-            - DeleteObject
-          requestParameters:
-            bucketName:
+          bucket:
+            name:
               - !Ref pBucketName
       Targets:
         - Arn: !Sub "arn:aws:events:${pApplicationRegion}:${AWS::AccountId}:event-bus/default"
           RoleArn: !GetAtt rCrossRegionEventBridgeRole.Arn
           Id: "CrossRegionDefaultEventBus"
 
-  # Cross-region event rule for data lake trigger
+  # Cross-account event rule for data lake trigger
   rCrossAccountEventBridgeRule:
     Type: AWS::Events::Rule
     Condition: DeployCrossAccountRule
     Properties:
-      Description: "Trigger cross account event"
+      Description: !Sub "(Cross Account) Trigger data lake for bucket: ${pBucketName}"
       State: "ENABLED"
       EventPattern:
         source:

source/infrastructure/data_lake/glue/glue_scripts_uploader.py

@@ -118,7 +118,8 @@ def _create_sdlf_heavy_transform_glue_script_custom_resource(self):
             properties={
                 "artifacts_bucket_name": self._solution_buckets.artifacts_bucket.bucket_name,
                 "artifacts_object_key": self._glue_script_path,
-                "glue_script_file": self._glue_script_local_file_path
+                "glue_script_file": self._glue_script_local_file_path,
+                "amc_dataset_version": "2.0.2"
             },
         )
         self._sdlf_heavy_transform_glue_script_custom_resource.node.add_dependency(