chore(angularjs): Explicitly annotate all AngularJS injection points

spinnaker · Feb 21, 2019 · f3fd790 · f3fd790
1 parent 2ba3b8d
commit f3fd790
Show file tree

Hide file tree

Showing 584 changed files with 1,036 additions and 867 deletions.
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
@@ -23,6 +23,7 @@ export interface IAmazonMultiInstanceJob extends IMultiInstanceJob {
 }
 
 export class AmazonInstanceWriter extends InstanceWriter {
+  public static $inject = ['providerServiceDelegate'];
   public constructor(protected providerServiceDelegate: ProviderServiceDelegate) {
     'ngInject';
     super(providerServiceDelegate);

diff --git a/app/scripts/modules/amazon/src/instance/awsInstanceType.service.js b/app/scripts/modules/amazon/src/instance/awsInstanceType.service.js
@@ -7,7 +7,7 @@ import { API } from '@spinnaker/core';
 
 module.exports = angular
   .module('spinnaker.amazon.instanceType.service', [])
-  .factory('awsInstanceTypeService', function($http, $q) {
+  .factory('awsInstanceTypeService', ['$http', '$q', function($http, $q) {
     var m5 = {
       type: 'm5',
       description:
@@ -289,4 +289,4 @@ module.exports = angular
       filterInstanceTypes,
       isEbsOptimized,
     };
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/instance/details/instance.details.controller.js b/app/scripts/modules/amazon/src/instance/details/instance.details.controller.js
@@ -22,7 +22,7 @@ module.exports = angular
     require('../../vpc/vpcTag.directive').name,
     CONFIRMATION_MODAL_SERVICE,
   ])
-  .controller('awsInstanceDetailsCtrl', function(
+  .controller('awsInstanceDetailsCtrl', ['$scope', '$state', '$uibModal', 'amazonInstanceWriter', 'confirmationModalService', 'instance', 'app', 'moniker', 'environment', '$q', 'overrides', function(
     $scope,
     $state,
     $uibModal,
@@ -514,4 +514,4 @@ module.exports = angular
     });
 
     $scope.account = instance.account;
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetails.controller.ts b/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetails.controller.ts
@@ -52,6 +52,7 @@ export class AwsLoadBalancerDetailsController implements IController {
   public firewallsLabel = FirewallLabels.get('Firewalls');
   public oidcConfigPath = SETTINGS.oidcConfigPath;
 
+  public static $inject = ['$scope', '$state', '$q', 'loadBalancer', 'app', 'securityGroupReader', 'loadBalancerReader'];
   constructor(
     private $scope: IScope,
     private $state: StateService,

diff --git a/app/scripts/modules/amazon/src/loadBalancer/details/targetGroupDetails.controller.ts b/app/scripts/modules/amazon/src/loadBalancer/details/targetGroupDetails.controller.ts
@@ -21,6 +21,7 @@ export class AwsTargetGroupDetailsController implements IController {
   public targetGroup: ITargetGroup;
   public loadBalancer: IAmazonApplicationLoadBalancer;
 
+  public static $inject = ['$scope', '$q', '$state', 'targetGroup', 'app'];
   constructor(
     private $scope: IScope,
     private $q: IQService,

diff --git a/app/scripts/modules/amazon/src/loadBalancer/targetGroup.states.ts b/app/scripts/modules/amazon/src/loadBalancer/targetGroup.states.ts
@@ -7,7 +7,7 @@ import { TargetGroupDetails } from './TargetGroupDetails';
 
 export const TARGET_GROUP_STATES = 'spinnaker.amazon.loadBalancer.targetGroup.states';
 module(TARGET_GROUP_STATES, [APPLICATION_STATE_PROVIDER]).config(
-  (applicationStateProvider: ApplicationStateProvider) => {
+  ['applicationStateProvider', (applicationStateProvider: ApplicationStateProvider) => {
     const targetGroupDetails: INestedState = {
       name: 'targetGroupDetails',
       url: '/targetGroupDetails/:provider/:accountId/:region/:vpcId/:loadBalancerName/:name',
@@ -49,5 +49,5 @@ module(TARGET_GROUP_STATES, [APPLICATION_STATE_PROVIDER]).config(
     };
 
     applicationStateProvider.addInsightDetailState(targetGroupDetails);
-  },
+  }],
 );
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/bake/awsBakeStage.js b/app/scripts/modules/amazon/src/pipeline/stages/bake/awsBakeStage.js
@@ -41,7 +41,7 @@ module.exports = angular
       restartable: true,
     });
   })
-  .controller('awsBakeStageCtrl', function($scope, $q, $uibModal) {
+  .controller('awsBakeStageCtrl', ['$scope', '$q', '$uibModal', function($scope, $q, $uibModal) {
     $scope.stage.extendedAttributes = $scope.stage.extendedAttributes || {};
     $scope.stage.regions = ($scope.stage.regions && $scope.stage.regions.sort()) || [];
 
@@ -164,4 +164,4 @@ module.exports = angular
     $scope.$watch('stage', deleteEmptyProperties, true);
 
     initialize();
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeExecutionDetails.controller.js b/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeExecutionDetails.controller.js
@@ -7,7 +7,7 @@ import { SETTINGS } from '@spinnaker/core';
 
 module.exports = angular
   .module('spinnaker.amazon.pipeline.stage.bake.executionDetails.controller', [require('@uirouter/angularjs').default])
-  .controller('awsBakeExecutionDetailsCtrl', function(
+  .controller('awsBakeExecutionDetailsCtrl', ['$scope', '$stateParams', 'executionDetailsSectionService', '$interpolate', function(
     $scope,
     $stateParams,
     executionDetailsSectionService,
@@ -29,4 +29,4 @@ module.exports = angular
     initialize();
 
     $scope.$on('$stateChangeSuccess', initialize);
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/awsCloneServerGroupStage.js b/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/awsCloneServerGroupStage.js
@@ -22,7 +22,7 @@ module.exports = angular
       ],
     });
   })
-  .controller('awsCloneServerGroupStageCtrl', function($scope) {
+  .controller('awsCloneServerGroupStageCtrl', ['$scope', function($scope) {
     let stage = $scope.stage;
 
     $scope.viewState = {
@@ -128,4 +128,4 @@ module.exports = angular
         stage.useAmiBlockDeviceMappings = false;
       }
     };
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/awsDestroyAsgStage.js b/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/awsDestroyAsgStage.js
@@ -28,7 +28,7 @@ module.exports = angular
       ],
     });
   })
-  .controller('awsDestroyAsgStageCtrl', function($scope) {
+  .controller('awsDestroyAsgStageCtrl', ['$scope', function($scope) {
     let stage = $scope.stage;
 
     $scope.state = {
@@ -58,4 +58,4 @@ module.exports = angular
     if (!stage.target) {
       stage.target = $scope.targets[0].val;
     }
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/awsDisableAsgStage.js b/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/awsDisableAsgStage.js
@@ -26,7 +26,7 @@ module.exports = angular
       ],
     });
   })
-  .controller('awsDisableAsgStageCtrl', function($scope) {
+  .controller('awsDisableAsgStageCtrl', ['$scope', function($scope) {
     let stage = $scope.stage;
 
     $scope.state = {
@@ -62,4 +62,4 @@ module.exports = angular
     if (!stage.target) {
       stage.target = $scope.targets[0].val;
     }
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/disableCluster/awsDisableClusterStage.js b/app/scripts/modules/amazon/src/pipeline/stages/disableCluster/awsDisableClusterStage.js
@@ -23,7 +23,7 @@ module.exports = angular
       ],
     });
   })
-  .controller('awsDisableClusterStageCtrl', function($scope) {
+  .controller('awsDisableClusterStageCtrl', ['$scope', function($scope) {
     var ctrl = this;
 
     let stage = $scope.stage;
@@ -76,4 +76,4 @@ module.exports = angular
       stage.preferLargerOverNewer = 'false';
     }
     stage.preferLargerOverNewer = stage.preferLargerOverNewer.toString();
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/awsEnableAsgStage.js b/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/awsEnableAsgStage.js
@@ -21,7 +21,7 @@ module.exports = angular
       ],
     });
   })
-  .controller('awsEnableAsgStageCtrl', function($scope) {
+  .controller('awsEnableAsgStageCtrl', ['$scope', function($scope) {
     var ctrl = this;
 
     let stage = $scope.stage;
@@ -66,4 +66,4 @@ module.exports = angular
     }
 
     $scope.$watch('stage.credentials', $scope.accountUpdated);
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/findAmi/awsFindAmiStage.js b/app/scripts/modules/amazon/src/pipeline/stages/findAmi/awsFindAmiStage.js
@@ -20,7 +20,7 @@ module.exports = angular
       ],
     });
   })
-  .controller('awsFindAmiStageCtrl', function($scope) {
+  .controller('awsFindAmiStageCtrl', ['$scope', function($scope) {
     let stage = $scope.stage;
 
     $scope.state = {
@@ -71,4 +71,4 @@ module.exports = angular
     }
 
     $scope.$watch('stage.credentials', $scope.accountUpdated);
-  });
+  }]);
diff --git a/...scripts/modules/amazon/src/pipeline/stages/findImageFromTags/awsFindImageFromTagsStage.js b/...scripts/modules/amazon/src/pipeline/stages/findImageFromTags/awsFindImageFromTagsStage.js
@@ -20,12 +20,12 @@ module.exports = angular
       ],
     });
   })
-  .controller('awsFindImageFromTagsStageCtrl', function($scope) {
+  .controller('awsFindImageFromTagsStageCtrl', ['$scope', function($scope) {
     $scope.stage.tags = $scope.stage.tags || {};
     $scope.stage.regions = $scope.stage.regions || [];
     $scope.stage.cloudProvider = $scope.stage.cloudProvider || 'aws';
 
     BakeryReader.getRegions('aws').then(function(regions) {
       $scope.regions = regions;
     });
-  });
+  }]);
diff --git a/...ipts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.js b/...ipts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.js
@@ -27,7 +27,7 @@ module.exports = angular
       strategy: true,
     });
   })
-  .controller('ModifyScalingProcessStageCtrl', function($scope, stage) {
+  .controller('ModifyScalingProcessStageCtrl', ['$scope', 'stage', function($scope, stage) {
     $scope.stage = stage;
 
     $scope.state = {
@@ -89,4 +89,4 @@ module.exports = angular
     };
 
     $scope.$watch('stage.credentials', $scope.accountUpdated);
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/awsResizeAsgStage.js b/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/awsResizeAsgStage.js
@@ -29,7 +29,7 @@ module.exports = angular
       ],
     });
   })
-  .controller('awsResizeAsgStageCtrl', function($scope) {
+  .controller('awsResizeAsgStageCtrl', ['$scope', function($scope) {
     var ctrl = this;
 
     let stage = $scope.stage;
@@ -120,4 +120,4 @@ module.exports = angular
         }
       }
     };
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/rollbackCluster/awsRollbackClusterStage.js b/app/scripts/modules/amazon/src/pipeline/stages/rollbackCluster/awsRollbackClusterStage.js
@@ -18,7 +18,7 @@ module.exports = angular
       ],
     });
   })
-  .controller('awsRollbackClusterStageCtrl', function($scope) {
+  .controller('awsRollbackClusterStageCtrl', ['$scope', function($scope) {
     var ctrl = this;
 
     let stage = $scope.stage;
@@ -56,4 +56,4 @@ module.exports = angular
     if (!stage.regions.length && $scope.application.defaultRegions.aws) {
       stage.regions.push($scope.application.defaultRegions.aws);
     }
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/awsScaleDownClusterStage.js b/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/awsScaleDownClusterStage.js
@@ -26,7 +26,7 @@ module.exports = angular
       strategy: true,
     });
   })
-  .controller('awsScaleDownClusterStageCtrl', function($scope) {
+  .controller('awsScaleDownClusterStageCtrl', ['$scope', function($scope) {
     var ctrl = this;
 
     let stage = $scope.stage;
@@ -70,4 +70,4 @@ module.exports = angular
       stage.preferLargerOverNewer = 'false';
     }
     stage.preferLargerOverNewer = stage.preferLargerOverNewer.toString();
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/shrinkCluster/awsShrinkClusterStage.js b/app/scripts/modules/amazon/src/pipeline/stages/shrinkCluster/awsShrinkClusterStage.js
@@ -21,7 +21,7 @@ module.exports = angular
       ],
     });
   })
-  .controller('awsShrinkClusterStageCtrl', function($scope) {
+  .controller('awsShrinkClusterStageCtrl', ['$scope', function($scope) {
     var ctrl = this;
 
     let stage = $scope.stage;
@@ -65,4 +65,4 @@ module.exports = angular
       stage.retainLargerOverNewer = 'false';
     }
     stage.retainLargerOverNewer = stage.retainLargerOverNewer.toString();
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/tagImage/awsTagImageStage.js b/app/scripts/modules/amazon/src/pipeline/stages/tagImage/awsTagImageStage.js
@@ -15,7 +15,7 @@ module.exports = angular
       executionConfigSections: ['tagImageConfig', 'taskStatus'],
     });
   })
-  .controller('awsTagImageStageCtrl', $scope => {
+  .controller('awsTagImageStageCtrl', ['$scope', $scope => {
     $scope.stage.tags = $scope.stage.tags || {};
     $scope.stage.cloudProvider = $scope.stage.cloudProvider || 'aws';
 
@@ -27,4 +27,4 @@ module.exports = angular
       $scope.consideredStages = new Map(upstreamDependencies.map(stage => [stage.refId, stage.name]));
     };
     $scope.$watch('stage.requisiteStageRefIds', initUpstreamStages);
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/reactShims/aws.react.module.ts b/app/scripts/modules/amazon/src/reactShims/aws.react.module.ts
@@ -4,8 +4,8 @@ import { AwsNgReact } from './aws.ngReact';
 import { AwsReactInjector } from './aws.react.injector';
 
 export const AWS_REACT_MODULE = 'spinnaker.amazon.react';
-module(AWS_REACT_MODULE, []).run(function($injector: any) {
+module(AWS_REACT_MODULE, []).run(['$injector', function($injector: any) {
   // Make angular services importable and (TODO when relevant) convert angular components to react
   AwsReactInjector.initialize($injector);
   AwsNgReact.initialize($injector);
-});
+}]);
diff --git a/app/scripts/modules/amazon/src/securityGroup/clone/cloneSecurityGroup.controller.js b/app/scripts/modules/amazon/src/securityGroup/clone/cloneSecurityGroup.controller.js
@@ -9,7 +9,7 @@ module.exports = angular
   .module('spinnaker.amazon.securityGroup.clone.controller', [
     require('../configure/configSecurityGroup.mixin.controller').name,
   ])
-  .controller('awsCloneSecurityGroupController', function(
+  .controller('awsCloneSecurityGroupController', ['$scope', '$uibModalInstance', '$controller', 'securityGroup', 'application', function(
     $scope,
     $uibModalInstance,
     $controller,
@@ -95,4 +95,4 @@ module.exports = angular
     };
 
     vm.initializeSecurityGroups();
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/securityGroup/configure/CreateSecurityGroupCtrl.js b/app/scripts/modules/amazon/src/securityGroup/configure/CreateSecurityGroupCtrl.js
@@ -9,7 +9,7 @@ module.exports = angular
     require('@uirouter/angularjs').default,
     CACHE_INITIALIZER_SERVICE,
   ])
-  .controller('awsCreateSecurityGroupCtrl', function(
+  .controller('awsCreateSecurityGroupCtrl', ['$scope', '$uibModalInstance', '$state', '$controller', 'cacheInitializer', 'application', 'securityGroup', function(
     $scope,
     $uibModalInstance,
     $state,
@@ -42,4 +42,4 @@ module.exports = angular
     ctrl.upsert = () => ctrl.mixinUpsert('Create');
 
     ctrl.initializeSecurityGroups().then(ctrl.initializeAccounts);
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/securityGroup/configure/EditSecurityGroupCtrl.js b/app/scripts/modules/amazon/src/securityGroup/configure/EditSecurityGroupCtrl.js
@@ -7,7 +7,7 @@ import { SecurityGroupWriter, TaskMonitor, FirewallLabels } from '@spinnaker/cor
 
 module.exports = angular
   .module('spinnaker.amazon.securityGroup.edit.controller', [require('@uirouter/angularjs').default])
-  .controller('awsEditSecurityGroupCtrl', function(
+  .controller('awsEditSecurityGroupCtrl', ['$scope', '$uibModalInstance', '$state', 'application', 'securityGroup', '$controller', function(
     $scope,
     $uibModalInstance,
     $state,
@@ -107,4 +107,4 @@ module.exports = angular
     };
 
     this.initializeSecurityGroups().then(this.initializeAccounts);
-  });
+  }]);
diff --git a/...cripts/modules/amazon/src/securityGroup/configure/configSecurityGroup.mixin.controller.js b/...cripts/modules/amazon/src/securityGroup/configure/configSecurityGroup.mixin.controller.js
@@ -23,7 +23,7 @@ module.exports = angular
     require('@uirouter/angularjs').default,
     SECURITY_GROUP_READER,
   ])
-  .controller('awsConfigSecurityGroupMixin', function(
+  .controller('awsConfigSecurityGroupMixin', ['$scope', '$state', '$uibModalInstance', 'application', 'securityGroup', 'securityGroupReader', 'cacheInitializer', function(
     $scope,
     $state,
     $uibModalInstance,
@@ -336,4 +336,4 @@ module.exports = angular
 
     var classicPattern = /^[\x20-\x7F]+$/;
     var vpcPattern = /^[a-zA-Z0-9\s._\-:/()#,@[\]+=&;{}!$*]+$/;
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/securityGroup/details/securityGroupDetail.controller.js b/app/scripts/modules/amazon/src/securityGroup/details/securityGroupDetail.controller.js
@@ -21,7 +21,7 @@ module.exports = angular
     CONFIRMATION_MODAL_SERVICE,
     require('../clone/cloneSecurityGroup.controller').name,
   ])
-  .controller('awsSecurityGroupDetailsCtrl', function(
+  .controller('awsSecurityGroupDetailsCtrl', ['$scope', '$state', 'resolvedSecurityGroup', 'app', 'confirmationModalService', 'securityGroupReader', '$uibModal', function(
     $scope,
     $state,
     resolvedSecurityGroup,
@@ -217,4 +217,4 @@ module.exports = angular
         refresh: extractSecurityGroup,
       };
     }
-  });
+  }]);
diff --git a/app/scripts/modules/amazon/src/serverGroup/configure/serverGroupCommandBuilder.service.js b/app/scripts/modules/amazon/src/serverGroup/configure/serverGroupCommandBuilder.service.js
@@ -13,7 +13,7 @@ module.exports = angular
     INSTANCE_TYPE_SERVICE,
     AWS_SERVER_GROUP_CONFIGURATION_SERVICE,
   ])
-  .factory('awsServerGroupCommandBuilder', function($q, instanceTypeService, awsServerGroupConfigurationService) {
+  .factory('awsServerGroupCommandBuilder', ['$q', 'instanceTypeService', 'awsServerGroupConfigurationService', function($q, instanceTypeService, awsServerGroupConfigurationService) {
     function buildNewServerGroupCommand(application, defaults) {
       defaults = defaults || {};
       var credentialsLoader = AccountService.getCredentialsKeyedByAccount('aws');
@@ -334,4 +334,4 @@ module.exports = angular
       buildServerGroupCommandFromPipeline: buildServerGroupCommandFromPipeline,
       buildUpdateServerGroupCommand: buildUpdateServerGroupCommand,
     };
-  });
+  }]);