Moving files around for more structure

Author: EC2 Default User

lib/chembl-25-stack.ts

@@ -5,10 +5,11 @@ import rds = require('@aws-cdk/aws-rds');
 import glue = require('@aws-cdk/aws-glue');
 import s3 = require('@aws-cdk/aws-s3');
 import s3assets = require('@aws-cdk/aws-s3-assets');
-import { RDSdataSetSetEnrollmentProps, RDSPostgresDataSetEnrollment } from './rds-data-set-enrollment';
+import { RDSdataSetSetEnrollmentProps, RDSPostgresDataSetEnrollment } from './constructs/rds-data-set-enrollment';
 import { DataSetStack, DataSetStackProps} from './dataset-stack';
 
 
+
 export interface ChemblStackEnrollmentProps extends DataSetStackProps {
 	databaseSecret: rds.DatabaseSecret;
 	database: rds.DatabaseInstance;

lib/datalake-stack.ts renamed to lib/constructs/data-lake-enrollment.ts

@@ -7,26 +7,6 @@ import s3 = require('@aws-cdk/aws-s3');
 import s3assets = require('@aws-cdk/aws-s3-assets');
 import { DataSetEnrollmentProps, DataSetEnrollment } from './data-set-enrollment';
 
-export interface DatalakeStackProps extends cdk.StackProps {
-    // chemblDB: rds.DatabaseInstance;
-    // chemblDBAccessSg: ec2.SecurityGroup;
-    // chemblDBSecret: rds.DatabaseSecret;
-}
-
-export class DatalakeStack extends cdk.Stack {
-  
-  public readonly DataLakeBucket: s3.Bucket; 
-  
-  constructor(scope: cdk.Construct, id: string, props: DatalakeStackProps) {
-    super(scope, id, props);
-
-    const dataLakeBucket = new s3.Bucket(this, 'dataLakeBucket');
-
-    this.DataLakeBucket = dataLakeBucket;
-  }
-}
-
-
 
 
 export interface DataLakeEnrollmentProps extends cdk.StackProps {

lib/data-set-enrollment.ts renamed to lib/constructs/data-set-enrollment.ts

@@ -6,7 +6,7 @@ import s3 = require('@aws-cdk/aws-s3');
 import s3assets = require('@aws-cdk/aws-s3-assets')
 import rds = require('@aws-cdk/aws-rds');
 import { DataSetEnrollmentProps, DataSetEnrollment } from './data-set-enrollment';
-import { DataLakeEnrollment, DataLakeEnrollmentProps } from './datalake-stack'
+import { DataLakeEnrollment, DataLakeEnrollmentProps } from './data-lake-enrollment'
 
 
 export interface RDSdataSetSetEnrollmentProps extends DataLakeEnrollmentProps {

lib/rds-data-set-enrollment.ts renamed to lib/constructs/rds-data-set-enrollment.ts

@@ -5,7 +5,7 @@ import glue = require('@aws-cdk/aws-glue');
 import s3 = require('@aws-cdk/aws-s3');
 import s3assets = require('@aws-cdk/aws-s3-assets');
 import { DataSetEnrollmentProps, DataSetEnrollment } from './data-set-enrollment';
-import { DataLakeEnrollment, DataLakeEnrollmentProps } from './datalake-stack'
+import { DataLakeEnrollment, DataLakeEnrollmentProps } from './data-lake-enrollment';
 
 
 export interface S3dataSetEnrollmentProps extends DataLakeEnrollmentProps {

lib/s3-data-set-enrollment.ts renamed to lib/constructs/s3-data-set-enrollment.ts

@@ -4,8 +4,8 @@ import iam = require('@aws-cdk/aws-iam');
 import glue = require('@aws-cdk/aws-glue');
 import s3 = require('@aws-cdk/aws-s3');
 import s3assets = require('@aws-cdk/aws-s3-assets');
-import { S3dataSetEnrollmentProps, S3dataSetEnrollment } from './s3-data-set-enrollment';
-import { DataSetStack, DataSetStackProps} from './dataset-stack';
+import { S3dataSetEnrollmentProps, S3dataSetEnrollment } from './constructs/s3-data-set-enrollment';
+import { DataSetStack, DataSetStackProps} from './stacks/dataset-stack';
 
 
 export interface OpenTargetsEnrollmentProps extends DataSetStackProps {

lib/opentargets-stack.ts

@@ -0,0 +1,28 @@
+import * as cdk from '@aws-cdk/core';
+import ec2 = require('@aws-cdk/aws-ec2');
+import iam = require('@aws-cdk/aws-iam');
+import rds = require('@aws-cdk/aws-rds');
+import glue = require('@aws-cdk/aws-glue');
+import s3 = require('@aws-cdk/aws-s3');
+import s3assets = require('@aws-cdk/aws-s3-assets');
+import { DataSetEnrollmentProps, DataSetEnrollment } from './constructs/data-set-enrollment';
+
+export interface DatalakeStackProps extends cdk.StackProps {
+
+}
+
+export class DatalakeStack extends cdk.Stack {
+  
+  public readonly DataLakeBucket: s3.Bucket; 
+  
+  constructor(scope: cdk.Construct, id: string, props: DatalakeStackProps) {
+    super(scope, id, props);
+
+    const dataLakeBucket = new s3.Bucket(this, 'dataLakeBucket');
+
+    this.DataLakeBucket = dataLakeBucket;
+  }
+}
+
+
+

lib/stacks/datalake-stack.ts

@@ -5,8 +5,8 @@ import rds = require('@aws-cdk/aws-rds');
 import glue = require('@aws-cdk/aws-glue');
 import s3 = require('@aws-cdk/aws-s3');
 import s3assets = require('@aws-cdk/aws-s3-assets');
-import { DataSetEnrollmentProps, DataSetEnrollment } from './data-set-enrollment';
-import { DataLakeEnrollmentProps, DataLakeEnrollment} from './datalake-stack';
+import { DataSetEnrollmentProps, DataSetEnrollment } from '../constructs/data-set-enrollment';
+import { DataLakeEnrollmentProps, DataLakeEnrollment} from '../constructs/data-lake-enrollment';
 
 
 export interface DataSetStackProps extends cdk.StackProps {