Merge pull request #167 from aws-solutions/release/v6.1.2

Update to version v6.1.2

.gitignore

@@ -14,7 +14,6 @@
 
 # dependencies
 **/node_modules
-package-lock.json
 
 # misc
 **/npm-debug.log

CHANGELOG.md

@@ -3,9 +3,19 @@ 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).
+## [6.1.2] - 2023-5-01
+### Added
+- Created unique cachePolicyName for CloudFront cache policy allowing the stack to deployed multiple times across regions.
+- Added unique prefix for Application Registry name so if a stack update is performance the new application will show up in app manager.
+- Added package-lock files to show snapshot of packages used during build.
+
+### Removed
+- Removed github action workflow files
+
 ## [6.1.1] - 2023-4-17
 ### Changed
 - Updated object ownership configuration on the CloudFormation logging bucket
+
 ## [6.1.0] - 2023-2-27
 ### Changed
 - Added region name and account ID to AppRegistry Application name

source/cdk/lib/vod-stack.ts

@@ -333,7 +333,10 @@ export class VideoOnDemand extends cdk.Stack {
      * Construct includes a logs bucket for the CloudFront distribution and a CloudFront
      * OriginAccessIdentity which is used to restrict access to S3 from CloudFront.
      */
+    const cachePolicyName = `cp-${cdk.Aws.REGION}-${cdk.Aws.STACK_NAME}`;
+
     const cachePolicy = new cloudfront.CachePolicy(this, 'CachePolicy', {
+      cachePolicyName: cachePolicyName,
       cookieBehavior: cloudfront.CacheCookieBehavior.none(),
       headerBehavior: cloudfront.CacheHeaderBehavior.allowList(
         'Origin',
@@ -2296,8 +2299,8 @@ export class VideoOnDemand extends cdk.Stack {
      * AppRegistry
      */
     const applicationName = `video-on-demand-on-aws-${cdk.Aws.REGION}-${cdk.Aws.ACCOUNT_ID}-${cdk.Aws.STACK_NAME}`;
-    const attributeGroup = new appreg.AttributeGroup(this, 'AppRegistryAttributeGroup', {
-      attributeGroupName: `${cdk.Aws.REGION}-${cdk.Aws.STACK_NAME}`,
+    const attributeGroup = new appreg.AttributeGroup(this, 'AppRegistryAttributeGroupId', {
+      attributeGroupName: `A30-${cdk.Aws.REGION}-${cdk.Aws.STACK_NAME}`,
       description: 'Attribute group for solution information',
       attributes: {
         applicationType: 'AWS-Solutions',

source/cdk/test/__snapshots__/vod.test.ts.snap

@@ -415,7 +415,7 @@ exports[`VideoOnDemand Stack Test 1`] = `
     },
     AppRegistryApp5349BE86: {
       DependsOn: [
-        AppRegistryAttributeGroup7AF07446,
+        AppRegistryAttributeGroupId7C2D526E,
       ],
       Properties: {
         Description: Service Catalog application to track and manage all your resources. The SolutionId is SO0021 and SolutionVersion is %%VERSION%%.,
@@ -448,9 +448,9 @@ exports[`VideoOnDemand Stack Test 1`] = `
       },
       Type: AWS::ServiceCatalogAppRegistry::Application,
     },
-    AppRegistryAppAttributeGroupAssociation89f88b663a927A6EC94A: {
+    AppRegistryAppAttributeGroupAssociation9a1cc5a2b862D1166969: {
       DependsOn: [
-        AppRegistryAttributeGroup7AF07446,
+        AppRegistryAttributeGroupId7C2D526E,
       ],
       Properties: {
         Application: {
@@ -461,7 +461,7 @@ exports[`VideoOnDemand Stack Test 1`] = `
         },
         AttributeGroup: {
           Fn::GetAtt: [
-            AppRegistryAttributeGroup7AF07446,
+            AppRegistryAttributeGroupId7C2D526E,
             Id,
           ],
         },
@@ -483,7 +483,7 @@ exports[`VideoOnDemand Stack Test 1`] = `
       },
       Type: AWS::ServiceCatalogAppRegistry::ResourceAssociation,
     },
-    AppRegistryAttributeGroup7AF07446: {
+    AppRegistryAttributeGroupId7C2D526E: {
       Properties: {
         Attributes: {
           applicationType: AWS-Solutions,
@@ -496,6 +496,7 @@ exports[`VideoOnDemand Stack Test 1`] = `
           Fn::Join: [
             ,
             [
+              A30-,
               {
                 Ref: AWS::Region,
               },
@@ -719,10 +720,14 @@ exports[`VideoOnDemand Stack Test 1`] = `
             Fn::Join: [
               ,
               [
-                VideoOnDemandCachePolicy7E8194AA-,
+                cp-,
                 {
                   Ref: AWS::Region,
                 },
+                -,
+                {
+                  Ref: AWS::StackName,
+                },
               ],
             ],
           },
@@ -2590,6 +2595,13 @@ exports[`VideoOnDemand Stack Test 1`] = `
             },
           ],
         },
+        OwnershipControls: {
+          Rules: [
+            {
+              ObjectOwnership: ObjectWriter,
+            },
+          ],
+        },
         PublicAccessBlockConfiguration: {
           BlockPublicAcls: true,
           BlockPublicPolicy: true,