From d55d95e65acc7efdd151f3480f56e11e49488449 Mon Sep 17 00:00:00 2001 From: Andrew de Rozario Date: Mon, 18 Jan 2021 17:12:50 +0000 Subject: [PATCH 1/2] updating Roda table and database names for template synth script --- SynthRodaTemplates.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SynthRodaTemplates.sh b/SynthRodaTemplates.sh index 6bc6227..ee44582 100755 --- a/SynthRodaTemplates.sh +++ b/SynthRodaTemplates.sh @@ -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 From aa02e585a1120fec5c10fbf14588d1b3e547183c Mon Sep 17 00:00:00 2001 From: Andrew de Rozario Date: Mon, 18 Jan 2021 17:14:33 +0000 Subject: [PATCH 2/2] updating rds.DatabaseInstanceSourceProps to use credentials object --- lib/baseline-stack.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/baseline-stack.ts b/lib/baseline-stack.ts index 38da812..4158a44 100644 --- a/lib/baseline-stack.ts +++ b/lib/baseline-stack.ts @@ -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 }); @@ -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, });