Skip to content

updating Roda template synth script and fixing rds.DatabaseInstanceProps credentials prop #21

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

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

updating Roda template synth script and fixing rds.DatabaseInstanceProps credentials prop #21

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
d55d95e
updating Roda table and database names for template synth script
Jan 18, 2021
aa02e58
updating rds.DatabaseInstanceSourceProps to use credentials object
Jan 18, 2021
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
12 changes: 6 additions & 6 deletions SynthRodaTemplates.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
aws glue get-tables --database-name opentargets_1911_dl > RODA_templates/open_targets_1911_get_tables.json
aws glue get-database --name opentargets_1911_dl > RODA_templates/open_targets_1911_get_database.json
aws glue get-tables --database-name opentargets_1911_dl-awsroda > RODA_templates/open_targets_1911_get_tables.json
aws glue get-database --name opentargets_1911_dl-awsroda > RODA_templates/open_targets_1911_get_database.json
npm run build && cdk synth OpenTargetsRodaTemplate
aws s3 cp cdk.out/OpenTargetsRodaTemplate.template.json s3://aws-roda-hcls-datalake/OpenTargetsRodaTemplate.json


aws glue get-tables --database-name chembl_25_dl > RODA_templates/chembl_25_get_tables.json
aws glue get-database --name chembl_25_dl > RODA_templates/chembl_25_get_database.json
aws glue get-tables --database-name chembl_25_dl-awsroda > RODA_templates/chembl_25_get_tables.json
aws glue get-database --name chembl_25_dl-awsroda > RODA_templates/chembl_25_get_database.json
npm run build && cdk synth ChemblRodaTemplate
aws s3 cp cdk.out/ChemblRodaTemplate.template.json s3://aws-roda-hcls-datalake/ChemblRodaTemplate.json

aws glue get-tables --database-name binding_db_dl > RODA_templates/binding_db_get_tables.json
aws glue get-database --name binding_db_dl > RODA_templates/binding_db_get_database.json
aws glue get-tables --database-name binding_db_dl-awsroda > RODA_templates/binding_db_get_tables.json
aws glue get-database --name binding_db_dl-awsroda > RODA_templates/binding_db_get_database.json
npm run build && cdk synth BindingDbRodaTemplate
aws s3 cp cdk.out/BindingDbRodaTemplate.template.json s3://aws-roda-hcls-datalake/BindingDbRodaTemplate.json

Expand Down
6 changes: 2 additions & 4 deletions lib/baseline-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,11 @@ export class BaselineStack extends cdk.Stack {

const chemblDb = new rds.DatabaseInstance(this, 'chembl25', {
engine: rds.DatabaseInstanceEngine.POSTGRES,
masterUsername: 'master',
credentials: rds.Credentials.fromPassword('master',chemblDBSecret.secretValueFromJson('password')),
vpc: baselineVpc,
vpcPlacement: appSubnetSelection,
instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE2, ec2.InstanceSize.SMALL),
instanceIdentifier: 'chembl-25-00',
masterUserPassword: chemblDBSecret.secretValueFromJson('password'),
securityGroups: [chemblDbSG],
deletionProtection: false
});
Expand Down Expand Up @@ -223,14 +222,13 @@ export class BaselineStack extends cdk.Stack {

const bindingDb = new rds.DatabaseInstance(this, 'bindingDb', {
engine: rds.DatabaseInstanceEngine.ORACLE_SE2,
masterUsername: 'master',
credentials: rds.Credentials.fromPassword('master',chemblDBSecret.secretValueFromJson('password')),
licenseModel: rds.LicenseModel.BRING_YOUR_OWN_LICENSE,
vpc: baselineVpc,
vpcPlacement: appSubnetSelection,
optionGroup: bindingDbOptionGroup,
instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE3, ec2.InstanceSize.SMALL),
instanceIdentifier: 'binding-db',
masterUserPassword: bindingDBSecret.secretValueFromJson('password'),
securityGroups: [bindingDbSg, bindingDbAccessSg],
deletionProtection: false,
});
Expand Down