chore(PromiseLike): Migrate code from IPromise types to PromiseLike

spinnaker · Oct 23, 2020 · d5ae512 · d5ae512
1 parent 39a282b
commit d5ae512
Show file tree

Hide file tree

Showing 19 changed files with 45 additions and 55 deletions.
diff --git a/app/scripts/modules/amazon/src/certificates/AmazonCertificateReader.ts b/app/scripts/modules/amazon/src/certificates/AmazonCertificateReader.ts
@@ -1,11 +1,10 @@
-import { IPromise } from 'angular';
 import { groupBy, sortBy } from 'lodash';
 
 import { AccountService, CertificateReader } from '@spinnaker/core';
 import { IAmazonCertificate } from 'amazon/domain';
 
 export class AmazonCertificateReader {
-  public static listCertificates(): IPromise<{ [accountId: string]: IAmazonCertificate[] }> {
+  public static listCertificates(): PromiseLike<{ [accountId: string]: IAmazonCertificate[] }> {
     return CertificateReader.listCertificatesByProvider('aws').then((certificates: IAmazonCertificate[]) => {
       // This account grouping should really go into clouddriver but since it's not, put it here for now.
       return AccountService.listAllAccounts('aws').then((allAccountDetails) => {

diff --git a/app/scripts/modules/amazon/src/image/image.reader.ts b/app/scripts/modules/amazon/src/image/image.reader.ts
@@ -1,4 +1,3 @@
-import { IPromise } from 'angular';
 import { $q } from 'ngimport';
 
 import { API } from '@spinnaker/core';
@@ -22,7 +21,7 @@ export interface IAmazonImage {
 }
 
 export class AwsImageReader {
-  public findImages(params: { q: string; region?: string }): IPromise<IAmazonImage[]> {
+  public findImages(params: { q: string; region?: string }): PromiseLike<IAmazonImage[]> {
     if (!params.q || params.q.length < 3) {
       return $q.when([{ message: 'Please enter at least 3 characters...', disabled: true }]) as any;
     }
@@ -33,7 +32,7 @@ export class AwsImageReader {
       .catch(() => [] as IAmazonImage[]);
   }
 
-  public getImage(amiName: string, region: string, credentials: string): IPromise<IAmazonImage> {
+  public getImage(amiName: string, region: string, credentials: string): PromiseLike<IAmazonImage> {
     return API.one('images')
       .one(credentials)
       .one(region)

diff --git a/app/scripts/modules/amazon/src/instance/amazon.instance.write.service.ts b/app/scripts/modules/amazon/src/instance/amazon.instance.write.service.ts
@@ -1,4 +1,4 @@
-import { IPromise, module } from 'angular';
+import { module } from 'angular';
 
 import {
   Application,
@@ -32,7 +32,7 @@ export class AmazonInstanceWriter extends InstanceWriter {
     instanceGroups: IMultiInstanceGroup[],
     application: Application,
     targetGroupNames: string[],
-  ): IPromise<ITask> {
+  ): PromiseLike<ITask> {
     const jobs = this.buildMultiInstanceJob(
       instanceGroups,
       'deregisterInstancesFromLoadBalancer',
@@ -50,7 +50,7 @@ export class AmazonInstanceWriter extends InstanceWriter {
     instance: IAmazonInstance,
     application: Application,
     params: any = {},
-  ): IPromise<ITask> {
+  ): PromiseLike<ITask> {
     params.type = 'deregisterInstancesFromLoadBalancer';
     params.instanceIds = [instance.id];
     params.targetGroupNames = instance.targetGroups;
@@ -86,7 +86,7 @@ export class AmazonInstanceWriter extends InstanceWriter {
     instance: IAmazonInstance,
     application: Application,
     params: any = {},
-  ): IPromise<ITask> {
+  ): PromiseLike<ITask> {
     params.type = 'registerInstancesWithLoadBalancer';
     params.instanceIds = [instance.id];
     params.targetGroupNames = instance.targetGroups;

diff --git a/app/scripts/modules/amazon/src/loadBalancer/OidcConfigReader.ts b/app/scripts/modules/amazon/src/loadBalancer/OidcConfigReader.ts
@@ -1,5 +1,3 @@
-import { IPromise } from 'angular';
-
 import { API } from '@spinnaker/core';
 
 export interface IAuthenticateOidcActionConfig {
@@ -17,7 +15,7 @@ export interface IAuthenticateOidcActionConfig {
 }
 
 export class OidcConfigReader {
-  public static getOidcConfigsByApp(app: string): IPromise<IAuthenticateOidcActionConfig[]> {
+  public static getOidcConfigsByApp(app: string): PromiseLike<IAuthenticateOidcActionConfig[]> {
     return API.one('oidcConfigs').withParams({ app }).getList();
   }
 }
diff --git a/app/scripts/modules/amazon/src/loadBalancer/amazonLoadBalancerDataUtils.ts b/app/scripts/modules/amazon/src/loadBalancer/amazonLoadBalancerDataUtils.ts
@@ -1,4 +1,3 @@
-import { IPromise } from 'angular';
 import { $q } from 'ngimport';
 import { flatten } from 'lodash';
 
@@ -43,7 +42,7 @@ export class AmazonLoadBalancerDataUtils {
   public static populateTargetGroups(
     application: Application,
     serverGroup: IAmazonServerGroup,
-  ): IPromise<ITargetGroup[]> {
+  ): PromiseLike<ITargetGroup[]> {
     return $q
       .all([AccountService.getAccountDetails(serverGroup.account), application.getDataSource('loadBalancers').ready()])
       .then((data) => {

diff --git a/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetails.controller.ts b/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetails.controller.ts
@@ -1,4 +1,4 @@
-import { IController, IPromise, IQService, IScope, module } from 'angular';
+import { IController, IQService, IScope, module } from 'angular';
 import { StateService } from '@uirouter/angularjs';
 import { head, sortBy } from 'lodash';
 
@@ -94,7 +94,7 @@ export class AwsLoadBalancerDetailsController implements IController {
     this.$state.go('^', null, { location: 'replace' });
   }
 
-  public extractLoadBalancer(): IPromise<void> {
+  public extractLoadBalancer(): PromiseLike<void> {
     const appLoadBalancer = this.app.loadBalancers.data.find((test: ILoadBalancer) => {
       return (
         test.name === this.loadBalancerFromParams.name &&

diff --git a/app/scripts/modules/amazon/src/loadBalancer/details/targetGroupDetails.controller.ts b/app/scripts/modules/amazon/src/loadBalancer/details/targetGroupDetails.controller.ts
@@ -1,4 +1,4 @@
-import { IController, IPromise, IQService, IScope, module } from 'angular';
+import { IController, IQService, IScope, module } from 'angular';
 import { StateService } from '@uirouter/angularjs';
 
 import { Application, ILoadBalancer, MANAGED_RESOURCE_DETAILS_INDICATOR } from '@spinnaker/core';
@@ -53,7 +53,7 @@ export class AwsTargetGroupDetailsController implements IController {
     this.$state.go('^', null, { location: 'replace' });
   }
 
-  public extractTargetGroup(): IPromise<void> {
+  public extractTargetGroup(): PromiseLike<void> {
     const { loadBalancerName, region, accountId, name } = this.targetGroupFromParams;
 
     const appLoadBalancer: IAmazonApplicationLoadBalancer = this.app.loadBalancers.data.find((test: ILoadBalancer) => {

diff --git a/app/scripts/modules/amazon/src/loadBalancer/loadBalancer.transformer.ts b/app/scripts/modules/amazon/src/loadBalancer/loadBalancer.transformer.ts
@@ -25,7 +25,6 @@ import {
   ITargetGroup,
 } from 'amazon/domain';
 import { VpcReader } from 'amazon/vpc/VpcReader';
-import { IPromise } from 'angular';
 import { chain, filter, flatten, map } from 'lodash';
 
 import { $q } from 'ngimport';
@@ -112,7 +111,7 @@ export class AwsLoadBalancerTransformer {
     });
   }
 
-  private normalizeTargetGroup(targetGroup: ITargetGroup): IPromise<ITargetGroup> {
+  private normalizeTargetGroup(targetGroup: ITargetGroup): PromiseLike<ITargetGroup> {
     this.normalizeServerGroups(targetGroup.serverGroups, targetGroup, 'targetGroups', 'TargetGroup');
 
     const activeServerGroups = filter(targetGroup.serverGroups, { isDisabled: false });
@@ -153,7 +152,7 @@ export class AwsLoadBalancerTransformer {
     }
   }
 
-  public normalizeLoadBalancer(loadBalancer: IAmazonLoadBalancer): IPromise<IAmazonLoadBalancer> {
+  public normalizeLoadBalancer(loadBalancer: IAmazonLoadBalancer): PromiseLike<IAmazonLoadBalancer> {
     this.normalizeServerGroups(loadBalancer.serverGroups, loadBalancer, 'loadBalancers', 'LoadBalancer');
 
     let serverGroups = loadBalancer.serverGroups;

diff --git a/.../pipeline/stages/deployCloudFormation/evaluateCloudFormationChangeSetExecution.service.ts b/.../pipeline/stages/deployCloudFormation/evaluateCloudFormationChangeSetExecution.service.ts
@@ -1,4 +1,4 @@
-import { IPromise, module } from 'angular';
+import { module } from 'angular';
 import { EXECUTION_SERVICE, ExecutionService } from '@spinnaker/core';
 import { IExecution, IExecutionStage } from '@spinnaker/core';
 import { Application } from '@spinnaker/core';
@@ -12,7 +12,7 @@ export class EvaluateCloudFormationChangeSetExecutionService {
     execution: IExecution,
     stage: IExecutionStage,
     changeSetExecutionChoice: string,
-  ): IPromise<void> {
+  ): PromiseLike<void> {
     const matcher = (result: IExecution) => {
       const match = result.stages.find((test: { id: any }) => test.id === stage.id);
       return match && match.status !== 'RUNNING';

diff --git a/app/scripts/modules/amazon/src/serverGroup/configure/serverGroupConfiguration.service.ts b/app/scripts/modules/amazon/src/serverGroup/configure/serverGroupConfiguration.service.ts
@@ -1,4 +1,4 @@
-import { module, IPromise } from 'angular';
+import { module } from 'angular';
 import { $q } from 'ngimport';
 import {
   chain,
@@ -150,7 +150,7 @@ export class AwsServerGroupConfigurationService {
     } as IAmazonServerGroupCommandBackingData;
   }
 
-  public configureCommand(application: Application, cmd: IAmazonServerGroupCommand): IPromise<void> {
+  public configureCommand(application: Application, cmd: IAmazonServerGroupCommand): PromiseLike<void> {
     this.applyOverrides('beforeConfiguration', cmd);
     // TODO: Instead of attaching these to the command itself, they could be static methods
     cmd.toggleSuspendedProcess = (command: IAmazonServerGroupCommand, process: string): void => {
@@ -222,7 +222,7 @@ export class AwsServerGroupConfigurationService {
         terminationPolicies: $q.when(clone(this.terminationPolicies)),
       })
       .then((backingData: Partial<IAmazonServerGroupCommandBackingData>) => {
-        let securityGroupReloader = $q.when();
+        let securityGroupReloader: PromiseLike<void> = $q.when();
         backingData.accounts = keys(backingData.credentialsKeyedByAccount);
         backingData.filtered = {} as IAmazonServerGroupCommandBackingDataFiltered;
         backingData.scalingProcesses = AutoScalingProcessService.listProcesses();
@@ -412,7 +412,7 @@ export class AwsServerGroupConfigurationService {
   public refreshSecurityGroups(
     command: IAmazonServerGroupCommand,
     skipCommandReconfiguration?: boolean,
-  ): IPromise<void> {
+  ): PromiseLike<void> {
     return this.cacheInitializer.refreshCache('securityGroups').then(() => {
       return this.securityGroupReader.getAllSecurityGroups().then((securityGroups) => {
         command.backingData.securityGroups = securityGroups;

diff --git a/app/scripts/modules/amazon/src/serverGroup/details/amazonServerGroupDetailsGetter.ts b/app/scripts/modules/amazon/src/serverGroup/details/amazonServerGroupDetailsGetter.ts
@@ -1,4 +1,3 @@
-import { IPromise } from 'angular';
 import { isEmpty } from 'lodash';
 import { Observable } from 'rxjs';
 
@@ -8,7 +7,7 @@ import { AwsReactInjector } from 'amazon/reactShims';
 import { AutoScalingProcessService } from './scalingProcesses/AutoScalingProcessService';
 import { IAmazonLoadBalancer, IAmazonServerGroup, IAmazonServerGroupView } from 'amazon/domain';
 
-function extractServerGroupSummary(props: IServerGroupDetailsProps): IPromise<IAmazonServerGroup> {
+function extractServerGroupSummary(props: IServerGroupDetailsProps): PromiseLike<IAmazonServerGroup> {
   const { app, serverGroup } = props;
   return app.ready().then(() => {
     let summary: IAmazonServerGroup = app.serverGroups.data.find((toCheck: IAmazonServerGroup) => {

diff --git a/app/scripts/modules/amazon/src/serverGroup/serverGroup.transformer.ts b/app/scripts/modules/amazon/src/serverGroup/serverGroup.transformer.ts
@@ -1,4 +1,4 @@
-import { module, IPromise } from 'angular';
+import { module } from 'angular';
 import { defaults } from 'lodash';
 
 import { IVpc } from '@spinnaker/core';
@@ -69,7 +69,7 @@ export class AwsServerGroupTransformer {
     return view;
   }
 
-  public normalizeServerGroup(serverGroup: IAmazonServerGroup): IPromise<IAmazonServerGroup> {
+  public normalizeServerGroup(serverGroup: IAmazonServerGroup): PromiseLike<IAmazonServerGroup> {
     serverGroup.instances.forEach((instance) => {
       instance.vpcId = serverGroup.vpcId;
     });

diff --git a/app/scripts/modules/appengine/src/instance/details/details.controller.ts b/app/scripts/modules/appengine/src/instance/details/details.controller.ts
@@ -1,4 +1,4 @@
-import { IController, IPromise, IQService, module } from 'angular';
+import { IController, IQService, module } from 'angular';
 import { cloneDeep, flattenDeep } from 'lodash';
 
 import {
@@ -82,7 +82,7 @@ class AppengineInstanceDetailsController implements IController {
     });
   }
 
-  private retrieveInstance(instance: InstanceFromStateParams): IPromise<IAppengineInstance> {
+  private retrieveInstance(instance: InstanceFromStateParams): PromiseLike<IAppengineInstance> {
     const instanceLocatorPredicate = (dataSource: InstanceManager) => {
       return dataSource.instances.some((possibleMatch) => possibleMatch.id === instance.instanceId);
     };

diff --git a/app/scripts/modules/appengine/src/pipeline/stages/appengineStage.controller.ts b/app/scripts/modules/appengine/src/pipeline/stages/appengineStage.controller.ts
@@ -1,4 +1,4 @@
-import { IController, IPromise } from 'angular';
+import { IController } from 'angular';
 
 import { AccountService, StageConstants } from '@spinnaker/core';
 
@@ -24,7 +24,7 @@ export class AppengineStageCtrl implements IController {
     this.$scope.stage.cloudProvider = 'appengine';
   }
 
-  protected setAccounts(): IPromise<void> {
+  protected setAccounts(): PromiseLike<void> {
     return AccountService.listAccounts('appengine').then((accounts: IAppengineAccount[]) => {
       this.$scope.accounts = accounts;
     });

diff --git a/app/scripts/modules/appengine/src/serverGroup/configure/serverGroupCommandBuilder.service.ts b/app/scripts/modules/appengine/src/serverGroup/configure/serverGroupCommandBuilder.service.ts
@@ -1,4 +1,4 @@
-import { IPromise, IQService, module } from 'angular';
+import { IQService, module } from 'angular';
 
 import {
   AccountService,
@@ -103,7 +103,7 @@ export class AppengineServerGroupCommandBuilder {
     app: Application,
     selectedProvider: string,
     mode = 'create',
-  ): IPromise<IAppengineServerGroupCommand> {
+  ): PromiseLike<IAppengineServerGroupCommand> {
     if (selectedProvider == null) {
       selectedProvider = 'appengine';
     }
@@ -139,7 +139,7 @@ export class AppengineServerGroupCommandBuilder {
   public buildServerGroupCommandFromExisting(
     app: Application,
     serverGroup: IAppengineServerGroup,
-  ): IPromise<IAppengineServerGroupCommand> {
+  ): PromiseLike<IAppengineServerGroupCommand> {
     return this.buildNewServerGroupCommand(app, 'appengine', 'clone').then((command) => {
       command.stack = serverGroup.stack;
       command.freeFormDetails = serverGroup.detail;
@@ -150,7 +150,7 @@ export class AppengineServerGroupCommandBuilder {
   public buildNewServerGroupCommandForPipeline(
     _stage: IStage,
     pipeline: IPipeline,
-  ): IPromise<{
+  ): PromiseLike<{
     viewState: {
       stage: IStage;
       pipeline: IPipeline;
@@ -179,7 +179,7 @@ export class AppengineServerGroupCommandBuilder {
     cluster: AppengineDeployDescription,
     _stage: IStage,
     pipeline: IPipeline,
-  ): ng.IPromise<IAppengineServerGroupCommand> {
+  ): PromiseLike<IAppengineServerGroupCommand> {
     return this.buildNewServerGroupCommand(app, 'appengine', 'editPipeline').then(
       (command: IAppengineServerGroupCommand) => {
         command = {

diff --git a/app/scripts/modules/cloudfoundry/src/image/image.reader.cf.ts b/app/scripts/modules/cloudfoundry/src/image/image.reader.cf.ts
@@ -1,11 +1,9 @@
-import { IPromise } from 'angular';
-
 import { API } from '@spinnaker/core';
 
 import { ICloudFoundryCluster } from 'cloudfoundry/domain';
 
 export class CloudFoundryImageReader {
-  public static findImages(account: string): IPromise<ICloudFoundryCluster[]> {
+  public static findImages(account: string): PromiseLike<ICloudFoundryCluster[]> {
     return API.one('images', 'find')
       .withParams({
         account,

diff --git a/...odules/cloudfoundry/src/serverGroup/configure/serverGroupCommandBuilderShim.service.cf.ts b/...odules/cloudfoundry/src/serverGroup/configure/serverGroupCommandBuilderShim.service.cf.ts
@@ -1,4 +1,4 @@
-import { IPromise, IQService } from 'angular';
+import { IQService } from 'angular';
 
 import { Application, IPipeline, IStage } from '@spinnaker/core';
 
@@ -13,15 +13,18 @@ export class CloudFoundryServerGroupCommandBuilderShim {
   public static $inject = ['$q'];
   constructor(private $q: IQService) {}
 
-  public buildNewServerGroupCommand(app: Application, defaults: any): IPromise<ICloudFoundryCreateServerGroupCommand> {
+  public buildNewServerGroupCommand(
+    app: Application,
+    defaults: any,
+  ): PromiseLike<ICloudFoundryCreateServerGroupCommand> {
     return this.$q.when(CloudFoundryServerGroupCommandBuilder.buildNewServerGroupCommand(app, defaults));
   }
 
   public buildServerGroupCommandFromExisting(
     app: Application,
     serverGroup: ICloudFoundryServerGroup,
     mode = 'clone',
-  ): IPromise<ICloudFoundryCreateServerGroupCommand> {
+  ): PromiseLike<ICloudFoundryCreateServerGroupCommand> {
     return this.$q.when(
       CloudFoundryServerGroupCommandBuilder.buildServerGroupCommandFromExisting(app, serverGroup, mode),
     );
@@ -30,7 +33,7 @@ export class CloudFoundryServerGroupCommandBuilderShim {
   public buildNewServerGroupCommandForPipeline(
     stage: IStage,
     pipeline: IPipeline,
-  ): IPromise<ICloudFoundryCreateServerGroupCommand> {
+  ): PromiseLike<ICloudFoundryCreateServerGroupCommand> {
     return this.$q.when(CloudFoundryServerGroupCommandBuilder.buildNewServerGroupCommandForPipeline(stage, pipeline));
   }
 
@@ -39,7 +42,7 @@ export class CloudFoundryServerGroupCommandBuilderShim {
     originalCluster: ICloudFoundryDeployConfiguration,
     stage: IStage,
     pipeline: IPipeline,
-  ): IPromise<ICloudFoundryCreateServerGroupCommand> {
+  ): PromiseLike<ICloudFoundryCreateServerGroupCommand> {
     return this.$q.when(
       CloudFoundryServerGroupCommandBuilder.buildServerGroupCommandFromPipeline(
         application,
@@ -53,7 +56,7 @@ export class CloudFoundryServerGroupCommandBuilderShim {
   public buildCloneServerGroupCommandFromPipeline(
     stage: IStage,
     pipeline: IPipeline,
-  ): IPromise<ICloudFoundryCreateServerGroupCommand> {
+  ): PromiseLike<ICloudFoundryCreateServerGroupCommand> {
     return this.$q.when(
       CloudFoundryServerGroupCommandBuilder.buildCloneServerGroupCommandFromPipeline(stage, pipeline),
     );

diff --git a/app/scripts/modules/cloudfoundry/src/serverGroup/details/cfServerGroupDetailsGetter.ts b/app/scripts/modules/cloudfoundry/src/serverGroup/details/cfServerGroupDetailsGetter.ts
@@ -1,13 +1,11 @@
-import { IPromise } from 'angular';
-
 import { isEmpty } from 'lodash';
 import { Observable } from 'rxjs';
 
 import { IServerGroupDetailsProps, ServerGroupReader } from '@spinnaker/core';
 
 import { ICloudFoundryLoadBalancer, ICloudFoundryServerGroup } from 'cloudfoundry/domain';
 
-function extractServerGroupSummary(props: IServerGroupDetailsProps): IPromise<ICloudFoundryServerGroup> {
+function extractServerGroupSummary(props: IServerGroupDetailsProps): PromiseLike<ICloudFoundryServerGroup> {
   const { app, serverGroup } = props;
   return app.ready().then(() => {
     let summary: ICloudFoundryServerGroup = app.serverGroups.data.find((toCheck: ICloudFoundryServerGroup) => {

diff --git a/app/scripts/modules/cloudfoundry/src/serverGroup/serverGroup.transformer.ts b/app/scripts/modules/cloudfoundry/src/serverGroup/serverGroup.transformer.ts
@@ -1,5 +1,3 @@
-import { IPromise } from 'angular';
-
 import { defaults } from 'lodash';
 
 import { ICloudFoundryServerGroup, ICloudFoundryEnvVar } from 'cloudfoundry/domain';
@@ -12,7 +10,7 @@ export class CloudFoundryServerGroupTransformer {
     return serverGroup;
   }
 
-  public normalizeServerGroup(serverGroup: ICloudFoundryServerGroup): IPromise<ICloudFoundryServerGroup> {
+  public normalizeServerGroup(serverGroup: ICloudFoundryServerGroup): PromiseLike<ICloudFoundryServerGroup> {
     return this.$q.resolve(serverGroup);
   }