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

Jump to bottom

fix(ecs): Fix incorrect de-duping of clusters #3782

Merged
merged 3 commits into from
Jun 13, 2019
Merged

fix(ecs): Fix incorrect de-duping of clusters #3782

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d91b9fc
fix(ecs): Fix incorrect de-duping of clusters with same name, but dif…
clareliguori Jun 12, 2019
6e5aac1
Merge branch 'master' into issue-4448
ezimanyi Jun 13, 2019
02c3e14
Merge branch 'master' into issue-4448
ezimanyi Jun 13, 2019
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
3 changes: 2 additions & 1 deletion ...in/java/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsServerClusterProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,8 @@ private Map<String, Set<EcsServerCluster>> findClustersForRegion(
boolean found = false;

for (EcsServerCluster cluster : clusterMap.get(applicationName)) {
if (cluster.getName().equals(escClusterName)) {
if (cluster.getName().equals(escClusterName)
&& cluster.getAccountName().equals(credentials.getName())) {
cluster.getServerGroups().add(ecsServerGroup);
found = true;
break;
Expand Down
27 changes: 25 additions & 2 deletions ...y/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsServerClusterProviderSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,11 @@ class EcsServerClusterProviderSpec extends Specification {
TaskDefinition cachedTaskDefinition
Instance ec2Instance
EcsServerCluster expectedCluster
EcsServerCluster expectedCluster2

private static final FAMILY_NAME = 'myapp-kcats-liated'
private static final CREDS_NAME = 'test'
private static final CREDS_NAME_2 = 'test2'

def setup() {
def taskId = 'task-id'
Expand All @@ -89,6 +91,12 @@ class EcsServerClusterProviderSpec extends Specification {
creds.getRegions() >> [new AmazonCredentials.AWSRegion('us-east-1', ['us-east-1b', 'us-east-1c', 'us-east-1d']),
new AmazonCredentials.AWSRegion('us-west-1', ['us-west-1b', 'us-west-1c', 'us-west-1d'])]

def creds2 = Mock(AmazonCredentials)
creds2.getCloudProvider() >> 'ecs'
creds2.getName() >> CREDS_NAME_2
creds2.getRegions() >> [new AmazonCredentials.AWSRegion('us-east-1', ['us-east-1b', 'us-east-1c', 'us-east-1d']),
new AmazonCredentials.AWSRegion('us-west-1', ['us-west-1b', 'us-west-1c', 'us-west-1d'])]


cachedService = new Service(
serviceName: serviceName,
Expand Down Expand Up @@ -153,14 +161,21 @@ class EcsServerClusterProviderSpec extends Specification {
expectedCluster.setServerGroups(new LinkedHashSet([ecsServerGroupEast, ecsServerGroupWest]))
expectedCluster.setLoadBalancers(Collections.singleton(loadbalancer))

expectedCluster2 = new EcsServerCluster()
expectedCluster2.setAccountName(creds2.getName())
expectedCluster2.setName(FAMILY_NAME)
expectedCluster2.setServerGroups(new LinkedHashSet([ecsServerGroupEast, ecsServerGroupWest]))
expectedCluster2.setLoadBalancers(Collections.singleton(loadbalancer))

def serviceAttributes = ServiceCachingAgent.convertServiceToAttributes(creds.getName(), creds.getRegions()[0].getName(), cachedService)
def serviceAttributes2 = ServiceCachingAgent.convertServiceToAttributes(creds2.getName(), creds.getRegions()[0].getName(), cachedService)
def taskAttributes = TaskCachingAgent.convertTaskToAttributes(task)

def serviceCacheData = new DefaultCacheData('', serviceAttributes, [:])
def serviceCacheData2 = new DefaultCacheData('', serviceAttributes2, [:])
def taskCacheData = new DefaultCacheData('', taskAttributes, [:])

accountCredentialsProvider.getAll() >> [creds]
accountCredentialsProvider.getAll() >> [creds, creds2]
ecsLoadbalancerCacheClient.find(_, _) >> [loadbalancer]
containerInformationService.getTaskPrivateAddress(_, _, _) >> "${ip}:1337"
containerInformationService.getHealthStatus(_, _, _, _) >> [healthStatus]
Expand All @@ -172,7 +187,7 @@ class EcsServerClusterProviderSpec extends Specification {
subnetSelector.getSubnetVpcIds(_, _, _) >> ['vpc-1234']

cacheView.filterIdentifiers(_, _) >> ['key']
cacheView.getAll(Keys.Namespace.SERVICES.ns, _) >> [serviceCacheData]
cacheView.getAll(Keys.Namespace.SERVICES.ns, _) >> [serviceCacheData, serviceCacheData2]
cacheView.getAll(Keys.Namespace.TASKS.ns, _) >> [taskCacheData]
}

Expand Down Expand Up @@ -321,6 +336,14 @@ class EcsServerClusterProviderSpec extends Specification {
retrievedCluster == expectedCluster
}

def 'should produce ecs clusters'() {
when:
def retrievedClusters = provider.getClusterDetails("myapp").values().flatten()

then:
retrievedClusters.sort() == [expectedCluster, expectedCluster2].sort()
}

def makeEcsServerGroup(String serviceName, String region, long startTime, String taskId, Map healthStatus, String ip) {
new EcsServerGroup(
name: serviceName,
Expand Down