@mettlecast/domain-cdk-packer 0.2.90 → 0.2.92

package/dist/DomainStack.js

@@ -124,7 +124,7 @@ export class DomainStack extends cdk.Stack {
             const resolvedUserPoolId = userPoolId ?? cdk.Fn.select(1, cdk.Fn.split('/', userPoolArn));
             jwtAuthorizer = new apigwv2.HttpAuthorizer(this, 'CognitoAuthorizer', {
                 httpApi: this.httpApi,
-                authorizerName: 'CognitoAuthorizer',
+                authorizerName: `CognitoAuthorizer-${domainId}`,
                 type: apigwv2.HttpAuthorizerType.JWT,
                 identitySource: ['$request.header.Authorization'],
                 jwtAudience: [userPoolClientId],

package/dist/__tests__/domain-stack.test.js

@@ -69,17 +69,17 @@ describe('DomainStack', () => {
     const eventBusArn = 'arn:aws:events:eu-north-1:123456789012:event-bus/tib-event-bus';
     it('synthesises without error for minimal registry', () => {
         const app = new cdk.App();
-        expect(() => new DomainStack(app, 'TestDomainStack', { registry: minimalRegistry, eventBusArn })).not.toThrow();
+        expect(() => new DomainStack(app, 'TestDomainStack', { registry: minimalRegistry, eventBusArn, projectId: 'Test', envCode: 'Dev' })).not.toThrow();
     });
     it('template contains HttpApi', () => {
         const app = new cdk.App();
-        const stack = new DomainStack(app, 'TestDomainStack2', { registry: minimalRegistry, eventBusArn });
+        const stack = new DomainStack(app, 'TestDomainStack2', { registry: minimalRegistry, eventBusArn, projectId: 'Test', envCode: 'Dev' });
         const template = Template.fromStack(stack);
         template.resourceCountIs('AWS::ApiGatewayV2::Api', 1);
     });
     it('template contains one Lambda function for the api entry', () => {
         const app = new cdk.App();
-        const stack = new DomainStack(app, 'TestDomainStack3', { registry: minimalRegistry, eventBusArn });
+        const stack = new DomainStack(app, 'TestDomainStack3', { registry: minimalRegistry, eventBusArn, projectId: 'Test', envCode: 'Dev' });
         const template = Template.fromStack(stack);
         template.resourceCountIs('AWS::Lambda::Function', 4);
     });
@@ -90,6 +90,8 @@ describe('DomainStack', () => {
         const stack = new DomainStack(app, 'TestDomainStackJwt', {
             registry: minimalRegistry,
             eventBusArn,
+            projectId: 'Test',
+            envCode: 'Dev',
             userPoolArn,
             userPoolClientId,
         });
@@ -98,6 +100,21 @@ describe('DomainStack', () => {
             AuthorizerType: 'JWT',
         });
     });
+    it('authorizer name is unique per-domain (includes domainId)', () => {
+        const app = new cdk.App();
+        const stack = new DomainStack(app, 'TestDomainStackName', {
+            registry: minimalRegistry,
+            eventBusArn,
+            projectId: 'Test',
+            envCode: 'Dev',
+            userPoolId: 'eu-north-1_test',
+            userPoolClientId: 'client-id',
+        });
+        const template = Template.fromStack(stack);
+        template.hasResourceProperties('AWS::ApiGatewayV2::Authorizer', {
+            Name: 'CognitoAuthorizer-test-domain',
+        });
+    });
     it('no authorizer attached when no JWT-protected actions are declared', () => {
         const app = new cdk.App();
         const registryNoAuth = {
@@ -120,6 +137,8 @@ describe('DomainStack', () => {
         const stack = new DomainStack(app, 'TestDomainStackNoAuth', {
             registry: registryNoAuth,
             eventBusArn,
+            projectId: 'Test',
+            envCode: 'Dev',
         });
         const template = Template.fromStack(stack);
         template.resourceCountIs('AWS::ApiGatewayV2::Authorizer', 0);
@@ -130,6 +149,8 @@ describe('DomainStack', () => {
         const stack = new DomainStack(app, 'TestDomainStackDbSecret', {
             registry: minimalRegistry,
             eventBusArn,
+            projectId: 'Test',
+            envCode: 'Dev',
             dbSecretArn,
         });
         const template = Template.fromStack(stack);
@@ -143,6 +164,8 @@ describe('DomainStack', () => {
         const stack = new DomainStack(app, 'TestDomainStackSecretGrant', {
             registry: minimalRegistry,
             eventBusArn,
+            projectId: 'Test',
+            envCode: 'Dev',
             dbSecretArn,
         });
         const template = Template.fromStack(stack);
@@ -152,7 +175,7 @@ describe('DomainStack', () => {
     });
     describe('domain S3 bucket', () => {
         const app = new cdk.App();
-        const stack = new DomainStack(app, 'TestDomainStackS3', { registry: minimalRegistry, eventBusArn });
+        const stack = new DomainStack(app, 'TestDomainStackS3', { registry: minimalRegistry, eventBusArn, projectId: 'Test', envCode: 'Dev' });
         const template = Template.fromStack(stack);
         it('creates exactly one S3 bucket', () => {
             template.resourceCountIs('AWS::S3::Bucket', 1);
@@ -170,7 +193,7 @@ describe('DomainStack', () => {
     });
     describe('tenant-scoped IAM role (defence in depth)', () => {
         const app = new cdk.App();
-        const stack = new DomainStack(app, 'TestDomainStackTenant', { registry: minimalRegistry, eventBusArn });
+        const stack = new DomainStack(app, 'TestDomainStackTenant', { registry: minimalRegistry, eventBusArn, projectId: 'Test', envCode: 'Dev' });
         const template = Template.fromStack(stack);
         it('creates a tenant-scoped IAM role', () => {
             template.hasResourceProperties('AWS::IAM::Role', {
@@ -280,6 +303,8 @@ describe('DomainStack', () => {
             const stack = new DomainStack(app, 'TestDomainStackMethods', {
                 registry: multiMethodRegistry,
                 eventBusArn,
+                projectId: 'Test',
+                envCode: 'Dev',
                 userPoolArn,
                 userPoolClientId,
             });
@@ -302,6 +327,8 @@ describe('DomainStack', () => {
             const stack = new DomainStack(app, 'TestDomainStackRouteAuth', {
                 registry: multiMethodRegistry,
                 eventBusArn,
+                projectId: 'Test',
+                envCode: 'Dev',
                 userPoolArn,
                 userPoolClientId,
             });
@@ -325,6 +352,8 @@ describe('DomainStack', () => {
             const stack = new DomainStack(app, 'TestDomainStackUnauthRoute', {
                 registry: multiMethodRegistry,
                 eventBusArn,
+                projectId: 'Test',
+                envCode: 'Dev',
                 userPoolArn,
                 userPoolClientId,
             });
@@ -340,6 +369,8 @@ describe('DomainStack', () => {
             const stack = new DomainStack(app, 'TestDomainStackMissingPool', {
                 registry: multiMethodRegistry,
                 eventBusArn,
+                projectId: 'Test',
+                envCode: 'Dev',
                 // No userPoolArn / userPoolId / userPoolClientId provided
             });
             // `Annotations.of(stack).errors` is not exposed; read the construct's
@@ -372,6 +403,8 @@ describe('DomainStack', () => {
             const stack = new DomainStack(app, 'TestDomainStackNoJwtNeeded', {
                 registry: noJwtRegistry,
                 eventBusArn,
+                projectId: 'Test',
+                envCode: 'Dev',
             });
             const metadata = stack.node.metadata;
             const errorMessages = metadata
@@ -445,6 +478,8 @@ describe('DomainStack', () => {
             const stack = new DomainStack(app, 'TestDomainStackActionRoutes', {
                 registry: registryWithActions,
                 eventBusArn,
+                projectId: 'Test',
+                envCode: 'Dev',
                 userPoolArn: 'arn:aws:cognito-idp:eu-north-1:123456789012:userpool/eu-north-1_abc123xyz',
                 userPoolClientId: 'test-client-id',
             });
@@ -459,6 +494,8 @@ describe('DomainStack', () => {
             const stack = new DomainStack(app, 'TestDomainStackInternalOnly', {
                 registry: registryWithActions,
                 eventBusArn,
+                projectId: 'Test',
+                envCode: 'Dev',
                 userPoolArn: 'arn:aws:cognito-idp:eu-north-1:123456789012:userpool/eu-north-1_abc123xyz',
                 userPoolClientId: 'test-client-id',
             });
@@ -472,6 +509,8 @@ describe('DomainStack', () => {
             const stack = new DomainStack(app, 'TestDomainStackActionJwt', {
                 registry: registryWithActions,
                 eventBusArn,
+                projectId: 'Test',
+                envCode: 'Dev',
                 userPoolArn: 'arn:aws:cognito-idp:eu-north-1:123456789012:userpool/eu-north-1_abc123xyz',
                 userPoolClientId: 'test-client-id',
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mettlecast/domain-cdk-packer",
-  "version": "0.2.90",
+  "version": "0.2.92",
   "type": "module",
   "publishConfig": {
     "registry": "https://registry.npmjs.org",