Merge of #35518

Author: mergify[bot]

packages/aws-cdk-lib/aws-cloudfront/lib/experimental/edge-function.ts

@@ -279,13 +279,15 @@ export class EdgeFunction extends Resource implements lambda.IVersion {
     }
 
     const edgeStackId = stackId ?? `edge-lambda-stack-${this.stack.node.addr}`;
+    const parentStack = Stack.of(this);
     let edgeStack = stage.node.tryFindChild(edgeStackId) as Stack;
     if (!edgeStack) {
       edgeStack = new Stack(stage, edgeStackId, {
         env: {
           region: EdgeFunction.EDGE_REGION,
           account: Stack.of(this).account,
         },
+        tags: parentStack.tags.tagValues(),
       });
     }
     this.stack.addDependency(edgeStack);

packages/aws-cdk-lib/aws-cloudfront/test/experimental/edge-function.test.ts

@@ -110,6 +110,25 @@ describe('stacks', () => {
     expect(fnStack.account).toEqual('111111111111');
   });
 
+  test('us-east-1 stack inherits tags of parent stack', () => {
+    stack = new cdk.Stack(app, 'StackWithDefaultAccount', {
+      env: { region: 'testregion' },
+      tags: {
+        abc: 'def',
+      },
+    });
+
+    new cloudfront.experimental.EdgeFunction(
+      stack,
+      'MyFn',
+      defaultEdgeFunctionProps(),
+    );
+
+    const fnStack = getFnStack();
+
+    expect(fnStack.tags.tagValues()).toEqual({ abc: 'def' });
+  });
+
   test('us-east-1 stack inherits account of parent stack, when parent stack account is undefined', () => {
     stack = new cdk.Stack(app, 'StackWithDefaultAccount', {
       env: { region: 'testregion' },