fix(ecs): Add image info to cluster's server groups (#3702)

Fixes spinnaker/spinnaker#4330
spinnaker · May 24, 2019 · 8138ed8 · 8138ed8
1 parent 681016c
commit 8138ed8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/...ddriver-ecs/src/main/java/com/netflix/spinnaker/clouddriver/ecs/model/EcsServerGroup.java b/...ddriver-ecs/src/main/java/com/netflix/spinnaker/clouddriver/ecs/model/EcsServerGroup.java
@@ -38,6 +38,7 @@ public class EcsServerGroup implements ServerGroup {
   Set<String> loadBalancers;
   Set<String> securityGroups;
   Map<String, Object> 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/...in/java/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsServerClusterProvider.java b/...in/java/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsServerClusterProvider.java
@@ -300,6 +300,9 @@ private EcsServerGroup buildEcsServerGroup(
       List<String> 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/...y/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsServerClusterProviderSpec.groovy b/...y/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: [],
     )
   }