Adding additional inheritence

Author: EC2 Default User

lib/data-set-enrollment.ts

@@ -70,6 +70,8 @@ export class DataSetEnrollment extends cdk.Construct {
 
 
 		let connectionArray = [];
+		
+		
 		if(props.SourceConnectionInput){
 			this.SourceConnection = new glue.CfnConnection(this, `${props.dataSetName}-src-connection`, {
 				catalogId: this.Dataset_Source.catalogId, 
@@ -105,15 +107,14 @@ export class DataSetEnrollment extends cdk.Construct {
 		glueScript.grantRead(this.DataSetGlueRole);
 
 
-		const etl_job = new glue.CfnJob(this, `${props.dataSetName}-EtlJob`, {
+		
+		/// The spread operator below (...) makes the connections property conditional. Its only used for JDBC sources at the moment.
+		const jobParams = {
 			executionProperty: {
 				maxConcurrentRuns: 1
 			}, 
 			name: `${props.dataSetName}_src_to_dl_etl`, 
 			timeout: 2880, 
-			connections: {
-				connections: connectionArray
-			},
 			glueVersion: "1.0", 
 			maxCapacity: 10.0,
 			command: {
@@ -123,8 +124,14 @@ export class DataSetEnrollment extends cdk.Construct {
 			}, 
 			role: this.DataSetGlueRole.roleArn,
 			maxRetries: 0, 
-			defaultArguments: props.GlueScriptArguments
-		});
+			defaultArguments: props.GlueScriptArguments,
+			...(typeof props.SourceConnectionInput !== "undefined" && {
+					connections: {
+						connections: connectionArray
+					}
+			})
+		}
+		const etl_job = new glue.CfnJob(this, `${props.dataSetName}-EtlJob`, jobParams );
 
 
 

lib/datalake-stack.ts

@@ -5,7 +5,7 @@ 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 } from './data-set-enrollment';
+import { DataSetEnrollmentProps, DataSetEnrollment } from './data-set-enrollment';
 
 export interface DatalakeStackProps extends cdk.StackProps {
     // chemblDB: rds.DatabaseInstance;
@@ -28,3 +28,24 @@ export class DatalakeStack extends cdk.Stack {
 
 
 
+
+export interface DataLakeEnrollmentProps extends cdk.StackProps {
+	dataLakeBucket: s3.Bucket;
+	GlueScriptPath: string;
+	GlueScriptArguments: any;
+	DataSetName: string;
+}
+
+export class DataLakeEnrollment extends cdk.Construct {
+  
+  public DataEnrollment: DataSetEnrollment; 
+  
+  constructor(scope: cdk.Construct, id: string, props: DataLakeEnrollmentProps) {
+    super(scope, id);
+  }
+}
+
+
+
+
+

lib/rds-data-set-enrollment.ts

@@ -6,24 +6,20 @@ 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'
 
 
-
-export interface RDSdataSetSetEnrollmentProps extends cdk.StackProps {
+export interface RDSdataSetSetEnrollmentProps extends DataLakeEnrollmentProps {
 	databaseSecret: rds.DatabaseSecret;
 	database: rds.DatabaseInstance;
 	accessSecurityGroup: ec2.SecurityGroup;
-	dataLakeBucket: s3.Bucket;
-	DataSetName: string;
 	JdbcTargetIncludePaths: string[];
-	GlueScriptPath: string;
-	GlueScriptArguments: any;	
 }
 
 
-export class RDSPostgresDataSetEnrollment extends cdk.Construct{
+export class RDSPostgresDataSetEnrollment extends DataLakeEnrollment {
 	constructor(scope: cdk.Construct, id: string, props: RDSdataSetSetEnrollmentProps) {
-		super(scope, id);
+		super(scope, id, props);
 
 		const dataSetName = props.DataSetName;
         const dataSetSourceConnectionName = `${dataSetName}-src`
@@ -39,7 +35,7 @@ export class RDSPostgresDataSetEnrollment extends cdk.Construct{
 
         }
 
-        const enrollment = new DataSetEnrollment(this, 'rdsDatasetEnrollment', {
+        this.DataEnrollment = new DataSetEnrollment(this, 'rdsDatasetEnrollment', {
 			dataLakeBucket: props.dataLakeBucket,
 			dataSetName: dataSetName,
 			SourceConnectionInput: {

lib/s3-data-set-enrollment.ts

@@ -5,22 +5,19 @@ 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'
 
 
-export interface S3dataSetEnrollmentProps extends cdk.StackProps {
+export interface S3dataSetEnrollmentProps extends DataLakeEnrollmentProps {
     sourceBucket: s3.IBucket;
     sourceBucketDataPrefixes: string[];
-	dataLakeBucket: s3.Bucket;
-	GlueScriptPath: string;
-	GlueScriptArguments: any;
-	DataSetName: string;
 }
 
 
 
-export class S3dataSetEnrollment extends cdk.Construct{
+export class S3dataSetEnrollment extends DataLakeEnrollment{
 	constructor(scope: cdk.Construct, id: string, props: S3dataSetEnrollmentProps) {
-		super(scope, id);
+		super(scope, id, props);
 
 		const dataSetName = props.DataSetName;
 
@@ -50,7 +47,7 @@ export class S3dataSetEnrollment extends cdk.Construct{
 
         }
 
-		const enrollment = new DataSetEnrollment(this, 'openTargetsEnrollment', {
+		this.DataEnrollment = new DataSetEnrollment(this, 'openTargetsEnrollment', {
 		    dataLakeBucket: props.dataLakeBucket,
 			dataSetName: dataSetName,
 			SourceAccessPolicy: s3AccessPolicy,