diff --git a/clouddriver-ecs/src/main/java/com/netflix/spinnaker/clouddriver/ecs/model/EcsServerGroup.java b/clouddriver-ecs/src/main/java/com/netflix/spinnaker/clouddriver/ecs/model/EcsServerGroup.java index 7413b9e4072..a3c1e5761ac 100644 --- a/clouddriver-ecs/src/main/java/com/netflix/spinnaker/clouddriver/ecs/model/EcsServerGroup.java +++ b/clouddriver-ecs/src/main/java/com/netflix/spinnaker/clouddriver/ecs/model/EcsServerGroup.java @@ -38,6 +38,7 @@ public class EcsServerGroup implements ServerGroup { Set loadBalancers; Set securityGroups; Map launchConfig; + Image image; InstanceCounts instanceCounts; Capacity capacity; ImagesSummary imagesSummary; @@ -61,4 +62,11 @@ public static class AutoScalingGroup { Integer maxSize; Integer desiredCapacity; } + + @Data + @NoArgsConstructor + public static class Image { + public String imageId; + public String name; + } } diff --git a/clouddriver-ecs/src/main/java/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsServerClusterProvider.java b/clouddriver-ecs/src/main/java/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsServerClusterProvider.java index eeb34001c14..0c0c646bb5c 100644 --- a/clouddriver-ecs/src/main/java/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsServerClusterProvider.java +++ b/clouddriver-ecs/src/main/java/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsServerClusterProvider.java @@ -300,6 +300,9 @@ private EcsServerGroup buildEcsServerGroup( List eniSecurityGroups) { ServerGroup.InstanceCounts instanceCounts = buildInstanceCount(instances); TaskDefinition ecsTaskDefinition = buildTaskDefinition(taskDefinition); + EcsServerGroup.Image image = new EcsServerGroup.Image(); + image.setImageId(ecsTaskDefinition.getContainerImage()); + image.setName(ecsTaskDefinition.getContainerImage()); String scalableTargetId = "service/" + ecsCluster + "/" + serviceName; String scalableTargetKey = Keys.getScalableTargetKey(account, region, scalableTargetId); @@ -359,6 +362,7 @@ private EcsServerGroup buildEcsServerGroup( .setRegion(region) .setInstances(instances) .setCapacity(capacity) + .setImage(image) .setInstanceCounts(instanceCounts) .setCreatedTime(creationTime) .setEcsCluster(ecsCluster) diff --git a/clouddriver-ecs/src/test/groovy/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsServerClusterProviderSpec.groovy b/clouddriver-ecs/src/test/groovy/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsServerClusterProviderSpec.groovy index 569f4169da7..15cdcb015c9 100644 --- a/clouddriver-ecs/src/test/groovy/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsServerClusterProviderSpec.groovy +++ b/clouddriver-ecs/src/test/groovy/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsServerClusterProviderSpec.groovy @@ -355,6 +355,10 @@ class EcsServerClusterProviderSpec extends Specification { environmentVariables: [], iamRole: 'None' ), + image: new EcsServerGroup.Image( + imageId: 'my-image', + name: 'my-image' + ), metricAlarms: [], ) }