fix(ecs): Cannot see instance details for ecs cluster (#9157) (#9256)

(cherry picked from commit c20da7a) Co-authored-by: Parag Sanjay Bhingre <pbhingre@amazon.com> Co-authored-by: Cameron Motevasselani <cmotevasselani@gmail.com>
spinnaker · Jun 14, 2021 · 803c512 · 803c512
1 parent 639bd32
commit 803c512
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 7 deletions.
diff --git a/app/scripts/modules/ecs/src/instance/details/instance.details.controller.js b/app/scripts/modules/ecs/src/instance/details/instance.details.controller.js
@@ -8,6 +8,7 @@ import {
   CloudProviderRegistry,
   ConfirmationModalService,
   InstanceReader,
+  InstanceWriter,
   RecentHistoryService,
   SETTINGS,
 } from '@spinnaker/core';
@@ -22,14 +23,13 @@ module(ECS_INSTANCE_DETAILS_INSTANCE_DETAILS_CONTROLLER, [UIROUTER_ANGULARJS, AN
     '$scope',
     '$state',
     '$uibModal',
-    'instanceWriter',
     'instance',
     'app',
     'moniker',
     'environment',
     '$q',
     'overrides',
-    function ($scope, $state, $uibModal, instanceWriter, instance, app, moniker, environment, $q, overrides) {
+    function ($scope, $state, $uibModal, instance, app, moniker, environment, $q, overrides) {
       // needed for standalone instances
       $scope.detailsTemplateUrl = CloudProviderRegistry.getValue('ecs', 'instance.detailsTemplateUrl');
 
@@ -248,7 +248,7 @@ module(ECS_INSTANCE_DETAILS_INSTANCE_DETAILS_CONTROLLER, [UIROUTER_ANGULARJS, AN
         };
 
         const submitMethod = function () {
-          return instanceWriter.terminateInstance(instance, app, defaultRequestParams);
+          return InstanceWriter.terminateInstance(instance, app, defaultRequestParams);
         };
 
         ConfirmationModalService.confirm({
@@ -274,7 +274,7 @@ module(ECS_INSTANCE_DETAILS_INSTANCE_DETAILS_CONTROLLER, [UIROUTER_ANGULARJS, AN
         };
 
         const submitMethod = function () {
-          return instanceWriter.terminateInstanceAndShrinkServerGroup(instance, app, defaultRequestParams);
+          return InstanceWriter.terminateInstanceAndShrinkServerGroup(instance, app, defaultRequestParams);
         };
 
         ConfirmationModalService.confirm({
@@ -295,7 +295,7 @@ module(ECS_INSTANCE_DETAILS_INSTANCE_DETAILS_CONTROLLER, [UIROUTER_ANGULARJS, AN
         };
 
         const submitMethod = function () {
-          return instanceWriter.enableInstanceInDiscovery(instance, app, defaultRequestParams);
+          return InstanceWriter.enableInstanceInDiscovery(instance, app, defaultRequestParams);
         };
 
         ConfirmationModalService.confirm({
@@ -316,7 +316,7 @@ module(ECS_INSTANCE_DETAILS_INSTANCE_DETAILS_CONTROLLER, [UIROUTER_ANGULARJS, AN
         };
 
         const submitMethod = function () {
-          return instanceWriter.disableInstanceInDiscovery(instance, app, defaultRequestParams);
+          return InstanceWriter.disableInstanceInDiscovery(instance, app, defaultRequestParams);
         };
 
         ConfirmationModalService.confirm({

diff --git a/app/scripts/modules/ecs/src/instance/details/instanceDetails.html b/app/scripts/modules/ecs/src/instance/details/instanceDetails.html
@@ -72,7 +72,7 @@ <h3>Could not find instance {{instanceIdNotFound}}.</h3>
       </div>
     </div>
   </div>
-  <div class="content" ng-if="!state.loading && instance">
+  <div class="content" data-test-id="instanceDetails.content" ng-if="!state.loading && instance">
     <collapsible-section heading="Instance Information" expanded="true">
       <dl class="dl-horizontal dl-narrow">
         <dt>Launched</dt>

diff --git a/test/functional/cypress/integration/ecs/clusters_list.spec.js b/test/functional/cypress/integration/ecs/clusters_list.spec.js
@@ -9,6 +9,8 @@ describe('Amazon ECS: aws-prod-ecsdemo cluster', () => {
       '/applications/ecsapp/serverGroups/**/aws-prod-ecsdemo-v000?includeDetails=false',
       'fixture:ecs/clusters/serverGroup.ecsdemo-v000.json',
     );
+    cy.route('/instances/ecs-my-aws-devel-acct/us-west-2/f8757e00-184d-4288-b535-4124a739e7be',
+      'fixture:ecs/clusters/serverGroups.json');
   });
 
   it('shows stored ECS cluster with their sequences', () => {
@@ -51,4 +53,38 @@ describe('Amazon ECS: aws-prod-ecsdemo cluster', () => {
       .get('a:contains("Rollback")')
       .click();
   });
+
+  it('shows stored instance details view action', () => {
+    cy.visit('#/applications/ecsapp/clusters');
+
+    cy.get('.sub-group:contains("aws-prod-ecsdemo")')
+      .find('.server-group:contains("v000")')
+      .find('.cluster-container')
+      .find('.instances')
+      .find('.instance-group')
+      .get('a[title="f8757e00-184d-4288-b535-4124a739e7be"]')
+      .click();
+
+    cy.get('.details-panel > .header')
+      .get('instance-details-header')
+      .get('.header-text')
+      .get('h3:contains("f8757e00-184d-4288-b535-4124a739e7be")');
+
+    cy.get('[data-test-id="instanceDetails.content"]')
+      .get('.collapsible-section').eq(0)
+      .get('dd:contains("2020-07-20 03:41:03 PDT")');
+
+    cy.get('[data-test-id="instanceDetails.content"]')
+      .get('.collapsible-section').eq(0)
+      .get('dd:contains("aws-final-test-v000")');
+
+    cy.get('[data-test-id="instanceDetails.content"]')
+      .get('.collapsible-section').eq(1)
+      .get('span:contains("Up")');
+
+    cy.get('[data-test-id="instanceDetails.content"]')
+      .get('.collapsible-heading').eq(2)
+      .click()
+      .get('span:contains("SpinnakerVPC (vpc-0a9ccfd1cba7bc715)")');
+  });
 });