fix(instanceService): prevents merge of instance and account details

spinnaker · Mar 24, 2017 · 5aa1588 · 5aa1588
1 parent ca41245
commit 5aa1588
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/InstanceService.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/InstanceService.groovy
@@ -41,12 +41,12 @@ class InstanceService {
   Map getForAccountAndRegion(String account, String region, String instanceId) {
     HystrixFactory.newMapCommand(GROUP, "getInstancesForAccountAndRegion-${providerLookupService.providerForAccount(account)}") {
       def accountDetails = clouddriverService.getAccount(account)
-      def instanceDetails = clouddriverService.getInstanceDetails(account, region, instanceId) << accountDetails
+      def instanceDetails = clouddriverService.getInstanceDetails(account, region, instanceId)
       def instanceContext = instanceDetails.collectEntries {
         return it.value instanceof String ? [it.key, it.value] : [it.key, ""]
       } as Map<String, String>
 
-      def context = getContext(account, region, instanceId) + instanceContext
+      def context = getContext(account, region, instanceId) + instanceContext + accountDetails
       return instanceDetails + [
           "insightActions": insightConfiguration.instance.findResults { it.applyContext(context) }
       ]