Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature: bring your own UserPool #159

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Feature: bring your own UserPool #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0252592
Add existingCognitoPoolId support
bogdankatishev Jan 24, 2024
cc70df7
Update snapshot and tests
bogdankatishev Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions source/infrastructure/lib/distributed-load-testing-on-aws-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,11 @@ export class DLTStack extends Stack {
constraintDescription: "The Egress CIDR block must be a valid IP CIDR range of the form x.x.x.x/x.",
});

const existingCognitoPoolId = new CfnParameter(this, "ExistingCognitoPoolId", {
type: "String",
description: "Existing Cognito Pool ID",
});

// CloudFormation metadata
this.templateOptions.metadata = {
"AWS::CloudFormation::Interface": {
Expand All @@ -188,6 +193,10 @@ export class DLTStack extends Stack {
egressCidrBlock.logicalId,
],
},
{
Label: { default: "Enter value here to use your own existing Cognito Pool" },
Parameters: [existingCognitoPoolId.logicalId],
},
],
ParameterLabels: {
[adminName.logicalId]: { default: "* Console Administrator Name" },
Expand All @@ -199,6 +208,9 @@ export class DLTStack extends Stack {
[subnetACidrBlock.logicalId]: { default: "AWS Fargate Subnet A CIDR Block" },
[subnetBCidrBlock.logicalId]: { default: "AWS Fargate Subnet A CIDR Block" },
[egressCidrBlock.logicalId]: { default: "AWS Fargate SecurityGroup CIDR Block" },
[existingCognitoPoolId.logicalId]: {
default: "The ID of an existing Cognito User Pool in this region. Ex: `us-east-1_123456789`",
},
},
},
};
Expand Down Expand Up @@ -412,6 +424,7 @@ export class DLTStack extends Stack {
apiId: dltApi.apiId,
cloudFrontDomainName: dltConsole.cloudFrontDomainName,
scenariosBucketArn: dltStorage.scenariosBucket.bucketArn,
existingCognitoPoolId: existingCognitoPoolId.valueAsString,
});

customResources.copyConsoleFiles({
Expand Down
21 changes: 17 additions & 4 deletions source/infrastructure/lib/front-end/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
CfnUserPoolUser,
} from "aws-cdk-lib/aws-cognito";
import { Effect, FederatedPrincipal, PolicyDocument, PolicyStatement, Role } from "aws-cdk-lib/aws-iam";
import { Aws, ArnFormat, CfnResource, Duration, RemovalPolicy, Stack } from "aws-cdk-lib";
import { Aws, ArnFormat, CfnResource, Duration, RemovalPolicy, Stack, CfnCondition, Fn } from "aws-cdk-lib";
import { CfnPolicy } from "aws-cdk-lib/aws-iot";
import { Construct } from "constructs";

Expand All @@ -26,6 +26,7 @@ export interface CognitoAuthConstructProps {
apiId: string;
cloudFrontDomainName: string;
scenariosBucketArn: string;
existingCognitoPoolId: string;
}

export class CognitoAuthConstruct extends Construct {
Expand All @@ -37,6 +38,11 @@ export class CognitoAuthConstruct extends Construct {
constructor(scope: Construct, id: string, props: CognitoAuthConstructProps) {
super(scope, id);

// CFN Conditions
const createUserPoolResourceCondition = new CfnCondition(this, "createUserPoolResource", {
expression: Fn.conditionEquals(props.existingCognitoPoolId, ""),
});

const dltIotPolicy = new CfnPolicy(this, "IoT-Policy", {
policyDocument: new PolicyDocument({
statements: [
Expand Down Expand Up @@ -132,7 +138,14 @@ export class CognitoAuthConstruct extends Construct {
userPoolName: `${Aws.STACK_NAME}-user-pool`,
});
(cognitoUserPool.node.defaultChild as CfnUserPool).userPoolAddOns = { advancedSecurityMode: "ENFORCED" };
this.cognitoUserPoolId = cognitoUserPool.userPoolId;
(cognitoUserPool.node.defaultChild as CfnUserPool).cfnOptions.condition = createUserPoolResourceCondition;

this.cognitoUserPoolId = Fn.conditionIf(
createUserPoolResourceCondition.logicalId,
cognitoUserPool.userPoolId,
props.existingCognitoPoolId
).toString();
const userPool = UserPool.fromUserPoolId(this, "UserPool", this.cognitoUserPoolId);

const clientWriteAttributes = new ClientAttributes().withStandardAttributes({
address: true,
Expand All @@ -142,7 +155,7 @@ export class CognitoAuthConstruct extends Construct {

const cognitoUserPoolClient = new UserPoolClient(this, "DLTUserPoolClient", {
userPoolClientName: `${Aws.STACK_NAME}-userpool-client`,
userPool: cognitoUserPool,
userPool,
generateSecret: false,
writeAttributes: clientWriteAttributes,
refreshTokenValidity: Duration.days(1),
Expand All @@ -155,7 +168,7 @@ export class CognitoAuthConstruct extends Construct {
cognitoIdentityProviders: [
{
clientId: this.cognitoUserPoolClientId,
providerName: cognitoUserPool.userPoolProviderName,
providerName: `cognito-idp.${userPool.env.region}.amazonaws.com/${userPool.userPoolId}`,
},
],
});
Expand Down
Loading