Merge pull request #90 from aws-solutions/release/v2.1.0

release v2.1.0 changes
aws-solutions · May 2, 2023 · 506b3d6 · 506b3d6
2 parents 904a67b + e834ccd
commit 506b3d6
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 400 deletions.
diff --git a/.github/workflows/pr-workflow.yml b/.github/workflows/pr-workflow.yml
diff --git a/.viperlightignore b/.viperlightignore
diff --git a/.viperlightrc b/.viperlightrc
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,16 @@ 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.1.0] - 2023-05-01
+
+### Changed:
+* Upgrade Media Insights on AWS dependency to v5.1.2
+* Updated template prefix from aws-content-analysis to content-analysis-on-aws
+
+### Fixed:
+
+* Updated object ownership configuration for ContentAnalysisWebsiteBucket
+* Fixed formatting in Auth stack for Admin Role
 
 ## [2.0.2] - 2023-01-11
 

diff --git a/README.md b/README.md
@@ -81,11 +81,11 @@ EMAIL=[specify your email]
 WEBAPP_STACK_NAME=[specify a stack name]
 REGION=[specify a region]
 VERSION=1.0.0
-git clone https://github.com/awslabs/aws-content-analysis
-cd aws-content-analysis
+git clone https://github.com/aws-solutions/content-analysis-on-aws
+cd content-analysis-on-aws
 cd deployment
 DATETIME=$(date '+%s')
-DIST_OUTPUT_BUCKET=aws-content-analysis-frontend-$DATETIME
+DIST_OUTPUT_BUCKET=content-analysis-on-aws-frontend-$DATETIME
 aws s3 mb s3://$DIST_OUTPUT_BUCKET-$REGION --region $REGION
 aws s3 mb s3://$TEMPLATE_OUTPUT_BUCKET --region $REGION
 ./build-s3-dist.sh --template-bucket ${TEMPLATE_OUTPUT_BUCKET} --code-bucket ${DIST_OUTPUT_BUCKET} --version ${VERSION} --region ${REGION}

diff --git a/buildspec.yml b/buildspec.yml
diff --git a/deployment/aws-content-analysis-auth.yaml b/deployment/aws-content-analysis-auth.yaml
@@ -279,10 +279,10 @@ Resources:
                     "Resource": "${searchdomain}/*"
                   },
                   {
-                  "Action": [
+                    "Action": [
                       "kms:Encrypt",
                       "kms:GenerateDataKey",
-                      "kms:Decrypt",
+                      "kms:Decrypt"
                     ],
                     "Effect": "Allow",
                     "Resource": "${kmskeyarn}"

diff --git a/deployment/aws-content-analysis-opensearch.yaml b/deployment/aws-content-analysis-opensearch.yaml
@@ -33,7 +33,7 @@ Mappings:
   SourceCode:
     General:
       RegionalS3Bucket: '%%REGIONAL_BUCKET_NAME%%'
-      KeyPrefix: "aws-content-analysis/%%VERSION%%"
+      KeyPrefix: "content-analysis-on-aws/%%VERSION%%"
 
 Resources:
   # Opensearch cluster

diff --git a/deployment/aws-content-analysis-use-existing-mie-stack.yaml b/deployment/aws-content-analysis-use-existing-mie-stack.yaml
@@ -25,7 +25,7 @@ Mappings:
   ContentAnalysisApp:
     SourceCode:
       GlobalS3Bucket: "%%GLOBAL_BUCKET_NAME%%"
-      TemplateKeyPrefix: "aws-content-analysis/%%VERSION%%"
+      TemplateKeyPrefix: "content-analysis-on-aws/%%VERSION%%"
 
 Resources:
 

diff --git a/deployment/aws-content-analysis-web.yaml b/deployment/aws-content-analysis-web.yaml
@@ -21,8 +21,8 @@ Mappings:
   SourceCode:
     General:
       RegionalS3Bucket: "%%REGIONAL_BUCKET_NAME%%"
-      CodeKeyPrefix: "aws-content-analysis/%%VERSION%%"
-      WebsitePrefix: "aws-content-analysis/%%VERSION%%/website"
+      CodeKeyPrefix: "content-analysis-on-aws/%%VERSION%%"
+      WebsitePrefix: "content-analysis-on-aws/%%VERSION%%/website"
 
 Resources:
   # Web application resources
@@ -92,6 +92,9 @@ Resources:
     DeletionPolicy: Retain
     Properties:
       AccessControl: LogDeliveryWrite
+      OwnershipControls:
+        Rules:
+          - ObjectOwnership: ObjectWriter
       BucketName: !GetAtt GetWebsiteBucketName.Data
       BucketEncryption:
         ServerSideEncryptionConfiguration:

diff --git a/deployment/aws-content-analysis.yaml b/deployment/aws-content-analysis.yaml
@@ -19,22 +19,22 @@ Parameters:
       - "r4.xlarge.search"
 
 Conditions:
-  EnableAnonymousData: !Equals [ !FindInMap [AnonymousData,SendAnonymousData,Data], Yes]
+  EnableAnonymousData: !Equals [ !FindInMap [AnonymousData,SendAnonymousData,Data], "Yes"]
 
 Mappings:
   MediaInsightsEngine:
     Release:
-      Version: "v5.0.0"
+      Version: "v5.1.2"
   Application:
     SourceCode:
       GlobalS3Bucket: "%%GLOBAL_BUCKET_NAME%%"
-      TemplateKeyPrefix: "aws-content-analysis/%%VERSION%%"
+      TemplateKeyPrefix: "content-analysis-on-aws/%%VERSION%%"
       RegionalS3Bucket: "%%REGIONAL_BUCKET_NAME%%"
-      CodeKeyPrefix: "aws-content-analysis/%%VERSION%%"
+      CodeKeyPrefix: "content-analysis-on-aws/%%VERSION%%"
       Version: "%%VERSION%%"
   AnonymousData:
     SendAnonymousData:
-      Data: Yes
+      Data: "Yes"
 
 Resources:
   # Deploy MIE Framework
@@ -44,17 +44,17 @@ Resources:
     Properties:
       TemplateURL: !Join
         - ""
-        - - "https://solutions-reference.s3.amazonaws.com/aws-media-insights-engine/"
+        - - "https://solutions-reference.s3.amazonaws.com/media-insights-on-aws/"
           - !FindInMap
             - MediaInsightsEngine
             - Release
             - Version
-          - "/media-insights-stack.template"
+          - "/media-insights-on-aws-stack.template"
       Parameters:
-        DeployAnalyticsPipeline: Yes
-        DeployTestResources: No
+        DeployAnalyticsPipeline: "Yes"
+        DeployTestResources: "No"
         MaxConcurrentWorkflows: 5
-        EnableXrayTrace: Yes
+        EnableXrayTrace: "Yes"
         SendAnonymousData: !FindInMap [AnonymousData,SendAnonymousData,Data]
         SolutionId: SO0042
         SolutionVersion: "%%VERSION%%"