fix(titus): use securityGroup instead of securityGroupDetails

spinnaker · Apr 16, 2018 · 11bae4a · 11bae4a
1 parent 3a31ae1
commit 11bae4a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 17 deletions.
diff --git a/app/scripts/modules/titus/src/instance/details/instance.details.controller.js b/app/scripts/modules/titus/src/instance/details/instance.details.controller.js
@@ -23,6 +23,7 @@ module.exports = angular
     CONFIRMATION_MODAL_SERVICE,
     RECENT_HISTORY_SERVICE,
     CLOUD_PROVIDER_REGISTRY,
+    require('../../securityGroup/securityGroup.read.service').name,
   ])
   .controller('titusInstanceDetailsCtrl', function(
     $scope,
@@ -37,6 +38,7 @@ module.exports = angular
     instanceReader,
     instance,
     app,
+    titusSecurityGroupReader,
   ) {
     // needed for standalone instances
     $scope.detailsTemplateUrl = cloudProviderRegistry.getValue('titus', 'instance.detailsTemplateUrl');
@@ -104,6 +106,18 @@ module.exports = angular
           $scope.instance.loadBalancers = loadBalancers;
           $scope.baseIpAddress = $scope.instance.placement.containerIp || $scope.instance.placement.host;
           $scope.instance.externalIpAddress = $scope.instance.placement.host;
+          if (details.securityGroups) {
+            $scope.securityGroups = _.chain(details.securityGroups)
+              .map(function(securityGroupId) {
+                return titusSecurityGroupReader.resolveIndexedSecurityGroup(
+                  app['securityGroupsIndex'],
+                  extraData,
+                  securityGroupId,
+                );
+              })
+              .compact()
+              .value();
+          }
           getBastionAddressForAccount($scope.instance.account, $scope.instance.region);
         }, autoClose);
       }

diff --git a/app/scripts/modules/titus/src/instance/details/instanceDetails.html b/app/scripts/modules/titus/src/instance/details/instanceDetails.html
@@ -151,10 +151,10 @@ <h3 class="horizontal middle space-between flex-1" select-on-dbl-click>
     </collapsible-section>
     <collapsible-section heading="Security Groups">
       <ul>
-        <li ng-repeat="securityGroup in instance.securityGroups | orderBy:'groupName'">
+        <li ng-repeat="securityGroup in securityGroups | orderBy:'name'">
           <a
-            ui-sref="^.securityGroupDetails({name: securityGroup.groupName, accountId: securityGroup.awsAccount, region: instance.placement.region, vpcId: securityGroup.awsVpcId, provider: 'aws'})">
-            {{securityGroup.groupName}} ({{securityGroup.groupId}})
+            ui-sref="^.securityGroupDetails({name: securityGroup.name, accountId: securityGroup.account, region: instance.region, vpcId: securityGroup.vpcId, provider: 'aws'})">
+            {{securityGroup.name}} ({{securityGroup.id}})
           </a>
         </li>
       </ul>

diff --git a/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.html b/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.html
@@ -145,10 +145,10 @@ <h3 class="horizontal middle space-between flex-1" select-on-dbl-click>
     </collapsible-section>
     <collapsible-section heading="Security Groups">
       <ul>
-        <li ng-repeat="securityGroup in serverGroup.securityGroupDetails | orderBy:'groupName'">
+        <li ng-repeat="securityGroup in securityGroups | orderBy:'name'">
           <a
-            ui-sref="^.securityGroupDetails({name: securityGroup.groupName, accountId: securityGroup.awsAccount, region: serverGroup.placement.region, vpcId: securityGroup.awsVpcId, provider: 'aws'})">
-            {{securityGroup.groupName}} ({{securityGroup.groupId}})
+            ui-sref="^.securityGroupDetails({name: securityGroup.name, accountId: securityGroup.account, region: serverGroup.placement.region, vpcId: securityGroup.vpcId, provider: 'aws'})">
+            {{securityGroup.name}} ({{securityGroup.id}})
           </a>
         </li>
       </ul>

diff --git a/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.titus.controller.js b/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.titus.controller.js
@@ -21,6 +21,7 @@ import { CONFIG_BIN_LINK_COMPONENT } from './scalingPolicy/configBin/configBinLi
 
 module.exports = angular
   .module('spinnaker.serverGroup.details.titus.controller', [
+    require('../../securityGroup/securityGroup.read.service').name,
     require('@uirouter/angularjs').default,
     ACCOUNT_SERVICE,
     require('../configure/ServerGroupCommandBuilder.js').name,
@@ -48,6 +49,7 @@ module.exports = angular
     awsServerGroupTransformer,
     serverGroupWarningMessageService,
     accountService,
+    titusSecurityGroupReader,
   ) {
     let application = app;
     this.application = app;
@@ -100,17 +102,10 @@ module.exports = angular
             if (details.securityGroups) {
               $scope.securityGroups = _.chain(details.securityGroups)
                 .map(function(id) {
-                  return (
-                    _.find(application.securityGroups.data, {
-                      accountName: serverGroup.accountId,
-                      region: 'global',
-                      id: id,
-                    }) ||
-                    _.find(application.securityGroups.data, {
-                      accountName: serverGroup.accountId,
-                      region: 'global',
-                      name: id,
-                    })
+                  return titusSecurityGroupReader.resolveIndexedSecurityGroup(
+                    application['securityGroupsIndex'],
+                    details,
+                    id,
                   );
                 })
                 .compact()