Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(aws): Only autocreate app elb security group on Create #2025

Merged
merged 1 commit into from
Oct 21, 2017
Merged

fix(aws): Only autocreate app elb security group on Create #2025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions ...er/clouddriver/aws/deploy/ops/loadbalancer/UpsertAmazonLoadBalancerAtomicOperation.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,24 +127,6 @@ class UpsertAmazonLoadBalancerAtomicOperation implements AtomicOperation<UpsertA
}

def securityGroupNamesToIds = regionScopedProvider.securityGroupService.getSecurityGroupIds(description.securityGroups, description.vpcId)
String application = null
try {
application = Names.parseName(description.name).getApp() ?: Names.parseName(description.clusterName).getApp()
IngressLoadBalancerGroupResult ingressLoadBalancerResult = ingressApplicationLoadBalancerGroup(
description,
application,
region,
listeners,
securityGroupLookupFactory
)

securityGroupNamesToIds.put(ingressLoadBalancerResult.groupName, ingressLoadBalancerResult.groupId)
task.updateStatus BASE_PHASE, "Authorized app ELB Security Group ${ingressLoadBalancerResult}"
} catch (Exception e) {
log.error("Failed to authorize app ELB security group {}-elb on application security group", application, e)
task.updateStatus BASE_PHASE, "Failed to authorize app ELB security group ${application}-elb on application security group"
}

def securityGroups = securityGroupNamesToIds.values()
log.info("security groups on {} {}", description.name, securityGroups)
String dnsName
Expand All @@ -155,6 +137,25 @@ class UpsertAmazonLoadBalancerAtomicOperation implements AtomicOperation<UpsertA
subnetIds = regionScopedProvider.subnetAnalyzer.getSubnetIdsForZones(availabilityZones,
description.subnetType, SubnetTarget.ELB, 1)
}

String application = null
try {
application = Names.parseName(description.name).getApp() ?: Names.parseName(description.clusterName).getApp()
IngressLoadBalancerGroupResult ingressLoadBalancerResult = ingressApplicationLoadBalancerGroup(
description,
application,
region,
listeners,
securityGroupLookupFactory
)

securityGroupNamesToIds.put(ingressLoadBalancerResult.groupName, ingressLoadBalancerResult.groupId)
task.updateStatus BASE_PHASE, "Authorized app ELB Security Group ${ingressLoadBalancerResult}"
} catch (Exception e) {
log.error("Failed to authorize app ELB security group {}-elb on application security group", application, e)
task.updateStatus BASE_PHASE, "Failed to authorize app ELB security group ${application}-elb on application security group"
}

dnsName = LoadBalancerUpsertHandler.createLoadBalancer(loadBalancing, loadBalancerName, isInternal, availabilityZones, subnetIds, listeners, securityGroups)
} else {
dnsName = loadBalancer.DNSName
Expand Down
51 changes: 2 additions & 49 deletions ...ver/aws/deploy/ops/loadbalancer/UpsertAmazonLoadBalancerClassicAtomicOperationSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,26 +231,11 @@ class UpsertAmazonLoadBalancerClassicAtomicOperationSpec extends Specification {
internalPort: 8080
))

description.vpcId = "vpcId"

when:
operation.operate([])

then:
1 * securityGroupLookup.getSecurityGroupByName('bar', 'kato-elb', 'vpcId') >> Optional.of(elbSecurityGroupUpdater)
1 * securityGroupLookup.getSecurityGroupByName('bar', 'kato', 'vpcId') >> Optional.of(appSecurityGroupUpdater)
1 * elbSecurityGroupUpdater.getSecurityGroup() >> elbSecurityGroup
1 * appSecurityGroupUpdater.getSecurityGroup() >> applicationSecurityGroup
1 * appSecurityGroupUpdater.addIngress(_) >> {
def permissions = it[0] as List<IpPermission>
assert permissions.size() == 3
assert 7001 in permissions*.fromPort && 8501 in permissions*.fromPort
assert 7001 in permissions*.toPort && 8501 in permissions*.toPort
assert 8080 in permissions*.fromPort && 8080 in permissions*.fromPort
assert elbSecurityGroup.groupId in permissions[0].userIdGroupPairs*.groupId
assert elbSecurityGroup.groupId in permissions[1].userIdGroupPairs*.groupId
assert elbSecurityGroup.groupId in permissions[2].userIdGroupPairs*.groupId
}
then: 'should not auto create elb sg on update'
0 * appSecurityGroupUpdater.addIngress(_)

and:
1 * loadBalancing.describeLoadBalancers(new DescribeLoadBalancersRequest(loadBalancerNames: ["kato-main-frontend"])) >>
Expand Down Expand Up @@ -292,7 +277,6 @@ class UpsertAmazonLoadBalancerClassicAtomicOperationSpec extends Specification {
)
]
description.listeners.clear()
description.vpcId = "vpcId"
description.listeners.add(
new UpsertAmazonLoadBalancerClassicDescription.Listener(
externalProtocol: UpsertAmazonLoadBalancerClassicDescription.Listener.ListenerType.TCP,
Expand All @@ -310,16 +294,6 @@ class UpsertAmazonLoadBalancerClassicAtomicOperationSpec extends Specification {
operation.operate([])

then:
1 * securityGroupLookup.getSecurityGroupByName('bar', 'kato-elb', 'vpcId') >> Optional.of(elbSecurityGroupUpdater)
1 * securityGroupLookup.getSecurityGroupByName('bar', 'kato', 'vpcId') >> Optional.of(appSecurityGroupUpdater)
1 * elbSecurityGroupUpdater.getSecurityGroup() >> elbSecurityGroup
1 * appSecurityGroupUpdater.getSecurityGroup() >> applicationSecurityGroup
1 * appSecurityGroupUpdater.addIngress(_) >> {
def permissions = it[0] as List<IpPermission>
assert permissions.size() == 3
}

and:
thrown(AtomicOperationException)

1 * loadBalancing.describeLoadBalancers(new DescribeLoadBalancersRequest(loadBalancerNames: ["kato-main-frontend"])) >>
Expand Down Expand Up @@ -357,13 +331,6 @@ class UpsertAmazonLoadBalancerClassicAtomicOperationSpec extends Specification {
operation.operate([])

then:
1 * securityGroupLookup.getSecurityGroupByName('bar', 'kato-elb', 'vpcId') >> Optional.of(elbSecurityGroupUpdater)
1 * securityGroupLookup.getSecurityGroupByName('bar', 'kato', 'vpcId') >> Optional.of(appSecurityGroupUpdater)
1 * elbSecurityGroupUpdater.getSecurityGroup() >> elbSecurityGroup
1 * appSecurityGroupUpdater.getSecurityGroup() >> applicationSecurityGroup
1 * appSecurityGroupUpdater.addIngress(_)

and:
1 * loadBalancing.describeLoadBalancers(new DescribeLoadBalancersRequest(loadBalancerNames: ["kato-main-frontend"])) >>
new DescribeLoadBalancersResult(loadBalancerDescriptions: [loadBalancer])
1 * loadBalancing.modifyLoadBalancerAttributes(_) >> { ModifyLoadBalancerAttributesRequest request ->
Expand Down Expand Up @@ -467,13 +434,6 @@ class UpsertAmazonLoadBalancerClassicAtomicOperationSpec extends Specification {
operation.operate([])

then:
1 * securityGroupLookup.getSecurityGroupByName('bar', 'kato-elb', 'vpcId') >> Optional.of(elbSecurityGroupUpdater)
1 * securityGroupLookup.getSecurityGroupByName('bar', 'kato', 'vpcId') >> Optional.of(appSecurityGroupUpdater)
1 * elbSecurityGroupUpdater.getSecurityGroup() >> elbSecurityGroup
1 * appSecurityGroupUpdater.getSecurityGroup() >> applicationSecurityGroup
1 * appSecurityGroupUpdater.addIngress(_)

and:
1 * loadBalancing.describeLoadBalancers(_) >> new DescribeLoadBalancersResult(loadBalancerDescriptions: [loadBalancer])
1 * loadBalancing.deleteLoadBalancerListeners(new DeleteLoadBalancerListenersRequest(loadBalancerPorts: [111]))
1 * loadBalancing.createLoadBalancerListeners(new CreateLoadBalancerListenersRequest(
Expand All @@ -492,13 +452,6 @@ class UpsertAmazonLoadBalancerClassicAtomicOperationSpec extends Specification {
operation.operate([])

then:
1 * securityGroupLookup.getSecurityGroupByName('bar', 'kato-elb', 'vpcId') >> Optional.of(elbSecurityGroupUpdater)
1 * securityGroupLookup.getSecurityGroupByName('bar', 'kato', 'vpcId') >> Optional.of(appSecurityGroupUpdater)
1 * elbSecurityGroupUpdater.getSecurityGroup() >> elbSecurityGroup
1 * appSecurityGroupUpdater.getSecurityGroup() >> applicationSecurityGroup
1 * appSecurityGroupUpdater.addIngress(_)

and:
1 * loadBalancing.describeLoadBalancers(_) >> new DescribeLoadBalancersResult(loadBalancerDescriptions: [loadBalancer])
1 * loadBalancing.deleteLoadBalancerListeners(new DeleteLoadBalancerListenersRequest(loadBalancerPorts: [111]))
0 * loadBalancing.deleteLoadBalancerListeners(_)
Expand Down