Merge branch 'main' into seed-feat

Author: Vieltojarvi

.changeset/lazy-words-invite.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/backend-cli': patch
+---
+
+Cache dependencies when assessing notices predicates

.changeset/loud-teams-wink.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/auth-construct': patch
+---
+
+Modified the AmplifyAuth class in packages/auth-construct/src/construct.ts to explicitly set the userPoolName property to match the construct's name property

.github/workflows/health_checks.yml

@@ -599,7 +599,7 @@ jobs:
           - os: macos-14
             node-version: 20
           - os: windows-latest
-            node-version: 20
+            node-version: 18
           - os: macos-14
             node-version: 22
           - os: windows-latest

packages/auth-construct/src/construct.test.ts

@@ -1,7 +1,7 @@
 import { beforeEach, describe, it, mock } from 'node:test';
 import { AmplifyAuth } from './construct.js';
 import { App, SecretValue, Stack, aws_cognito } from 'aws-cdk-lib';
-import { Template } from 'aws-cdk-lib/assertions';
+import { Match, Template } from 'aws-cdk-lib/assertions';
 import assert from 'node:assert';
 import {
   BackendOutputEntry,
@@ -3062,4 +3062,30 @@ void describe('Auth construct', () => {
       assert.equal(name.startsWith(expectedPrefix), true);
     });
   });
+
+  void it('sets the correct userPoolName when name is provided', () => {
+    const app = new App();
+    const stack = new Stack(app);
+    const customAuthName = 'CustomAuthName';
+    new AmplifyAuth(stack, 'test', {
+      loginWith: { email: true },
+      name: customAuthName,
+    });
+    const template = Template.fromStack(stack);
+    template.hasResourceProperties('AWS::Cognito::UserPool', {
+      UserPoolName: customAuthName,
+    });
+  });
+
+  void it('uses empty string as userPoolName when name is not provided', () => {
+    const app = new App();
+    const stack = new Stack(app);
+    new AmplifyAuth(stack, 'test', {
+      loginWith: { email: true },
+    });
+    const template = Template.fromStack(stack);
+    template.hasResourceProperties('AWS::Cognito::UserPool', {
+      UserPoolName: Match.absent(),
+    });
+  });
 });

packages/auth-construct/src/construct.ts

@@ -630,6 +630,7 @@ export class AmplifyAuth
             )
           : undefined,
       customSenderKmsKey: this.customSenderKMSkey,
+      userPoolName: props.name || undefined,
     };
     return userPoolProps;
   };