@spinnaker/ecs 2026.2.2 → 2026.3.0

package/src/serverGroup/events/EcsServerGroupEventsModal.spec.tsx

@@ -0,0 +1,109 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+
+import { ModalBody, ReactModal, Spinner } from '@spinnaker/core';
+
+import { EcsServerGroupEventsModal } from './EcsServerGroupEventsModal';
+import { EventsLink } from './EventsLink';
+import { ServerGroupEventsReader } from './serverGroupEventsReader.service';
+
+function deferred<T>() {
+  let resolve: (value: T) => void;
+  const promise = new Promise<T>((res) => (resolve = res));
+  return { promise, resolve: resolve! };
+}
+
+describe('ECS server group events', () => {
+  const serverGroup = { name: 'fnord-main-v001' } as any;
+  const modalProps = {
+    serverGroup,
+    dismissModal: jasmine.createSpy('dismissModal'),
+    resolveModal: jasmine.createSpy('resolveModal'),
+  };
+
+  const modalBody = (wrapper: any) => shallow(<div>{wrapper.find(ModalBody).prop('children')}</div>);
+
+  it('opens the React events modal from the events link', () => {
+    const show = spyOn(ReactModal, 'show');
+    const wrapper = shallow(<EventsLink serverGroup={serverGroup} />);
+
+    wrapper.find('a').simulate('click', { preventDefault: jasmine.createSpy('preventDefault') });
+
+    expect(show).toHaveBeenCalledOnceWith(EcsServerGroupEventsModal, { serverGroup });
+  });
+
+  it('renders loading while events are pending', () => {
+    spyOn(ServerGroupEventsReader, 'getEvents').and.returnValue(new Promise(() => undefined));
+
+    const wrapper = shallow(<EcsServerGroupEventsModal {...modalProps} />);
+
+    expect(wrapper.find(Spinner).exists()).toBe(true);
+  });
+
+  it('renders an error when the reader rejects', async () => {
+    spyOn(ServerGroupEventsReader, 'getEvents').and.returnValue(Promise.reject(new Error('failed')));
+    const wrapper = shallow(<EcsServerGroupEventsModal {...modalProps} />);
+
+    await Promise.resolve();
+    wrapper.update();
+
+    expect(modalBody(wrapper).text()).toContain('There was an error loading events for fnord-main-v001');
+  });
+
+  it('renders an empty state when no events are returned', async () => {
+    spyOn(ServerGroupEventsReader, 'getEvents').and.returnValue(Promise.resolve([]));
+    const wrapper = shallow(<EcsServerGroupEventsModal {...modalProps} />);
+
+    await Promise.resolve();
+    wrapper.update();
+
+    expect(modalBody(wrapper).text()).toContain('No ECS events found for fnord-main-v001');
+  });
+
+  it('renders ECS events and status labels', async () => {
+    spyOn(ServerGroupEventsReader, 'getEvents').and.returnValue(
+      Promise.resolve([
+        { id: 'one', createdAt: 1710000000000, message: 'service reached steady state', status: 'Success' },
+        { id: 'two', createdAt: 1710000001000, message: 'deployment transitioning', status: 'Transition' },
+      ]),
+    );
+    const wrapper = shallow(<EcsServerGroupEventsModal {...modalProps} />);
+
+    await Promise.resolve();
+    wrapper.update();
+
+    const body = modalBody(wrapper);
+    expect(body.text()).toContain('service reached steady state');
+    expect(body.text()).toContain('deployment transitioning');
+    expect(body.find('.label-success').text()).toBe('Success');
+    expect(body.find('.label-info').text()).toBe('Transition');
+  });
+
+  it('ignores stale responses and responses received after unmount', async () => {
+    const first = deferred<any[]>();
+    const second = deferred<any[]>();
+    const getEvents = spyOn(ServerGroupEventsReader, 'getEvents').and.callFake((group: any) =>
+      group.name === 'first' ? first.promise : second.promise,
+    );
+    const wrapper = shallow(
+      <EcsServerGroupEventsModal {...modalProps} serverGroup={{ ...serverGroup, name: 'first' }} />,
+    );
+    wrapper.setProps({ serverGroup: { ...serverGroup, name: 'second' } });
+
+    first.resolve([{ id: 'old', message: 'stale event', status: 'Success', createdAt: 1 }]);
+    await first.promise;
+    await Promise.resolve();
+    wrapper.update();
+    expect(modalBody(wrapper).text()).not.toContain('stale event');
+
+    const instance = wrapper.instance() as EcsServerGroupEventsModal;
+    const setState = spyOn(instance, 'setState').and.callThrough();
+    wrapper.unmount();
+    second.resolve([{ id: 'new', message: 'late event', status: 'Success', createdAt: 2 }]);
+    await second.promise;
+    await Promise.resolve();
+
+    expect(getEvents).toHaveBeenCalledTimes(2);
+    expect(setState).not.toHaveBeenCalled();
+  });
+});

package/src/serverGroup/events/EcsServerGroupEventsModal.tsx

@@ -0,0 +1,112 @@
+import React from 'react';
+
+import type { IModalComponentProps, IServerGroup } from '@spinnaker/core';
+import { ModalBody, ModalFooter, ModalHeader, Spinner, timestamp } from '@spinnaker/core';
+
+import type { IEventDescription } from './serverGroupEventsReader.service';
+import { ServerGroupEventsReader } from './serverGroupEventsReader.service';
+
+export interface IEcsServerGroupEventsModalProps extends IModalComponentProps {
+  serverGroup: IServerGroup;
+}
+
+interface IEcsServerGroupEventsModalState {
+  loading: boolean;
+  error: boolean;
+  events: IEventDescription[];
+}
+
+export class EcsServerGroupEventsModal extends React.Component<
+  IEcsServerGroupEventsModalProps,
+  IEcsServerGroupEventsModalState
+> {
+  public state: IEcsServerGroupEventsModalState = { loading: true, error: false, events: [] };
+
+  private mounted = false;
+  private requestId = 0;
+
+  public componentDidMount(): void {
+    this.mounted = true;
+    this.loadEvents();
+  }
+
+  public componentDidUpdate(previousProps: IEcsServerGroupEventsModalProps): void {
+    if (previousProps.serverGroup !== this.props.serverGroup) {
+      this.loadEvents();
+    }
+  }
+
+  public componentWillUnmount(): void {
+    this.mounted = false;
+    this.requestId++;
+  }
+
+  private loadEvents(): void {
+    const requestId = ++this.requestId;
+    this.setState({ loading: true, error: false, events: [] });
+    ServerGroupEventsReader.getEvents(this.props.serverGroup).then(
+      (events) => {
+        if (this.mounted && requestId === this.requestId) {
+          this.setState({ loading: false, error: false, events });
+        }
+      },
+      () => {
+        if (this.mounted && requestId === this.requestId) {
+          this.setState({ loading: false, error: true, events: [] });
+        }
+      },
+    );
+  }
+
+  public render() {
+    const { dismissModal, serverGroup } = this.props;
+    const { loading, error, events } = this.state;
+    return (
+      <>
+        <ModalHeader>{`Server Group Events for ${serverGroup.name}`}</ModalHeader>
+        <ModalBody>
+          {loading && (
+            <div className="horizontal center middle sp-margin-xl-yaxis">
+              <Spinner size="small" />
+            </div>
+          )}
+          {!loading && error && (
+            <div className="text-center">
+              <p>{`There was an error loading events for ${serverGroup.name}. Please try again later.`}</p>
+            </div>
+          )}
+          {!loading && !error && events.length === 0 && (
+            <div className="text-center">
+              <p>{`No ECS events found for ${serverGroup.name}.`}</p>
+            </div>
+          )}
+          {!loading &&
+            !error &&
+            events.map((event, index) => (
+              <div key={event.id || index}>
+                <p className="clearfix">
+                  <span
+                    className={`label label-${
+                      event.status === 'Success' ? 'success' : event.status === 'Transition' ? 'info' : 'danger'
+                    } pull-left`}
+                  >
+                    {event.status}
+                  </span>
+                  <span className="label label-default pull-right">{timestamp(event.createdAt)}</span>
+                </p>
+                <div>{event.message}</div>
+                {index < events.length - 1 && <hr />}
+              </div>
+            ))}
+        </ModalBody>
+        <ModalFooter
+          primaryActions={
+            <button className="btn btn-primary" onClick={dismissModal}>
+              Close
+            </button>
+          }
+        />
+      </>
+    );
+  }
+}

package/src/serverGroup/events/EventsLink.tsx

@@ -1,5 +1,23 @@
+import React from 'react';
+
 import type { IServerGroup } from '@spinnaker/core';
+import { ReactModal } from '@spinnaker/core';
+
+import { EcsServerGroupEventsModal } from './EcsServerGroupEventsModal';
 
 export interface IViewScalingActivitiesLinkProps {
   serverGroup: IServerGroup;
 }
+
+export function EventsLink({ serverGroup }: IViewScalingActivitiesLinkProps) {
+  const showEvents = (event: React.MouseEvent<HTMLAnchorElement>) => {
+    event.preventDefault();
+    ReactModal.show(EcsServerGroupEventsModal, { serverGroup });
+  };
+
+  return (
+    <a href="#" onClick={showEvents}>
+      View Events
+    </a>
+  );
+}

package/src/serverGroup/events/serverGroupEventsReader.service.spec.ts

@@ -0,0 +1,41 @@
+import { mockHttpClient } from '../../../../core/src/api/mock/jasmine';
+
+import { ServerGroupEventsReader } from './serverGroupEventsReader.service';
+
+describe('ServerGroupEventsReader', () => {
+  const serverGroup = {
+    app: 'fnord',
+    account: 'test',
+    name: 'fnord-main-v001',
+    region: 'us-east-1',
+    cloudProvider: 'ecs',
+  } as any;
+
+  it('reads ECS server group events', async () => {
+    const http = mockHttpClient();
+    const events = [{ id: 'one', createdAt: 1, message: 'steady state', status: 'Success' }];
+    http
+      .expectGET('/applications/fnord/serverGroups/test/fnord-main-v001/events')
+      .withParams({ region: 'us-east-1', provider: 'ecs' })
+      .respond(200, events);
+
+    const result = ServerGroupEventsReader.getEvents(serverGroup);
+    await http.flush();
+
+    await expectAsync(Promise.resolve(result)).toBeResolvedTo(events);
+  });
+
+  it('rejects when the events request fails', async () => {
+    const http = mockHttpClient();
+    http
+      .expectGET('/applications/fnord/serverGroups/test/fnord-main-v001/events')
+      .withParams({ region: 'us-east-1', provider: 'ecs' })
+      .respond(500, { message: 'failed' });
+
+    const result = Promise.resolve(ServerGroupEventsReader.getEvents(serverGroup));
+    const expectation = expectAsync(result).toBeRejected();
+    await http.flush();
+
+    await expectation;
+  });
+});

package/src/serverGroup/events/serverGroupEventsReader.service.ts

@@ -1,5 +1,3 @@
-import { $log } from 'ngimport';
-
 import type { IServerGroup } from '@spinnaker/core';
 import { REST } from '@spinnaker/core';
 
@@ -11,17 +9,13 @@ export interface IEventDescription {
 }
 
 export class ServerGroupEventsReader {
-  public static getEvents(serverGroup: IServerGroup): PromiseLike<IEventDescription[]> {
+  public static getEvents(serverGroup: IServerGroup): Promise<IEventDescription[]> {
     return REST('/applications')
       .path(serverGroup.app, 'serverGroups', serverGroup.account, serverGroup.name, 'events')
       .query({
         region: serverGroup.region,
         provider: serverGroup.cloudProvider,
       })
-      .get()
-      .catch((error: any): any[] => {
-        $log.error(error, 'error retrieving events');
-        return [];
-      });
+      .get();
   }
 }

package/src/serverGroup/serverGroup.transformer.spec.ts

@@ -1,54 +1,40 @@
-import type { IQService, IRootScopeService, IScope } from 'angular';
-import { mock } from 'angular';
-
 import type { IAmazonServerGroup, IScalingPolicyAlarmView, IStepAdjustment } from '@spinnaker/amazon';
 import { VpcReader } from '@spinnaker/amazon';
 
-import type { EcsServerGroupTransformer } from './serverGroup.transformer';
-import { ECS_SERVER_GROUP_TRANSFORMER } from './serverGroup.transformer';
+import { EcsServerGroupTransformer } from './serverGroup.transformer';
 
 describe('ecsServerGroupTransformer', () => {
-  let transformer: EcsServerGroupTransformer, $q: IQService, $scope: IScope;
-
-  beforeEach(mock.module(ECS_SERVER_GROUP_TRANSFORMER));
+  let transformer: EcsServerGroupTransformer;
 
-  beforeEach(
-    mock.inject(
-      (_ecsServerGroupTransformer_: EcsServerGroupTransformer, _$q_: IQService, $rootScope: IRootScopeService) => {
-        transformer = _ecsServerGroupTransformer_;
-        $q = _$q_;
-        $scope = $rootScope.$new();
-      },
-    ),
-  );
+  beforeEach(() => {
+    transformer = new EcsServerGroupTransformer();
+  });
 
   describe('normalize server group', () => {
     beforeEach(() => {
       spyOn(VpcReader, 'listVpcs').and.returnValue(
-        $q.when([{ account: 'test', region: 'us-east-1', id: 'vpc-1', name: 'main' } as any]),
+        Promise.resolve([{ account: 'test', region: 'us-east-1', id: 'vpc-1', name: 'main' } as any]),
       );
     });
 
-    it('adds vpc name to server group', () => {
+    it('adds vpc name to server group', async () => {
       const serverGroup = {
         account: 'test',
         region: 'us-east-1',
         vpcId: 'vpc-1',
         instances: [],
       } as IAmazonServerGroup;
-      transformer.normalizeServerGroup(serverGroup);
-      $scope.$digest();
+      await transformer.normalizeServerGroup(serverGroup);
       expect(serverGroup.vpcName).toBe('main');
     });
 
-    it('adds empty vpc name when no vpcId found on server group', () => {
+    it('adds empty vpc name when no vpcId found on server group', async () => {
       const serverGroup = {
         account: 'test',
         region: 'us-east-1',
         instances: [],
       } as IAmazonServerGroup;
-      transformer.normalizeServerGroup(serverGroup);
-      $scope.$digest();
+      await transformer.normalizeServerGroup(serverGroup);
       expect(serverGroup.vpcName).toBe('');
     });
   });

package/src/serverGroup/serverGroup.transformer.ts

@@ -1,4 +1,3 @@
-import { module } from 'angular';
 import { defaults } from 'lodash';
 
 import type {
@@ -70,7 +69,7 @@ export class EcsServerGroupTransformer {
     return view;
   }
 
-  public normalizeServerGroup(serverGroup: IAmazonServerGroup): PromiseLike<IAmazonServerGroup> {
+  public normalizeServerGroup(serverGroup: IAmazonServerGroup): Promise<IAmazonServerGroup> {
     serverGroup.instances.forEach((instance: IInstance) => {
       instance.vpcId = serverGroup.vpcId;
     });
@@ -112,6 +111,3 @@ export class EcsServerGroupTransformer {
     return command;
   }
 }
-
-export const ECS_SERVER_GROUP_TRANSFORMER = 'spinnaker.ecs.serverGroup.transformer';
-module(ECS_SERVER_GROUP_TRANSFORMER, []).service('ecsServerGroupTransformer', EcsServerGroupTransformer);

package/src/serviceDiscovery/serviceDiscovery.read.service.ts

@@ -2,7 +2,7 @@ import { REST } from '@spinnaker/core';
 import type { IServiceDiscoveryRegistryDescriptor } from './IServiceDiscovery';
 
 export class ServiceDiscoveryReader {
-  public static listServiceDiscoveryRegistries(): PromiseLike<IServiceDiscoveryRegistryDescriptor[]> {
+  public static listServiceDiscoveryRegistries(): Promise<IServiceDiscoveryRegistryDescriptor[]> {
     return REST('/ecs/serviceDiscoveryRegistries').get();
   }
 }

package/dist/common/common.module.d.ts

@@ -1 +0,0 @@
-export declare const COMMON_MODULE = "spinnaker.ecs.common";

package/dist/common/footer.component.d.ts

@@ -1 +0,0 @@
-export declare const ECS_FOOTER_COMPONENT = "spinnaker.ecs.footer";

package/dist/instance/details/instance.details.controller.d.ts

@@ -1,2 +0,0 @@
-export const ECS_INSTANCE_DETAILS_INSTANCE_DETAILS_CONTROLLER: "spinnaker.ecs.instance.details.controller";
-export const name: "spinnaker.ecs.instance.details.controller";

package/dist/securityGroup/details/securityGroupDetail.controller.d.ts

@@ -1,2 +0,0 @@
-export const ECS_SECURITYGROUP_DETAILS_SECURITYGROUPDETAIL_CONTROLLER: "spinnaker.ecs.securityGroup.details.controller";
-export const name: "spinnaker.ecs.securityGroup.details.controller";

package/dist/securityGroup/securityGroup.module.d.ts

@@ -1 +0,0 @@
-export declare const ECS_SECURITY_GROUP_MODULE = "spinnaker.ecs.securityGroup";

package/dist/serverGroup/configure/wizard/CloneServerGroup.ecs.controller.d.ts

@@ -1,2 +0,0 @@
-export const ECS_SERVERGROUP_CONFIGURE_WIZARD_CLONESERVERGROUP_ECS_CONTROLLER: "spinnaker.ecs.cloneServerGroup.controller";
-export const name: "spinnaker.ecs.cloneServerGroup.controller";

package/dist/serverGroup/configure/wizard/advancedSettings/advancedSettings.component.d.ts

@@ -1,2 +0,0 @@
-export const ECS_SERVERGROUP_CONFIGURE_WIZARD_ADVANCEDSETTINGS_ADVANCEDSETTINGS_COMPONENT: "spinnaker.ecs.serverGroup.configure.wizard.advancedSettings.component";
-export const name: "spinnaker.ecs.serverGroup.configure.wizard.advancedSettings.component";

package/dist/serverGroup/configure/wizard/horizontalScaling/horizontalScaling.component.d.ts

@@ -1,2 +0,0 @@
-export const ECS_SERVERGROUP_CONFIGURE_WIZARD_HORIZONTALSCALING_HORIZONTALSCALING_COMPONENT: "spinnaker.ecs.serverGroup.configure.wizard.horizontalScaling.component";
-export const name: "spinnaker.ecs.serverGroup.configure.wizard.horizontalScaling.component";

package/dist/serverGroup/configure/wizard/location/ServerGroupBasicSettings.controller.d.ts

@@ -1,2 +0,0 @@
-export const ECS_SERVERGROUP_CONFIGURE_WIZARD_LOCATION_SERVERGROUPBASICSETTINGS_CONTROLLER: "spinnaker.ecs.serverGroup.configure.basicSettings";
-export const name: "spinnaker.ecs.serverGroup.configure.basicSettings";

package/dist/serverGroup/configure/wizard/logging/logging.component.d.ts

@@ -1 +0,0 @@
-export declare const ECS_SERVER_GROUP_LOGGING = "spinnaker.ecs.serverGroup.configure.wizard.logging.component";

package/dist/serverGroup/details/resize/resizeCapacity.component.d.ts

@@ -1 +0,0 @@
-export declare const ECS_RESIZE_CAPACITY_COMPONENT = "spinnaker.ecs.serverGroup.resize";

package/dist/serverGroup/details/resize/resizeServerGroup.controller.d.ts

@@ -1,2 +0,0 @@
-export const ECS_SERVERGROUP_DETAILS_RESIZE_RESIZESERVERGROUP_CONTROLLER: "spinnaker.ecs.serverGroup.details.resize.controller";
-export const name: "spinnaker.ecs.serverGroup.details.resize.controller";

package/dist/serverGroup/details/rollback/rollbackServerGroup.controller.d.ts

@@ -1,2 +0,0 @@
-export const ECS_SERVERGROUP_DETAILS_ROLLBACK_ROLLBACKSERVERGROUP_CONTROLLER: "spinnaker.ecs.serverGroup.details.rollback.controller";
-export const name: "spinnaker.ecs.serverGroup.details.rollback.controller";

package/dist/serverGroup/details/serverGroupDetails.ecs.controller.d.ts

@@ -1,2 +0,0 @@
-export const ECS_SERVERGROUP_DETAILS_SERVERGROUPDETAILS_ECS_CONTROLLER: "spinnaker.ecs.serverGroup.details.controller";
-export const name: "spinnaker.ecs.serverGroup.details.controller";

package/dist/serverGroup/details/serverGroupDetails.module.d.ts

@@ -1 +0,0 @@
-export declare const SERVER_GROUP_DETAILS_MODULE = "spinnaker.ecs.serverGroup.details";

package/dist/serverGroup/events/events.component.d.ts

@@ -1,3 +0,0 @@
-import type { IComponentOptions } from 'angular';
-export declare const viewEventsLink: IComponentOptions;
-export declare const VIEW_EVENTS_LINK_COMPONENT = "spinnaker.ecs.serverGroup.details.viewEvents.link";

package/dist/serverGroup/events/events.controller.d.ts

@@ -1,19 +0,0 @@
-import type { IController } from 'angular';
-import type { IModalServiceInstance } from 'angular-ui-bootstrap';
-import type { IServerGroup } from '@spinnaker/core';
-import type { IEventDescription } from './serverGroupEventsReader.service';
-export interface IScalingActivitiesViewState {
-    loading: boolean;
-    error: boolean;
-}
-export declare class EventsController implements IController {
-    private $uibModalInstance;
-    serverGroup: IServerGroup;
-    viewState: IScalingActivitiesViewState;
-    events: IEventDescription[];
-    static $inject: string[];
-    constructor($uibModalInstance: IModalServiceInstance, serverGroup: IServerGroup);
-    $onInit(): void;
-    close(): void;
-}
-export declare const EVENTS_CTRL = "spinnaker.ecs.serverGroup.events.controller";

package/dist/serverGroup/serverGroup.module.d.ts

@@ -1 +0,0 @@
-export declare const ECS_SERVERGROUP_MODULE = "spinnaker.ecs.serverGroup";

package/src/common/common.module.ts

@@ -1,6 +0,0 @@
-import { module } from 'angular';
-
-import { ECS_FOOTER_COMPONENT } from './footer.component';
-
-export const COMMON_MODULE = 'spinnaker.ecs.common';
-module(COMMON_MODULE, [ECS_FOOTER_COMPONENT]);

package/src/common/footer.component.ts

@@ -1,29 +0,0 @@
-import type { IComponentOptions } from 'angular';
-import { module } from 'angular';
-
-const footerComponent: IComponentOptions = {
-  bindings: {
-    action: '&',
-    isValid: '&',
-    cancel: '&',
-    account: '=?',
-    verification: '=?',
-  },
-  template: `
-    <div class="modal-footer">
-      <user-verification account="$ctrl.account" verification="$ctrl.verification"></user-verification>
-      <button type="submit" ng-click="$ctrl.action()" style="display:none"></button> <!-- Allows form submission via enter keypress-->
-      <button class="btn btn-default" ng-click="$ctrl.cancel()">Cancel</button>
-      <button type="submit"
-              class="btn btn-primary"
-              ng-click="$ctrl.action()"
-              ng-disabled="!$ctrl.isValid()">
-        Submit
-      </button>
-    </div>
-  `,
-  controller: () => {},
-};
-
-export const ECS_FOOTER_COMPONENT = 'spinnaker.ecs.footer';
-module(ECS_FOOTER_COMPONENT, []).component('ecsFooter', footerComponent);