Eks integ tests #77
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,14 +27,15 @@ export class LoadBalancerPlugin { | |
| } | ||
|
|
||
| public createLoadBalancer = ( | ||
| appName: string, | ||
| resourceId: string, | ||
| params: LoadBalancerArgs | ||
| ): aws.lb.LoadBalancer => { | ||
| let lb: aws.lb.LoadBalancer | ||
| switch (params.loadBalancerType) { | ||
| case 'application': | ||
| lb = new aws.lb.LoadBalancer(`${appName}-${resourceId}-alb`, { | ||
| name: `${appName}-${resourceId}`, | ||
|
Comment on lines
+37
to
+38
There was a problem hiding this comment. Will this (and similar) conflict with @DavidSeptimus-Klotho's work? If so, probably just need to coordinate. There was a problem hiding this comment. i mentioned i was doing this to him, he said he hadnt touched these modules yet so should be good |
||
| internal: params.internal || false, | ||
| loadBalancerType: 'application', | ||
| securityGroups: params.securityGroups, | ||
|
|
@@ -44,8 +45,8 @@ export class LoadBalancerPlugin { | |
| }) | ||
| break | ||
| case 'network': | ||
| lb = new aws.lb.LoadBalancer(`${appName}-${resourceId}-nlb`, { | ||
| name: `${appName}-${resourceId}`, | ||
| internal: params.internal || true, | ||
| loadBalancerType: 'network', | ||
| subnets: params.subnets, | ||
|
|
@@ -60,8 +61,12 @@ export class LoadBalancerPlugin { | |
| return lb | ||
| } | ||
|
|
||
| public createListener = ( | ||
| appName: string, | ||
| resourceId: string, | ||
| params: ListenerArgs | ||
| ): aws.lb.Listener => { | ||
| return new aws.lb.Listener(`${appName}-${resourceId}-listener`, { | ||
| loadBalancerArn: params.loadBalancerArn, | ||
| defaultActions: params.defaultActions, | ||
| port: params.port, | ||
|
|
@@ -70,26 +75,31 @@ export class LoadBalancerPlugin { | |
| } | ||
|
|
||
| public createListenerRule = ( | ||
| appName: string, | ||
| resourceId: string, | ||
| params: ListenerRuleArgs | ||
| ): aws.lb.ListenerRule => { | ||
| return new aws.lb.ListenerRule(`${appName}-${resourceId}-listenerRule`, { | ||
| listenerArn: params.listenerArn, | ||
| actions: params.actions, | ||
| conditions: params.conditions, | ||
| priority: params.priority, | ||
| }) | ||
| } | ||
|
|
||
| public createTargetGroup = ( | ||
| appName: string, | ||
| resourceId, | ||
| params: TargetGroupArgs | ||
| ): aws.lb.TargetGroup => { | ||
| let targetGroup: aws.lb.TargetGroup | ||
| if (params.targetType != 'lambda' && !(params.port && params.protocol)) { | ||
| throw new Error('Port and Protocol must be specified for non lambda target types') | ||
| } | ||
| switch (params.targetType) { | ||
| case 'ip': | ||
| targetGroup = new aws.lb.TargetGroup(`${appName}-${resourceId}-targetGroup`, { | ||
| name: `${appName}-${resourceId}`, | ||
| port: params.port, | ||
| protocol: params.protocol, | ||
| targetType: 'ip', | ||
|
|
@@ -98,17 +108,17 @@ export class LoadBalancerPlugin { | |
| }) | ||
| break | ||
| case 'instance': | ||
| targetGroup = new aws.lb.TargetGroup(`${appName}-${resourceId}-targetGroup`, { | ||
| name: `${appName}-${resourceId}`, | ||
| port: params.port, | ||
| protocol: params.protocol, | ||
| vpcId: params.vpcId, | ||
| tags: params.tags, | ||
| }) | ||
| break | ||
| case 'alb': | ||
| targetGroup = new aws.lb.TargetGroup(`${appName}-${resourceId}-targetGroup`, { | ||
| name: `${appName}-${resourceId}`, | ||
| targetType: 'alb', | ||
| port: params.port, | ||
| protocol: params.protocol, | ||
|
|
@@ -118,8 +128,8 @@ export class LoadBalancerPlugin { | |
| }) | ||
| break | ||
| case 'lambda': | ||
| targetGroup = new aws.lb.TargetGroup(`${appName}-${resourceId}-targetGroup`, { | ||
| name: `${appName}-${resourceId}`, | ||
| targetType: 'lambda', | ||
| tags: params.tags, | ||
| }) | ||
|
|
@@ -131,10 +141,11 @@ export class LoadBalancerPlugin { | |
| } | ||
|
|
||
| public attachTargetGroupToResource = ( | ||
| appName: string, | ||
| resourceId: string, | ||
| params: TargetGroupAttachmentArgs | ||
| ): aws.lb.TargetGroupAttachment => { | ||
| return new aws.lb.TargetGroupAttachment(`${appName}-${resourceId}-targetGroupAttachment`, { | ||
| targetGroupArn: params.targetGroupArn, | ||
| targetId: params.targetId, | ||
| port: params.port, | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume this one is still broken because of #48? (If so, let's update line 123 just for completeness)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
well its broken because our current release branch is broken mainly. So we need 2 releases then can enable this and the helm one.