chore(tslint): ❯ npx tslint --fix -p tsconfig.json

spinnaker · Apr 10, 2018 · b1ddb67 · b1ddb67
1 parent e74be82
commit b1ddb67
Show file tree

Hide file tree

Showing 168 changed files with 382 additions and 399 deletions.
diff --git a/app/scripts/modules/amazon/src/aws.settings.ts b/app/scripts/modules/amazon/src/aws.settings.ts
@@ -28,7 +28,7 @@ export interface IAWSProviderSettings extends IProviderSettings {
   disableSpotPricing?: boolean;
 }
 
-export const AWSProviderSettings: IAWSProviderSettings = <IAWSProviderSettings>SETTINGS.providers.aws || {
+export const AWSProviderSettings: IAWSProviderSettings = (SETTINGS.providers.aws as IAWSProviderSettings) || {
   defaults: {},
 };
 if (AWSProviderSettings) {

diff --git a/app/scripts/modules/amazon/src/domain/IAmazonLoadBalancerSourceData.ts b/app/scripts/modules/amazon/src/domain/IAmazonLoadBalancerSourceData.ts
@@ -109,10 +109,10 @@ export interface IApplicationLoadBalancerCertificateSourceData {
 
 export interface IApplicationLoadBalancerListenerSourceData {
   certificates?: IApplicationLoadBalancerCertificateSourceData[];
-  defaultActions: {
+  defaultActions: Array<{
     targetGroupName: string;
     type: 'forward';
-  }[];
+  }>;
   listenerArn: string;
   loadBalancerName: string;
   port: number;
@@ -142,16 +142,16 @@ export interface IClassicLoadBalancerSourceData extends IAmazonLoadBalancerSourc
     unhealthyThreshold: number;
   };
   instances: string[];
-  listenerDescriptions: { listener: IClassicListenerSourceData; policyNames: string[] }[];
+  listenerDescriptions: Array<{ listener: IClassicListenerSourceData; policyNames: string[] }>;
   policies: {
-    appCookieStickinessPolicies: {
+    appCookieStickinessPolicies: Array<{
       CookieName: string;
       PolicyName: string;
-    }[];
-    lbcookieStickinessPolicies: {
+    }>;
+    lbcookieStickinessPolicies: Array<{
       CookieExpirationPeriod: string;
       PolicyName: string;
-    }[];
+    }>;
     otherPolicies: any[];
   };
   sourceSecurityGroup: {

diff --git a/app/scripts/modules/amazon/src/domain/IAmazonServerGroup.ts b/app/scripts/modules/amazon/src/domain/IAmazonServerGroup.ts
@@ -9,7 +9,7 @@ export interface IAmazonAsg extends IAsg {
   healthCheckType: string;
   healthCheckGracePeriod: number;
   terminationPolicies: string[];
-  enabledMetrics: { metric: string }[];
+  enabledMetrics: Array<{ metric: string }>;
   vpczoneIdentifier?: string;
 }
 

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
@@ -48,7 +48,7 @@ export class AmazonInstanceWriter extends InstanceWriter {
     const descriptor = this.buildMultiInstanceDescriptor(jobs, 'Deregister', `from ${targetGroupNames.join(' and ')}`);
     return this.taskExecutor.executeTask({
       job: jobs,
-      application: application,
+      application,
       description: descriptor,
     });
   }
@@ -66,7 +66,7 @@ export class AmazonInstanceWriter extends InstanceWriter {
     params.cloudProvider = instance.cloudProvider;
     return this.taskExecutor.executeTask({
       job: [params],
-      application: application,
+      application,
       description: `Deregister instance: ${instance.id}`,
     });
   }
@@ -84,7 +84,7 @@ export class AmazonInstanceWriter extends InstanceWriter {
     const descriptor = this.buildMultiInstanceDescriptor(jobs, 'Register', `with ${targetGroupNames.join(' and ')}`);
     return this.taskExecutor.executeTask({
       job: jobs,
-      application: application,
+      application,
       description: descriptor,
     });
   }
@@ -102,7 +102,7 @@ export class AmazonInstanceWriter extends InstanceWriter {
     params.cloudProvider = instance.cloudProvider;
     return this.taskExecutor.executeTask({
       job: [params],
-      application: application,
+      application,
       description: `Register instance: ${instance.id}`,
     });
   }

diff --git a/app/scripts/modules/amazon/src/loadBalancer/configure/common/LoadBalancerLocation.tsx b/app/scripts/modules/amazon/src/loadBalancer/configure/common/LoadBalancerLocation.tsx
@@ -165,7 +165,7 @@ class LoadBalancerLocationImpl extends React.Component<
       region = this.props.values.region;
     return ReactInjector.subnetReader.listSubnets().then(subnets => {
       return chain(subnets)
-        .filter({ account: account, region: region })
+        .filter({ account, region })
         .reject({ target: 'ec2' })
         .value();
     });

diff --git a/app/scripts/modules/amazon/src/loadBalancer/configure/common/SecurityGroups.tsx b/app/scripts/modules/amazon/src/loadBalancer/configure/common/SecurityGroups.tsx
@@ -20,7 +20,7 @@ import { AWSProviderSettings } from 'amazon/aws.settings';
 import { IAmazonClassicLoadBalancerUpsertCommand } from 'amazon/domain';
 
 export interface ISecurityGroupsState {
-  availableSecurityGroups: { label: string; value: string }[];
+  availableSecurityGroups: Array<{ label: string; value: string }>;
   defaultSecurityGroups: string[];
   loaded: boolean;
   refreshing: boolean;
@@ -93,7 +93,7 @@ class SecurityGroupsImpl extends React.Component<
 
     const newRemoved = removed.slice();
 
-    let availableSecurityGroups: { label: string; value: string }[] = [];
+    let availableSecurityGroups: Array<{ label: string; value: string }> = [];
 
     if (
       account &&
@@ -158,7 +158,7 @@ class SecurityGroupsImpl extends React.Component<
       });
   }
 
-  private handleSecurityGroupsChanged(newValues: { label: string; value: string }[]): void {
+  private handleSecurityGroupsChanged(newValues: Array<{ label: string; value: string }>): void {
     this.props.setFieldValue('securityGroups', newValues.map(sg => sg.value));
   }
 

diff --git a/...s/modules/amazon/src/loadBalancer/configure/common/createAmazonLoadBalancer.controller.ts b/...s/modules/amazon/src/loadBalancer/configure/common/createAmazonLoadBalancer.controller.ts
@@ -282,7 +282,7 @@ export abstract class CreateAmazonLoadBalancerCtrl {
       region = this.loadBalancerCommand.region;
     return this.subnetReader.listSubnets().then(subnets => {
       return chain(subnets)
-        .filter({ account: account, region: region })
+        .filter({ account, region })
         .reject({ target: 'ec2' })
         .value();
     });

diff --git a/app/scripts/modules/amazon/src/loadBalancer/details/LoadBalancerActions.tsx b/app/scripts/modules/amazon/src/loadBalancer/details/LoadBalancerActions.tsx
@@ -89,7 +89,7 @@ export class LoadBalancerActions extends React.Component<ILoadBalancerActionsPro
       account: loadBalancerFromParams.accountId,
       applicationName: app.name,
       taskMonitorConfig: taskMonitor,
-      submitMethod: submitMethod,
+      submitMethod,
     });
   }
 

diff --git a/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetails.controller.spec.ts b/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetails.controller.spec.ts
@@ -32,10 +32,10 @@ describe('Controller: LoadBalancerDetailsCtrl', function() {
         const app = applicationModelBuilder.createApplication('app', { key: 'loadBalancers', lazy: true });
         app.loadBalancers.data.push(loadBalancer);
         controller = $controller(AwsLoadBalancerDetailsController, {
-          $scope: $scope,
-          loadBalancer: loadBalancer,
-          app: app,
-          $state: $state,
+          $scope,
+          loadBalancer,
+          app,
+          $state,
         });
       },
     ),

diff --git a/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetails.controller.ts b/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetails.controller.ts
@@ -39,7 +39,7 @@ export interface ILoadBalancerFromStateParams {
 export class AwsLoadBalancerDetailsController implements IController {
   public application: Application;
   public elbProtocol: string;
-  public listeners: { in: string; targets: ITargetGroup[] }[];
+  public listeners: Array<{ in: string; targets: ITargetGroup[] }>;
   public loadBalancerFromParams: ILoadBalancerFromStateParams;
   public loadBalancer: IAmazonLoadBalancer;
   public securityGroups: ISecurityGroup[];

diff --git a/app/scripts/modules/amazon/src/loadBalancer/loadBalancer.transformer.ts b/app/scripts/modules/amazon/src/loadBalancer/loadBalancer.transformer.ts
@@ -293,7 +293,7 @@ export class AwsLoadBalancerTransformer {
             protocol: listener.protocol,
             port: listener.port,
             defaultActions: listener.defaultActions,
-            certificates: certificates,
+            certificates,
             rules: listener.rules || [],
             sslPolicy: listener.sslPolicy,
           };

diff --git a/app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.ts b/app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.ts
@@ -52,7 +52,7 @@ class IngressRuleSelectorController implements IController {
     this.regionalVpcs[account].push({
       name: vpc.name,
       region: vpc.region,
-      account: account,
+      account,
       id: vpc.id,
       label: vpc.label,
       deprecated: vpc.deprecated,

diff --git a/app/scripts/modules/amazon/src/serverGroup/configure/serverGroupConfiguration.service.ts b/app/scripts/modules/amazon/src/serverGroup/configure/serverGroupConfiguration.service.ts
@@ -254,7 +254,7 @@ export class AwsServerGroupConfigurationService {
 
   public loadImagesFromApplicationName(application: Application, provider: string): any {
     return this.awsImageReader.findImages({
-      provider: provider,
+      provider,
       q: application.name.replace(/_/g, '[_\\-]') + '*',
     });
   }

diff --git a/...ts/modules/amazon/src/serverGroup/configure/wizard/capacity/capacitySelector.component.ts b/...ts/modules/amazon/src/serverGroup/configure/wizard/capacity/capacitySelector.component.ts
@@ -6,7 +6,7 @@ module(CAPACITY_SELECTOR, []).component('awsServerGroupCapacitySelector', {
     command: '=',
   },
   templateUrl: require('./capacitySelector.component.html'),
-  controller: function() {
+  controller() {
     this.minMaxDesiredTemplate = require('./minMaxDesiredFields.template.html');
 
     this.preferSourceCapacityOptions = [

diff --git a/...amazon/src/serverGroup/configure/wizard/securityGroups/securityGroupsRemoved.component.ts b/...amazon/src/serverGroup/configure/wizard/securityGroups/securityGroupsRemoved.component.ts
@@ -8,7 +8,7 @@ module(SECURITY_GROUPS_REMOVED, []).component('serverGroupSecurityGroupsRemoved'
     command: '=',
     removed: '=',
   },
-  controller: function() {
+  controller() {
     this.acknowledgeSecurityGroupRemoval = () => {
       if (has(this.command, 'viewState.dirty')) {
         this.command.viewState.dirty.securityGroups = null;

diff --git a/app/scripts/modules/amazon/src/serverGroup/details/AmazonServerGroupActions.tsx b/app/scripts/modules/amazon/src/serverGroup/details/AmazonServerGroupActions.tsx
@@ -82,7 +82,7 @@ export class AmazonServerGroupActions extends React.Component<IAmazonServerGroup
       provider: 'aws',
       taskMonitorConfig: taskMonitor,
       interestingHealthProviderNames: undefined as string[],
-      submitMethod: submitMethod,
+      submitMethod,
       askForReason: true,
       platformHealthOnlyShowOverride: app.attributes.platformHealthOnlyShowOverride,
       platformHealthType: 'Amazon',
@@ -123,7 +123,7 @@ export class AmazonServerGroupActions extends React.Component<IAmazonServerGroup
       taskMonitorConfig: taskMonitor,
       platformHealthOnlyShowOverride: app.attributes.platformHealthOnlyShowOverride,
       platformHealthType: 'Amazon',
-      submitMethod: submitMethod,
+      submitMethod,
       askForReason: true,
     };
 
@@ -181,7 +181,7 @@ export class AmazonServerGroupActions extends React.Component<IAmazonServerGroup
       taskMonitorConfig: taskMonitor,
       platformHealthOnlyShowOverride: app.attributes.platformHealthOnlyShowOverride,
       platformHealthType: 'Amazon',
-      submitMethod: submitMethod,
+      submitMethod,
       askForReason: true,
     };
 

diff --git a/...es/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.ts b/...es/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.ts
@@ -6,7 +6,7 @@ const scalingPolicyPopover: IComponentOptions = {
     serverGroup: '=',
   },
   templateUrl: require('./scalingPolicyPopover.component.html'),
-  controller: function() {
+  controller() {
     this.$onInit = () => {
       this.alarm = this.policy.alarms[0];
 

diff --git a/...n/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.controller.ts b/...n/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.controller.ts
@@ -103,7 +103,7 @@ export class UpsertTargetTrackingController implements IComponentController {
       adjustmentType: null,
       name: this.policy.policyName,
       estimatedInstanceWarmup: this.policy.estimatedInstanceWarmup || 600,
-      targetTrackingConfiguration: Object.assign({}, this.policy.targetTrackingConfiguration),
+      targetTrackingConfiguration: { ...this.policy.targetTrackingConfiguration },
     };
   }
 }
diff --git a/...mazon/src/serverGroup/details/scalingPolicy/upsert/alarm/metricSelector.component.spec.ts b/...mazon/src/serverGroup/details/scalingPolicy/upsert/alarm/metricSelector.component.spec.ts
@@ -38,11 +38,11 @@ describe('Component: metric selector', () => {
   );
 
   const initialize = () => {
-    $ctrl = <MetricSelectorController>$componentController(
+    $ctrl = $componentController(
       'awsMetricSelector',
       { $scope, cloudMetricsReader },
       { alarm, serverGroup, alarmUpdated },
-    );
+    ) as MetricSelectorController;
     $ctrl.$onInit();
   };
 

diff --git a/...les/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/metricSelector.component.ts b/...les/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/metricSelector.component.ts
@@ -116,17 +116,15 @@ export class MetricSelectorController implements IController {
   }
 
   private buildMetricOption(metric: ICloudMetricDescriptor): IMetricOption {
-    const option: IMetricOption = Object.assign(
-      {
-        label: `(${metric.namespace}) ${metric.name}`,
-        dimensions: [],
-        dimensionValues: metric.dimensions
-          .sort(dimensionSorter)
-          .map(d => d.value)
-          .join(', '),
-      },
-      metric,
-    );
+    const option: IMetricOption = {
+      label: `(${metric.namespace}) ${metric.name}`,
+      dimensions: [],
+      dimensionValues: metric.dimensions
+        .sort(dimensionSorter)
+        .map(d => d.value)
+        .join(', '),
+      ...metric,
+    };
     return option;
   }
 

diff --git a/...es/amazon/src/serverGroup/details/scalingPolicy/upsert/step/stepPolicyAction.component.ts b/...es/amazon/src/serverGroup/details/scalingPolicy/upsert/step/stepPolicyAction.component.ts
@@ -9,7 +9,7 @@ const stepPolicyActionComponent = {
     boundsChanged: '&',
   },
   templateUrl: require('./stepPolicyAction.component.html'),
-  controller: function() {
+  controller() {
     this.operatorChanged = () => {
       this.command.adjustmentType = this.viewState.operator === 'Set to' ? 'ExactCapacity' : 'ChangeInCapacity';
       this.adjustmentTypeOptions =

diff --git a/app/scripts/modules/amazon/src/serverGroup/details/sections/SecurityGroupsDetailsSection.tsx b/app/scripts/modules/amazon/src/serverGroup/details/sections/SecurityGroupsDetailsSection.tsx
@@ -29,7 +29,7 @@ export class SecurityGroupsDetailsSection extends React.Component<
       securityGroups = chain(serverGroup.launchConfig.securityGroups)
         .map((id: string) => {
           return (
-            find(app.securityGroups.data, { accountName: serverGroup.account, region: serverGroup.region, id: id }) ||
+            find(app.securityGroups.data, { accountName: serverGroup.account, region: serverGroup.region, id }) ||
             find(app.securityGroups.data, { accountName: serverGroup.account, region: serverGroup.region, name: id })
           );
         })

diff --git a/app/scripts/modules/amazon/src/serverGroup/serverGroup.transformer.ts b/app/scripts/modules/amazon/src/serverGroup/serverGroup.transformer.ts
@@ -46,7 +46,7 @@ export class AwsServerGroupTransformer {
   }
 
   public transformScalingPolicy(policy: IScalingPolicy): IScalingPolicyView {
-    const view: IScalingPolicyView = Object.assign({}, policy) as IScalingPolicyView;
+    const view: IScalingPolicyView = { ...policy } as IScalingPolicyView;
     const upperBoundSorter = (a: IStepAdjustmentView, b: IStepAdjustmentView) =>
         b.metricIntervalUpperBound - a.metricIntervalUpperBound,
       lowerBoundSorter = (a: IStepAdjustmentView, b: IStepAdjustmentView) =>
@@ -66,7 +66,7 @@ export class AwsServerGroupTransformer {
   }
 
   public normalizeServerGroupDetails(serverGroup: IAmazonServerGroup): IAmazonServerGroupView {
-    const view: IAmazonServerGroupView = Object.assign({}, serverGroup) as IAmazonServerGroupView;
+    const view: IAmazonServerGroupView = { ...serverGroup } as IAmazonServerGroupView;
     if (serverGroup.scalingPolicies) {
       view.scalingPolicies = serverGroup.scalingPolicies.map(policy => this.transformScalingPolicy(policy));
     }

diff --git a/app/scripts/modules/amazon/src/validation/applicationName.validator.ts b/app/scripts/modules/amazon/src/validation/applicationName.validator.ts
@@ -74,8 +74,8 @@ class AmazonApplicationNameValidator implements IApplicationNameValidator {
     }
 
     return {
-      warnings: warnings,
-      errors: errors,
+      warnings,
+      errors,
     };
   }
 }

diff --git a/app/scripts/modules/appengine/src/appengine.settings.ts b/app/scripts/modules/appengine/src/appengine.settings.ts
@@ -8,8 +8,8 @@ export interface IAppengineProviderSettings extends IProviderSettings {
   };
 }
 
-export const AppengineProviderSettings: IAppengineProviderSettings = <IAppengineProviderSettings>SETTINGS.providers
-  .appengine || { defaults: {} };
+export const AppengineProviderSettings: IAppengineProviderSettings = (SETTINGS.providers
+  .appengine as IAppengineProviderSettings) || { defaults: {} };
 if (AppengineProviderSettings) {
   AppengineProviderSettings.resetToOriginal = SETTINGS.resetProvider('appengine');
 }
diff --git a/app/scripts/modules/appengine/src/instance/details/details.controller.ts b/app/scripts/modules/appengine/src/instance/details/details.controller.ts
@@ -68,7 +68,7 @@ class AppengineInstanceDetailsController implements IController {
     const taskMonitor = {
       application: this.app,
       title: 'Terminating ' + shortName,
-      onTaskComplete: function() {
+      onTaskComplete() {
         if (this.$state.includes('**.instanceDetails', { instanceId: instance.name })) {
           this.$state.go('^');
         }
@@ -84,7 +84,7 @@ class AppengineInstanceDetailsController implements IController {
       buttonText: 'Terminate ' + shortName,
       account: instance.account,
       taskMonitorConfig: taskMonitor,
-      submitMethod: submitMethod,
+      submitMethod,
     });
   }
 

diff --git a/app/scripts/modules/appengine/src/loadBalancer/details/details.controller.ts b/app/scripts/modules/appengine/src/loadBalancer/details/details.controller.ts
@@ -79,7 +79,7 @@ class AppengineLoadBalancerDetailsController implements IController {
       body: this.getConfirmationModalBodyHtml(),
       account: this.loadBalancer.account,
       taskMonitorConfig: taskMonitor,
-      submitMethod: submitMethod,
+      submitMethod,
     });
   }
 

diff --git a/app/scripts/modules/appengine/src/serverGroup/configure/serverGroupCommandBuilder.service.ts b/app/scripts/modules/appengine/src/serverGroup/configure/serverGroupCommandBuilder.service.ts
@@ -110,7 +110,7 @@ export class AppengineServerGroupCommandBuilder {
     };
 
     const viewState: IViewState = {
-      mode: mode,
+      mode,
       submitButtonLabel: this.getSubmitButtonLabel(mode),
       disableStrategySelection: mode === 'create',
     };