@spinnaker/core 2026.2.2 → 2026.3.0

package/src/serverGroup/serverGroupWriter.service.spec.ts

@@ -1,16 +1,17 @@
-import { mock, noop } from 'angular';
+import { noop } from 'lodash';
 
 import { mockHttpClient } from '../api/mock/jasmine';
 import type { MockHttpClient } from '../api/mock/mockHttpClient';
 import { Application } from '../application/application.model';
 import { ApplicationModelBuilder } from '../application/applicationModel.builder';
 import { ApplicationDataSourceRegistry } from '../application/service/ApplicationDataSourceRegistry';
+import type { DeckRuntime } from '../bootstrap/DeckRuntime';
+import { createDeckRuntime } from '../bootstrap/DeckRuntime';
 import type {
   IServerGroupCommand,
   IServerGroupCommandViewState,
 } from './configure/common/serverGroupCommandBuilder.service';
-import type { ServerGroupWriter } from './serverGroupWriter.service';
-import { SERVER_GROUP_WRITER } from './serverGroupWriter.service';
+import { ServerGroupWriter } from './serverGroupWriter.service';
 import type { ITaskCommand } from '../task/taskExecutor';
 
 interface IApplicationTask {
@@ -24,26 +25,16 @@ class TestApplication extends Application {
 describe('serverGroupWriter', function () {
   let serverGroupTransformer: any, serverGroupWriter: ServerGroupWriter;
 
-  beforeEach(mock.module(SERVER_GROUP_WRITER));
-
-  beforeEach(function () {
-    mock.inject(function (_serverGroupWriter_: ServerGroupWriter, _serverGroupTransformer_: any) {
-      serverGroupWriter = _serverGroupWriter_;
-      serverGroupTransformer = _serverGroupTransformer_;
-    });
-  });
-
   beforeEach(function () {
+    serverGroupTransformer = {
+      convertServerGroupCommandToDeployConfiguration: (command: any) => command,
+    };
+    serverGroupWriter = new ServerGroupWriter(serverGroupTransformer);
     spyOn(serverGroupTransformer, 'convertServerGroupCommandToDeployConfiguration').and.callFake((command: any) => {
       return command;
     });
   });
 
-  it('should inject defined objects', async function () {
-    expect(serverGroupTransformer).toBeDefined();
-    expect(serverGroupWriter).toBeDefined();
-  });
-
   describe('clone server group submit', function () {
     async function postTask(http: MockHttpClient, serverGroupCommand: IServerGroupCommand): Promise<ITaskCommand> {
       let submitted: ITaskCommand = {};
@@ -126,3 +117,45 @@ describe('serverGroupWriter', function () {
     });
   });
 });
+
+describe('direct runtime server group writer', () => {
+  let runtime: DeckRuntime;
+
+  beforeEach(() => {
+    runtime = createDeckRuntime();
+  });
+
+  afterEach(() => runtime.dispose());
+
+  it('submits a destroy job with the runtime-owned writer', async () => {
+    const http = mockHttpClient();
+    let submitted: ITaskCommand = {};
+    http
+      .expectPOST('/tasks')
+      .respond(200, { ref: '/1' })
+      .onRequestReceived((request) => (submitted = request.data));
+    http.expectGET('/tasks/1').respond(200, {});
+
+    const task = runtime.services.serverGroupWriter.destroyServerGroup(
+      {
+        name: 'app-test-v001',
+        account: 'test-account',
+        region: 'us-east-1',
+        provider: 'directRuntimeServerGroupWriterTest',
+      } as any,
+      { name: 'app' } as any,
+    );
+    await http.flush();
+    await task;
+
+    expect(submitted.job[0]).toEqual(
+      jasmine.objectContaining({
+        type: 'destroyServerGroup',
+        serverGroupName: 'app-test-v001',
+        credentials: 'test-account',
+        region: 'us-east-1',
+        cloudProvider: 'directRuntimeServerGroupWriterTest',
+      }),
+    );
+  });
+});

package/src/serverGroup/serverGroupWriter.service.ts

@@ -1,12 +1,9 @@
-import { module } from 'angular';
-
 import type { Application } from '../application/application.model';
 import type { IServerGroupCommand } from './configure/common/serverGroupCommandBuilder.service';
 import type { ISecurityGroup, IServerGroup, ITask } from '../domain';
 import type { IMoniker } from '../naming';
 import { NameUtils } from '../naming';
 import { FirewallLabels } from '../securityGroup/label';
-import { CORE_SERVERGROUP_SERVERGROUP_TRANSFORMER } from './serverGroup.transformer';
 import type { IJob } from '../task/taskExecutor';
 import { TaskExecutor } from '../task/taskExecutor';
 
@@ -30,10 +27,9 @@ export interface IServerGroupJob extends IJob {
 }
 
 export class ServerGroupWriter {
-  public static $inject = ['serverGroupTransformer'];
   constructor(private serverGroupTransformer: any) {}
 
-  public cloneServerGroup(command: IServerGroupCommand, application: Application): PromiseLike<ITask> {
+  public cloneServerGroup(command: IServerGroupCommand, application: Application): Promise<ITask> {
     let description: string;
     if (command.viewState.mode === 'clone') {
       description = `Create Cloned Server Group from ${command.source.asgName}`;
@@ -58,7 +54,7 @@ export class ServerGroupWriter {
     serverGroup: IServerGroup,
     application: Application,
     params: IServerGroupJob = {},
-  ): PromiseLike<ITask> {
+  ): Promise<ITask> {
     params.asgName = serverGroup.name;
     params.moniker = serverGroup.moniker;
     params.serverGroupName = serverGroup.name;
@@ -74,11 +70,7 @@ export class ServerGroupWriter {
     });
   }
 
-  public disableServerGroup(
-    serverGroup: IServerGroup,
-    appName: string,
-    params: IServerGroupJob = {},
-  ): PromiseLike<ITask> {
+  public disableServerGroup(serverGroup: IServerGroup, appName: string, params: IServerGroupJob = {}): Promise<ITask> {
     params.asgName = serverGroup.name;
     params.serverGroupName = serverGroup.name;
     params.moniker = serverGroup.moniker;
@@ -98,7 +90,7 @@ export class ServerGroupWriter {
     serverGroup: IServerGroup,
     application: Application,
     params: IServerGroupJob = {},
-  ): PromiseLike<ITask> {
+  ): Promise<ITask> {
     params.asgName = serverGroup.name;
     params.serverGroupName = serverGroup.name;
     params.moniker = serverGroup.moniker;
@@ -123,7 +115,7 @@ export class ServerGroupWriter {
       .join(', ');
   }
 
-  public mapLoadBalancers(serverGroup: IServerGroup, application: Application, params: any = {}): PromiseLike<ITask> {
+  public mapLoadBalancers(serverGroup: IServerGroup, application: Application, params: any = {}): Promise<ITask> {
     params.type = 'mapLoadBalancers';
     params.name = [serverGroup.name];
     params.loadBalancerNames = serverGroup.loadBalancers;
@@ -141,7 +133,7 @@ export class ServerGroupWriter {
     serverGroup: IServerGroup,
     application: Application,
     params: IServerGroupJob = {},
-  ): PromiseLike<ITask> {
+  ): Promise<ITask> {
     params.asgName = serverGroup.name;
     params.serverGroupName = serverGroup.name;
     params.moniker = serverGroup.moniker;
@@ -164,7 +156,7 @@ export class ServerGroupWriter {
     serverGroup: IServerGroup,
     application: Application,
     params: IServerGroupJob = {},
-  ): PromiseLike<ITask> {
+  ): Promise<ITask> {
     params.type = 'rollbackServerGroup';
     params.moniker = serverGroup.moniker;
     params.region = serverGroup.region;
@@ -178,7 +170,7 @@ export class ServerGroupWriter {
     });
   }
 
-  public unmapLoadBalancers(serverGroup: IServerGroup, application: Application, params: any = {}): PromiseLike<ITask> {
+  public unmapLoadBalancers(serverGroup: IServerGroup, application: Application, params: any = {}): Promise<ITask> {
     params.type = 'unmapLoadBalancers';
     params.name = [serverGroup.name];
     params.loadBalancerNames = serverGroup.loadBalancers;
@@ -197,7 +189,7 @@ export class ServerGroupWriter {
     securityGroups: ISecurityGroup[],
     application: Application,
     hasLaunchTemplate?: boolean,
-  ): PromiseLike<ITask> {
+  ): Promise<ITask> {
     const job: IServerGroupJob = {
       amiName: serverGroup.image.name,
       imageId: serverGroup.image.imageId,
@@ -221,6 +213,3 @@ export class ServerGroupWriter {
     });
   }
 }
-
-export const SERVER_GROUP_WRITER = 'spinnaker.core.serverGroup.write.service';
-module(SERVER_GROUP_WRITER, [CORE_SERVERGROUP_SERVERGROUP_TRANSFORMER]).service('serverGroupWriter', ServerGroupWriter);

package/src/serverGroupManager/ServerGroupManager.spec.tsx

@@ -0,0 +1,53 @@
+import { shallow } from 'enzyme';
+import React from 'react';
+
+import { ServerGroupManagerComponent } from './ServerGroupManager';
+import { ServerGroupManagerHeading } from './ServerGroupManagerHeading';
+
+describe('<ServerGroupManager />', () => {
+  const serverGroup = {
+    account: 'k8s-local',
+    cloudProvider: 'kubernetes',
+    cluster: 'backend',
+    instanceCounts: {
+      up: 2,
+      down: 0,
+      starting: 0,
+      succeeded: 0,
+      failed: 0,
+      unknown: 0,
+      outOfService: 0,
+    },
+    instances: [],
+    name: 'backend-65b97dd546',
+    region: 'dev',
+    type: 'kubernetes',
+  } as any;
+
+  it('links grouped server group managers to manager details', () => {
+    const originalUrl = window.location.href;
+    window.history.replaceState(null, '', '#/applications/kubernetesapp/clusters');
+
+    try {
+      const component = shallow(
+        <ServerGroupManagerComponent
+          application={{ name: 'kubernetesapp' } as any}
+          grouping={{} as any}
+          manager="deployment backend"
+          serverGroups={[serverGroup]}
+          sortFilter={{} as any}
+          router={{} as any}
+          stateParams={{}}
+          stateService={{ includes: () => false } as any}
+        />,
+      );
+
+      expect(component.find(ServerGroupManagerHeading).prop('detailsHref')).toBe(
+        '#/applications/kubernetesapp/clusters/serverGroupManagerDetails/kubernetes/k8s-local/dev/deployment%20backend',
+      );
+      component.unmount();
+    } finally {
+      window.history.replaceState(null, '', originalUrl);
+    }
+  });
+});

package/src/serverGroupManager/ServerGroupManager.tsx

@@ -6,7 +6,8 @@ import type { Application } from '../application';
 import type { IClusterSubgroup } from '../cluster';
 import type { IInstanceCounts, IServerGroup } from '../domain';
 import type { ISortFilter } from '../filterModel';
-import { ReactInjector } from '../reactShims';
+import type { IRouterInjectedProps } from '../navigation/routerContext';
+import { withRouter } from '../navigation/routerContext';
 import { ServerGroup } from '../serverGroup';
 
 interface IServerGroupManagerProps {
@@ -17,7 +18,19 @@ interface IServerGroupManagerProps {
   serverGroups: IServerGroup[];
 }
 
-export class ServerGroupManager extends React.Component<IServerGroupManagerProps> {
+export class ServerGroupManagerComponent extends React.Component<IServerGroupManagerProps & IRouterInjectedProps> {
+  private getDetailsHref(): string {
+    const { application, manager, serverGroups } = this.props;
+    const currentHash = window.location.hash || `#/applications/${application.name}`;
+    const clustersPath = currentHash.includes('/clusters')
+      ? currentHash.split('/clusters')[0]
+      : `#/applications/${application.name}`;
+
+    return `${clustersPath}/clusters/serverGroupManagerDetails/${serverGroups[0].cloudProvider}/${
+      serverGroups[0].account
+    }/${serverGroups[0].region}/${encodeURIComponent(manager)}`;
+  }
+
   private isSelected = (): boolean => {
     const { manager, serverGroups } = this.props;
     const params = {
@@ -27,24 +40,15 @@ export class ServerGroupManager extends React.Component<IServerGroupManagerProps
       serverGroupManager: manager,
       name: manager,
     };
-    return ReactInjector.$state.includes('**.serverGroupManager', params);
+    return this.props.stateService.includes('**.serverGroupManager', params);
   };
 
   private handleClick = (e: React.MouseEvent<HTMLElement>): void => {
-    const { manager, serverGroups } = this.props;
-    const nextState = ReactInjector.$state.current.name.endsWith('.clusters')
-      ? '.serverGroupManager'
-      : '^.serverGroupManager';
-
-    e.preventDefault();
     e.stopPropagation();
-    ReactInjector.$state.go(nextState, {
-      accountId: serverGroups[0].account,
-      region: serverGroups[0].region,
-      provider: serverGroups[0].cloudProvider,
-      serverGroupManager: manager,
-      name: manager,
-    });
+    if (e.button === 0 && !e.metaKey && !e.ctrlKey && !e.shiftKey && !e.altKey) {
+      e.preventDefault();
+      window.location.hash = this.getDetailsHref();
+    }
   };
 
   private buildHealthCounts = (): IInstanceCounts => {
@@ -76,6 +80,7 @@ export class ServerGroupManager extends React.Component<IServerGroupManagerProps
       <div className={classNames(classes)}>
         <ServerGroupManagerHeading
           onClick={this.handleClick}
+          detailsHref={this.getDetailsHref()}
           health={this.buildHealthCounts()}
           provider={serverGroups[0].type}
           heading={manager}
@@ -99,3 +104,6 @@ export class ServerGroupManager extends React.Component<IServerGroupManagerProps
     );
   }
 }
+
+export const ServerGroupManager = withRouter(ServerGroupManagerComponent);
+ServerGroupManager.displayName = 'ServerGroupManager';

package/src/serverGroupManager/ServerGroupManagerHeading.tsx

@@ -14,6 +14,7 @@ export interface IServerGroupManagerHeadingProps {
   heading: string;
   grouping: IClusterSubgroup;
   app: Application;
+  detailsHref?: string;
   onClick(event: React.MouseEvent<HTMLElement>): void;
 }
 
@@ -24,11 +25,17 @@ export const ServerGroupManagerHeading = ({
   heading,
   grouping,
   app,
+  detailsHref,
 }: IServerGroupManagerHeadingProps) => {
   const showEntityTags = SETTINGS.feature && SETTINGS.feature.entityTags;
 
   return (
-    <div className={`flex-container-h baseline server-group-title`} onClick={onClick}>
+    <a
+      className={`flex-container-h baseline server-group-title`}
+      href={detailsHref}
+      onClickCapture={onClick}
+      style={{ color: 'inherit', textDecoration: 'none' }}
+    >
       <div className="flex-container-h baseline section-title">
         <CloudProviderLogo provider={provider} height="16px" width="16px" />
         {heading}
@@ -47,6 +54,6 @@ export const ServerGroupManagerHeading = ({
       <div className="flex-container-h baseline flex-pull-right">
         <HealthCounts container={health} />
       </div>
-    </div>
+    </a>
   );
 };

package/src/serverGroupManager/ServerGroupManagerReader.ts

@@ -3,7 +3,7 @@ import { REST } from '../api/ApiService';
 import type { IServerGroupManager } from '../domain/IServerGroupManager';
 
 export class ServerGroupManagerReader {
-  public static getServerGroupManagersForApplication(application: string): PromiseLike<IServerGroupManager[]> {
+  public static getServerGroupManagersForApplication(application: string): Promise<IServerGroupManager[]> {
     return REST('/applications').path(application, 'serverGroupManagers').get();
   }
 }

package/src/serverGroupManager/ServerGroupManagerTag.tsx

@@ -2,8 +2,9 @@ import React from 'react';
 
 import type { Application } from '../application';
 import type { IServerGroup, IServerGroupManager } from '../domain';
+import type { IRouterInjectedProps } from '../navigation/routerContext';
+import { withRouter } from '../navigation/routerContext';
 import { Tooltip } from '../presentation/Tooltip';
-import { ReactInjector } from '../reactShims';
 
 import type { IServerGroupManagerStateParams } from './serverGroupManager.states';
 
@@ -12,7 +13,7 @@ export interface IServerGroupManagerTagProps {
   serverGroup: IServerGroup;
 }
 
-export class ServerGroupManagerTag extends React.Component<IServerGroupManagerTagProps> {
+class ServerGroupManagerTagComponent extends React.Component<IServerGroupManagerTagProps & IRouterInjectedProps> {
   public render() {
     const serverGroupManager = this.extractServerGroupManager();
     if (!serverGroupManager) {
@@ -48,9 +49,9 @@ export class ServerGroupManagerTag extends React.Component<IServerGroupManagerTa
 
   private openDetails = (event: React.MouseEvent<HTMLElement>): void => {
     event.preventDefault();
-    const { $state } = ReactInjector;
-    const nextState = $state.current.name.endsWith('.clusters') ? '.serverGroupManager' : '^.serverGroupManager';
-    $state.go(nextState, this.buildStateParams());
+    const { stateService } = this.props;
+    const nextState = stateService.current.name.endsWith('.clusters') ? '.serverGroupManager' : '^.serverGroupManager';
+    stateService.go(nextState, this.buildStateParams());
   };
 
   private buildStateParams(): IServerGroupManagerStateParams {
@@ -63,3 +64,6 @@ export class ServerGroupManagerTag extends React.Component<IServerGroupManagerTa
     };
   }
 }
+
+export const ServerGroupManagerTag = withRouter(ServerGroupManagerTagComponent);
+ServerGroupManagerTag.displayName = 'ServerGroupManagerTag';

package/src/serverGroupManager/serverGroupManager.dataSource.ts

@@ -1,33 +1,28 @@
-import type { IQService } from 'angular';
-import { module } from 'angular';
-
 import { ServerGroupManagerReader } from './ServerGroupManagerReader';
 import type { Application } from '../application';
 import { ApplicationDataSourceRegistry } from '../application';
 import type { IServerGroupManager } from '../domain/IServerGroupManager';
 import { EntityTagsReader } from '../entityTag/EntityTagsReader';
 
-export const SERVER_GROUP_MANAGER_DATA_SOURCE = 'spinnaker.core.serverGroupManager.dataSource';
-module(SERVER_GROUP_MANAGER_DATA_SOURCE, []).run([
-  '$q',
-  ($q: IQService) => {
-    const loader = (application: Application) =>
-      ServerGroupManagerReader.getServerGroupManagersForApplication(application.name);
+export function registerServerGroupManagerDataSource(): void {
+  const loader = (application: Application) =>
+    ServerGroupManagerReader.getServerGroupManagersForApplication(application.name);
+
+  const onLoad = (_application: Application, serverGroupManagers: IServerGroupManager[]) =>
+    Promise.resolve(serverGroupManagers);
 
-    const onLoad = (_application: Application, serverGroupManagers: IServerGroupManager[]) =>
-      $q.resolve(serverGroupManagers);
+  const addTags = (application: Application) => {
+    EntityTagsReader.addTagsToServerGroupManagers(application);
+  };
 
-    const addTags = (application: Application) => {
-      EntityTagsReader.addTagsToServerGroupManagers(application);
-    };
+  ApplicationDataSourceRegistry.registerDataSource({
+    key: 'serverGroupManagers',
+    visible: false,
+    loader,
+    onLoad,
+    afterLoad: addTags,
+    defaultData: [],
+  });
+}
 
-    ApplicationDataSourceRegistry.registerDataSource({
-      key: 'serverGroupManagers',
-      visible: false,
-      loader,
-      onLoad,
-      afterLoad: addTags,
-      defaultData: [],
-    });
-  },
-]);
+registerServerGroupManagerDataSource();

package/src/serverGroupManager/serverGroupManager.states.ts

@@ -1,8 +1,6 @@
-import { module } from 'angular';
-
 import { ServerGroupManagerDetails } from './ServerGroupManagerDetails';
 import type { ApplicationStateProvider } from '../application';
-import { APPLICATION_STATE_PROVIDER } from '../application';
+import { registerApplicationState } from '../application';
 import type { INestedState } from '../navigation';
 
 export interface IServerGroupManagerStateParams {
@@ -12,36 +10,36 @@ export interface IServerGroupManagerStateParams {
   name: string;
 }
 
-export const SERVER_GROUP_MANAGER_STATES = 'spinnaker.core.serverGroupManager.states';
-module(SERVER_GROUP_MANAGER_STATES, [APPLICATION_STATE_PROVIDER]).config([
-  'applicationStateProvider',
-  (applicationStateProvider: ApplicationStateProvider) => {
-    const serverGroupManagerDetails: INestedState = {
-      name: 'serverGroupManager',
-      url: '/serverGroupManagerDetails/:provider/:accountId/:region/:name',
-      views: {
-        'detail@../insight': {
-          component: ServerGroupManagerDetails,
-          $type: 'react',
-        },
-      },
-      resolve: {
-        accountId: ['$stateParams', ($stateParams: IServerGroupManagerStateParams) => $stateParams.accountId],
-        serverGroupManager: ['$stateParams', ($stateParams: IServerGroupManagerStateParams) => $stateParams],
-      },
-      data: {
-        pageTitleDetails: {
-          title: 'Server Group Manager Details',
-          nameParam: 'name',
-          accountParam: 'accountId',
-          regionParam: 'region',
-        },
-        history: {
-          type: 'serverGroupManagers',
-        },
-      },
-    };
-
-    applicationStateProvider.addInsightDetailState(serverGroupManagerDetails);
+const serverGroupManagerDetails: INestedState = {
+  name: 'serverGroupManager',
+  url: '/serverGroupManagerDetails/:provider/:accountId/:region/:name',
+  views: {
+    'detail@../insight': {
+      component: ServerGroupManagerDetails,
+      $type: 'react',
+    },
+  },
+  resolve: {
+    accountId: ['$stateParams', ($stateParams: IServerGroupManagerStateParams) => $stateParams.accountId],
+    serverGroupManager: ['$stateParams', ($stateParams: IServerGroupManagerStateParams) => $stateParams],
+  },
+  data: {
+    pageTitleDetails: {
+      title: 'Server Group Manager Details',
+      nameParam: 'name',
+      accountParam: 'accountId',
+      regionParam: 'region',
+    },
+    history: {
+      type: 'serverGroupManagers',
+    },
   },
-]);
+};
+
+function addServerGroupManagerDetailsState(applicationStateProvider: ApplicationStateProvider): void {
+  applicationStateProvider.addInsightDetailState(serverGroupManagerDetails);
+}
+
+registerApplicationState((applicationStateProvider: ApplicationStateProvider) => {
+  addServerGroupManagerDetailsState(applicationStateProvider);
+});

package/src/serviceAccount/ServiceAccountReader.ts

@@ -1,20 +1,18 @@
-import { $q } from 'ngimport';
-
 import { REST } from '../api/ApiService';
 import { SETTINGS } from '../config/settings';
 
 export class ServiceAccountReader {
-  public static getServiceAccounts(): PromiseLike<string[]> {
+  public static getServiceAccounts(): Promise<string[]> {
     if (!SETTINGS.feature.fiatEnabled) {
-      return $q.resolve([]);
+      return Promise.resolve([]);
     } else {
       return REST('/auth/user/serviceAccounts').get();
     }
   }
 
-  public static getServiceAccountsForApplication(application: string): PromiseLike<string[]> {
+  public static getServiceAccountsForApplication(application: string): Promise<string[]> {
     if (!SETTINGS.feature.fiatEnabled) {
-      return $q.resolve([]);
+      return Promise.resolve([]);
     } else {
       return REST('/auth/user/serviceAccounts').query({ application: application }).get();
     }

package/src/services/ServicesReader.ts

@@ -2,7 +2,7 @@ import { REST } from '../api/ApiService';
 import type { IService } from '../domain';
 
 export class ServicesReader {
-  public static getServices(account: string, region: string): PromiseLike<IService[]> {
+  public static getServices(account: string, region: string): Promise<IService[]> {
     return REST('/servicebroker')
       .path(account, 'services')
       .query({

package/src/slack/SlackReader.ts

@@ -11,7 +11,7 @@ export interface ISlackChannel {
 }
 
 export class SlackReader {
-  public static getChannels(): PromiseLike<ISlackChannel[]> {
+  public static getChannels(): Promise<ISlackChannel[]> {
     return REST('/slack/channels')
       .get()
       .catch(() => [] as ISlackChannel[]);

package/src/slack/index.ts

@@ -1,2 +1 @@
-export * from './slackChannelSelector.component';
 export * from './SlackReader';

package/src/snapshot/SnapshotReader.ts

@@ -2,7 +2,7 @@ import { REST } from '../api';
 import type { ISnapshot } from '../domain';
 
 export class SnapshotReader {
-  public static getSnapshotHistory(application: string, account: string, params = {}): PromiseLike<ISnapshot[]> {
+  public static getSnapshotHistory(application: string, account: string, params = {}): Promise<ISnapshot[]> {
     return REST('/applications').path(application, 'snapshots', account, 'history').query(params).get();
   }
 }

package/src/snapshot/SnapshotWriter.ts

@@ -1,5 +1,4 @@
 import { isString } from 'lodash';
-import { $q } from 'ngimport';
 
 import type { IAccountDetails } from '../account';
 import { AccountService } from '../account/AccountService';
@@ -39,13 +38,13 @@ export class SnapshotWriter {
     return jobs;
   }
 
-  private static loadAccountDetails(app: Application): PromiseLike<IAccountDetails[]> {
+  private static loadAccountDetails(app: Application): Promise<IAccountDetails[]> {
     const accounts = isString(app.accounts) ? app.accounts.split(',') : [];
     const accountDetailPromises = accounts.map((account) => AccountService.getAccountDetails(account));
-    return $q.all(accountDetailPromises);
+    return Promise.all(accountDetailPromises);
   }
 
-  public static takeSnapshot(app: Application): PromiseLike<ITask> {
+  public static takeSnapshot(app: Application): Promise<ITask> {
     return this.loadAccountDetails(app).then((accountDetails) => {
       const jobs = this.buildSaveSnapshotJobs(app, accountDetails);
       return TaskExecutor.executeTask({
@@ -56,7 +55,7 @@ export class SnapshotWriter {
     });
   }
 
-  public static restoreSnapshot(app: Application, account: string, timestamp: number): PromiseLike<ITask> {
+  public static restoreSnapshot(app: Application, account: string, timestamp: number): Promise<ITask> {
     return AccountService.getAccountDetails(account).then((accountDetail) => {
       const jobs = this.buildRestoreSnapshotJob(app, accountDetail, timestamp);
       return TaskExecutor.executeTask({

package/src/storage/StorageAccountReader.ts

@@ -1,7 +1,7 @@
 import { REST } from '../api/ApiService';
 
 export class StorageAccountReader {
-  public static getStorageAccounts(): PromiseLike<string[]> {
+  public static getStorageAccounts(): Promise<string[]> {
     return REST('/storage').get();
   }
 }