Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.

Updated to meet new Aurora version conventions + a few other things #2

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

Updated to meet new Aurora version conventions + a few other things #2

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
1105306
Updated Postgres versioning, added bastion host, updated amplify conf…
adistasiINN Nov 30, 2023
c650879
Update bastion name
Nov 30, 2023
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
27 changes: 18 additions & 9 deletions lib/aws-amplify-codepipeline-db-migrations-main-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export class AwsAmplifyCodepipelineDbMigrationsMainStack extends cdk.Stack {
]
}
);

// Create Security Groups
const codeBuildSecurityGroup = new ec2.SecurityGroup(
this, "CodeBuildSecurityGroup", {
Expand All @@ -52,9 +52,17 @@ export class AwsAmplifyCodepipelineDbMigrationsMainStack extends cdk.Stack {
codeBuildSecurityGroup,
ec2.Port.tcp(5432),);


// Create Database Cluster
const databaseCluster = this.createDatabaseCluster(this, vpc, databaseSecurityGroup, props);


// Create Bastion Host
const bastionHost = new ec2.BastionHostLinux(this, 'BastionHost', {
vpc,
securityGroup: codeBuildSecurityGroup,
instanceName: `${props?.stackName}-BastionHost`,
});

// Create Amplify Stack
const codeCommitRepository = this.createCodeCommitRepository(this, props);

Expand Down Expand Up @@ -86,7 +94,7 @@ export class AwsAmplifyCodepipelineDbMigrationsMainStack extends cdk.Stack {
'ServerlessCluster',
{
clusterIdentifier: `${props?.stackName}-ServerlessCluster`,
engine: rds.DatabaseClusterEngine.AURORA_POSTGRESQL,
engine: rds.DatabaseClusterEngine.auroraPostgres({version: rds.AuroraPostgresEngineVersion.VER_11_13}),
vpc,
vpcSubnets: {
subnetType: ec2.SubnetType.PRIVATE,
Expand All @@ -103,7 +111,7 @@ export class AwsAmplifyCodepipelineDbMigrationsMainStack extends cdk.Stack {
minCapacity: rds.AuroraCapacityUnit.ACU_2,
maxCapacity: rds.AuroraCapacityUnit.ACU_2,
},
parameterGroup: rds.ParameterGroup.fromParameterGroupName(scope, 'ParameterGroup', 'default.aurora-postgresql10'),
parameterGroup: rds.ParameterGroup.fromParameterGroupName(scope, 'ParameterGroup', 'default.aurora-postgresql11'),
}
);
}
Expand Down Expand Up @@ -192,7 +200,8 @@ export class AwsAmplifyCodepipelineDbMigrationsMainStack extends cdk.Stack {
'build':{
'commands': [
'npx amplify init --yes --amplify "{\\"envName\\":\\"dev\\",\\"defaultEditor\\":\\"code\\"}" --providers "{\\"awscloudformation\\":{\\"useProfile\\":false,\\"accessKeyId\\":\\"$AMPLIFY_USER_ACCESS_KEY_ID\\",\\"secretAccessKey\\":\\"$AMPLIFY_USER_SECRET_ACCESS_KEY\\",\\"region\\":\\"us-east-1\\"}}"',
'npx amplify publish --yes',
'npx amplify configure project --yes --amplify "{\\"envName\\":\\"dev\\",\\"defaultEditor\\":\\"code\\"}" --providers "{\\"awscloudformation\\":{\\"useProfile\\":false,\\"accessKeyId\\":\\"$AMPLIFY_USER_ACCESS_KEY_ID\\",\\"secretAccessKey\\":\\"$AMPLIFY_USER_SECRET_ACCESS_KEY\\",\\"region\\":\\"us-east-1\\"}}" --frontend "{\\"frontend\\":\\"javascript\\",\\"framework\\":\\"react\\",\\"config\\":{\\"SourceDir\\":\\"src\\",\\"DistributionDir\\":\\"build\\",\\"BuildCommand\\":\\"npm run-script build\\",\\"StartCommand\\":\\"npm run-script start\\"}}"',
'npx amplify publish --invalidateCloudFront --yes'
]
},
}
Expand Down Expand Up @@ -240,10 +249,10 @@ export class AwsAmplifyCodepipelineDbMigrationsMainStack extends cdk.Stack {
'commands': [
'python3 -m venv env',
'source env/bin/activate',
'pip install psycopg2-binary',
'pip install postgres',
'pip install SQLAlchemy',
'pip install alembic',
'pip install psycopg2-binary==2.9.3',
'pip install postgres==4.0',
'pip install SQLAlchemy==1.4.41',
'pip install alembic==1.11.1',
'pip install boto3',
'pip install pytest',
'sed -i "s/sqlalchemy.url = [^\\n]*/sqlalchemy.url = postgresql:\\/\\/$DATABASE_SECRET_USERNAME:$DATABASE_SECRET_PASSWORD@$DATABASE_SECRET_HOST\\/$DATABASE_SECRET_DBNAME/" alembic.ini',
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"typescript": "~3.9.7"
},
"dependencies": {
"aws-cdk": "^2.16.0",
"aws-cdk": "^2.101.1",
"aws-cdk-lib": "^2.16.0",
"constructs": "^10.0.0",
"source-map-support": "^0.5.16"
Expand Down