updating Roda table and database names for template synth script

Author: Andrew de Rozario

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
 

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,
         });