feat: added network configuration array

Author: gagan1510

package.json

@@ -4,13 +4,23 @@ import { CfnTargetGroup, NetworkTargetGroupProps } from '@aws-cdk/aws-elasticloa
 import * as iam from '@aws-cdk/aws-iam';
 import { Effect, PolicyStatement, ServicePrincipal } from '@aws-cdk/aws-iam';
 import * as cdk from '@aws-cdk/core';
+import { LoadBalancerProps } from './network';
 
 export interface InternalVPC {
   readonly type: string;
   readonly vpcName: string;
   readonly vpcProps?: VpcProps;
 }
 
+export interface NetworkProps {
+  readonly protocol: string;
+  readonly port: number;
+  readonly healthCheckPath: string;
+  readonly sslEnabled: boolean;
+  readonly host: string;
+  readonly lbArn: string;
+}
+
 export interface IngressRule {
   readonly sourceSG: string;
   readonly description?: string;
@@ -83,15 +93,17 @@ export interface AutoScalerProps {
   readonly tags?: CfnAutoScalingGroup.TagPropertyProperty[];
   readonly tgProps?: TargetGroupProps;
   readonly subnets: string[];
+  readonly networkProps: NetworkProps[];
+  readonly appName: string;
 }
 
 export class AutoScaler extends cdk.Resource {
-  public readonly targetGroupArn: string;
+  public readonly loadBalancerProperties?: LoadBalancerProps[];
   constructor(scope: cdk.Construct, id: string, props: AutoScalerProps) {
     super(scope, id);
 
     const launchTemplate = this.getLT(props.templateProps, props.asgName);
-    const tgArn = this.getTG(props.tgProps, props.templateProps.vpc.vpcName);
+    this.loadBalancerProperties = this.getTG(props.networkProps, props.templateProps.vpc.vpcName, props.appName);
 
     new CfnAutoScalingGroup(this, props.asgName, {
       maxSize: props.maxSize,
@@ -102,16 +114,12 @@ export class AutoScaler extends cdk.Resource {
         launchTemplateId: launchTemplate.launchTemplateId,
         launchTemplateName: launchTemplate.launchTemplateName,
       },
-      targetGroupArns: tgArn,
+      targetGroupArns: this.loadBalancerProperties.map( (lb) => { return lb.targetGroupArn; } ),
       tags: props.tags,
       availabilityZones: this.getZones(props.subnets),
       vpcZoneIdentifier: props.subnets,
       healthCheckGracePeriod: 300,
     });
-    if (tgArn.length) {
-      this.targetGroupArn = tgArn[0];
-    }
-    this.targetGroupArn = '';
   }
 
   private getVPC(props: InternalVPC) {
@@ -250,23 +258,32 @@ export class AutoScaler extends cdk.Resource {
     }
   }
 
-  private getTG(props: TargetGroupProps | undefined, vpcId: string) {
-    if (props != undefined) {
-      const tg = new CfnTargetGroup(this, props.name!, {
-        name: props.name,
+  private getTG(props: NetworkProps[], vpcId: string, appName: string) {
+    let lbProps: LoadBalancerProps[] = [];
+    props.forEach(t => {
+      const tg = new CfnTargetGroup(this, appName + t.port.toString(), {
+        name: appName + t.port?.toString(),
         healthCheckEnabled: true,
-        healthCheckPath: props.healthPath!,
-        ...((props.protocol == 'GRPC') ? { protocol: 'HTTP' } : { protocol: props.protocol }),
-        ...((props.protocol == 'GRPC') ? { protocolVersion: 'GRPC' } : {}),
-        healthCheckTimeoutSeconds: props.timeout!,
-        healthCheckPort: String(props.port!),
-        port: props.port!,
+        healthCheckPath: t.healthCheckPath!,
+        ...((t.protocol == 'GRPC') ? { protocol: 'HTTP' } : { protocol: t.protocol }),
+        ...((t.protocol == 'GRPC') ? { protocolVersion: 'GRPC' } : {}),
+        healthCheckTimeoutSeconds: 30,
+        healthCheckPort: String(t.port!),
+        port: t.port!,
         vpcId: vpcId,
       });
-      return [tg.ref];
-    } else {
-      return [];
-    }
+
+      lbProps.push({
+        appName: appName,
+        hostHeader: t.host,
+        lbArn: t.lbArn,
+        sslEnabled: t.sslEnabled,
+        targetGroupArn: tg.ref,
+      });
+
+    });
+
+    return lbProps;
   }
 
   private getZones(subnets: string[]) {

src/constructs/autoScalingGroup.ts

@@ -2,8 +2,7 @@ import { CfnAutoScalingGroup } from '@aws-cdk/aws-autoscaling';
 import { EbsDeviceVolumeType } from '@aws-cdk/aws-ec2';
 import { Effect, PolicyStatement, Role, ServicePrincipal } from '@aws-cdk/aws-iam';
 import { Construct } from '@aws-cdk/core';
-import { InternalSG } from '..';
-import { AutoScaler, IngressRule, InternalRole } from './autoScalingGroup';
+import { AutoScaler, IngressRule, NetworkProps, InternalSG, TargetGroupProps, InternalRole } from './autoScalingGroup';
 import { Deployment } from './deployment';
 import { BalancerEntry } from './network';
 
@@ -15,24 +14,19 @@ export interface MicroServiceProps {
   readonly asgMaxSize?: string;
   readonly asgMinSize?: string;
   readonly instanceLabels?: CfnAutoScalingGroup.TagPropertyProperty[];
-  readonly healthCheckPath?: string;
-  readonly port?: number;
   readonly vpc: string;
   readonly subnets: string[];
-  readonly protocol?: string;
   readonly diskSize?: number;
   readonly role: InternalRole;
   readonly tcpRules?: IngressRule[];
-  readonly sslEnabled?: boolean;
-  readonly host?: string;
-  readonly lbArn?: string;
   readonly ami?: string;
   readonly sshKey: string;
   readonly diskType?: string;
   readonly createCodedeployApplication?: boolean;
   readonly deploymentPolicies?: string[];
   readonly applicationType?: string;
   readonly securityGroupProps?: InternalSG;
+  readonly networkProps?: NetworkProps[];
 }
 export class MicroService extends Construct {
 
@@ -42,23 +36,19 @@ export class MicroService extends Construct {
   public readonly asgMinSize?: string;
   public readonly env?: string;
   public readonly instanceLabels?: CfnAutoScalingGroup.TagPropertyProperty[];
-  public readonly healthCheckPath?: string;
-  public readonly port?: number;
-  public readonly protocol?: string;
   public readonly diskSize?: number;
   public readonly vpc: string;
   public readonly role: InternalRole;
   public readonly tcpRules?: IngressRule[];
   public readonly subnets: string[];
-  public readonly sslEnabled?: boolean;
-  public readonly host?: string;
-  public readonly lbArn?: string;
   public readonly sshKey: string;
   public readonly diskType?: string;
   public readonly createCodedeployApplication?: boolean;
   public readonly deploymentPolicies?: string[];
   public readonly applicationType?: string;
   public readonly securityGroupProps?: InternalSG;
+  public readonly networkProps?: NetworkProps[];
+  public readonly targetGroupProps: TargetGroupProps[];
 
   constructor(scope: Construct, id: string, props: MicroServiceProps) {
     super(scope, id);
@@ -69,38 +59,28 @@ export class MicroService extends Construct {
     this.asgMinSize = props?.asgMinSize ?? '1';
     this.env = props?.env ?? 'development';
     this.instanceLabels = props?.instanceLabels;
-    this.healthCheckPath = props?.healthCheckPath ?? '/v1/healthCheck';
-    this.port = props.port ?? undefined;
-    this.protocol = props.protocol ?? 'HTTP';
     this.diskSize = props.diskSize ?? 8;
     this.vpc = props.vpc;
     this.role = props.role;
     this.tcpRules = props.tcpRules ?? [];
     this.subnets = props.subnets;
-    this.sslEnabled = props.sslEnabled;
-    this.host = props.host;
-    this.lbArn = props.lbArn;
     this.sshKey = props.sshKey;
     this.diskType = props.diskType;
     this.createCodedeployApplication = props.createCodedeployApplication ?? false;
     this.deploymentPolicies = props.deploymentPolicies ?? [];
     this.applicationType = props.applicationType ?? 'new';
     this.securityGroupProps = props.securityGroupProps;
+    this.networkProps = props.networkProps ?? [];
+    this.targetGroupProps = [];
+    this.networkProps = props.networkProps ?? [];
 
     const resourceNamePrefix = this.env + '-' + this.appName;
     const asg = new AutoScaler(this, resourceNamePrefix + '-as', {
       asgName: resourceNamePrefix + '-ASG',
+      appName: resourceNamePrefix,
+      networkProps: this.networkProps,
       maxSize: this.asgMaxSize,
       minSize: this.asgMinSize,
-      tgProps: this.port ? {
-        type: 'new',
-        healthPath: this.healthCheckPath,
-        protocol: this.protocol,
-        port: this.port,
-        name: ((resourceNamePrefix + '-TG').length >= 32)? this.env + '-' + this.appName + '-TG':resourceNamePrefix + '-TG',
-        timeout: 10,
-        thresholdCount: 2,
-      }: undefined,
       templateProps: {
         instanceType: this.instanceType,
         detailedMonitoring: false,
@@ -144,17 +124,14 @@ export class MicroService extends Construct {
         tgName: resourceNamePrefix + '-TG',
       });
       dep.node.addDependency(depRole);
+      dep.node.addDependency(asg);
     }
 
-    if (this.host && this.lbArn && asg.targetGroupArn != '') {
-      const lbEntry = new BalancerEntry(this, resourceNamePrefix + '-lb', {
-        appName: this.appName,
-        hostHeader: this.host,
-        targetGroupArn: asg.targetGroupArn,
-        lbArn: this.lbArn,
-        sslEnabled: this.sslEnabled ?? false,
+    if (this.networkProps.length) {
+      asg.loadBalancerProperties?.forEach(lbProp => {
+        const lbEntry = new BalancerEntry(this, lbProp.hostHeader, lbProp);
+        lbEntry.node.addDependency(asg);
       });
-      lbEntry.node.addDependency(asg);
     }
   }
 

src/constructs/microservice.ts

@@ -4,52 +4,62 @@ describe('my suite', () => {
   });
 });
 
-// import { SynthUtils } from '@aws-cdk/assert';
-// import { Stack } from '@aws-cdk/core';
+// import { App, Stack, StackProps } from '@aws-cdk/core';
+// import { Construct } from 'constructs';
 // import { MicroService } from '../src/constructs/microservice';
 
-// test('dlq creates an alarm', () => {
-//   const stack = new Stack();
-//   new MicroService(stack, 'UnknownAPI', {
-//     appName: 'UnknownAPI',
-//     env: 'development',
-//     asgMaxSize: '1',
-//     asgMinSize: '1',
-//     diskSize: 20,
-//     instanceLabels: [
-//       {
-//         key: 'NODE-VERSION',
-//         propagateAtLaunch: true,
-//         value: '12',
-//       },
-//       {
-//         key: 'TYPE',
-//         propagateAtLaunch: true,
-//         value: 'application',
-//       },
-//     ],
-//     instanceType: 't3.micro',
-//     vpc: 'vpc-1234567',
-//     port: 8000,
-//     protocol: 'HTTP',
-//     healthCheckPath: '/health',
-//     subnets: ['subnet-987654321', 'subnet-12345678'],
-//     tcpRules: [
-//       {
-//         sourceSG: 'sg-12345678',
-//         description: 'ssh rule',
-//         port: 22,
+
+// class TestStack extends Stack {
+//   constructor(scope: Construct, id: string, props?: StackProps) {
+//     super(scope, id, props);
+//     new MicroService(this, 'test', {
+//       appName: 'test',
+//       env: 'prod',
+//       asgMaxSize: '1',
+//       asgMinSize: '1',
+//       diskSize: 20,
+//       instanceLabels: [
+//         {
+//           key: 'SUDOERS_GROUPS_TAG',
+//           propagateAtLaunch: true,
+//           value: 'Developers',
+//         },
+//       ],
+//       instanceType: 't3.micro',
+//       vpc: 'vpc-1234567',
+//       role: {
+//         type: 'existing',
+//         roleArn: 'arn:aws:iam::123456789233:instance-profile/API-DEV',
 //       },
-//     ],
-//     host: 'abc-test-123.smallcase.com',
-//     lbArn: 'arn:aws:elasticloadbalancing:ap-south-1:12345678910:loadbalancer/app/API-DEV-External',
-//     sslEnabled: false,
-//     sshKey: 'master-dev',
-//     createCodedeployApplication: true,
-//     role: {
-//       type: 'new',
-//     },
-//     applicationType: 'new',
+//       sshKey: 'master-dev',
+//       subnets: ['subnet-12345678', 'subnet-123456789'],
+//       tcpRules: [
+//         {
+//           sourceSG: 'sg-12345678',
+//           description: 'ssh rule',
+//           port: 22,
+//         },
+//       ],
+//       networkProps: [
+//         {
+//           healthCheckPath: '/health',
+//           host: 'abc-test-123.smallcase.com',
+//           lbArn: 'arn:aws:elasticloadbalancing:ap-south-1:123456789233:loadbalancer/app/API-DEV-External',
+//           sslEnabled: false,
+//           port: 8000,
+//           protocol: 'HTTP',
+//         },
+//       ],
+//       createCodedeployApplication: true,
+//     });
+//   }
+// }
+
+
+// test('hello', () => {
+//   const app = new App();
+//   new TestStack(app, 'TestStack', {
+//     env: { account: '123456789233', region: 'ap-south-1' },
 //   });
-//   expect(SynthUtils.toCloudFormation(stack)).toMatchSnapshot();
+//   app.synth();
 // });