fix(aws): Better support for serializing instanceType (#5111)

Moves the instance type determination (launch config vs template) to the `AmazonServerGroup` and out of the `ServerGroupController`.
spinnaker · Nov 19, 2020 · 4e0e57c · 4e0e57c
1 parent 7067aba
commit 4e0e57c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/...-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/model/AmazonServerGroup.groovy b/...-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/model/AmazonServerGroup.groovy
@@ -132,6 +132,11 @@ class AmazonServerGroup implements ServerGroup, Serializable {
     return securityGroups
   }
 
+  @Override
+  String getInstanceType() {
+    return launchConfig?.instanceType ?: ((Map<String, String>)launchTemplate?.launchTemplateData)?.instanceType
+  }
+
   @Override
   ServerGroup.InstanceCounts getInstanceCounts() {
     Collection<Instance> instances = getInstances()

diff --git a/clouddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/model/ServerGroup.java b/clouddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/model/ServerGroup.java
@@ -123,6 +123,10 @@ default String getType() {
   @Empty
   Map<String, Object> getLaunchConfig();
 
+  default String getInstanceType() {
+    return null;
+  }
+
   /**
    * A collection of attributes describing the tags of this server group
    *

diff --git a/...rc/main/groovy/com/netflix/spinnaker/clouddriver/controllers/ServerGroupController.groovy b/...rc/main/groovy/com/netflix/spinnaker/clouddriver/controllers/ServerGroupController.groovy
@@ -134,17 +134,6 @@ class ServerGroupController {
     sg.application = moniker.app
     sg.stack = moniker.stack
     sg.freeFormDetail = moniker.detail
-
-    //The following fields exist in the non-expanded result and so even though there is some
-    //minor data duplication here it seems reasonable to also set these fields in the expanded result.
-    if (serverGroup.launchConfig) {
-      if (serverGroup.launchConfig.instanceType) {
-        sg.instanceType = serverGroup.launchConfig.instanceType
-      }
-    }
-    if (serverGroup.launchTemplate && serverGroup.launchTemplate.launchTemplateData) {
-      instanceType = serverGroup.launchTemplate.launchTemplateData.instanceType
-    }
     sg.account = cluster.accountName
 
     return sg
@@ -301,16 +290,8 @@ class ServerGroupController {
       securityGroups = serverGroup.getSecurityGroups()
       loadBalancers = serverGroup.getLoadBalancers()
       serverGroupManagers = serverGroup.getServerGroupManagers()
+      instanceType = serverGroup.getInstanceType()
       moniker = serverGroup.getMoniker()
-      if (serverGroup.launchConfig) {
-        if (serverGroup.launchConfig.instanceType) {
-          instanceType = serverGroup.launchConfig.instanceType
-        }
-      }
-
-      if (serverGroup.launchTemplate && serverGroup.launchTemplate.launchTemplateData) {
-        instanceType = serverGroup.launchTemplate.launchTemplateData.instanceType
-      }
 
       if (serverGroup.tags) {
         tags = serverGroup.tags