From 466bded8c4f5c74cd568069b59d274c5f52fa31d Mon Sep 17 00:00:00 2001
From: biffgaut <biffgaut@amazon.com>
Date: Tue, 7 Feb 2023 14:30:52 -0500
Subject: [PATCH] Remove originAccessIdentityName

---
 .../aws-cloudfront-mediastore/lib/index.ts                    | 4 ++--
 .../test/cloudfront-distribution-mediastore-helper.test.ts    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/lib/index.ts
index 9bd9b4d76..22f37912e 100644
--- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/lib/index.ts
+++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/lib/index.ts
@@ -116,7 +116,7 @@ export class CloudFrontToMediaStore extends Construct {
               Resource: `arn:${Aws.PARTITION}:mediastore:${Aws.REGION}:${Aws.ACCOUNT_ID}:container/${Aws.STACK_NAME}/*`,
               Condition: {
                 StringEquals: {
-                  'aws:UserAgent': this.cloudFrontOriginAccessIdentity.originAccessIdentityName
+                  'aws:UserAgent': this.cloudFrontOriginAccessIdentity.originAccessIdentityId
                 },
                 Bool: {
                   'aws:SecureTransport': 'true'
@@ -127,7 +127,7 @@ export class CloudFrontToMediaStore extends Construct {
         };
 
         const userAgentHeader: Record<string, string> = {
-          'User-Agent': this.cloudFrontOriginAccessIdentity.originAccessIdentityName
+          'User-Agent': this.cloudFrontOriginAccessIdentity.originAccessIdentityId
         };
 
         if (cloudFrontDistributionProps) {
diff --git a/source/patterns/@aws-solutions-constructs/core/test/cloudfront-distribution-mediastore-helper.test.ts b/source/patterns/@aws-solutions-constructs/core/test/cloudfront-distribution-mediastore-helper.test.ts
index 22cc6d8d3..c1e5d97e1 100644
--- a/source/patterns/@aws-solutions-constructs/core/test/cloudfront-distribution-mediastore-helper.test.ts
+++ b/source/patterns/@aws-solutions-constructs/core/test/cloudfront-distribution-mediastore-helper.test.ts
@@ -242,7 +242,7 @@ test('CloudFront distribution for MediaStore with user provided custom headers w
   const cloudfrontOriginAccessIdentity = CloudFrontOriginAccessIdentity(stack);
   const cfProps = {
     customHeaders: {
-      'User-Agent': cloudfrontOriginAccessIdentity.originAccessIdentityName
+      'User-Agent': cloudfrontOriginAccessIdentity.originAccessIdentityId
     }
   };