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 index d7af9809473..13b85b16b5e 100644 --- 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 index 278ac9f2b2e..82bcc43472a 100644 --- 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 index 4ba25cc2598..b24b66f506f 100644 --- 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 index e592df8ac81..bbbe242c66f 100644 --- 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 index 7d8a773219d..08a09836ffc 100644 --- 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 index e9710d1bcc6..39e5c1566ca 100644 --- 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 index 7fdbea9a1fb..fb6ba8ec5f7 100644 --- 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 index 3ee673c379d..72a51c972b3 100644 --- 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 index 7699ca96033..14482f19d33 100644 --- 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 index b67f24fdf89..aed39bd83f8 100644 --- 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 index 4ae4bfec2f5..fe40b08643f 100644 --- 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 index 15bec5ab7a1..e7e3739557d 100644 --- 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 index a468b70e637..558978a9659 100644 --- 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 index fb1713754ae..cebc3290dbd 100644 --- 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/app/scripts/modules/amazon/src/pipeline/stages/findImageFromTags/awsFindImageFromTagsStage.js b/app/scripts/modules/amazon/src/pipeline/stages/findImageFromTags/awsFindImageFromTagsStage.js index dd91ee726d7..5c00e59a1b1 100644 --- a/app/scripts/modules/amazon/src/pipeline/stages/findImageFromTags/awsFindImageFromTagsStage.js +++ b/app/scripts/modules/amazon/src/pipeline/stages/findImageFromTags/awsFindImageFromTagsStage.js @@ -20,7 +20,7 @@ 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'; @@ -28,4 +28,4 @@ module.exports = angular BakeryReader.getRegions('aws').then(function(regions) { $scope.regions = regions; }); - }); + }]); diff --git a/app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.js b/app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.js index 908bde5cb2f..60b1c09d0f2 100644 --- a/app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.js +++ b/app/scripts/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 index a824ecfbca8..8782ad85f61 100644 --- 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 index 10f66a0591c..a5f496cb405 100644 --- 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 index 0e60ec3a603..b900f8d2693 100644 --- 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 index 9b834d126a9..ee0970d7f7f 100644 --- 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 index 2c2efe418cb..54bff39b73a 100644 --- 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 index 8a3fc12b2b4..6f4ea681075 100644 --- 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 index 646f9583815..c3acc165bff 100644 --- 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 index 38f50dbb91f..9453931bfde 100644 --- 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 index 4e9342f72af..1d2ef7cd3c4 100644 --- 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/app/scripts/modules/amazon/src/securityGroup/configure/configSecurityGroup.mixin.controller.js b/app/scripts/modules/amazon/src/securityGroup/configure/configSecurityGroup.mixin.controller.js index 3a92ac4dcc0..93dd4ce4b05 100644 --- a/app/scripts/modules/amazon/src/securityGroup/configure/configSecurityGroup.mixin.controller.js +++ b/app/scripts/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 index d8daaefeccf..b54e139b497 100644 --- 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 index d32e622d5c9..472c1ae6407 100644 --- 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, }; - }); + }]); diff --git a/app/scripts/modules/amazon/src/serverGroup/configure/serverGroupConfiguration.service.ts b/app/scripts/modules/amazon/src/serverGroup/configure/serverGroupConfiguration.service.ts index 91d27736c38..491fec5f226 100644 --- a/app/scripts/modules/amazon/src/serverGroup/configure/serverGroupConfiguration.service.ts +++ b/app/scripts/modules/amazon/src/serverGroup/configure/serverGroupConfiguration.service.ts @@ -122,6 +122,7 @@ export class AwsServerGroupConfigurationService { 'Default', ]; + public static $inject = ['securityGroupReader', 'awsInstanceTypeService', 'cacheInitializer', 'loadBalancerReader', 'serverGroupCommandRegistry']; constructor( private securityGroupReader: SecurityGroupReader, private awsInstanceTypeService: any, diff --git a/app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.controller.js b/app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.controller.js index 6a8be929449..216c77b12b2 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.controller.js +++ b/app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.controller.js @@ -8,7 +8,7 @@ module.exports = angular .module('spinnaker.amazon.serverGroup.editAsgAdvancedSettings.modal.controller', [ require('../../configure/serverGroupCommandBuilder.service').name, ]) - .controller('EditAsgAdvancedSettingsCtrl', function( + .controller('EditAsgAdvancedSettingsCtrl', ['$scope', '$uibModalInstance', 'application', 'serverGroup', 'awsServerGroupCommandBuilder', function( $scope, $uibModalInstance, application, @@ -41,4 +41,4 @@ module.exports = angular }; this.cancel = $uibModalInstance.dismiss; - }); + }]); diff --git a/app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.controller.js b/app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.controller.js index 4ec6bfb1e1d..729e99a66eb 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.controller.js +++ b/app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.controller.js @@ -7,7 +7,7 @@ import { SERVER_GROUP_WRITER, TaskMonitor } from '@spinnaker/core'; module.exports = angular .module('spinnaker.amazon.serverGroup.details.rollback.controller', [SERVER_GROUP_WRITER]) - .controller('awsRollbackServerGroupCtrl', function( + .controller('awsRollbackServerGroupCtrl', ['$scope', '$uibModalInstance', 'serverGroupWriter', 'application', 'serverGroup', 'previousServerGroup', 'disabledServerGroups', 'allServerGroups', function( $scope, $uibModalInstance, serverGroupWriter, @@ -128,4 +128,4 @@ module.exports = angular this.group = function(serverGroup) { return serverGroup.isDisabled ? 'Disabled Server Groups' : 'Enabled Server Groups'; }; - }); + }]); diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.js index a5a5a77547c..b924518db55 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.js +++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.js @@ -22,7 +22,7 @@ module.exports = angular application: '=', }, templateUrl: require('./alarmBasedSummary.component.html'), - controller: function($uibModal, confirmationModalService) { + controller: ['$uibModal', 'confirmationModalService', function($uibModal, confirmationModalService) { this.popoverTemplate = require('./popover/scalingPolicyDetails.popover.html'); this.editPolicy = () => { @@ -57,5 +57,5 @@ module.exports = angular submitMethod: submitMethod, }); }; - }, + }], }); diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.js index c8e745fc85b..64c1d05d125 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.js +++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.js @@ -27,7 +27,7 @@ module.exports = angular // not provide a unit of measurement for an alarm or a metric, only statistics }, templateUrl: require('./metricAlarmChart.component.html'), - controller: function($filter) { + controller: ['$filter', function($filter) { // converts alarm into parameters used to retrieve statistic data let getFilterParameters = () => { let alarm = this.alarm; @@ -188,5 +188,5 @@ module.exports = angular this.alarmUpdated.unsubscribe(); } }; - }, + }], }); diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.component.ts b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.component.ts index a2b96403794..93a2512e5a5 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.component.ts +++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.component.ts @@ -14,6 +14,7 @@ class TargetTrackingSummaryController implements IComponentController { public config: ITargetTrackingConfiguration; public popoverTemplate = require('./targetTrackingPopover.html'); + public static $inject = ['$uibModal', 'confirmationModalService']; constructor(private $uibModal: IModalService, private confirmationModalService: ConfirmationModalService) { 'ngInject'; } diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.controller.ts b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.controller.ts index 89394755612..696d278ea64 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.controller.ts +++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.controller.ts @@ -31,6 +31,7 @@ export class UpsertTargetTrackingController implements IComponentController { public state: ITargetTrackingState; public command: ITargetTrackingPolicyCommand; + public static $inject = ['$uibModalInstance', 'policy', 'serverGroup', 'application']; constructor( private $uibModalInstance: IModalServiceInstance, public policy: ITargetTrackingPolicy, diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.controller.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.controller.js index 371c0e3a76f..363e253fdc9 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.controller.js +++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.controller.js @@ -16,7 +16,7 @@ module.exports = angular STEP_POLICY_ACTION, require('./alarm/alarmConfigurer.component').name, ]) - .controller('awsUpsertScalingPolicyCtrl', function($uibModalInstance, serverGroup, application, policy) { + .controller('awsUpsertScalingPolicyCtrl', ['$uibModalInstance', 'serverGroup', 'application', 'policy', function($uibModalInstance, serverGroup, application, policy) { this.serverGroup = serverGroup; this.viewState = { @@ -203,4 +203,4 @@ module.exports = angular this.cancel = $uibModalInstance.dismiss; this.initialize(); - }); + }]); diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingProcesses/modifyScalingProcesses.controller.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingProcesses/modifyScalingProcesses.controller.js index d4a72655683..7caf8edf590 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scalingProcesses/modifyScalingProcesses.controller.js +++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingProcesses/modifyScalingProcesses.controller.js @@ -7,7 +7,7 @@ import { TaskExecutor, TaskMonitor } from '@spinnaker/core'; module.exports = angular .module('spinnaker.amazon.serverGroup.details.autoscaling.process.controller', []) - .controller('ModifyScalingProcessesCtrl', function($scope, $uibModalInstance, application, serverGroup, processes) { + .controller('ModifyScalingProcessesCtrl', ['$scope', '$uibModalInstance', 'application', 'serverGroup', 'processes', function($scope, $uibModalInstance, application, serverGroup, processes) { $scope.command = angular.copy(processes); $scope.serverGroup = serverGroup; $scope.verification = {}; @@ -100,4 +100,4 @@ module.exports = angular }; this.cancel = $uibModalInstance.dismiss; - }); + }]); diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scheduledAction/editScheduledActions.modal.controller.js b/app/scripts/modules/amazon/src/serverGroup/details/scheduledAction/editScheduledActions.modal.controller.js index fd75c840119..e16b6c371e6 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scheduledAction/editScheduledActions.modal.controller.js +++ b/app/scripts/modules/amazon/src/serverGroup/details/scheduledAction/editScheduledActions.modal.controller.js @@ -6,7 +6,7 @@ import { TaskExecutor, TaskMonitor } from '@spinnaker/core'; module.exports = angular .module('spinnaker.amazon.serverGroup.details.scheduledActions.editScheduledActions.modal.controller', []) - .controller('EditScheduledActionsCtrl', function($scope, $uibModalInstance, application, serverGroup) { + .controller('EditScheduledActionsCtrl', ['$scope', '$uibModalInstance', 'application', 'serverGroup', function($scope, $uibModalInstance, application, serverGroup) { $scope.command = { scheduledActions: serverGroup.scheduledActions.map(action => { return { @@ -57,4 +57,4 @@ module.exports = angular }; this.cancel = $uibModalInstance.dismiss; - }); + }]); diff --git a/app/scripts/modules/amazon/src/serverGroup/details/securityGroup/editSecurityGroups.modal.controller.js b/app/scripts/modules/amazon/src/serverGroup/details/securityGroup/editSecurityGroups.modal.controller.js index 71f583fff55..f1b5e50c48f 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/securityGroup/editSecurityGroups.modal.controller.js +++ b/app/scripts/modules/amazon/src/serverGroup/details/securityGroup/editSecurityGroups.modal.controller.js @@ -10,7 +10,7 @@ module.exports = angular SERVER_GROUP_WRITER, SECURITY_GROUP_READER, ]) - .controller('EditSecurityGroupsCtrl', function( + .controller('EditSecurityGroupsCtrl', ['$scope', '$uibModalInstance', 'serverGroupWriter', 'securityGroupReader', 'application', 'serverGroup', 'securityGroups', function( $scope, $uibModalInstance, serverGroupWriter, @@ -76,4 +76,4 @@ module.exports = angular }; this.cancel = $uibModalInstance.dismiss; - }); + }]); diff --git a/app/scripts/modules/appengine/src/cache/cacheConfigurer.service.ts b/app/scripts/modules/appengine/src/cache/cacheConfigurer.service.ts index 6df7de1a00e..96a46115403 100644 --- a/app/scripts/modules/appengine/src/cache/cacheConfigurer.service.ts +++ b/app/scripts/modules/appengine/src/cache/cacheConfigurer.service.ts @@ -15,6 +15,7 @@ class AppengineCacheConfigurer { initializers: [(): ng.IPromise => this.loadBalancerReader.listLoadBalancers('appengine')], }; + public static $inject = ['loadBalancerReader']; constructor(private loadBalancerReader: any) { 'ngInject'; } diff --git a/app/scripts/modules/appengine/src/common/conditionalDescriptionListItem.component.ts b/app/scripts/modules/appengine/src/common/conditionalDescriptionListItem.component.ts index 0e971fccf46..053a58d00e3 100644 --- a/app/scripts/modules/appengine/src/common/conditionalDescriptionListItem.component.ts +++ b/app/scripts/modules/appengine/src/common/conditionalDescriptionListItem.component.ts @@ -5,6 +5,7 @@ class AppengineConditionalDescriptionListItemCtrl implements IController { public key: string; public component: any; + public static $inject = ['$filter']; constructor(private $filter: IFilterService) { 'ngInject'; } diff --git a/app/scripts/modules/appengine/src/instance/details/details.controller.ts b/app/scripts/modules/appengine/src/instance/details/details.controller.ts index 4b2b2a19ec8..0d6a88296e6 100644 --- a/app/scripts/modules/appengine/src/instance/details/details.controller.ts +++ b/app/scripts/modules/appengine/src/instance/details/details.controller.ts @@ -33,6 +33,7 @@ class AppengineInstanceDetailsController implements IController { public outOfServiceToolTip = ` An App Engine instance is 'Out Of Service' if no load balancers are directing traffic to its server group.`; + public static $inject = ['$q', 'app', 'instanceWriter', 'confirmationModalService', 'instance']; constructor( private $q: IQService, private app: Application, diff --git a/app/scripts/modules/appengine/src/loadBalancer/configure/wizard/wizard.controller.ts b/app/scripts/modules/appengine/src/loadBalancer/configure/wizard/wizard.controller.ts index e8e99338e1b..c844a647253 100644 --- a/app/scripts/modules/appengine/src/loadBalancer/configure/wizard/wizard.controller.ts +++ b/app/scripts/modules/appengine/src/loadBalancer/configure/wizard/wizard.controller.ts @@ -20,6 +20,7 @@ class AppengineLoadBalancerWizardController implements IController { public submitButtonLabel: string; public taskMonitor: TaskMonitor; + public static $inject = ['$scope', '$state', '$uibModalInstance', 'application', 'loadBalancer', 'isNew', 'forPipelineConfig', 'appengineLoadBalancerTransformer', 'wizardSubFormValidation']; constructor( public $scope: ng.IScope, private $state: StateService, diff --git a/app/scripts/modules/appengine/src/loadBalancer/details/details.controller.ts b/app/scripts/modules/appengine/src/loadBalancer/details/details.controller.ts index d2719b42c6b..25553dd57b6 100644 --- a/app/scripts/modules/appengine/src/loadBalancer/details/details.controller.ts +++ b/app/scripts/modules/appengine/src/loadBalancer/details/details.controller.ts @@ -26,6 +26,7 @@ class AppengineLoadBalancerDetailsController implements IController { public loadBalancer: IAppengineLoadBalancer; public dispatchRules: string[] = []; + public static $inject = ['$uibModal', '$state', '$scope', 'loadBalancer', 'app', 'confirmationModalService']; constructor( private $uibModal: IModalService, private $state: StateService, diff --git a/app/scripts/modules/appengine/src/loadBalancer/transformer.ts b/app/scripts/modules/appengine/src/loadBalancer/transformer.ts index e13c65363d9..b01199a7b73 100644 --- a/app/scripts/modules/appengine/src/loadBalancer/transformer.ts +++ b/app/scripts/modules/appengine/src/loadBalancer/transformer.ts @@ -77,6 +77,7 @@ export class AppengineLoadBalancerUpsertDescription implements ILoadBalancerUpse } export class AppengineLoadBalancerTransformer { + public static $inject = ['$q']; constructor(private $q: ng.IQService) { 'ngInject'; } diff --git a/app/scripts/modules/appengine/src/pipeline/stages/appengineStage.controller.ts b/app/scripts/modules/appengine/src/pipeline/stages/appengineStage.controller.ts index d1a421cefe2..e2293fd4050 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/appengineStage.controller.ts +++ b/app/scripts/modules/appengine/src/pipeline/stages/appengineStage.controller.ts @@ -6,6 +6,7 @@ import { AppengineHealth } from 'appengine/common/appengineHealth'; import { IAppengineAccount, IAppengineStageScope } from 'appengine/domain'; export class AppengineStageCtrl implements IController { + public static $inject = ['$scope']; constructor(protected $scope: IAppengineStageScope) { $scope.platformHealth = AppengineHealth.PLATFORM; } diff --git a/app/scripts/modules/appengine/src/pipeline/stages/destroyAsg/appengineDestroyAsgStage.ts b/app/scripts/modules/appengine/src/pipeline/stages/destroyAsg/appengineDestroyAsgStage.ts index e9e25cf263b..685ba21c730 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/destroyAsg/appengineDestroyAsgStage.ts +++ b/app/scripts/modules/appengine/src/pipeline/stages/destroyAsg/appengineDestroyAsgStage.ts @@ -6,6 +6,7 @@ import { IAppengineStageScope } from 'appengine/domain'; import { AppengineStageCtrl } from '../appengineStage.controller'; class AppengineDestroyAsgStageCtrl extends AppengineStageCtrl { + public static $inject = ['$scope']; constructor(protected $scope: IAppengineStageScope) { 'ngInject'; super($scope); diff --git a/app/scripts/modules/appengine/src/pipeline/stages/disableAsg/appengineDisableAsgStage.ts b/app/scripts/modules/appengine/src/pipeline/stages/disableAsg/appengineDisableAsgStage.ts index 40acc9adb53..7bf65dd487b 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/disableAsg/appengineDisableAsgStage.ts +++ b/app/scripts/modules/appengine/src/pipeline/stages/disableAsg/appengineDisableAsgStage.ts @@ -7,6 +7,7 @@ import { IAppengineStageScope } from 'appengine/domain'; import { AppengineStageCtrl } from '../appengineStage.controller'; class AppengineDisableAsgStageCtrl extends AppengineStageCtrl { + public static $inject = ['$scope']; constructor(protected $scope: IAppengineStageScope) { 'ngInject'; super($scope); diff --git a/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/appengineEditLoadBalancerStage.ts b/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/appengineEditLoadBalancerStage.ts index 8e23bb35e34..91fdfe01232 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/appengineEditLoadBalancerStage.ts +++ b/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/appengineEditLoadBalancerStage.ts @@ -7,6 +7,7 @@ import { CloudProviderRegistry, ILoadBalancer, Registry } from '@spinnaker/core' import { APPENGINE_LOAD_BALANCER_CHOICE_MODAL_CTRL } from './loadBalancerChoice.modal.controller'; class AppengineEditLoadBalancerStageCtrl implements IController { + public static $inject = ['$scope', '$uibModal']; constructor(public $scope: any, private $uibModal: IModalService) { 'ngInject'; $scope.stage.loadBalancers = $scope.stage.loadBalancers || []; diff --git a/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/loadBalancerChoice.modal.controller.ts b/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/loadBalancerChoice.modal.controller.ts index fa000479373..92324b9b988 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/loadBalancerChoice.modal.controller.ts +++ b/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/loadBalancerChoice.modal.controller.ts @@ -9,6 +9,7 @@ class AppengineLoadBalancerChoiceModalCtrl implements IController { public loadBalancers: ILoadBalancer[]; public selectedLoadBalancer: ILoadBalancer; + public static $inject = ['$uibModal', '$uibModalInstance', 'application']; constructor( private $uibModal: IModalService, private $uibModalInstance: IModalServiceInstance, diff --git a/app/scripts/modules/appengine/src/pipeline/stages/enableAsg/appengineEnableAsgStage.ts b/app/scripts/modules/appengine/src/pipeline/stages/enableAsg/appengineEnableAsgStage.ts index 60cbbd93ac0..98c19f08c77 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/enableAsg/appengineEnableAsgStage.ts +++ b/app/scripts/modules/appengine/src/pipeline/stages/enableAsg/appengineEnableAsgStage.ts @@ -7,6 +7,7 @@ import { IAppengineStageScope } from 'appengine/domain'; import { AppengineStageCtrl } from '../appengineStage.controller'; class AppengineEnableAsgStageCtrl extends AppengineStageCtrl { + public static $inject = ['$scope']; constructor(protected $scope: IAppengineStageScope) { 'ngInject'; super($scope); diff --git a/app/scripts/modules/appengine/src/pipeline/stages/shrinkCluster/appengineShrinkClusterStage.ts b/app/scripts/modules/appengine/src/pipeline/stages/shrinkCluster/appengineShrinkClusterStage.ts index d103486b226..c1b336a7d9b 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/shrinkCluster/appengineShrinkClusterStage.ts +++ b/app/scripts/modules/appengine/src/pipeline/stages/shrinkCluster/appengineShrinkClusterStage.ts @@ -12,6 +12,7 @@ interface IAppengineShrinkClusterStage extends IAppengineStage { } class AppengineShrinkClusterStageCtrl extends AppengineStageCtrl { + public static $inject = ['$scope']; constructor(public $scope: IAppengineStageScope) { 'ngInject'; super($scope); diff --git a/app/scripts/modules/appengine/src/pipeline/stages/startServerGroup/appengineStartServerGroupStage.ts b/app/scripts/modules/appengine/src/pipeline/stages/startServerGroup/appengineStartServerGroupStage.ts index d59de209488..4b3926b375a 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/startServerGroup/appengineStartServerGroupStage.ts +++ b/app/scripts/modules/appengine/src/pipeline/stages/startServerGroup/appengineStartServerGroupStage.ts @@ -7,6 +7,7 @@ import { IAppengineStageScope } from 'appengine/domain'; import { AppengineStageCtrl } from '../appengineStage.controller'; class AppengineStartServerGroupStageCtrl extends AppengineStageCtrl { + public static $inject = ['$scope']; constructor(public $scope: IAppengineStageScope) { 'ngInject'; super($scope); diff --git a/app/scripts/modules/appengine/src/pipeline/stages/stopServerGroup/appengineStopServerGroupStage.ts b/app/scripts/modules/appengine/src/pipeline/stages/stopServerGroup/appengineStopServerGroupStage.ts index da0ea68bcd8..209324a72c0 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/stopServerGroup/appengineStopServerGroupStage.ts +++ b/app/scripts/modules/appengine/src/pipeline/stages/stopServerGroup/appengineStopServerGroupStage.ts @@ -7,6 +7,7 @@ import { IAppengineStageScope } from 'appengine/domain/index'; import { AppengineStageCtrl } from '../appengineStage.controller'; class AppengineStopServerGroupStageCtrl extends AppengineStageCtrl { + public static $inject = ['$scope']; constructor(public $scope: IAppengineStageScope) { 'ngInject'; super($scope); diff --git a/app/scripts/modules/appengine/src/serverGroup/configure/serverGroupCommandBuilder.service.ts b/app/scripts/modules/appengine/src/serverGroup/configure/serverGroupCommandBuilder.service.ts index 523edf57f27..c27fc816205 100644 --- a/app/scripts/modules/appengine/src/serverGroup/configure/serverGroupCommandBuilder.service.ts +++ b/app/scripts/modules/appengine/src/serverGroup/configure/serverGroupCommandBuilder.service.ts @@ -93,6 +93,7 @@ export class AppengineServerGroupCommandBuilder { return pipeline.expectedArtifacts || []; } + public static $inject = ['$q']; constructor(private $q: IQService) { 'ngInject'; } diff --git a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/basicSettings.controller.ts b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/basicSettings.controller.ts index aa2c7e89317..f35b2a858bb 100644 --- a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/basicSettings.controller.ts +++ b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/basicSettings.controller.ts @@ -16,6 +16,7 @@ interface IAppengineBasicSettingsScope extends IScope { } class AppengineServerGroupBasicSettingsCtrl implements IController { + public static $inject = ['$scope', '$state', '$controller', '$uibModalStack']; constructor( public $scope: IAppengineBasicSettingsScope, $state: StateService, diff --git a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/cloneServerGroup.controller.ts b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/cloneServerGroup.controller.ts index a7e08bdc645..0a0d64e1c38 100644 --- a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/cloneServerGroup.controller.ts +++ b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/cloneServerGroup.controller.ts @@ -21,6 +21,7 @@ class AppengineCloneServerGroupCtrl implements IController { }; public taskMonitor: TaskMonitor; + public static $inject = ['$scope', '$uibModalInstance', 'serverGroupCommand', 'application', 'serverGroupWriter', 'appengineServerGroupCommandBuilder']; constructor( public $scope: IScope, private $uibModalInstance: IModalInstanceService, diff --git a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/configFiles.component.ts b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/configFiles.component.ts index efe9e2ce715..2bd91eaa85c 100644 --- a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/configFiles.component.ts +++ b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/configFiles.component.ts @@ -39,6 +39,7 @@ class AppengineConfigFileConfigurerCtrl implements IController { private artifactAccounts: IArtifactAccount[] = []; public command: IAppengineConfigFileConfigurerCtrlCommand; + public static $inject = ['$scope']; constructor(public $scope: IScope) {} public $onInit(): void { diff --git a/app/scripts/modules/appengine/src/serverGroup/details/details.controller.ts b/app/scripts/modules/appengine/src/serverGroup/details/details.controller.ts index 241795d4c2b..1a30e0a60dc 100644 --- a/app/scripts/modules/appengine/src/serverGroup/details/details.controller.ts +++ b/app/scripts/modules/appengine/src/serverGroup/details/details.controller.ts @@ -57,6 +57,7 @@ class AppengineServerGroupDetailsController implements IController { `; } + public static $inject = ['$state', '$scope', '$uibModal', 'serverGroup', 'app', 'serverGroupWriter', 'confirmationModalService', 'appengineServerGroupWriter', 'appengineServerGroupCommandBuilder']; constructor( private $state: any, private $scope: IPrivateScope, diff --git a/app/scripts/modules/appengine/src/serverGroup/transformer.ts b/app/scripts/modules/appengine/src/serverGroup/transformer.ts index 54dd2117708..fbb7703f356 100644 --- a/app/scripts/modules/appengine/src/serverGroup/transformer.ts +++ b/app/scripts/modules/appengine/src/serverGroup/transformer.ts @@ -68,6 +68,7 @@ export class AppengineDeployDescription { } class AppengineServerGroupTransformer { + public static $inject = ['$q']; constructor(private $q: ng.IQService) { 'ngInject'; } diff --git a/app/scripts/modules/azure/cache/cacheConfigurer.service.js b/app/scripts/modules/azure/cache/cacheConfigurer.service.js index a4a5b0e5dde..a973cb9ecd1 100644 --- a/app/scripts/modules/azure/cache/cacheConfigurer.service.js +++ b/app/scripts/modules/azure/cache/cacheConfigurer.service.js @@ -6,7 +6,7 @@ import { AccountService, INSTANCE_TYPE_SERVICE, LOAD_BALANCER_READ_SERVICE, Subn module.exports = angular .module('spinnaker.azure.cache.initializer', [LOAD_BALANCER_READ_SERVICE, INSTANCE_TYPE_SERVICE]) - .factory('azureCacheConfigurer', function($q, instanceTypeService, loadBalancerReader) { + .factory('azureCacheConfigurer', ['$q', 'instanceTypeService', 'loadBalancerReader', function($q, instanceTypeService, loadBalancerReader) { let config = Object.create(null); config.credentials = { @@ -27,4 +27,4 @@ module.exports = angular }; return config; - }); + }]); diff --git a/app/scripts/modules/azure/instance/azureInstanceType.service.js b/app/scripts/modules/azure/instance/azureInstanceType.service.js index e3c963eb57c..a22d32ca1f4 100644 --- a/app/scripts/modules/azure/instance/azureInstanceType.service.js +++ b/app/scripts/modules/azure/instance/azureInstanceType.service.js @@ -7,7 +7,7 @@ import { API, InfrastructureCaches } from '@spinnaker/core'; module.exports = angular .module('spinnaker.azure.instanceType.service', []) - .factory('azureInstanceTypeService', function($http, $q) { + .factory('azureInstanceTypeService', ['$http', '$q', function($http, $q) { var m3 = { type: 'M3', description: @@ -305,4 +305,4 @@ module.exports = angular getAvailableTypesForRegions: getAvailableTypesForRegions, getAllTypesByRegion: getAllTypesByRegion, }; - }); + }]); diff --git a/app/scripts/modules/azure/instance/details/instance.details.controller.js b/app/scripts/modules/azure/instance/details/instance.details.controller.js index 7a303af7077..811cf44a189 100644 --- a/app/scripts/modules/azure/instance/details/instance.details.controller.js +++ b/app/scripts/modules/azure/instance/details/instance.details.controller.js @@ -19,7 +19,7 @@ module.exports = angular INSTANCE_WRITE_SERVICE, CONFIRMATION_MODAL_SERVICE, ]) - .controller('azureInstanceDetailsCtrl', function( + .controller('azureInstanceDetailsCtrl', ['$scope', '$state', '$uibModal', 'instanceWriter', 'confirmationModalService', 'instance', 'app', '$q', function( $scope, $state, $uibModal, @@ -388,4 +388,4 @@ module.exports = angular }); $scope.account = instance.account; - }); + }]); diff --git a/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancer.controller.js b/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancer.controller.js index 73b7428cc9b..959ec8f0324 100644 --- a/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancer.controller.js +++ b/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancer.controller.js @@ -17,7 +17,7 @@ module.exports = angular require('@uirouter/angularjs').default, require('../loadBalancer.transformer').name, ]) - .controller('azureCreateLoadBalancerCtrl', function( + .controller('azureCreateLoadBalancerCtrl', ['$scope', '$uibModalInstance', '$state', 'azureLoadBalancerTransformer', 'application', 'loadBalancer', 'isNew', function( $scope, $uibModalInstance, $state, @@ -257,4 +257,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.controller.js b/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.controller.js index ffe37409292..5196b0a1dbc 100644 --- a/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.controller.js +++ b/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.controller.js @@ -18,7 +18,7 @@ module.exports = angular LOAD_BALANCER_READ_SERVICE, CONFIRMATION_MODAL_SERVICE, ]) - .controller('azureLoadBalancerDetailsCtrl', function( + .controller('azureLoadBalancerDetailsCtrl', ['$scope', '$state', '$exceptionHandler', '$uibModal', 'loadBalancer', 'app', 'securityGroupReader', 'confirmationModalService', 'loadBalancerReader', '$q', function( $scope, $state, $exceptionHandler, @@ -149,4 +149,4 @@ module.exports = angular submitMethod: submitMethod, }); }; - }); + }]); diff --git a/app/scripts/modules/azure/loadBalancer/loadBalancer.transformer.js b/app/scripts/modules/azure/loadBalancer/loadBalancer.transformer.js index 05ee9a937b5..45171cb8eb7 100644 --- a/app/scripts/modules/azure/loadBalancer/loadBalancer.transformer.js +++ b/app/scripts/modules/azure/loadBalancer/loadBalancer.transformer.js @@ -8,7 +8,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.azure.loadBalancer.transformer', []) - .factory('azureLoadBalancerTransformer', function($q) { + .factory('azureLoadBalancerTransformer', ['$q', function($q) { function normalizeLoadBalancer(loadBalancer) { loadBalancer.serverGroups.forEach(function(serverGroup) { serverGroup.account = loadBalancer.account; @@ -106,4 +106,4 @@ module.exports = angular convertLoadBalancerForEditing: convertLoadBalancerForEditing, constructNewLoadBalancerTemplate: constructNewLoadBalancerTemplate, }; - }); + }]); diff --git a/app/scripts/modules/azure/pipeline/stages/bake/azureBakeStage.js b/app/scripts/modules/azure/pipeline/stages/bake/azureBakeStage.js index eeca7743f53..492e66166a7 100644 --- a/app/scripts/modules/azure/pipeline/stages/bake/azureBakeStage.js +++ b/app/scripts/modules/azure/pipeline/stages/bake/azureBakeStage.js @@ -44,7 +44,7 @@ module.exports = angular restartable: true, }); }) - .controller('azureBakeStageCtrl', function($scope, $q, $uibModal) { + .controller('azureBakeStageCtrl', ['$scope', '$q', '$uibModal', function($scope, $q, $uibModal) { $scope.stage.extendedAttributes = $scope.stage.extendedAttributes || {}; $scope.stage.regions = $scope.stage.regions || []; @@ -151,4 +151,4 @@ module.exports = angular $scope.$watch('stage', deleteEmptyProperties, true); initialize(); - }); + }]); diff --git a/app/scripts/modules/azure/pipeline/stages/bake/bakeExecutionDetails.controller.js b/app/scripts/modules/azure/pipeline/stages/bake/bakeExecutionDetails.controller.js index 49c44a9ae9b..fe215298907 100644 --- a/app/scripts/modules/azure/pipeline/stages/bake/bakeExecutionDetails.controller.js +++ b/app/scripts/modules/azure/pipeline/stages/bake/bakeExecutionDetails.controller.js @@ -6,7 +6,7 @@ import { SETTINGS } from '@spinnaker/core'; module.exports = angular .module('spinnaker.azure.pipeline.stage.bake.executionDetails.controller', [require('@uirouter/angularjs').default]) - .controller('azureBakeExecutionDetailsCtrl', function( + .controller('azureBakeExecutionDetailsCtrl', ['$scope', '$stateParams', 'executionDetailsSectionService', '$interpolate', function( $scope, $stateParams, executionDetailsSectionService, @@ -26,4 +26,4 @@ module.exports = angular initialize(); $scope.$on('$stateChangeSuccess', initialize); - }); + }]); diff --git a/app/scripts/modules/azure/pipeline/stages/destroyAsg/azureDestroyAsgStage.js b/app/scripts/modules/azure/pipeline/stages/destroyAsg/azureDestroyAsgStage.js index fa017d6c2ce..d9be4af93be 100644 --- a/app/scripts/modules/azure/pipeline/stages/destroyAsg/azureDestroyAsgStage.js +++ b/app/scripts/modules/azure/pipeline/stages/destroyAsg/azureDestroyAsgStage.js @@ -27,7 +27,7 @@ module.exports = angular ], }); }) - .controller('azureDestroyAsgStageCtrl', function($scope) { + .controller('azureDestroyAsgStageCtrl', ['$scope', function($scope) { var ctrl = this; let stage = $scope.stage; @@ -66,4 +66,4 @@ module.exports = angular if (!stage.target) { stage.target = $scope.targets[0].val; } - }); + }]); diff --git a/app/scripts/modules/azure/pipeline/stages/disableAsg/azureDisableAsgStage.js b/app/scripts/modules/azure/pipeline/stages/disableAsg/azureDisableAsgStage.js index 94109780dbc..d295a2b359d 100644 --- a/app/scripts/modules/azure/pipeline/stages/disableAsg/azureDisableAsgStage.js +++ b/app/scripts/modules/azure/pipeline/stages/disableAsg/azureDisableAsgStage.js @@ -26,7 +26,7 @@ module.exports = angular ], }); }) - .controller('azureDisableAsgStageCtrl', function($scope) { + .controller('azureDisableAsgStageCtrl', ['$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/azure/pipeline/stages/enableAsg/azureEnableAsgStage.js b/app/scripts/modules/azure/pipeline/stages/enableAsg/azureEnableAsgStage.js index d2241971ca4..bd3ba60bfe4 100644 --- a/app/scripts/modules/azure/pipeline/stages/enableAsg/azureEnableAsgStage.js +++ b/app/scripts/modules/azure/pipeline/stages/enableAsg/azureEnableAsgStage.js @@ -21,7 +21,7 @@ module.exports = angular ], }); }) - .controller('azureEnableAsgStageCtrl', function($scope) { + .controller('azureEnableAsgStageCtrl', ['$scope', function($scope) { var ctrl = this; let stage = $scope.stage; @@ -63,4 +63,4 @@ module.exports = angular } $scope.$watch('stage.credentials', $scope.accountUpdated); - }); + }]); diff --git a/app/scripts/modules/azure/securityGroup/clone/cloneSecurityGroup.controller.js b/app/scripts/modules/azure/securityGroup/clone/cloneSecurityGroup.controller.js index e71c24a0614..880dccebe8a 100644 --- a/app/scripts/modules/azure/securityGroup/clone/cloneSecurityGroup.controller.js +++ b/app/scripts/modules/azure/securityGroup/clone/cloneSecurityGroup.controller.js @@ -10,7 +10,7 @@ module.exports = angular require('../securityGroup.write.service').name, require('../configure/CreateSecurityGroupCtrl').name, ]) - .controller('azureCloneSecurityGroupController', function( + .controller('azureCloneSecurityGroupController', ['$scope', '$uibModalInstance', '$controller', '$state', 'azureSecurityGroupWriter', 'securityGroup', 'application', function( $scope, $uibModalInstance, $controller, @@ -156,4 +156,4 @@ module.exports = angular return azureSecurityGroupWriter.upsertSecurityGroup($scope.securityGroup, application, 'Clone', params); }); }; - }); + }]); diff --git a/app/scripts/modules/azure/securityGroup/configure/CreateSecurityGroupCtrl.js b/app/scripts/modules/azure/securityGroup/configure/CreateSecurityGroupCtrl.js index d27b535bc01..3d7f47f7d55 100644 --- a/app/scripts/modules/azure/securityGroup/configure/CreateSecurityGroupCtrl.js +++ b/app/scripts/modules/azure/securityGroup/configure/CreateSecurityGroupCtrl.js @@ -10,7 +10,7 @@ module.exports = angular require('../securityGroup.write.service').name, ]) - .controller('azureCreateSecurityGroupCtrl', function( + .controller('azureCreateSecurityGroupCtrl', ['$scope', '$uibModalInstance', '$state', '$controller', 'application', 'securityGroup', 'azureSecurityGroupWriter', function( $scope, $uibModalInstance, $state, @@ -162,4 +162,4 @@ module.exports = angular } $scope.securityGroup.securityRules = []; - }); + }]); diff --git a/app/scripts/modules/azure/securityGroup/configure/EditSecurityGroupCtrl.js b/app/scripts/modules/azure/securityGroup/configure/EditSecurityGroupCtrl.js index f3840137540..af118b0c531 100644 --- a/app/scripts/modules/azure/securityGroup/configure/EditSecurityGroupCtrl.js +++ b/app/scripts/modules/azure/securityGroup/configure/EditSecurityGroupCtrl.js @@ -17,7 +17,7 @@ module.exports = angular SECURITY_GROUP_READER, require('../securityGroup.write.service').name, ]) - .controller('azureEditSecurityGroupCtrl', function( + .controller('azureEditSecurityGroupCtrl', ['$scope', '$uibModalInstance', '$exceptionHandler', '$state', 'securityGroupReader', 'cacheInitializer', 'application', 'securityGroup', 'azureSecurityGroupWriter', function( $scope, $uibModalInstance, $exceptionHandler, @@ -166,4 +166,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/azure/securityGroup/configure/configSecurityGroup.mixin.controller.js b/app/scripts/modules/azure/securityGroup/configure/configSecurityGroup.mixin.controller.js index 1592ea2f3b5..01dbe60b5f3 100644 --- a/app/scripts/modules/azure/securityGroup/configure/configSecurityGroup.mixin.controller.js +++ b/app/scripts/modules/azure/securityGroup/configure/configSecurityGroup.mixin.controller.js @@ -16,7 +16,7 @@ module.exports = angular require('@uirouter/angularjs').default, SECURITY_GROUP_READER, ]) - .controller('azureConfigSecurityGroupMixin', function( + .controller('azureConfigSecurityGroupMixin', ['$scope', '$state', '$uibModalInstance', 'application', 'securityGroup', 'securityGroupReader', 'modalWizardService', 'cacheInitializer', function( $scope, $state, $uibModalInstance, @@ -246,4 +246,4 @@ module.exports = angular var classicPattern = /^[\x20-\x7F]+$/; var vpcPattern = /^[a-zA-Z0-9\s._\-:/()#,@[\]+=&;{}!$*]+$/; - }); + }]); diff --git a/app/scripts/modules/azure/securityGroup/details/securityGroupDetail.controller.js b/app/scripts/modules/azure/securityGroup/details/securityGroupDetail.controller.js index c1a3a511943..69ce3f2a2fe 100644 --- a/app/scripts/modules/azure/securityGroup/details/securityGroupDetail.controller.js +++ b/app/scripts/modules/azure/securityGroup/details/securityGroupDetail.controller.js @@ -13,7 +13,7 @@ module.exports = angular CONFIRMATION_MODAL_SERVICE, require('../clone/cloneSecurityGroup.controller').name, ]) - .controller('azureSecurityGroupDetailsCtrl', function( + .controller('azureSecurityGroupDetailsCtrl', ['$scope', '$state', 'resolvedSecurityGroup', 'app', 'confirmationModalService', 'azureSecurityGroupWriter', 'securityGroupReader', '$uibModal', function( $scope, $state, resolvedSecurityGroup, @@ -135,4 +135,4 @@ module.exports = angular refresh: extractSecurityGroup, }; } - }); + }]); diff --git a/app/scripts/modules/azure/serverGroup/configure/serverGroupCommandBuilder.service.js b/app/scripts/modules/azure/serverGroup/configure/serverGroupCommandBuilder.service.js index 900fad5ca63..bd7e0b95750 100644 --- a/app/scripts/modules/azure/serverGroup/configure/serverGroupCommandBuilder.service.js +++ b/app/scripts/modules/azure/serverGroup/configure/serverGroupCommandBuilder.service.js @@ -6,7 +6,7 @@ import { NameUtils } from '@spinnaker/core'; module.exports = angular .module('spinnaker.azure.serverGroupCommandBuilder.service', [require('../../image/image.reader').name]) - .factory('azureServerGroupCommandBuilder', function($q, azureImageReader) { + .factory('azureServerGroupCommandBuilder', ['$q', 'azureImageReader', function($q, azureImageReader) { function buildNewServerGroupCommand(application, defaults) { defaults = defaults || {}; @@ -143,4 +143,4 @@ module.exports = angular buildServerGroupCommandFromExisting: buildServerGroupCommandFromExisting, buildServerGroupCommandFromPipeline: buildServerGroupCommandFromPipeline, }; - }); + }]); diff --git a/app/scripts/modules/azure/serverGroup/configure/serverGroupConfiguration.service.js b/app/scripts/modules/azure/serverGroup/configure/serverGroupConfiguration.service.js index 1552aa5b391..582aecb441f 100644 --- a/app/scripts/modules/azure/serverGroup/configure/serverGroupConfiguration.service.js +++ b/app/scripts/modules/azure/serverGroup/configure/serverGroupConfiguration.service.js @@ -17,7 +17,7 @@ module.exports = angular SECURITY_GROUP_READER, CACHE_INITIALIZER_SERVICE, ]) - .factory('azureServerGroupConfigurationService', function( + .factory('azureServerGroupConfigurationService', ['$q', 'azureImageReader', 'securityGroupReader', 'cacheInitializer', 'loadBalancerReader', function( $q, azureImageReader, securityGroupReader, @@ -254,4 +254,4 @@ module.exports = angular refreshSecurityGroups: refreshSecurityGroups, getRegionalSecurityGroups: getRegionalSecurityGroups, }; - }); + }]); diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/CloneServerGroup.azure.controller.js b/app/scripts/modules/azure/serverGroup/configure/wizard/CloneServerGroup.azure.controller.js index eadfe20b9c9..174b67b50a6 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/CloneServerGroup.azure.controller.js +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/CloneServerGroup.azure.controller.js @@ -11,7 +11,7 @@ module.exports = angular require('../../serverGroup.transformer').name, SERVER_GROUP_WRITER, ]) - .controller('azureCloneServerGroupCtrl', function( + .controller('azureCloneServerGroupCtrl', ['$scope', '$uibModalInstance', '$q', '$state', 'serverGroupWriter', 'azureServerGroupConfigurationService', 'serverGroupCommand', 'application', 'title', function( $scope, $uibModalInstance, $q, @@ -202,4 +202,4 @@ module.exports = angular $scope.state.requiresTemplateSelection = false; configureCommand(); }; - }); + }]); diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/ServerGroupInstanceArchetype.controller.js b/app/scripts/modules/azure/serverGroup/configure/wizard/ServerGroupInstanceArchetype.controller.js index 1018530537b..b387253fc8d 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/ServerGroupInstanceArchetype.controller.js +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/ServerGroupInstanceArchetype.controller.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.azure.serverGroup.configure.instanceArchetype.controller', []) - .controller('azureInstanceArchetypeCtrl', function($scope, instanceTypeService, modalWizardService) { + .controller('azureInstanceArchetypeCtrl', ['$scope', 'instanceTypeService', 'modalWizardService', function($scope, instanceTypeService, modalWizardService) { var wizard = modalWizardService.getWizard(); $scope.$watch('command.viewState.instanceProfile', function() { @@ -23,4 +23,4 @@ module.exports = angular wizard.markComplete('instance-profile'); } }); - }); + }]); diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/ServerGroupInstanceType.controller.js b/app/scripts/modules/azure/serverGroup/configure/wizard/ServerGroupInstanceType.controller.js index f3a5f22525f..94baa504267 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/ServerGroupInstanceType.controller.js +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/ServerGroupInstanceType.controller.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.azure.serverGroup.configure.instanceType.controller', []) - .controller('azureInstanceTypeCtrl', function($scope, modalWizardService) { + .controller('azureInstanceTypeCtrl', ['$scope', 'modalWizardService', function($scope, modalWizardService) { modalWizardService.getWizard().markComplete('instance-type'); modalWizardService.getWizard().markClean('instance-type'); - }); + }]); diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/advancedSettings/ServerGroupAdvancedSettings.controller.js b/app/scripts/modules/azure/serverGroup/configure/wizard/advancedSettings/ServerGroupAdvancedSettings.controller.js index 883c2a56695..d15d0d6c6dd 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/advancedSettings/ServerGroupAdvancedSettings.controller.js +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/advancedSettings/ServerGroupAdvancedSettings.controller.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.azure.serverGroup.configure.advancedSetting.controller', []) - .controller('azureServerGroupAdvancedSettingsCtrl', function($scope, modalWizardService) { + .controller('azureServerGroupAdvancedSettingsCtrl', ['$scope', 'modalWizardService', function($scope, modalWizardService) { modalWizardService.getWizard().markComplete('advanced'); $scope.$watch('form.$valid', function(newVal) { @@ -14,4 +14,4 @@ module.exports = angular modalWizardService.getWizard().markDirty('advanced'); } }); - }); + }]); diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/basicSettings/ServerGroupBasicSettings.controller.js b/app/scripts/modules/azure/serverGroup/configure/wizard/basicSettings/ServerGroupBasicSettings.controller.js index 81ad4ff6575..5004117304e 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/basicSettings/ServerGroupBasicSettings.controller.js +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/basicSettings/ServerGroupBasicSettings.controller.js @@ -11,7 +11,7 @@ module.exports = angular require('./image.regional.filter').name, IMAGE_READER, ]) - .controller('azureServerGroupBasicSettingsCtrl', function($scope, $controller, $uibModalStack, $state, imageReader) { + .controller('azureServerGroupBasicSettingsCtrl', ['$scope', '$controller', '$uibModalStack', '$state', 'imageReader', function($scope, $controller, $uibModalStack, $state, imageReader) { $scope.$watch('form.$valid', function(newVal) { if (newVal) { ModalWizard.markClean('basic-settings'); @@ -52,4 +52,4 @@ module.exports = angular return pattern.test(detail); }, }; - }); + }]); diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/loadBalancers/ServerGroupLoadBalancers.controller.js b/app/scripts/modules/azure/serverGroup/configure/wizard/loadBalancers/ServerGroupLoadBalancers.controller.js index d4594f2c03c..046a0217010 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/loadBalancers/ServerGroupLoadBalancers.controller.js +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/loadBalancers/ServerGroupLoadBalancers.controller.js @@ -6,7 +6,7 @@ import { InfrastructureCaches, LOAD_BALANCER_READ_SERVICE, NetworkReader, ModalW module.exports = angular .module('spinnaker.azure.serverGroup.configure.loadBalancer.controller', [LOAD_BALANCER_READ_SERVICE]) - .controller('azureServerGroupLoadBalancersCtrl', function($scope, loadBalancerReader) { + .controller('azureServerGroupLoadBalancersCtrl', ['$scope', 'loadBalancerReader', function($scope, loadBalancerReader) { ModalWizard.markClean('load-balancers'); if ($scope.command.credentials && $scope.command.region && $scope.command.loadBalancerName) { @@ -55,4 +55,4 @@ module.exports = angular } }); }; - }); + }]); diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/networkSettings/ServerGroupNetworkSettings.controller.js b/app/scripts/modules/azure/serverGroup/configure/wizard/networkSettings/ServerGroupNetworkSettings.controller.js index ad89edd0f97..6e660ee3d11 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/networkSettings/ServerGroupNetworkSettings.controller.js +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/networkSettings/ServerGroupNetworkSettings.controller.js @@ -6,7 +6,7 @@ import { ModalWizard } from '@spinnaker/core'; module.exports = angular .module('spinnaker.azure.serverGroup.configure.networkSettings.controller', []) - .controller('azureServerGroupNetworkSettingsCtrl', function($scope) { + .controller('azureServerGroupNetworkSettingsCtrl', ['$scope', function($scope) { ModalWizard.markClean('network-settings'); $scope.command.selectedVnet = { @@ -28,4 +28,4 @@ module.exports = angular return 'Virtual network was not selected'; } }; - }); + }]); diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/securityGroup/ServerGroupSecurityGroups.controller.js b/app/scripts/modules/azure/serverGroup/configure/wizard/securityGroup/ServerGroupSecurityGroups.controller.js index c230d92c20f..ff8ac134d4f 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/securityGroup/ServerGroupSecurityGroups.controller.js +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/securityGroup/ServerGroupSecurityGroups.controller.js @@ -6,7 +6,7 @@ import { ModalWizard } from '@spinnaker/core'; module.exports = angular .module('spinnaker.azure.serverGroup.configure.securityGroups.controller', []) - .controller('azureServerGroupSecurityGroupsCtrl', function($scope) { + .controller('azureServerGroupSecurityGroupsCtrl', ['$scope', function($scope) { ModalWizard.markClean('security-groups'); ModalWizard.markComplete('security-groups'); @@ -18,4 +18,4 @@ module.exports = angular $scope.command.securityGroupName = securityGroup.id; ModalWizard.markComplete('security-groups'); }; - }); + }]); diff --git a/app/scripts/modules/azure/serverGroup/details/serverGroupDetails.azure.controller.js b/app/scripts/modules/azure/serverGroup/details/serverGroupDetails.azure.controller.js index 8d93de15ddf..bbb04724fea 100644 --- a/app/scripts/modules/azure/serverGroup/details/serverGroupDetails.azure.controller.js +++ b/app/scripts/modules/azure/serverGroup/details/serverGroupDetails.azure.controller.js @@ -20,7 +20,7 @@ module.exports = angular CONFIRMATION_MODAL_SERVICE, SERVER_GROUP_WRITER, ]) - .controller('azureServerGroupDetailsCtrl', function( + .controller('azureServerGroupDetailsCtrl', ['$scope', '$state', '$templateCache', 'app', 'serverGroup', 'azureServerGroupCommandBuilder', '$uibModal', 'confirmationModalService', 'serverGroupWriter', function( $scope, $state, $templateCache, @@ -236,4 +236,4 @@ module.exports = angular } return null; }; - }); + }]); diff --git a/app/scripts/modules/azure/validation/applicationName.validator.js b/app/scripts/modules/azure/validation/applicationName.validator.js index 65eacd965ae..e782a34e9ce 100644 --- a/app/scripts/modules/azure/validation/applicationName.validator.js +++ b/app/scripts/modules/azure/validation/applicationName.validator.js @@ -35,6 +35,6 @@ module.exports = angular validate: validate, }; }) - .run(function(azureApplicationNameValidator) { + .run(['azureApplicationNameValidator', function(azureApplicationNameValidator) { ApplicationNameValidator.registerValidator('azure', azureApplicationNameValidator); - }); + }]); diff --git a/app/scripts/modules/canary/acaTask/acaTaskExecutionDetails.controller.js b/app/scripts/modules/canary/acaTask/acaTaskExecutionDetails.controller.js index 31ee64ff329..a8ce4121165 100644 --- a/app/scripts/modules/canary/acaTask/acaTaskExecutionDetails.controller.js +++ b/app/scripts/modules/canary/acaTask/acaTaskExecutionDetails.controller.js @@ -9,7 +9,7 @@ module.exports = angular require('@uirouter/angularjs').default, require('../canary/canaryDeployment/canaryDeploymentHistory.service').name, ]) - .controller('acaTaskExecutionDetailsCtrl', function( + .controller('acaTaskExecutionDetailsCtrl', ['$scope', '$stateParams', 'executionDetailsSectionService', 'canaryDeploymentHistoryService', function( $scope, $stateParams, executionDetailsSectionService, @@ -75,4 +75,4 @@ module.exports = angular initialize(); $scope.$on('$stateChangeSuccess', initialize); - }); + }]); diff --git a/app/scripts/modules/canary/acaTask/acaTaskStage.js b/app/scripts/modules/canary/acaTask/acaTaskStage.js index a16627e1829..15df2925713 100644 --- a/app/scripts/modules/canary/acaTask/acaTaskStage.js +++ b/app/scripts/modules/canary/acaTask/acaTaskStage.js @@ -26,7 +26,7 @@ module.exports = angular }); } }) - .controller('AcaTaskStageCtrl', function($scope, $uibModal, stage) { + .controller('AcaTaskStageCtrl', ['$scope', '$uibModal', 'stage', function($scope, $uibModal, stage) { var user = AuthenticationService.getAuthenticatedUser(); $scope.stage = stage; $scope.stage.baseline = $scope.stage.baseline || {}; @@ -102,4 +102,4 @@ module.exports = angular return 0; }); }; - }); + }]); diff --git a/app/scripts/modules/canary/acaTask/acaTaskStage.module.js b/app/scripts/modules/canary/acaTask/acaTaskStage.module.js index bd14e177401..6f990de8608 100644 --- a/app/scripts/modules/canary/acaTask/acaTaskStage.module.js +++ b/app/scripts/modules/canary/acaTask/acaTaskStage.module.js @@ -14,6 +14,6 @@ module.exports = angular CANARY_SCORE_COMPONENT, require('../canary/canaryStatus.directive').name, ]) - .run(function(acaTaskTransformer) { + .run(['acaTaskTransformer', function(acaTaskTransformer) { Registry.pipeline.registerTransformer(acaTaskTransformer); - }); + }]); diff --git a/app/scripts/modules/canary/canary/actions/endCanary.controller.js b/app/scripts/modules/canary/canary/actions/endCanary.controller.js index 7da87de14a8..5919aa00c70 100644 --- a/app/scripts/modules/canary/canary/actions/endCanary.controller.js +++ b/app/scripts/modules/canary/canary/actions/endCanary.controller.js @@ -6,7 +6,7 @@ import { SETTINGS } from '@spinnaker/core'; module.exports = angular .module('spinnaker.canary.actions.override.result.controller', [require('@uirouter/angularjs').default]) - .controller('EndCanaryCtrl', function($scope, $http, $uibModalInstance, canaryId) { + .controller('EndCanaryCtrl', ['$scope', '$http', '$uibModalInstance', 'canaryId', function($scope, $http, $uibModalInstance, canaryId) { $scope.command = { reason: null, result: 'SUCCESS', @@ -28,4 +28,4 @@ module.exports = angular }; this.cancel = $uibModalInstance.dismiss; - }); + }]); diff --git a/app/scripts/modules/canary/canary/actions/generateScore.controller.js b/app/scripts/modules/canary/canary/actions/generateScore.controller.js index f03557773c0..9fcf74ad711 100644 --- a/app/scripts/modules/canary/canary/actions/generateScore.controller.js +++ b/app/scripts/modules/canary/canary/actions/generateScore.controller.js @@ -6,7 +6,7 @@ import { SETTINGS } from '@spinnaker/core'; module.exports = angular .module('spinnaker.canary.actions.generate.score.controller', [require('@uirouter/angularjs').default]) - .controller('GenerateScoreCtrl', function($scope, $http, $uibModalInstance, canaryId) { + .controller('GenerateScoreCtrl', ['$scope', '$http', '$uibModalInstance', 'canaryId', function($scope, $http, $uibModalInstance, canaryId) { $scope.command = { duration: null, durationUnit: 'h', @@ -28,4 +28,4 @@ module.exports = angular }; this.cancel = $uibModalInstance.dismiss; - }); + }]); diff --git a/app/scripts/modules/canary/canary/canaryDeployment/canaryDeploymentExecutionDetails.controller.js b/app/scripts/modules/canary/canary/canaryDeployment/canaryDeploymentExecutionDetails.controller.js index 396ddaa3c4e..f67f270dc61 100644 --- a/app/scripts/modules/canary/canary/canaryDeployment/canaryDeploymentExecutionDetails.controller.js +++ b/app/scripts/modules/canary/canary/canaryDeployment/canaryDeploymentExecutionDetails.controller.js @@ -9,7 +9,7 @@ module.exports = angular require('@uirouter/angularjs').default, require('./canaryDeploymentHistory.service').name, ]) - .controller('CanaryDeploymentExecutionDetailsCtrl', function( + .controller('CanaryDeploymentExecutionDetailsCtrl', ['$scope', '$stateParams', 'executionDetailsSectionService', 'canaryDeploymentHistoryService', function( $scope, $stateParams, executionDetailsSectionService, @@ -87,4 +87,4 @@ module.exports = angular initialize(); $scope.$on('$stateChangeSuccess', initialize); - }); + }]); diff --git a/app/scripts/modules/canary/canary/canaryExecutionDetails.controller.js b/app/scripts/modules/canary/canary/canaryExecutionDetails.controller.js index af939e24650..21c7ed8850f 100644 --- a/app/scripts/modules/canary/canary/canaryExecutionDetails.controller.js +++ b/app/scripts/modules/canary/canary/canaryExecutionDetails.controller.js @@ -6,7 +6,7 @@ import { SETTINGS } from '@spinnaker/core'; module.exports = angular .module('spinnaker.canary.details.controller', [require('@uirouter/angularjs').default]) - .controller('CanaryExecutionDetailsCtrl', function($scope, $stateParams, executionDetailsSectionService) { + .controller('CanaryExecutionDetailsCtrl', ['$scope', '$stateParams', 'executionDetailsSectionService', function($scope, $stateParams, executionDetailsSectionService) { $scope.configSections = ['canarySummary', 'canaryConfig', 'taskStatus']; $scope.configUrl = SETTINGS.canaryConfig ? SETTINGS.canaryConfig.analysisConfigUrl : null; @@ -27,4 +27,4 @@ module.exports = angular initialize(); $scope.$on('$stateChangeSuccess', initialize); - }); + }]); diff --git a/app/scripts/modules/canary/canary/canaryExecutionSummary.controller.js b/app/scripts/modules/canary/canary/canaryExecutionSummary.controller.js index 2a0a82d581c..11ea6569f2c 100644 --- a/app/scripts/modules/canary/canary/canaryExecutionSummary.controller.js +++ b/app/scripts/modules/canary/canary/canaryExecutionSummary.controller.js @@ -10,7 +10,7 @@ module.exports = angular require('./actions/generateScore.controller').name, require('./actions/endCanary.controller').name, ]) - .controller('CanaryExecutionSummaryCtrl', function($scope, $http, $uibModal) { + .controller('CanaryExecutionSummaryCtrl', ['$scope', '$http', '$uibModal', function($scope, $http, $uibModal) { this.generateCanaryScore = function() { $uibModal.open({ templateUrl: require('./actions/generateScore.modal.html'), @@ -43,4 +43,4 @@ module.exports = angular return stageConfig.restartable || false; }; - }); + }]); diff --git a/app/scripts/modules/canary/canary/canaryStage.js b/app/scripts/modules/canary/canary/canaryStage.js index 582e6075ffa..13f74521aed 100644 --- a/app/scripts/modules/canary/canary/canaryStage.js +++ b/app/scripts/modules/canary/canary/canaryStage.js @@ -180,7 +180,7 @@ module.exports = angular }); } }) - .controller('CanaryStageCtrl', function( + .controller('CanaryStageCtrl', ['$scope', '$uibModal', 'stage', 'providerSelectionService', 'serverGroupCommandBuilder', 'awsServerGroupTransformer', function( $scope, $uibModal, stage, @@ -527,4 +527,4 @@ module.exports = angular $scope.stage.canary.canaryConfig.canaryHealthCheckHandler.minimumCanaryResultScore = unhealthyScore; }); }; - }); + }]); diff --git a/app/scripts/modules/canary/canary/canaryStage.module.js b/app/scripts/modules/canary/canary/canaryStage.module.js index 6a163e2f63e..9848b30b40e 100644 --- a/app/scripts/modules/canary/canary/canaryStage.module.js +++ b/app/scripts/modules/canary/canary/canaryStage.module.js @@ -18,6 +18,6 @@ module.exports = angular CANARY_SCORES_CONFIG_COMPONENT, require('./canaryStatus.directive').name, ]) - .run(function(canaryStageTransformer) { + .run(['canaryStageTransformer', function(canaryStageTransformer) { Registry.pipeline.registerTransformer(canaryStageTransformer); - }); + }]); diff --git a/app/scripts/modules/cloudfoundry/src/instance/details/cloudfoundryInstanceDetails.module.ts b/app/scripts/modules/cloudfoundry/src/instance/details/cloudfoundryInstanceDetails.module.ts index d86a9939925..67c577bd364 100644 --- a/app/scripts/modules/cloudfoundry/src/instance/details/cloudfoundryInstanceDetails.module.ts +++ b/app/scripts/modules/cloudfoundry/src/instance/details/cloudfoundryInstanceDetails.module.ts @@ -25,6 +25,7 @@ interface InstanceManager { } class CloudFoundryInstanceDetailsCtrl implements IController { + public static $inject = ['$scope', 'app', 'instance', 'instanceWriter', 'confirmationModalService', '$q']; constructor( public $scope: IScope, private app: Application, diff --git a/app/scripts/modules/cloudfoundry/src/loadBalancer/details/cloudFoundryLoadBalancerDetails.module.ts b/app/scripts/modules/cloudfoundry/src/loadBalancer/details/cloudFoundryLoadBalancerDetails.module.ts index d386a41dfcb..441fffcc237 100644 --- a/app/scripts/modules/cloudfoundry/src/loadBalancer/details/cloudFoundryLoadBalancerDetails.module.ts +++ b/app/scripts/modules/cloudfoundry/src/loadBalancer/details/cloudFoundryLoadBalancerDetails.module.ts @@ -16,6 +16,7 @@ class CloudFoundryLoadBalancerDetailsCtrl implements IController { private loadBalancerFromParams: ILoadBalancerFromStateParams; public loadBalancer: ICloudFoundryLoadBalancer; + public static $inject = ['$scope', 'app', 'confirmationModalService', 'loadBalancer', '$q']; constructor( public $scope: IScope, private app: Application, diff --git a/app/scripts/modules/cloudfoundry/src/loadBalancer/loadBalancer.transformer.ts b/app/scripts/modules/cloudfoundry/src/loadBalancer/loadBalancer.transformer.ts index 92f0521da29..219cf76b187 100644 --- a/app/scripts/modules/cloudfoundry/src/loadBalancer/loadBalancer.transformer.ts +++ b/app/scripts/modules/cloudfoundry/src/loadBalancer/loadBalancer.transformer.ts @@ -44,6 +44,7 @@ export class CloudFoundryLoadBalancerUpsertDescription } export class CloudFoundryLoadBalancerTransformer { + public static $inject = ['$q']; constructor(private $q: ng.IQService) { 'ngInject'; } diff --git a/app/scripts/modules/cloudfoundry/src/pipeline/stages/cloneServerGroup/cloudfoundryCloneServerGroupStage.module.ts b/app/scripts/modules/cloudfoundry/src/pipeline/stages/cloneServerGroup/cloudfoundryCloneServerGroupStage.module.ts index 4c375744f78..908bfbc6314 100644 --- a/app/scripts/modules/cloudfoundry/src/pipeline/stages/cloneServerGroup/cloudfoundryCloneServerGroupStage.module.ts +++ b/app/scripts/modules/cloudfoundry/src/pipeline/stages/cloneServerGroup/cloudfoundryCloneServerGroupStage.module.ts @@ -4,6 +4,7 @@ import { CloudfoundryCloneServerGroupStageConfig } from './CloudfoundryCloneServ import { IStage, Registry } from '@spinnaker/core'; class CloudfoundryCloneServerGroupStageCtrl implements IController { + public static $inject = ['$scope']; constructor(public $scope: IScope) { 'ngInject'; } diff --git a/app/scripts/modules/cloudfoundry/src/pipeline/stages/deployService/cloudfoundryDeployServiceStage.module.ts b/app/scripts/modules/cloudfoundry/src/pipeline/stages/deployService/cloudfoundryDeployServiceStage.module.ts index c7f1cb8c532..4eaa35829e3 100644 --- a/app/scripts/modules/cloudfoundry/src/pipeline/stages/deployService/cloudfoundryDeployServiceStage.module.ts +++ b/app/scripts/modules/cloudfoundry/src/pipeline/stages/deployService/cloudfoundryDeployServiceStage.module.ts @@ -7,6 +7,7 @@ import { CloudfoundryDeployServiceExecutionDetails } from './CloudfoundryDeployS import { IServiceFieldValidatorConfig } from 'cloudfoundry/pipeline/config/validation/ServiceFieldValidatorConfig'; class CloudFoundryDeployServiceStageCtrl implements IController { + public static $inject = ['$scope']; constructor(public $scope: IScope) { 'ngInject'; } diff --git a/app/scripts/modules/cloudfoundry/src/pipeline/stages/destroyAsg/cloudfoundryDestroyAsgStage.module.ts b/app/scripts/modules/cloudfoundry/src/pipeline/stages/destroyAsg/cloudfoundryDestroyAsgStage.module.ts index 2ef92475d15..06663133274 100644 --- a/app/scripts/modules/cloudfoundry/src/pipeline/stages/destroyAsg/cloudfoundryDestroyAsgStage.module.ts +++ b/app/scripts/modules/cloudfoundry/src/pipeline/stages/destroyAsg/cloudfoundryDestroyAsgStage.module.ts @@ -5,6 +5,7 @@ import { CloudfoundryDestroyAsgStageConfig } from './CloudfoundryDestroyAsgStage import { Application, IStage, Registry } from '@spinnaker/core'; class CloudFoundryDestroyAsgStageCtrl implements IController { + public static $inject = ['$scope', 'application']; constructor(public $scope: IScope, private application: Application) { 'ngInject'; this.$scope.application = this.application; diff --git a/app/scripts/modules/cloudfoundry/src/pipeline/stages/destroyService/cloudfoundryDestroyServiceStage.module.ts b/app/scripts/modules/cloudfoundry/src/pipeline/stages/destroyService/cloudfoundryDestroyServiceStage.module.ts index 15da79a04b2..317b500c2a9 100644 --- a/app/scripts/modules/cloudfoundry/src/pipeline/stages/destroyService/cloudfoundryDestroyServiceStage.module.ts +++ b/app/scripts/modules/cloudfoundry/src/pipeline/stages/destroyService/cloudfoundryDestroyServiceStage.module.ts @@ -6,6 +6,7 @@ import { ExecutionDetailsTasks, IStage, Registry } from '@spinnaker/core'; import { CloudfoundryDestroyServiceExecutionDetails } from './CloudfoundryDestroyServiceExecutionDetails'; class CloudFoundryDestroyServiceStageCtrl implements IController { + public static $inject = ['$scope']; constructor(public $scope: IScope) { 'ngInject'; } diff --git a/app/scripts/modules/cloudfoundry/src/pipeline/stages/disableAsg/cloudfoundryDisableAsgStage.module.ts b/app/scripts/modules/cloudfoundry/src/pipeline/stages/disableAsg/cloudfoundryDisableAsgStage.module.ts index 46deb308ebb..0188b1345c6 100644 --- a/app/scripts/modules/cloudfoundry/src/pipeline/stages/disableAsg/cloudfoundryDisableAsgStage.module.ts +++ b/app/scripts/modules/cloudfoundry/src/pipeline/stages/disableAsg/cloudfoundryDisableAsgStage.module.ts @@ -5,6 +5,7 @@ import { CloudfoundryDisableAsgStageConfig } from './CloudfoundryDisableAsgStage import { Application, IStage, Registry } from '@spinnaker/core'; class CloudFoundryDisableAsgStageCtrl implements IController { + public static $inject = ['$scope', 'application']; constructor(public $scope: IScope, private application: Application) { 'ngInject'; this.$scope.application = this.application; diff --git a/app/scripts/modules/cloudfoundry/src/pipeline/stages/enableAsg/cloudfoundryEnableAsgStage.module.ts b/app/scripts/modules/cloudfoundry/src/pipeline/stages/enableAsg/cloudfoundryEnableAsgStage.module.ts index cf72a40d6fb..c6ba4b9ae27 100644 --- a/app/scripts/modules/cloudfoundry/src/pipeline/stages/enableAsg/cloudfoundryEnableAsgStage.module.ts +++ b/app/scripts/modules/cloudfoundry/src/pipeline/stages/enableAsg/cloudfoundryEnableAsgStage.module.ts @@ -5,6 +5,7 @@ import { CloudfoundryEnableAsgStageConfig } from './CloudfoundryEnableAsgStageCo import { Application, IStage, Registry } from '@spinnaker/core'; class CloudFoundryEnableAsgStageCtrl implements IController { + public static $inject = ['$scope', 'application']; constructor(public $scope: IScope, private application: Application) { 'ngInject'; this.$scope.application = this.application; diff --git a/app/scripts/modules/cloudfoundry/src/pipeline/stages/mapLoadBalancers/cloudfoundryMapLoadBalancersStage.module.ts b/app/scripts/modules/cloudfoundry/src/pipeline/stages/mapLoadBalancers/cloudfoundryMapLoadBalancersStage.module.ts index d97a1252e29..6062255e886 100644 --- a/app/scripts/modules/cloudfoundry/src/pipeline/stages/mapLoadBalancers/cloudfoundryMapLoadBalancersStage.module.ts +++ b/app/scripts/modules/cloudfoundry/src/pipeline/stages/mapLoadBalancers/cloudfoundryMapLoadBalancersStage.module.ts @@ -6,6 +6,7 @@ import { AccountService, ExecutionDetailsTasks, IStage, Registry } from '@spinna import { CloudfoundryMapLoadBalancersExecutionDetails } from './CloudfoundryMapLoadBalancersExecutionDetails'; class CloudFoundryMapLoadBalancersStageCtrl implements IController { + public static $inject = ['$scope']; constructor(public $scope: IScope) { 'ngInject'; $scope.accounts = []; diff --git a/app/scripts/modules/cloudfoundry/src/pipeline/stages/resizeAsg/cloudfoundryResizeAsgStage.module.ts b/app/scripts/modules/cloudfoundry/src/pipeline/stages/resizeAsg/cloudfoundryResizeAsgStage.module.ts index c63fe0c0921..6f757b94a22 100644 --- a/app/scripts/modules/cloudfoundry/src/pipeline/stages/resizeAsg/cloudfoundryResizeAsgStage.module.ts +++ b/app/scripts/modules/cloudfoundry/src/pipeline/stages/resizeAsg/cloudfoundryResizeAsgStage.module.ts @@ -6,6 +6,7 @@ import { Application, IStage, Registry } from '@spinnaker/core'; import { IInstanceFieldSizeValidationConfig } from 'cloudfoundry/pipeline/config/validation/instanceSize.validator'; class CloudFoundryResizeAsgStageCtrl implements IController { + public static $inject = ['$scope', 'application']; constructor(public $scope: IScope, private application: Application) { 'ngInject'; this.$scope.application = this.application; diff --git a/app/scripts/modules/cloudfoundry/src/pipeline/stages/rollbackCluster/cloudfoundryRollbackClusterStage.module.ts b/app/scripts/modules/cloudfoundry/src/pipeline/stages/rollbackCluster/cloudfoundryRollbackClusterStage.module.ts index b931976af70..643c6204120 100644 --- a/app/scripts/modules/cloudfoundry/src/pipeline/stages/rollbackCluster/cloudfoundryRollbackClusterStage.module.ts +++ b/app/scripts/modules/cloudfoundry/src/pipeline/stages/rollbackCluster/cloudfoundryRollbackClusterStage.module.ts @@ -5,6 +5,7 @@ import { CloudfoundryRollbackClusterStageConfig } from './CloudfoundryRollbackCl import { Application, IStage, Registry } from '@spinnaker/core'; class CloudFoundryRollbackClusterStageCtrl implements IController { + public static $inject = ['$scope', 'application']; constructor(public $scope: IScope, private application: Application) { 'ngInject'; this.$scope.application = this.application; diff --git a/app/scripts/modules/cloudfoundry/src/pipeline/stages/unmapLoadBalancers/cloudfoundryUnmapLoadBalancersStage.module.ts b/app/scripts/modules/cloudfoundry/src/pipeline/stages/unmapLoadBalancers/cloudfoundryUnmapLoadBalancersStage.module.ts index 9bf5136ae88..35247670660 100644 --- a/app/scripts/modules/cloudfoundry/src/pipeline/stages/unmapLoadBalancers/cloudfoundryUnmapLoadBalancersStage.module.ts +++ b/app/scripts/modules/cloudfoundry/src/pipeline/stages/unmapLoadBalancers/cloudfoundryUnmapLoadBalancersStage.module.ts @@ -6,6 +6,7 @@ import { AccountService, ExecutionDetailsTasks, IStage, Registry } from '@spinna import { CloudfoundryUnmapLoadBalancersExecutionDetails } from './CloudfoundryUnmapLoadBalancersExecutionDetails'; class CloudFoundryUnmapLoadBalancersStageCtrl implements IController { + public static $inject = ['$scope']; constructor(public $scope: IScope) { 'ngInject'; $scope.accounts = []; diff --git a/app/scripts/modules/cloudfoundry/src/reactShims/cf.react.module.ts b/app/scripts/modules/cloudfoundry/src/reactShims/cf.react.module.ts index f10c4c89922..7f9ccc90372 100644 --- a/app/scripts/modules/cloudfoundry/src/reactShims/cf.react.module.ts +++ b/app/scripts/modules/cloudfoundry/src/reactShims/cf.react.module.ts @@ -3,7 +3,7 @@ import { module } from 'angular'; import { CloudFoundryReactInjector } from './cf.react.injector'; export const CLOUD_FOUNDRY_REACT_MODULE = 'spinnaker.cloudfoundry.react'; -module(CLOUD_FOUNDRY_REACT_MODULE, []).run(($injector: any) => { +module(CLOUD_FOUNDRY_REACT_MODULE, []).run(['$injector', ($injector: any) => { // Make angular services importable and (TODO when relevant) convert angular components to react CloudFoundryReactInjector.initialize($injector); -}); +}]); diff --git a/app/scripts/modules/cloudfoundry/src/serverGroup/configure/serverGroupCommandBuilder.service.cf.ts b/app/scripts/modules/cloudfoundry/src/serverGroup/configure/serverGroupCommandBuilder.service.cf.ts index 303984289b7..053cfe959a8 100644 --- a/app/scripts/modules/cloudfoundry/src/serverGroup/configure/serverGroupCommandBuilder.service.cf.ts +++ b/app/scripts/modules/cloudfoundry/src/serverGroup/configure/serverGroupCommandBuilder.service.cf.ts @@ -38,6 +38,7 @@ export class CloudFoundryServerGroupCommandBuilder { } } + public static $inject = ['$q']; constructor(private $q: IQService) { 'ngInject'; } diff --git a/app/scripts/modules/cloudfoundry/src/serverGroup/serverGroup.transformer.ts b/app/scripts/modules/cloudfoundry/src/serverGroup/serverGroup.transformer.ts index 84e87c49127..58ed0b54d5d 100644 --- a/app/scripts/modules/cloudfoundry/src/serverGroup/serverGroup.transformer.ts +++ b/app/scripts/modules/cloudfoundry/src/serverGroup/serverGroup.transformer.ts @@ -5,6 +5,7 @@ import { defaults } from 'lodash'; import { ICloudFoundryServerGroup, ICloudFoundryEnvVar } from 'cloudfoundry/domain'; export class CloudFoundryServerGroupTransformer { + public static $inject = ['$q']; public constructor(private $q: ng.IQService) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/account/accountSelectField.component.ts b/app/scripts/modules/core/src/account/accountSelectField.component.ts index eeef7fec18f..399524cfb1d 100644 --- a/app/scripts/modules/core/src/account/accountSelectField.component.ts +++ b/app/scripts/modules/core/src/account/accountSelectField.component.ts @@ -22,12 +22,12 @@ module(ACCOUNT_SELECT_COMPONENT, []).component('accountSelectField', { onChange: '&', readOnly: '=', }, - controller: function($timeout: ITimeoutService) { + controller: ['$timeout', function($timeout: ITimeoutService) { this.handleSelectChanged = (event: React.ChangeEvent) => { $timeout(() => { this.currentValue = this.component[this.field] = event.target.value; this.onChange && this.onChange(); }); }; - }, + }], }); diff --git a/app/scripts/modules/core/src/api/network.interceptor.ts b/app/scripts/modules/core/src/api/network.interceptor.ts index 3df3e8c29a1..8376e4e3b30 100644 --- a/app/scripts/modules/core/src/api/network.interceptor.ts +++ b/app/scripts/modules/core/src/api/network.interceptor.ts @@ -23,6 +23,7 @@ export class NetworkInterceptor implements IHttpInterceptor { private retryQueue: Dictionary = {}; private MAX_RETRIES = 4; + public static $inject = ['$q', '$window', '$timeout', '$injector']; constructor( private $q: IQService, private $window: IWindowService, @@ -79,6 +80,6 @@ export class NetworkInterceptor implements IHttpInterceptor { export const NETWORK_INTERCEPTOR = 'spinnaker.core.network.interceptor'; module(NETWORK_INTERCEPTOR, []) .service('networkInterceptor', NetworkInterceptor) - .config(($httpProvider: IHttpProvider) => { + .config(['$httpProvider', ($httpProvider: IHttpProvider) => { $httpProvider.interceptors.push('networkInterceptor'); - }); + }]); diff --git a/app/scripts/modules/core/src/application/application.state.provider.ts b/app/scripts/modules/core/src/application/application.state.provider.ts index 18f3df73779..40513408ea0 100644 --- a/app/scripts/modules/core/src/application/application.state.provider.ts +++ b/app/scripts/modules/core/src/application/application.state.provider.ts @@ -25,6 +25,7 @@ export class ApplicationStateProvider implements IServiceProvider { children: this.insightStates, }; + public static $inject = ['stateConfigProvider']; constructor(private stateConfigProvider: StateConfigProvider) { 'ngInject'; this.childStates.push(this.insightState); diff --git a/app/scripts/modules/core/src/application/applications.state.provider.ts b/app/scripts/modules/core/src/application/applications.state.provider.ts index 7a2b49a2861..8166b0995a7 100644 --- a/app/scripts/modules/core/src/application/applications.state.provider.ts +++ b/app/scripts/modules/core/src/application/applications.state.provider.ts @@ -6,7 +6,7 @@ import { Applications } from 'core/application/search/Applications'; export const APPLICATIONS_STATE_PROVIDER = 'spinnaker.core.application.applications.state'; module(APPLICATIONS_STATE_PROVIDER, [STATE_CONFIG_PROVIDER, APPLICATION_STATE_PROVIDER]).config( - (stateConfigProvider: StateConfigProvider, applicationStateProvider: ApplicationStateProvider) => { + ['stateConfigProvider', 'applicationStateProvider', (stateConfigProvider: StateConfigProvider, applicationStateProvider: ApplicationStateProvider) => { const applicationsState: INestedState = { name: 'applications', url: '/applications', @@ -27,5 +27,5 @@ module(APPLICATIONS_STATE_PROVIDER, [STATE_CONFIG_PROVIDER, APPLICATION_STATE_PR applicationStateProvider.addParentState(applicationsState, 'main@'); stateConfigProvider.addToRootState(applicationsState); stateConfigProvider.addRewriteRule('/applications/{application}', '/applications/{application}/clusters'); - }, + }], ); diff --git a/app/scripts/modules/core/src/application/config/appConfig.states.ts b/app/scripts/modules/core/src/application/config/appConfig.states.ts index 7bc84ae49f4..2d88196c613 100644 --- a/app/scripts/modules/core/src/application/config/appConfig.states.ts +++ b/app/scripts/modules/core/src/application/config/appConfig.states.ts @@ -6,7 +6,7 @@ import { ApplicationStateProvider, APPLICATION_STATE_PROVIDER } from '../applica import { ApplicationConfig } from './ApplicationConfig'; export const APP_CONFIG_STATES = 'spinnaker.core.application.states'; -module(APP_CONFIG_STATES, [APPLICATION_STATE_PROVIDER]).config((applicationStateProvider: ApplicationStateProvider) => { +module(APP_CONFIG_STATES, [APPLICATION_STATE_PROVIDER]).config(['applicationStateProvider', (applicationStateProvider: ApplicationStateProvider) => { const configState: INestedState = { name: 'config', url: '/config?section', @@ -29,4 +29,4 @@ module(APP_CONFIG_STATES, [APPLICATION_STATE_PROVIDER]).config((applicationState }; applicationStateProvider.addChildState(configState); -}); +}]); diff --git a/app/scripts/modules/core/src/application/config/applicationAttributes.directive.js b/app/scripts/modules/core/src/application/config/applicationAttributes.directive.js index 876c96cb4b0..ef2c701f50f 100644 --- a/app/scripts/modules/core/src/application/config/applicationAttributes.directive.js +++ b/app/scripts/modules/core/src/application/config/applicationAttributes.directive.js @@ -26,7 +26,7 @@ module.exports = angular controllerAs: 'vm', }; }) - .controller('ApplicationAttributesCtrl', function($uibModal, overrideRegistry) { + .controller('ApplicationAttributesCtrl', ['$uibModal', 'overrideRegistry', function($uibModal, overrideRegistry) { const cpHealthMsg = 'considers only cloud provider health when executing tasks'; const healthOverrideMsg = 'shows a health override option for each operation'; const setHealthMessage = () => { @@ -93,4 +93,4 @@ module.exports = angular }) .catch(() => {}); }; - }); + }]); diff --git a/app/scripts/modules/core/src/application/config/applicationCacheManagement.directive.js b/app/scripts/modules/core/src/application/config/applicationCacheManagement.directive.js index 8d744c2c605..a13d7185b71 100644 --- a/app/scripts/modules/core/src/application/config/applicationCacheManagement.directive.js +++ b/app/scripts/modules/core/src/application/config/applicationCacheManagement.directive.js @@ -25,7 +25,7 @@ module.exports = angular controllerAs: 'vm', }; }) - .controller('ApplicationCacheManagementCtrl', function($log, cacheInitializer) { + .controller('ApplicationCacheManagementCtrl', ['$log', 'cacheInitializer', function($log, cacheInitializer) { this.refreshCaches = () => { this.clearingCaches = true; cacheInitializer.refreshCaches().then( @@ -60,4 +60,4 @@ module.exports = angular }, ); }; - }); + }]); diff --git a/app/scripts/modules/core/src/application/config/applicationConfig.controller.js b/app/scripts/modules/core/src/application/config/applicationConfig.controller.js index 10121193d81..5b4026d7dc9 100644 --- a/app/scripts/modules/core/src/application/config/applicationConfig.controller.js +++ b/app/scripts/modules/core/src/application/config/applicationConfig.controller.js @@ -21,7 +21,7 @@ module.exports = angular TRAFFIC_GUARD_CONFIG_COMPONENT, require('./links/applicationLinks.component').name, ]) - .controller('ApplicationConfigController', function($state, app, $scope) { + .controller('ApplicationConfigController', ['$state', 'app', '$scope', function($state, app, $scope) { this.application = app; this.isDataSourceEnabled = key => app.dataSources.some(ds => ds.key === key && ds.disabled === false); this.feature = SETTINGS.feature; @@ -54,4 +54,4 @@ module.exports = angular this.bannerConfigProps.saveError = true; }); }; - }); + }]); diff --git a/app/scripts/modules/core/src/application/config/applicationSnapshotSection.component.js b/app/scripts/modules/core/src/application/config/applicationSnapshotSection.component.js index 9aa8ba7150a..e8a4ae42c52 100644 --- a/app/scripts/modules/core/src/application/config/applicationSnapshotSection.component.js +++ b/app/scripts/modules/core/src/application/config/applicationSnapshotSection.component.js @@ -16,7 +16,7 @@ module.exports = angular bindings: { application: '=', }, - controller: function($state, confirmationModalService) { + controller: ['$state', 'confirmationModalService', function($state, confirmationModalService) { if (this.application.notFound) { return; } @@ -40,5 +40,5 @@ module.exports = angular submitMethod: submitMethod, }); }; - }, + }], }); diff --git a/app/scripts/modules/core/src/application/config/deleteApplicationSection.directive.js b/app/scripts/modules/core/src/application/config/deleteApplicationSection.directive.js index daede117722..e334e7f362b 100644 --- a/app/scripts/modules/core/src/application/config/deleteApplicationSection.directive.js +++ b/app/scripts/modules/core/src/application/config/deleteApplicationSection.directive.js @@ -27,7 +27,7 @@ module.exports = angular controller: 'DeleteApplicationSectionCtrl', }; }) - .controller('DeleteApplicationSectionCtrl', function($state, confirmationModalService) { + .controller('DeleteApplicationSectionCtrl', ['$state', 'confirmationModalService', function($state, confirmationModalService) { if (this.application.notFound) { return; } @@ -55,4 +55,4 @@ module.exports = angular submitMethod: submitMethod, }); }; - }); + }]); diff --git a/app/scripts/modules/core/src/application/config/links/applicationLinks.component.js b/app/scripts/modules/core/src/application/config/links/applicationLinks.component.js index a9dbddd1ad0..2fa89bbfeeb 100644 --- a/app/scripts/modules/core/src/application/config/links/applicationLinks.component.js +++ b/app/scripts/modules/core/src/application/config/links/applicationLinks.component.js @@ -19,7 +19,7 @@ module.exports = angular application: '=', }, templateUrl: require('./applicationLinks.component.html'), - controller: function($uibModal) { + controller: ['$uibModal', function($uibModal) { let initialize = () => { if (this.application.notFound) { return; @@ -111,5 +111,5 @@ module.exports = angular }; this.$onInit = initialize; - }, + }], }); diff --git a/app/scripts/modules/core/src/application/config/links/editLinks.modal.controller.js b/app/scripts/modules/core/src/application/config/links/editLinks.modal.controller.js index 4e91ca6883b..159bed14126 100644 --- a/app/scripts/modules/core/src/application/config/links/editLinks.modal.controller.js +++ b/app/scripts/modules/core/src/application/config/links/editLinks.modal.controller.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.application.config.links.editJson', []) - .controller('EditLinksModalCtrl', function(sections, $uibModalInstance) { + .controller('EditLinksModalCtrl', ['sections', '$uibModalInstance', function(sections, $uibModalInstance) { this.cancel = $uibModalInstance.dismiss; this.initialize = () => { @@ -21,4 +21,4 @@ module.exports = angular }; this.initialize(); - }); + }]); diff --git a/app/scripts/modules/core/src/application/config/trafficGuard/trafficGuardConfig.component.ts b/app/scripts/modules/core/src/application/config/trafficGuard/trafficGuardConfig.component.ts index bd52aac772b..5acb9087414 100644 --- a/app/scripts/modules/core/src/application/config/trafficGuard/trafficGuardConfig.component.ts +++ b/app/scripts/modules/core/src/application/config/trafficGuard/trafficGuardConfig.component.ts @@ -27,6 +27,7 @@ export class TrafficGuardConfigController { isDirty: false, }; + public static $inject = ['$log']; public constructor(private $log: ILogService) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/application/modal/createApplication.modal.controller.js b/app/scripts/modules/core/src/application/modal/createApplication.modal.controller.js index 95491627422..e3b44b834ec 100644 --- a/app/scripts/modules/core/src/application/modal/createApplication.modal.controller.js +++ b/app/scripts/modules/core/src/application/modal/createApplication.modal.controller.js @@ -20,7 +20,7 @@ module.exports = angular require('./applicationProviderFields.component').name, CHAOS_MONKEY_NEW_APPLICATION_CONFIG_COMPONENT, ]) - .controller('CreateApplicationModalCtrl', function($scope, $q, $log, $state, $uibModalInstance, $timeout) { + .controller('CreateApplicationModalCtrl', ['$scope', '$q', '$log', '$state', '$uibModalInstance', '$timeout', function($scope, $q, $log, $state, $uibModalInstance, $timeout) { let applicationLoader = ApplicationReader.listApplications(); applicationLoader.then(applications => (this.data.appNameList = _.map(applications, 'name'))); @@ -122,4 +122,4 @@ module.exports = angular } this.createApplicationForTests(); }; - }); + }]); diff --git a/app/scripts/modules/core/src/application/modal/editApplication.controller.modal.js b/app/scripts/modules/core/src/application/modal/editApplication.controller.modal.js index 3d934155e0a..e668af5a59e 100644 --- a/app/scripts/modules/core/src/application/modal/editApplication.controller.modal.js +++ b/app/scripts/modules/core/src/application/modal/editApplication.controller.modal.js @@ -11,7 +11,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.editApplication.modal.controller', [require('./applicationProviderFields.component').name]) - .controller('EditApplicationController', function($scope, $window, $state, $uibModalInstance, application) { + .controller('EditApplicationController', ['$scope', '$window', '$state', '$uibModalInstance', 'application', function($scope, $window, $state, $uibModalInstance, application) { var vm = this; this.data = { gitSources: SETTINGS.gitSources || ['stash', 'github', 'bitbucket', 'gitlab'], @@ -119,4 +119,4 @@ module.exports = angular }; return vm; - }); + }]); diff --git a/app/scripts/modules/core/src/application/modal/platformHealthOverride.directive.js b/app/scripts/modules/core/src/application/modal/platformHealthOverride.directive.js index c5dd8a7a105..48d19bc18fd 100644 --- a/app/scripts/modules/core/src/application/modal/platformHealthOverride.directive.js +++ b/app/scripts/modules/core/src/application/modal/platformHealthOverride.directive.js @@ -25,7 +25,7 @@ module.exports = angular .attr('checked', _.isEqual(scope.command.interestingHealthProviderNames, [scope.platformHealthType])); }; }) - .controller('PlatformHealthOverrideCtrl', function($scope) { + .controller('PlatformHealthOverrideCtrl', ['$scope', function($scope) { $scope.clicked = function($event) { if ($event.currentTarget.checked) { $scope.command.interestingHealthProviderNames = [$scope.platformHealthType]; @@ -33,4 +33,4 @@ module.exports = angular delete $scope.command.interestingHealthProviderNames; } }; - }); + }]); diff --git a/app/scripts/modules/core/src/application/modal/validation/validateApplicationName.directive.ts b/app/scripts/modules/core/src/application/modal/validation/validateApplicationName.directive.ts index 790631ce7d2..870f0fec223 100644 --- a/app/scripts/modules/core/src/application/modal/validation/validateApplicationName.directive.ts +++ b/app/scripts/modules/core/src/application/modal/validation/validateApplicationName.directive.ts @@ -17,6 +17,7 @@ class ValidateApplicationNameController implements IController { public $attrs: IValidateNameAttrs; public $scope: IScope; + public static $inject = ['$q']; constructor(private $q: IQService) {} public initialize() { diff --git a/app/scripts/modules/core/src/artifact/ExpectedArtifactSelectorViewController.ts b/app/scripts/modules/core/src/artifact/ExpectedArtifactSelectorViewController.ts index 7317b3bc309..53f28b95967 100644 --- a/app/scripts/modules/core/src/artifact/ExpectedArtifactSelectorViewController.ts +++ b/app/scripts/modules/core/src/artifact/ExpectedArtifactSelectorViewController.ts @@ -20,6 +20,7 @@ export interface IExpectedArtifactSelectorViewControllerDelegate { export class ExpectedArtifactSelectorViewController { public accountsForArtifact: IArtifactAccount[] = []; + public static $inject = ['delegate']; constructor(private delegate: IExpectedArtifactSelectorViewControllerDelegate) {} public updateAccounts = (expectedArtifact: IExpectedArtifact) => { diff --git a/app/scripts/modules/core/src/authentication/authentication.interceptor.service.ts b/app/scripts/modules/core/src/authentication/authentication.interceptor.service.ts index ada807871f5..7370c45259b 100644 --- a/app/scripts/modules/core/src/authentication/authentication.interceptor.service.ts +++ b/app/scripts/modules/core/src/authentication/authentication.interceptor.service.ts @@ -3,6 +3,7 @@ import { AuthenticationService } from './AuthenticationService'; import { SETTINGS } from 'core/config/settings'; export class AuthenticationInterceptor implements ng.IHttpInterceptor { + public static $inject = ['$q']; constructor(private $q: ng.IQService) { 'ngInject'; } @@ -33,8 +34,8 @@ export class AuthenticationInterceptor implements ng.IHttpInterceptor { export const AUTHENTICATION_INTERCEPTOR_SERVICE = 'spinnaker.authentication.interceptor.service'; module(AUTHENTICATION_INTERCEPTOR_SERVICE, []) .service('authenticationInterceptor', AuthenticationInterceptor) - .config(($httpProvider: ng.IHttpProvider) => { + .config(['$httpProvider', ($httpProvider: ng.IHttpProvider) => { if (SETTINGS.authEnabled) { $httpProvider.interceptors.push('authenticationInterceptor'); } - }); + }]); diff --git a/app/scripts/modules/core/src/authentication/authentication.module.ts b/app/scripts/modules/core/src/authentication/authentication.module.ts index 510e61dcc63..e7457f7ad23 100644 --- a/app/scripts/modules/core/src/authentication/authentication.module.ts +++ b/app/scripts/modules/core/src/authentication/authentication.module.ts @@ -8,9 +8,9 @@ const angular = require('angular'); export const AUTHENTICATION_MODULE = 'spinnaker.authentication'; angular .module(AUTHENTICATION_MODULE, [AUTHENTICATION_INTERCEPTOR_SERVICE, require('./userMenu/userMenu.module').name]) - .config(function($httpProvider: ng.IHttpProvider) { + .config(['$httpProvider', function($httpProvider: ng.IHttpProvider) { $httpProvider.interceptors.push('gateRequestInterceptor'); - }) + }]) .factory('gateRequestInterceptor', function() { return { request(config: ng.IRequestConfig) { diff --git a/app/scripts/modules/core/src/bootstrap/angular.config.ts b/app/scripts/modules/core/src/bootstrap/angular.config.ts index b6389cbd198..57d70f848b7 100644 --- a/app/scripts/modules/core/src/bootstrap/angular.config.ts +++ b/app/scripts/modules/core/src/bootstrap/angular.config.ts @@ -3,29 +3,29 @@ import { ICompileProvider, IHttpProvider, ILocationProvider, ILogProvider } from import { bootstrapModule } from './bootstrap.module'; import { SETTINGS } from 'core/config'; -bootstrapModule.config(($logProvider: ILogProvider) => { +bootstrapModule.config(['$logProvider', ($logProvider: ILogProvider) => { 'ngInject'; $logProvider.debugEnabled(SETTINGS.debugEnabled); -}); +}]); -bootstrapModule.config(($httpProvider: IHttpProvider) => { +bootstrapModule.config(['$httpProvider', ($httpProvider: IHttpProvider) => { 'ngInject'; $httpProvider.defaults.headers.patch = { 'Content-Type': 'application/json;charset=utf-8', }; -}); +}]); // Angular 1.6 defaults preAssignBindingsEnabled to false, reset to true to mimic 1.5 behavior. // See https://docs.angularjs.org/guide/migration#migrate1.5to1.6-ng-services-$compile -bootstrapModule.config(($compileProvider: ICompileProvider) => { +bootstrapModule.config(['$compileProvider', ($compileProvider: ICompileProvider) => { 'ngInject'; $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|mailto|hipchat|slack|ssh):/); $compileProvider.preAssignBindingsEnabled(true); -}); +}]); // Angular 1.6 sets default hashPrefix to '!', change it back to '' // See https://docs.angularjs.org/guide/migration#migrate1.5to1.6-ng-services-$location -bootstrapModule.config(($locationProvider: ILocationProvider) => { +bootstrapModule.config(['$locationProvider', ($locationProvider: ILocationProvider) => { 'ngInject'; $locationProvider.hashPrefix(''); -}); +}]); diff --git a/app/scripts/modules/core/src/bootstrap/appInit.ts b/app/scripts/modules/core/src/bootstrap/appInit.ts index 394d696fbee..c1e91208486 100644 --- a/app/scripts/modules/core/src/bootstrap/appInit.ts +++ b/app/scripts/modules/core/src/bootstrap/appInit.ts @@ -6,13 +6,13 @@ import { SETTINGS } from 'core/config'; import { CacheInitializerService } from 'core/cache'; import { StateService } from '@uirouter/core'; -bootstrapModule.run(($rootScope: IRootScopeService, $state: StateService) => { +bootstrapModule.run(['$rootScope', '$state', ($rootScope: IRootScopeService, $state: StateService) => { 'ngInject'; $rootScope.feature = SETTINGS.feature; $rootScope.$state = $state; // TODO: Do we really need this? -}); +}]); -bootstrapModule.run((cacheInitializer: CacheInitializerService) => { +bootstrapModule.run(['cacheInitializer', (cacheInitializer: CacheInitializerService) => { 'ngInject'; cacheInitializer.initialize(); -}); +}]); diff --git a/app/scripts/modules/core/src/bootstrap/spinnaker.component.ts b/app/scripts/modules/core/src/bootstrap/spinnaker.component.ts index 6bc888396f7..b9175e3a37d 100644 --- a/app/scripts/modules/core/src/bootstrap/spinnaker.component.ts +++ b/app/scripts/modules/core/src/bootstrap/spinnaker.component.ts @@ -27,6 +27,7 @@ const template = ` class SpinnakerController implements IController { public spinnakerHeaderTemplate: string; public feature: IFeatures; + public static $inject = ['overrideRegistry']; constructor(overrideRegistry: OverrideRegistry) { 'ngInject'; react2angular(SpinnakerHeader); diff --git a/app/scripts/modules/core/src/bootstrap/stateChange.logger.ts b/app/scripts/modules/core/src/bootstrap/stateChange.logger.ts index 31a6ccbeba2..c00f0b062e2 100644 --- a/app/scripts/modules/core/src/bootstrap/stateChange.logger.ts +++ b/app/scripts/modules/core/src/bootstrap/stateChange.logger.ts @@ -5,7 +5,7 @@ import '@uirouter/rx'; import { bootstrapModule } from './bootstrap.module'; -bootstrapModule.run(($uiRouter: UIRouter, $log: ILogService) => { +bootstrapModule.run(['$uiRouter', '$log', ($uiRouter: UIRouter, $log: ILogService) => { 'ngInject'; const subscription = $uiRouter.globals.start$.subscribe((transition: Transition) => { @@ -25,4 +25,4 @@ bootstrapModule.run(($uiRouter: UIRouter, $log: ILogService) => { }); $uiRouter.disposable({ dispose: () => subscription.unsubscribe() }); -}); +}]); diff --git a/app/scripts/modules/core/src/bootstrap/transitionTrace.toggle.ts b/app/scripts/modules/core/src/bootstrap/transitionTrace.toggle.ts index eae5446cd8f..6c54264db51 100644 --- a/app/scripts/modules/core/src/bootstrap/transitionTrace.toggle.ts +++ b/app/scripts/modules/core/src/bootstrap/transitionTrace.toggle.ts @@ -4,7 +4,7 @@ import { bootstrapModule } from './bootstrap.module'; import { paramChangedHelper } from 'core/bootstrap'; /** Changes UI-Router console tracing based on the query parameter `trace` */ -bootstrapModule.run(($uiRouter: UIRouter) => { +bootstrapModule.run(['$uiRouter', ($uiRouter: UIRouter) => { 'ngInject'; const changeTraceSetting = (newValue: string) => { @@ -23,4 +23,4 @@ bootstrapModule.run(($uiRouter: UIRouter) => { }; $uiRouter.transitionService.onBefore({}, paramChangedHelper('trace', changeTraceSetting)); -}); +}]); diff --git a/app/scripts/modules/core/src/bootstrap/uiBootstrap.config.ts b/app/scripts/modules/core/src/bootstrap/uiBootstrap.config.ts index a96a5b125cd..63ad6006cda 100644 --- a/app/scripts/modules/core/src/bootstrap/uiBootstrap.config.ts +++ b/app/scripts/modules/core/src/bootstrap/uiBootstrap.config.ts @@ -1,7 +1,7 @@ import { bootstrapModule } from './bootstrap.module'; import { ITooltipProvider, IModalProvider } from 'angular-ui-bootstrap'; -bootstrapModule.config(($uibTooltipProvider: ITooltipProvider) => { +bootstrapModule.config(['$uibTooltipProvider', ($uibTooltipProvider: ITooltipProvider) => { 'ngInject'; $uibTooltipProvider.options({ appendToBody: true, @@ -10,10 +10,10 @@ bootstrapModule.config(($uibTooltipProvider: ITooltipProvider) => { $uibTooltipProvider.setTriggers({ 'mouseenter focus': 'mouseleave blur', }); -}); +}]); -bootstrapModule.config(($uibModalProvider: IModalProvider) => { +bootstrapModule.config(['$uibModalProvider', ($uibModalProvider: IModalProvider) => { 'ngInject'; $uibModalProvider.options.backdrop = 'static'; $uibModalProvider.options.keyboard = false; -}); +}]); diff --git a/app/scripts/modules/core/src/bootstrap/uiRouterRxjs.ts b/app/scripts/modules/core/src/bootstrap/uiRouterRxjs.ts index 6d422a72fa6..12156c41576 100644 --- a/app/scripts/modules/core/src/bootstrap/uiRouterRxjs.ts +++ b/app/scripts/modules/core/src/bootstrap/uiRouterRxjs.ts @@ -3,7 +3,7 @@ import { UIRouterRxPlugin } from '@uirouter/rx'; import { UIRouter } from '@uirouter/core'; /** Register the @uirouter/rx plugin to add observables for state changes, i.e., `router.globals.start$` */ -bootstrapModule.config(($uiRouterProvider: UIRouter) => { +bootstrapModule.config(['$uiRouterProvider', ($uiRouterProvider: UIRouter) => { 'ngInject'; $uiRouterProvider.plugin(UIRouterRxPlugin); -}); +}]); diff --git a/app/scripts/modules/core/src/bootstrap/uiRouterVisualizer.toggle.ts b/app/scripts/modules/core/src/bootstrap/uiRouterVisualizer.toggle.ts index 114c4c9a1fc..df3213cfd5e 100644 --- a/app/scripts/modules/core/src/bootstrap/uiRouterVisualizer.toggle.ts +++ b/app/scripts/modules/core/src/bootstrap/uiRouterVisualizer.toggle.ts @@ -6,7 +6,7 @@ import { bootstrapModule } from './bootstrap.module'; * Toggles the @uirouter/visualizer based on query parameter `vis` changing * Type javascript:vis() in the browser url or add `&vis=true` to the spinnaker URL */ -bootstrapModule.run(($uiRouter: UIRouter) => { +bootstrapModule.run(['$uiRouter', ($uiRouter: UIRouter) => { 'ngInject'; let visualizerEnabled: 'true' | 'false' = 'false'; @@ -70,4 +70,4 @@ bootstrapModule.run(($uiRouter: UIRouter) => { (window as any).vis = createVisualizer; $uiRouter.transitionService.onStart({}, toggleVisualizer); -}); +}]); diff --git a/app/scripts/modules/core/src/bootstrap/uiSelect.config.ts b/app/scripts/modules/core/src/bootstrap/uiSelect.config.ts index 8932d9727d6..b21500046bb 100644 --- a/app/scripts/modules/core/src/bootstrap/uiSelect.config.ts +++ b/app/scripts/modules/core/src/bootstrap/uiSelect.config.ts @@ -2,7 +2,7 @@ import { IScope } from 'angular'; import { bootstrapModule } from './bootstrap.module'; function uiSelectDecorator($provide: ng.auto.IProvideService) { - $provide.decorator('uiSelectMultipleDirective', function($delegate: any) { + $provide.decorator('uiSelectMultipleDirective', ['$delegate', function($delegate: any) { const [uiSelect] = $delegate, originalLink = uiSelect.link, SELECT_EVENT_KEY = 'uis:select'; @@ -23,12 +23,12 @@ function uiSelectDecorator($provide: ng.auto.IProvideService) { }; return $delegate; - }); + }]); // The GCP nested approach throws an exception when activating the select when there's a nested select option, // but it's harmless so we trap it and discard it - $provide.decorator('uiSelectMinErr', function($delegate: any) { + $provide.decorator('uiSelectMinErr', ['$delegate', function($delegate: any) { return function handledError() { const original = $delegate; if (arguments.length === 3) { @@ -43,9 +43,9 @@ function uiSelectDecorator($provide: ng.auto.IProvideService) { } return original.apply(this, arguments); }; - }); + }]); - $provide.decorator('$exceptionHandler', function($delegate: any) { + $provide.decorator('$exceptionHandler', ['$delegate', function($delegate: any) { return function(exception: Error, cause: any) { if (exception && exception.message === 'IGNORE') { return; @@ -57,13 +57,14 @@ function uiSelectDecorator($provide: ng.auto.IProvideService) { $delegate(exception, cause); } }; - }); + }]); } +uiSelectDecorator.$inject = ['$provide']; bootstrapModule.config(uiSelectDecorator); -bootstrapModule.config((uiSelectConfig: any) => { +bootstrapModule.config(['uiSelectConfig', (uiSelectConfig: any) => { 'ngInject'; uiSelectConfig.theme = 'select2'; uiSelectConfig.appendToBody = true; -}); +}]); diff --git a/app/scripts/modules/core/src/cache/cacheInitializer.service.ts b/app/scripts/modules/core/src/cache/cacheInitializer.service.ts index e24fc2a2cfc..ef88fb3be7f 100644 --- a/app/scripts/modules/core/src/cache/cacheInitializer.service.ts +++ b/app/scripts/modules/core/src/cache/cacheInitializer.service.ts @@ -81,6 +81,7 @@ export class CacheInitializerService { } } + public static $inject = ['$q', 'securityGroupReader', 'providerServiceDelegate']; constructor( private $q: ng.IQService, private securityGroupReader: SecurityGroupReader, diff --git a/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelection.service.ts b/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelection.service.ts index 49b6d903ba8..39cc1cf3567 100644 --- a/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelection.service.ts +++ b/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelection.service.ts @@ -10,6 +10,7 @@ import { SETTINGS } from 'core/config/settings'; export type IProviderSelectionFilter = (app: Application, acc: IAccountDetails, prov: ICloudProviderConfig) => boolean; export class ProviderSelectionService { + public static $inject = ['$uibModal', '$q']; constructor(private $uibModal: IModalService, private $q: IQService) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelector.directive.js b/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelector.directive.js index f483f7ae566..24268ace6e6 100644 --- a/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelector.directive.js +++ b/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelector.directive.js @@ -39,7 +39,7 @@ module.exports = angular }, }; }) - .controller('ProviderSelectCtrl', function($scope, $uibModalInstance, providerOptions) { + .controller('ProviderSelectCtrl', ['$scope', '$uibModalInstance', 'providerOptions', function($scope, $uibModalInstance, providerOptions) { $scope.command = { provider: '', }; @@ -55,4 +55,4 @@ module.exports = angular }; this.cancel = $uibModalInstance.dismiss; - }); + }]); diff --git a/app/scripts/modules/core/src/cloudProvider/providerService.delegate.ts b/app/scripts/modules/core/src/cloudProvider/providerService.delegate.ts index a70506d5c8a..be9bea7bc2d 100644 --- a/app/scripts/modules/core/src/cloudProvider/providerService.delegate.ts +++ b/app/scripts/modules/core/src/cloudProvider/providerService.delegate.ts @@ -6,6 +6,7 @@ import IInjectorService = angular.auto.IInjectorService; import { CloudProviderRegistry } from './CloudProviderRegistry'; export class ProviderServiceDelegate { + public static $inject = ['$injector']; constructor(private $injector: IInjectorService) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelection.service.ts b/app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelection.service.ts index 2dd2ec72451..02dfc6ab90a 100644 --- a/app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelection.service.ts +++ b/app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelection.service.ts @@ -6,6 +6,7 @@ import { AccountService } from 'core/account/AccountService'; import { CloudProviderRegistry } from 'core/cloudProvider'; export class SkinSelectionService { + public static $inject = ['$uibModal']; constructor(private $uibModal: IModalService) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelector.component.ts b/app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelector.component.ts index 61f7937cd13..9fb0c9b0ea1 100644 --- a/app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelector.component.ts +++ b/app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelector.component.ts @@ -5,6 +5,7 @@ import { IController, module } from 'angular'; export class SkinSelectorCtrl implements IController { public command = { skin: '' }; + public static $inject = ['skinOptions', '$uibModalInstance']; constructor(public skinOptions: string[], private $uibModalInstance: IModalInstanceService) { 'ngInject'; diff --git a/app/scripts/modules/core/src/cluster/allClusters.controller.js b/app/scripts/modules/core/src/cluster/allClusters.controller.js index 6a18114b4ce..ea0d248139f 100644 --- a/app/scripts/modules/core/src/cluster/allClusters.controller.js +++ b/app/scripts/modules/core/src/cluster/allClusters.controller.js @@ -26,7 +26,7 @@ module.exports = angular INSIGHT_FILTER_COMPONENT, require('angular-ui-bootstrap'), ]) - .controller('AllClustersCtrl', function( + .controller('AllClustersCtrl', ['$scope', 'app', '$uibModal', '$timeout', 'providerSelectionService', 'insightFilterStateModel', 'serverGroupCommandBuilder', 'skinSelectionService', function( $scope, app, $uibModal, @@ -150,4 +150,4 @@ module.exports = angular this.loadError = true; this.initialized = true; }; - }); + }]); diff --git a/app/scripts/modules/core/src/cluster/cluster.service.ts b/app/scripts/modules/core/src/cluster/cluster.service.ts index b36cde109e8..677cacee505 100644 --- a/app/scripts/modules/core/src/cluster/cluster.service.ts +++ b/app/scripts/modules/core/src/cluster/cluster.service.ts @@ -14,6 +14,7 @@ import { SETTINGS } from 'core/config/settings'; import { taskMatcher } from './task.matcher'; export class ClusterService { + public static $inject = ['$q', 'serverGroupTransformer', 'providerServiceDelegate']; constructor( private $q: IQService, private serverGroupTransformer: any, diff --git a/app/scripts/modules/core/src/cluster/filter/clusterFilter.component.ts b/app/scripts/modules/core/src/cluster/filter/clusterFilter.component.ts index 0b689dfa5d8..366d8d7e19e 100644 --- a/app/scripts/modules/core/src/cluster/filter/clusterFilter.component.ts +++ b/app/scripts/modules/core/src/cluster/filter/clusterFilter.component.ts @@ -38,6 +38,7 @@ class ClusterFilterCtrl { private groupsUpdatedSubscription: Subscription; private locationChangeUnsubscribe: () => void; + public static $inject = ['$scope', '$rootScope', '$timeout', 'clusterDependentFilterHelper']; constructor( public $scope: IScope, public $rootScope: IScope, diff --git a/app/scripts/modules/core/src/cluster/onDemand/onDemandClusterPicker.component.ts b/app/scripts/modules/core/src/cluster/onDemand/onDemandClusterPicker.component.ts index 0ef13522a81..37698b753ef 100644 --- a/app/scripts/modules/core/src/cluster/onDemand/onDemandClusterPicker.component.ts +++ b/app/scripts/modules/core/src/cluster/onDemand/onDemandClusterPicker.component.ts @@ -13,6 +13,7 @@ class OnDemandClusterPickerController implements IController { public totalClusterCount: number; public optionTemplate: string = require('./onDemandOptionTemplate.html'); + public static $inject = ['$scope']; constructor(private $scope: IScope) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/confirmationModal/confirmationModal.controller.js b/app/scripts/modules/core/src/confirmationModal/confirmationModal.controller.js index 272b4193bbf..7431b7894c0 100644 --- a/app/scripts/modules/core/src/confirmationModal/confirmationModal.controller.js +++ b/app/scripts/modules/core/src/confirmationModal/confirmationModal.controller.js @@ -6,7 +6,7 @@ import { TaskMonitor } from 'core/task/monitor/TaskMonitor'; module.exports = angular .module('spinnaker.core.confirmationModal.controller', [require('angular-ui-bootstrap')]) - .controller('ConfirmationModalCtrl', function($scope, $uibModalInstance, params) { + .controller('ConfirmationModalCtrl', ['$scope', '$uibModalInstance', 'params', function($scope, $uibModalInstance, params) { $scope.params = params; $scope.state = { @@ -74,4 +74,4 @@ module.exports = angular }; this.cancel = () => $uibModalInstance.dismiss({ source: 'footer' }); - }); + }]); diff --git a/app/scripts/modules/core/src/confirmationModal/confirmationModal.service.ts b/app/scripts/modules/core/src/confirmationModal/confirmationModal.service.ts index 9bbcfd1fad3..98135c603e3 100644 --- a/app/scripts/modules/core/src/confirmationModal/confirmationModal.service.ts +++ b/app/scripts/modules/core/src/confirmationModal/confirmationModal.service.ts @@ -31,6 +31,7 @@ export class ConfirmationModalService { cancelButtonText: 'Cancel', }; + public static $inject = ['$uibModal', '$sce']; public constructor(private $uibModal: IModalService, private $sce: ng.ISCEService) {} public confirm(params: IConfirmationModalParams): ng.IPromise { diff --git a/app/scripts/modules/core/src/diffs/viewChangesLink.component.ts b/app/scripts/modules/core/src/diffs/viewChangesLink.component.ts index dd4fada92fe..8fba25a73f1 100644 --- a/app/scripts/modules/core/src/diffs/viewChangesLink.component.ts +++ b/app/scripts/modules/core/src/diffs/viewChangesLink.component.ts @@ -18,6 +18,7 @@ class ViewChangesModalController { public previousBuildLink: string; public currentBuildLink: string; + public static $inject = ['$uibModalInstance', 'buildInfo', 'commits', 'hasJarChanges', 'jarDiffs', 'nameItem']; constructor( private $uibModalInstance: IModalInstanceService, public buildInfo: IBuildDiffInfo, @@ -63,6 +64,7 @@ class ViewChangesLinkController implements IController { private loadingExecution = false; private executionLoaded = false; + public static $inject = ['$uibModal', 'executionService']; constructor(private $uibModal: IModalService, private executionService: ExecutionService) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/entityTag/entitySource.component.ts b/app/scripts/modules/core/src/entityTag/entitySource.component.ts index a4265bbaea8..c3e6035282e 100644 --- a/app/scripts/modules/core/src/entityTag/entitySource.component.ts +++ b/app/scripts/modules/core/src/entityTag/entitySource.component.ts @@ -15,6 +15,7 @@ class EntitySourceCtrl implements IController { public comments: string; private loadingExecution = false; + public static $inject = ['executionService']; constructor(private executionService: ExecutionService) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/entityTag/entityTags.dataSource.ts b/app/scripts/modules/core/src/entityTag/entityTags.dataSource.ts index c53c5ed8730..8d4e6af5c08 100644 --- a/app/scripts/modules/core/src/entityTag/entityTags.dataSource.ts +++ b/app/scripts/modules/core/src/entityTag/entityTags.dataSource.ts @@ -9,7 +9,7 @@ import { LOAD_BALANCER_READ_SERVICE } from 'core/loadBalancer/loadBalancer.read. import { SETTINGS } from 'core/config/settings'; export const ENTITY_TAGS_DATA_SOURCE = 'spinnaker.core.entityTag.dataSource'; -module(ENTITY_TAGS_DATA_SOURCE, [LOAD_BALANCER_READ_SERVICE]).run(($q: IQService) => { +module(ENTITY_TAGS_DATA_SOURCE, [LOAD_BALANCER_READ_SERVICE]).run(['$q', ($q: IQService) => { if (!SETTINGS.feature.entityTags) { return; } @@ -55,4 +55,4 @@ module(ENTITY_TAGS_DATA_SOURCE, [LOAD_BALANCER_READ_SERVICE]).run(($q: IQService onLoad: addEntityTags, afterLoad: addTagsToEntities, }); -}); +}]); diff --git a/app/scripts/modules/core/src/forms/ignoreEmptyDelete.directive.js b/app/scripts/modules/core/src/forms/ignoreEmptyDelete.directive.js index e107a366cfe..cdb490c43bc 100644 --- a/app/scripts/modules/core/src/forms/ignoreEmptyDelete.directive.js +++ b/app/scripts/modules/core/src/forms/ignoreEmptyDelete.directive.js @@ -4,8 +4,8 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.utils.ignoreEmptyDelete.directive', [require('ui-select')]) - .config(function($provide) { - $provide.decorator('uiSelectMultipleDirective', function($delegate) { + .config(['$provide', function($provide) { + $provide.decorator('uiSelectMultipleDirective', ['$delegate', function($delegate) { // because we hacked the multiple select directive CSS so drastically, // when the focus is in the search field in multiselect mode, pressing delete // behaves unexpectedly out of the box: it will delete previous selections, @@ -41,5 +41,5 @@ module.exports = angular }; }; return $delegate; - }); - }); + }]); + }]); diff --git a/app/scripts/modules/core/src/forms/mapEditor/mapEditor.component.js b/app/scripts/modules/core/src/forms/mapEditor/mapEditor.component.js index 643dd0ef4f1..75a1986d47e 100644 --- a/app/scripts/modules/core/src/forms/mapEditor/mapEditor.component.js +++ b/app/scripts/modules/core/src/forms/mapEditor/mapEditor.component.js @@ -19,7 +19,7 @@ module.exports = angular label: '@', hiddenKeys: '<', }, - controller: function($scope) { + controller: ['$scope', function($scope) { this.backingModel = []; // Set default values for optional fields @@ -77,6 +77,6 @@ module.exports = angular }; $scope.$watch(() => JSON.stringify(this.backingModel), this.synchronize); - }, + }], templateUrl: require('./mapEditor.component.html'), }); diff --git a/app/scripts/modules/core/src/help/helpField.component.ts b/app/scripts/modules/core/src/help/helpField.component.ts index 11c31f668a0..a74d53ab0dd 100644 --- a/app/scripts/modules/core/src/help/helpField.component.ts +++ b/app/scripts/modules/core/src/help/helpField.component.ts @@ -21,6 +21,7 @@ export class HelpFieldCtrl implements IController { private popoverShownStart: number; private popoverClose: IPromise; + public static $inject = ['$timeout', '$analytics']; constructor(private $timeout: ITimeoutService, private $analytics: any) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/history/recentHistory.service.ts b/app/scripts/modules/core/src/history/recentHistory.service.ts index 0959c9df6f1..1747b703cea 100644 --- a/app/scripts/modules/core/src/history/recentHistory.service.ts +++ b/app/scripts/modules/core/src/history/recentHistory.service.ts @@ -132,11 +132,11 @@ export class RecentHistoryService { } export const RECENT_HISTORY_SERVICE = 'spinnaker.core.history.recentHistory.service'; -module(RECENT_HISTORY_SERVICE, []).run(($rootScope: ng.IRootScopeService) => { +module(RECENT_HISTORY_SERVICE, []).run(['$rootScope', ($rootScope: ng.IRootScopeService) => { $rootScope.$on('$stateChangeSuccess', (_event: IAngularEvent, toState: Ng1StateDeclaration, toParams: any) => { if (toState.data && toState.data.history) { const params = omit(toParams || {}, ['debug', 'vis', 'trace']); RecentHistoryService.addItem(toState.data.history.type, toState.name, params, toState.data.history.keyParams); } }); -}); +}]); diff --git a/app/scripts/modules/core/src/image/image.reader.ts b/app/scripts/modules/core/src/image/image.reader.ts index eee0142c17b..558f494b974 100644 --- a/app/scripts/modules/core/src/image/image.reader.ts +++ b/app/scripts/modules/core/src/image/image.reader.ts @@ -25,6 +25,7 @@ export interface IImageReader { } export class ImageReader { + public static $inject = ['providerServiceDelegate']; public constructor(private providerServiceDelegate: ProviderServiceDelegate) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/insight/insightFilter.component.ts b/app/scripts/modules/core/src/insight/insightFilter.component.ts index cd98f7d46c5..0a291306526 100644 --- a/app/scripts/modules/core/src/insight/insightFilter.component.ts +++ b/app/scripts/modules/core/src/insight/insightFilter.component.ts @@ -3,6 +3,7 @@ import { INSIGHT_LAYOUT_COMPONENT } from 'core/insight/insightLayout.component'; import { InsightFilterStateModel } from './insightFilterState.model'; export class InsightFilterCtrl implements IController { + public static $inject = ['insightFilterStateModel']; constructor(public insightFilterStateModel: InsightFilterStateModel) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/insight/insightLayout.component.ts b/app/scripts/modules/core/src/insight/insightLayout.component.ts index a3112f34cc7..b3d4706da60 100644 --- a/app/scripts/modules/core/src/insight/insightLayout.component.ts +++ b/app/scripts/modules/core/src/insight/insightLayout.component.ts @@ -7,6 +7,7 @@ class InsightLayoutCtrl { public app: Application; public ready = false; + public static $inject = ['insightFilterStateModel']; constructor(public insightFilterStateModel: InsightFilterStateModel) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/instance/details/console/consoleOutput.modal.controller.js b/app/scripts/modules/core/src/instance/details/console/consoleOutput.modal.controller.js index ea07981b274..e0deb36c415 100644 --- a/app/scripts/modules/core/src/instance/details/console/consoleOutput.modal.controller.js +++ b/app/scripts/modules/core/src/instance/details/console/consoleOutput.modal.controller.js @@ -6,7 +6,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.instance.details.console.controller', []) - .controller('ConsoleOutputCtrl', function($scope, $uibModalInstance, instance, usesMultiOutput) { + .controller('ConsoleOutputCtrl', ['$scope', '$uibModalInstance', 'instance', 'usesMultiOutput', function($scope, $uibModalInstance, instance, usesMultiOutput) { const instanceId = instance.instanceId || instance.id; $scope.vm = { loading: true, @@ -46,4 +46,4 @@ module.exports = angular }; $scope.fetchLogs(true); - }); + }]); diff --git a/app/scripts/modules/core/src/instance/details/instanceLinks.component.js b/app/scripts/modules/core/src/instance/details/instanceLinks.component.js index 279aa940e56..5d549826abc 100644 --- a/app/scripts/modules/core/src/instance/details/instanceLinks.component.js +++ b/app/scripts/modules/core/src/instance/details/instanceLinks.component.js @@ -16,7 +16,7 @@ module.exports = angular.module('spinnaker.core.instance.details.instanceLinks', environment: '=', }, templateUrl: require('./instanceLinks.component.html'), - controller: function($interpolate) { + controller: ['$interpolate', function($interpolate) { this.port = _.get(this.application, 'attributes.instancePort', SETTINGS.defaultInstancePort) || 80; this.sections = _.cloneDeep( _.get(this.application, 'attributes.instanceLinks', SETTINGS.defaultInstanceLinks) || [], @@ -49,5 +49,5 @@ module.exports = angular.module('spinnaker.core.instance.details.instanceLinks', }; }); }); - }, + }], }); diff --git a/app/scripts/modules/core/src/instance/details/multipleInstances.controller.js b/app/scripts/modules/core/src/instance/details/multipleInstances.controller.js index b7db02a1230..375300b41d5 100644 --- a/app/scripts/modules/core/src/instance/details/multipleInstances.controller.js +++ b/app/scripts/modules/core/src/instance/details/multipleInstances.controller.js @@ -13,7 +13,7 @@ module.exports = angular CONFIRMATION_MODAL_SERVICE, require('./multipleInstanceServerGroup.directive').name, ]) - .controller('MultipleInstancesCtrl', function($scope, $state, confirmationModalService, instanceWriter, app) { + .controller('MultipleInstancesCtrl', ['$scope', '$state', 'confirmationModalService', 'instanceWriter', 'app', function($scope, $state, confirmationModalService, instanceWriter, app) { this.selectedGroups = []; /** @@ -258,4 +258,4 @@ module.exports = angular ClusterState.multiselectModel.deselectAllInstances(); multiselectWatcher.unsubscribe(); }); - }); + }]); diff --git a/app/scripts/modules/core/src/instance/instance.states.ts b/app/scripts/modules/core/src/instance/instance.states.ts index d1b118e0537..346d5590f11 100644 --- a/app/scripts/modules/core/src/instance/instance.states.ts +++ b/app/scripts/modules/core/src/instance/instance.states.ts @@ -10,7 +10,7 @@ import { InstanceDetails } from './details/InstanceDetails'; export const INSTANCE_STATES = 'spinnaker.core.instance.states'; module(INSTANCE_STATES, [APPLICATION_STATE_PROVIDER, STATE_CONFIG_PROVIDER]).config( - (applicationStateProvider: ApplicationStateProvider, stateConfigProvider: StateConfigProvider) => { + ['applicationStateProvider', 'stateConfigProvider', (applicationStateProvider: ApplicationStateProvider, stateConfigProvider: StateConfigProvider) => { const instanceDetails: INestedState = { name: 'instanceDetails', url: '/instanceDetails/:provider/:instanceId', @@ -114,5 +114,5 @@ module(INSTANCE_STATES, [APPLICATION_STATE_PROVIDER, STATE_CONFIG_PROVIDER]).con applicationStateProvider.addInsightDetailState(instanceDetails); applicationStateProvider.addInsightDetailState(multipleInstances); stateConfigProvider.addToRootState(standaloneInstance); - }, + }], ); diff --git a/app/scripts/modules/core/src/instance/instance.write.service.ts b/app/scripts/modules/core/src/instance/instance.write.service.ts index 4a00351a303..43a688be0ba 100644 --- a/app/scripts/modules/core/src/instance/instance.write.service.ts +++ b/app/scripts/modules/core/src/instance/instance.write.service.ts @@ -29,6 +29,7 @@ export interface IMultiInstanceJob { } export class InstanceWriter { + public static $inject = ['providerServiceDelegate']; public constructor(protected providerServiceDelegate: ProviderServiceDelegate) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/instance/instanceType.service.ts b/app/scripts/modules/core/src/instance/instanceType.service.ts index cdd08b9b438..eabfc737c6b 100644 --- a/app/scripts/modules/core/src/instance/instanceType.service.ts +++ b/app/scripts/modules/core/src/instance/instanceType.service.ts @@ -56,6 +56,7 @@ export interface IInstanceTypeService { } export class InstanceTypeService { + public static $inject = ['providerServiceDelegate']; public constructor(private providerServiceDelegate: ProviderServiceDelegate) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/interceptor/debug.interceptor.ts b/app/scripts/modules/core/src/interceptor/debug.interceptor.ts index 749c9ca7984..3be0e23625f 100644 --- a/app/scripts/modules/core/src/interceptor/debug.interceptor.ts +++ b/app/scripts/modules/core/src/interceptor/debug.interceptor.ts @@ -27,4 +27,4 @@ export class DebugInterceptor implements IHttpInterceptor { export const DEBUG_INTERCEPTOR = 'spinnaker.core.debug.interceptor'; module(DEBUG_INTERCEPTOR, []) .service('debugInterceptor', DebugInterceptor) - .config(($httpProvider: IHttpProvider) => $httpProvider.interceptors.push('debugInterceptor')); + .config(['$httpProvider', ($httpProvider: IHttpProvider) => $httpProvider.interceptors.push('debugInterceptor')]); diff --git a/app/scripts/modules/core/src/loadBalancer/loadBalancer.dataSource.ts b/app/scripts/modules/core/src/loadBalancer/loadBalancer.dataSource.ts index 37ce7c0696c..0a899c99fdd 100644 --- a/app/scripts/modules/core/src/loadBalancer/loadBalancer.dataSource.ts +++ b/app/scripts/modules/core/src/loadBalancer/loadBalancer.dataSource.ts @@ -9,7 +9,7 @@ import { LOAD_BALANCER_READ_SERVICE, LoadBalancerReader } from 'core/loadBalance export const LOAD_BALANCER_DATA_SOURCE = 'spinnaker.core.loadBalancer.dataSource'; module(LOAD_BALANCER_DATA_SOURCE, [LOAD_BALANCER_READ_SERVICE]).run( - ($q: IQService, loadBalancerReader: LoadBalancerReader) => { + ['$q', 'loadBalancerReader', ($q: IQService, loadBalancerReader: LoadBalancerReader) => { const loadLoadBalancers = (application: Application) => { return loadBalancerReader.loadLoadBalancers(application.name); }; @@ -36,5 +36,5 @@ module(LOAD_BALANCER_DATA_SOURCE, [LOAD_BALANCER_READ_SERVICE]).run( regionField: 'region', description: 'Traffic distribution management between servers', }); - }, + }], ); diff --git a/app/scripts/modules/core/src/loadBalancer/loadBalancer.read.service.ts b/app/scripts/modules/core/src/loadBalancer/loadBalancer.read.service.ts index ee0025cf421..e6946b1521c 100644 --- a/app/scripts/modules/core/src/loadBalancer/loadBalancer.read.service.ts +++ b/app/scripts/modules/core/src/loadBalancer/loadBalancer.read.service.ts @@ -16,6 +16,7 @@ export interface ILoadBalancersByAccount { } export class LoadBalancerReader { + public static $inject = ['$q', 'loadBalancerTransformer']; public constructor(private $q: IQService, private loadBalancerTransformer: any) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/loadBalancer/loadBalancer.states.ts b/app/scripts/modules/core/src/loadBalancer/loadBalancer.states.ts index b59e3e92b41..1fd64d17320 100644 --- a/app/scripts/modules/core/src/loadBalancer/loadBalancer.states.ts +++ b/app/scripts/modules/core/src/loadBalancer/loadBalancer.states.ts @@ -11,7 +11,7 @@ import { LoadBalancerFilters } from './filter/LoadBalancerFilters'; export const LOAD_BALANCER_STATES = 'spinnaker.core.loadBalancer.states'; module(LOAD_BALANCER_STATES, [APPLICATION_STATE_PROVIDER]).config( - (applicationStateProvider: ApplicationStateProvider, stateConfigProvider: StateConfigProvider) => { + ['applicationStateProvider', 'stateConfigProvider', (applicationStateProvider: ApplicationStateProvider, stateConfigProvider: StateConfigProvider) => { const loadBalancerDetails: INestedState = { name: 'loadBalancerDetails', url: '/loadBalancerDetails/:provider/:accountId/:region/:vpcId/:name', @@ -72,5 +72,5 @@ module(LOAD_BALANCER_STATES, [APPLICATION_STATE_PROVIDER]).config( applicationStateProvider.addInsightState(loadBalancers); applicationStateProvider.addInsightDetailState(loadBalancerDetails); - }, + }], ); diff --git a/app/scripts/modules/core/src/loadBalancer/loadBalancer.transformer.js b/app/scripts/modules/core/src/loadBalancer/loadBalancer.transformer.js index c87b15ace01..f3cbc1553e6 100644 --- a/app/scripts/modules/core/src/loadBalancer/loadBalancer.transformer.js +++ b/app/scripts/modules/core/src/loadBalancer/loadBalancer.transformer.js @@ -9,7 +9,7 @@ import { PROVIDER_SERVICE_DELEGATE } from 'core/cloudProvider/providerService.de module.exports = angular .module('spinnaker.core.loadBalancer.transformer', [PROVIDER_SERVICE_DELEGATE]) - .factory('loadBalancerTransformer', function(providerServiceDelegate) { + .factory('loadBalancerTransformer', ['providerServiceDelegate', function(providerServiceDelegate) { function normalizeLoadBalancer(loadBalancer) { return AccountService.getAccountDetails(loadBalancer.account).then(accountDetails => { return providerServiceDelegate @@ -45,4 +45,4 @@ module.exports = angular normalizeLoadBalancer: normalizeLoadBalancer, normalizeLoadBalancerSet: normalizeLoadBalancerSet, }; - }); + }]); diff --git a/app/scripts/modules/core/src/modal/modal.module.js b/app/scripts/modules/core/src/modal/modal.module.js index 72862796031..b755d038a3a 100644 --- a/app/scripts/modules/core/src/modal/modal.module.js +++ b/app/scripts/modules/core/src/modal/modal.module.js @@ -17,10 +17,10 @@ module.exports = angular SUBMIT_BUTTON_COMPONENT, V2_MODAL_WIZARD_COMPONENT, ]) - .run(function($rootScope, $uibModalStack) { + .run(['$rootScope', '$uibModalStack', function($rootScope, $uibModalStack) { $rootScope.$on('$stateChangeStart', function(event, toState, toParams) { if (!toParams.allowModalToStayOpen) { $uibModalStack.dismissAll(); } }); - }); + }]); diff --git a/app/scripts/modules/core/src/modal/wizard/v2wizardPage.component.ts b/app/scripts/modules/core/src/modal/wizard/v2wizardPage.component.ts index a8495720096..97b233a6238 100644 --- a/app/scripts/modules/core/src/modal/wizard/v2wizardPage.component.ts +++ b/app/scripts/modules/core/src/modal/wizard/v2wizardPage.component.ts @@ -69,6 +69,7 @@ export class WizardPageController implements IController { */ public state: IWizardPageState; + public static $inject = ['$scope']; public constructor(private $scope: ng.IScope) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/navigation/state.provider.ts b/app/scripts/modules/core/src/navigation/state.provider.ts index a8103f1a4a6..2f667fc6035 100644 --- a/app/scripts/modules/core/src/navigation/state.provider.ts +++ b/app/scripts/modules/core/src/navigation/state.provider.ts @@ -39,6 +39,7 @@ export class StateConfigProvider implements IServiceProvider { children: [], }; + public static $inject = ['$urlRouterProvider', 'stateHelperProvider']; constructor(private $urlRouterProvider: UrlRouterProvider, private stateHelperProvider: StateHelper) { 'ngInject'; } @@ -169,7 +170,7 @@ export const sortKeyParamType = { export const STATE_CONFIG_PROVIDER = 'spinnaker.core.navigation.state.config.provider'; module(STATE_CONFIG_PROVIDER, [require('@uirouter/angularjs').default, STATE_HELPER]) .provider('stateConfig', StateConfigProvider) - .config(($urlRouterProvider: UrlRouterProvider) => { + .config(['$urlRouterProvider', ($urlRouterProvider: UrlRouterProvider) => { $urlRouterProvider.otherwise('/'); // Don't crash on trailing slashes $urlRouterProvider.when('/{path:.*}/', [ @@ -178,10 +179,10 @@ module(STATE_CONFIG_PROVIDER, [require('@uirouter/angularjs').default, STATE_HEL return '/' + $match.path; }, ]); - }) - .config(($urlServiceProvider: UrlService) => { + }]) + .config(['$urlServiceProvider', ($urlServiceProvider: UrlService) => { $urlServiceProvider.config.type('trueKeyObject', trueKeyObjectParamType); $urlServiceProvider.config.type('inverse-boolean', inverseBooleanParamType); $urlServiceProvider.config.type('boolean', booleanParamType); $urlServiceProvider.config.type('sortKey', sortKeyParamType); - }); + }]); diff --git a/app/scripts/modules/core/src/navigation/stateHelper.provider.ts b/app/scripts/modules/core/src/navigation/stateHelper.provider.ts index 66623b0238c..22cd4796065 100644 --- a/app/scripts/modules/core/src/navigation/stateHelper.provider.ts +++ b/app/scripts/modules/core/src/navigation/stateHelper.provider.ts @@ -5,6 +5,7 @@ import { INestedState } from './state.provider'; export class StateHelper implements ng.IServiceProvider { private registeredStates: string[] = []; + public static $inject = ['$stateRegistryProvider']; constructor(private $stateRegistryProvider: StateRegistry) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/notification/modal/editNotification.controller.modal.js b/app/scripts/modules/core/src/notification/modal/editNotification.controller.modal.js index 5e68028d8ea..d242e723c87 100644 --- a/app/scripts/modules/core/src/notification/modal/editNotification.controller.modal.js +++ b/app/scripts/modules/core/src/notification/modal/editNotification.controller.modal.js @@ -10,7 +10,7 @@ import './editNotification.less'; module.exports = angular .module('spinnaker.core.notification.modal.editNotification.modal.controller', []) - .controller('EditNotificationController', function($scope, $uibModalInstance, notification, level, stageType) { + .controller('EditNotificationController', ['$scope', '$uibModalInstance', 'notification', 'level', 'stageType', function($scope, $uibModalInstance, notification, level, stageType) { var vm = this; vm.notification = angular.copy(notification); @@ -79,4 +79,4 @@ module.exports = angular ); return vm; - }); + }]); diff --git a/app/scripts/modules/core/src/notification/notificationList.directive.js b/app/scripts/modules/core/src/notification/notificationList.directive.js index cb4fd21e2d0..a61d6416bf2 100644 --- a/app/scripts/modules/core/src/notification/notificationList.directive.js +++ b/app/scripts/modules/core/src/notification/notificationList.directive.js @@ -23,7 +23,7 @@ module.exports = angular controllerAs: 'notificationListCtrl', }; }) - .controller('NotificationListCtrl', function($scope, $uibModal) { + .controller('NotificationListCtrl', ['$scope', '$uibModal', function($scope, $uibModal) { var vm = this; vm.revertNotificationChanges = function() { @@ -140,4 +140,4 @@ module.exports = angular }; return vm; - }); + }]); diff --git a/app/scripts/modules/core/src/notification/notificationType.service.js b/app/scripts/modules/core/src/notification/notificationType.service.js index 2710ca347a3..8f43469bcf5 100644 --- a/app/scripts/modules/core/src/notification/notificationType.service.js +++ b/app/scripts/modules/core/src/notification/notificationType.service.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.notifications.service', [require('./notificationTypeConfig.provider').name]) - .factory('notificationTypeService', function(notificationTypeConfig) { + .factory('notificationTypeService', ['notificationTypeConfig', function(notificationTypeConfig) { function listNotificationTypes() { return notificationTypeConfig.listNotificationTypes(); } @@ -17,4 +17,4 @@ module.exports = angular listNotificationTypes: listNotificationTypes, getNotificationType: getNotificationType, }; - }); + }]); diff --git a/app/scripts/modules/core/src/notification/selector/notificationSelector.directive.js b/app/scripts/modules/core/src/notification/selector/notificationSelector.directive.js index 84af11f5a34..923a624b5e9 100644 --- a/app/scripts/modules/core/src/notification/selector/notificationSelector.directive.js +++ b/app/scripts/modules/core/src/notification/selector/notificationSelector.directive.js @@ -17,7 +17,7 @@ module.exports = angular controllerAs: 'vm', }; }) - .controller('NotificationSelectorCtrl', function(notificationTypeService) { + .controller('NotificationSelectorCtrl', ['notificationTypeService', function(notificationTypeService) { this.notificationTypes = notificationTypeService.listNotificationTypes(); this.originalType = this.notification.type; @@ -41,4 +41,4 @@ module.exports = angular } this.updateNotificationType(); - }); + }]); diff --git a/app/scripts/modules/core/src/notification/types/bearychat/bearychat.notification.type.module.js b/app/scripts/modules/core/src/notification/types/bearychat/bearychat.notification.type.module.js index e28cc053a9f..9e33a04fc28 100644 --- a/app/scripts/modules/core/src/notification/types/bearychat/bearychat.notification.type.module.js +++ b/app/scripts/modules/core/src/notification/types/bearychat/bearychat.notification.type.module.js @@ -4,10 +4,10 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.notification.types.bearychat', []) - .config(function(notificationTypeConfigProvider) { + .config(['notificationTypeConfigProvider', function(notificationTypeConfigProvider) { notificationTypeConfigProvider.registerNotificationType({ label: 'Bearychat', key: 'bearychat', addressTemplateUrl: require('./additionalFields.html'), }); - }); + }]); diff --git a/app/scripts/modules/core/src/notification/types/email/email.notification.type.module.js b/app/scripts/modules/core/src/notification/types/email/email.notification.type.module.js index 868d9a04f2a..feb6a0e62c8 100644 --- a/app/scripts/modules/core/src/notification/types/email/email.notification.type.module.js +++ b/app/scripts/modules/core/src/notification/types/email/email.notification.type.module.js @@ -4,10 +4,10 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.notification.types.email', []) - .config(function(notificationTypeConfigProvider) { + .config(['notificationTypeConfigProvider', function(notificationTypeConfigProvider) { notificationTypeConfigProvider.registerNotificationType({ label: 'Email', key: 'email', addressTemplateUrl: require('./additionalFields.html'), }); - }); + }]); diff --git a/app/scripts/modules/core/src/notification/types/githubstatus/githubstatus.notification.type.module.ts b/app/scripts/modules/core/src/notification/types/githubstatus/githubstatus.notification.type.module.ts index 32c7fec8620..b4f747e52e7 100644 --- a/app/scripts/modules/core/src/notification/types/githubstatus/githubstatus.notification.type.module.ts +++ b/app/scripts/modules/core/src/notification/types/githubstatus/githubstatus.notification.type.module.ts @@ -11,10 +11,10 @@ interface IRegisterNotificationTypeConfigProvider { export const SPINNAKER_CORE_NOTIFICATION_TYPES_GITHUB_STATUS = 'spinnaker.core.notification.types.githubstatus'; module(SPINNAKER_CORE_NOTIFICATION_TYPES_GITHUB_STATUS, []).config( - (notificationTypeConfigProvider: IRegisterNotificationTypeConfigProvider) => { + ['notificationTypeConfigProvider', (notificationTypeConfigProvider: IRegisterNotificationTypeConfigProvider) => { notificationTypeConfigProvider.registerNotificationType({ label: 'Github Status', key: 'githubStatus', }); - }, + }], ); diff --git a/app/scripts/modules/core/src/notification/types/googlechat/googlechat.notification.type.module.js b/app/scripts/modules/core/src/notification/types/googlechat/googlechat.notification.type.module.js index f9987b74123..df019811ba0 100644 --- a/app/scripts/modules/core/src/notification/types/googlechat/googlechat.notification.type.module.js +++ b/app/scripts/modules/core/src/notification/types/googlechat/googlechat.notification.type.module.js @@ -4,10 +4,10 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.notification.types.googlechat', []) - .config(function(notificationTypeConfigProvider) { + .config(['notificationTypeConfigProvider', function(notificationTypeConfigProvider) { notificationTypeConfigProvider.registerNotificationType({ label: 'GoogleChat', key: 'googlechat', addressTemplateUrl: require('./additionalFields.html'), }); - }); + }]); diff --git a/app/scripts/modules/core/src/notification/types/hipchat/hipchat.notification.type.module.js b/app/scripts/modules/core/src/notification/types/hipchat/hipchat.notification.type.module.js index 4ef4f875e45..596d09a27df 100644 --- a/app/scripts/modules/core/src/notification/types/hipchat/hipchat.notification.type.module.js +++ b/app/scripts/modules/core/src/notification/types/hipchat/hipchat.notification.type.module.js @@ -4,10 +4,10 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.notification.types.hipchat', []) - .config(function(notificationTypeConfigProvider) { + .config(['notificationTypeConfigProvider', function(notificationTypeConfigProvider) { notificationTypeConfigProvider.registerNotificationType({ label: 'HipChat', key: 'hipchat', addressTemplateUrl: require('./additionalFields.html'), }); - }); + }]); diff --git a/app/scripts/modules/core/src/notification/types/pubsub/pubsub.notification.type.module.js b/app/scripts/modules/core/src/notification/types/pubsub/pubsub.notification.type.module.js index c9dbd58600c..e78adfb089f 100644 --- a/app/scripts/modules/core/src/notification/types/pubsub/pubsub.notification.type.module.js +++ b/app/scripts/modules/core/src/notification/types/pubsub/pubsub.notification.type.module.js @@ -4,10 +4,10 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.notification.types.pubsub', []) - .config(function(notificationTypeConfigProvider) { + .config(['notificationTypeConfigProvider', function(notificationTypeConfigProvider) { notificationTypeConfigProvider.registerNotificationType({ label: 'Pubsub', key: 'pubsub', addressTemplateUrl: require('./additionalFields.html'), }); - }); + }]); diff --git a/app/scripts/modules/core/src/notification/types/slack/slack.notification.type.module.js b/app/scripts/modules/core/src/notification/types/slack/slack.notification.type.module.js index a15d5cf70aa..fccd1d83ac6 100644 --- a/app/scripts/modules/core/src/notification/types/slack/slack.notification.type.module.js +++ b/app/scripts/modules/core/src/notification/types/slack/slack.notification.type.module.js @@ -4,10 +4,10 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.notification.types.slack', []) - .config(function(notificationTypeConfigProvider) { + .config(['notificationTypeConfigProvider', function(notificationTypeConfigProvider) { notificationTypeConfigProvider.registerNotificationType({ label: 'Slack', key: 'slack', addressTemplateUrl: require('./additionalFields.html'), }); - }); + }]); diff --git a/app/scripts/modules/core/src/notification/types/sms/sms.notification.type.module.js b/app/scripts/modules/core/src/notification/types/sms/sms.notification.type.module.js index 05426bd15a3..59358d17901 100644 --- a/app/scripts/modules/core/src/notification/types/sms/sms.notification.type.module.js +++ b/app/scripts/modules/core/src/notification/types/sms/sms.notification.type.module.js @@ -4,10 +4,10 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.notification.types.sms', []) - .config(function(notificationTypeConfigProvider) { + .config(['notificationTypeConfigProvider', function(notificationTypeConfigProvider) { notificationTypeConfigProvider.registerNotificationType({ label: 'SMS', key: 'sms', addressTemplateUrl: require('./additionalFields.html'), }); - }); + }]); diff --git a/app/scripts/modules/core/src/overrideRegistry/override.registry.ts b/app/scripts/modules/core/src/overrideRegistry/override.registry.ts index b59bb319d0b..a228a07aa87 100644 --- a/app/scripts/modules/core/src/overrideRegistry/override.registry.ts +++ b/app/scripts/modules/core/src/overrideRegistry/override.registry.ts @@ -36,7 +36,7 @@ export class OverrideRegistry { export const OVERRIDE_REGISTRY = 'spinnaker.core.override.registry'; module(OVERRIDE_REGISTRY, []) .service('overrideRegistry', OverrideRegistry) - .run((overrideRegistry: OverrideRegistry) => { + .run(['overrideRegistry', (overrideRegistry: OverrideRegistry) => { 'ngInject'; overrideRegistrationQueue.setRegistries(overrideRegistry); - }); + }]); diff --git a/app/scripts/modules/core/src/pageTitle/pageTitle.service.ts b/app/scripts/modules/core/src/pageTitle/pageTitle.service.ts index 0ae09395086..996e71ef615 100644 --- a/app/scripts/modules/core/src/pageTitle/pageTitle.service.ts +++ b/app/scripts/modules/core/src/pageTitle/pageTitle.service.ts @@ -33,6 +33,7 @@ export class PageTitleService { private previousPageTitle = 'Spinnaker'; private routeCount = 0; + public static $inject = ['$rootScope', '$stateParams', '$transitions']; constructor(private $rootScope: IScope, private $stateParams: StateParams, $transitions: TransitionService) { 'ngInject'; document.title = 'Spinnaker: Loading...'; diff --git a/app/scripts/modules/core/src/pagerDuty/pageApplicationOwner.modal.controller.ts b/app/scripts/modules/core/src/pagerDuty/pageApplicationOwner.modal.controller.ts index 2a9027ed5e3..ba6b40c4a35 100644 --- a/app/scripts/modules/core/src/pagerDuty/pageApplicationOwner.modal.controller.ts +++ b/app/scripts/modules/core/src/pagerDuty/pageApplicationOwner.modal.controller.ts @@ -9,6 +9,7 @@ export class PageModalCtrl implements IController { public reason: string; public taskMonitor: TaskMonitor; + public static $inject = ['$uibModalInstance', 'application']; constructor(public $uibModalInstance: IModalInstanceService, public application: Application) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/pagerDuty/pager.states.ts b/app/scripts/modules/core/src/pagerDuty/pager.states.ts index db994abe3dc..1e60dbb85d5 100644 --- a/app/scripts/modules/core/src/pagerDuty/pager.states.ts +++ b/app/scripts/modules/core/src/pagerDuty/pager.states.ts @@ -6,7 +6,7 @@ import { Pager } from './Pager'; export const PAGER_STATES = 'spinnaker.core.pager.states'; -module(PAGER_STATES, [STATE_CONFIG_PROVIDER]).config((stateConfigProvider: StateConfigProvider) => { +module(PAGER_STATES, [STATE_CONFIG_PROVIDER]).config(['stateConfigProvider', (stateConfigProvider: StateConfigProvider) => { const pageState: INestedState = { url: '/page?app&q&keys&by&direction&hideNoApps', name: 'page', @@ -58,4 +58,4 @@ module(PAGER_STATES, [STATE_CONFIG_PROVIDER]).config((stateConfigProvider: State }, }; stateConfigProvider.addToRootState(pageState); -}); +}]); diff --git a/app/scripts/modules/core/src/pipeline/config/actions/delete/delete.module.js b/app/scripts/modules/core/src/pipeline/config/actions/delete/delete.module.js index 18e6aa94384..64ac8b25f92 100644 --- a/app/scripts/modules/core/src/pipeline/config/actions/delete/delete.module.js +++ b/app/scripts/modules/core/src/pipeline/config/actions/delete/delete.module.js @@ -7,7 +7,7 @@ import { PipelineConfigService } from 'core/pipeline/config/services/PipelineCon module.exports = angular .module('spinnaker.core.pipeline.config.actions.delete', [require('@uirouter/angularjs').default]) - .controller('DeletePipelineModalCtrl', function($scope, $uibModalInstance, $log, application, pipeline, $state) { + .controller('DeletePipelineModalCtrl', ['$scope', '$uibModalInstance', '$log', 'application', 'pipeline', '$state', function($scope, $uibModalInstance, $log, application, pipeline, $state) { this.cancel = $uibModalInstance.dismiss; $scope.viewState = {}; @@ -41,4 +41,4 @@ module.exports = angular }, ); }; - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/actions/disable/disable.module.js b/app/scripts/modules/core/src/pipeline/config/actions/disable/disable.module.js index 0daf4c6d3c3..db412035bad 100644 --- a/app/scripts/modules/core/src/pipeline/config/actions/disable/disable.module.js +++ b/app/scripts/modules/core/src/pipeline/config/actions/disable/disable.module.js @@ -6,7 +6,7 @@ import { PipelineConfigService } from 'core/pipeline/config/services/PipelineCon module.exports = angular .module('spinnaker.core.pipeline.config.actions.disable', []) - .controller('DisablePipelineModalCtrl', function($uibModalInstance, pipeline) { + .controller('DisablePipelineModalCtrl', ['$uibModalInstance', 'pipeline', function($uibModalInstance, pipeline) { this.viewState = {}; this.pipelineName = pipeline.name; @@ -23,4 +23,4 @@ module.exports = angular }, ); }; - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/actions/enable/enable.module.js b/app/scripts/modules/core/src/pipeline/config/actions/enable/enable.module.js index caecf92bce9..513d094569e 100644 --- a/app/scripts/modules/core/src/pipeline/config/actions/enable/enable.module.js +++ b/app/scripts/modules/core/src/pipeline/config/actions/enable/enable.module.js @@ -6,7 +6,7 @@ import { PipelineConfigService } from 'core/pipeline/config/services/PipelineCon module.exports = angular .module('spinnaker.core.pipeline.config.actions.enable', []) - .controller('EnablePipelineModalCtrl', function($uibModalInstance, pipeline) { + .controller('EnablePipelineModalCtrl', ['$uibModalInstance', 'pipeline', function($uibModalInstance, pipeline) { this.viewState = {}; this.pipelineName = pipeline.name; @@ -23,4 +23,4 @@ module.exports = angular }, ); }; - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/actions/history/showHistory.controller.js b/app/scripts/modules/core/src/pipeline/config/actions/history/showHistory.controller.js index 003c5f488a8..199e0025949 100644 --- a/app/scripts/modules/core/src/pipeline/config/actions/history/showHistory.controller.js +++ b/app/scripts/modules/core/src/pipeline/config/actions/history/showHistory.controller.js @@ -13,7 +13,7 @@ module.exports = angular require('./diffSummary.component').name, DIFF_VIEW_COMPONENT, ]) - .controller('ShowHistoryCtrl', function( + .controller('ShowHistoryCtrl', ['$window', 'pipelineConfigId', 'currentConfig', 'isStrategy', '$uibModalInstance', '$filter', function( $window, pipelineConfigId, currentConfig, @@ -78,4 +78,4 @@ module.exports = angular }; PipelineConfigService.getHistory(pipelineConfigId, isStrategy, 100).then(historyLoaded, loadError); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/actions/lock/lock.module.js b/app/scripts/modules/core/src/pipeline/config/actions/lock/lock.module.js index 3147cf9e8fb..b55b702f73a 100644 --- a/app/scripts/modules/core/src/pipeline/config/actions/lock/lock.module.js +++ b/app/scripts/modules/core/src/pipeline/config/actions/lock/lock.module.js @@ -6,7 +6,7 @@ import { PipelineConfigService } from 'core/pipeline/config/services/PipelineCon module.exports = angular .module('spinnaker.core.pipeline.config.actions.lock', []) - .controller('LockPipelineModalCtrl', function($uibModalInstance, pipeline) { + .controller('LockPipelineModalCtrl', ['$uibModalInstance', 'pipeline', function($uibModalInstance, pipeline) { this.viewState = {}; this.pipelineName = pipeline.name; this.cancel = $uibModalInstance.dismiss; @@ -29,4 +29,4 @@ module.exports = angular }, ); }; - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/actions/rename/rename.module.js b/app/scripts/modules/core/src/pipeline/config/actions/rename/rename.module.js index 441cce45eab..67f84788411 100644 --- a/app/scripts/modules/core/src/pipeline/config/actions/rename/rename.module.js +++ b/app/scripts/modules/core/src/pipeline/config/actions/rename/rename.module.js @@ -8,7 +8,7 @@ import { PipelineConfigService } from 'core/pipeline/config/services/PipelineCon module.exports = angular .module('spinnaker.core.pipeline.config.actions.rename', []) - .controller('RenamePipelineModalCtrl', function($scope, application, pipeline, $uibModalInstance, $log) { + .controller('RenamePipelineModalCtrl', ['$scope', 'application', 'pipeline', '$uibModalInstance', '$log', function($scope, application, pipeline, $uibModalInstance, $log) { this.cancel = $uibModalInstance.dismiss; var currentName = pipeline.name; @@ -38,4 +38,4 @@ module.exports = angular }, ); }; - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/actions/unlock/unlock.module.js b/app/scripts/modules/core/src/pipeline/config/actions/unlock/unlock.module.js index 8d384ee5778..2743343f3e7 100644 --- a/app/scripts/modules/core/src/pipeline/config/actions/unlock/unlock.module.js +++ b/app/scripts/modules/core/src/pipeline/config/actions/unlock/unlock.module.js @@ -6,7 +6,7 @@ import { PipelineConfigService } from 'core/pipeline/config/services/PipelineCon module.exports = angular .module('spinnaker.core.pipeline.config.actions.unlock', []) - .controller('unlockPipelineModalCtrl', function($uibModalInstance, pipeline) { + .controller('unlockPipelineModalCtrl', ['$uibModalInstance', 'pipeline', function($uibModalInstance, pipeline) { this.viewState = {}; this.pipelineName = pipeline.name; this.cancel = $uibModalInstance.dismiss; @@ -21,4 +21,4 @@ module.exports = angular }, ); }; - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/copyStage/copyStage.modal.controller.ts b/app/scripts/modules/core/src/pipeline/config/copyStage/copyStage.modal.controller.ts index 5c2d82200ac..16c7a16ce1a 100644 --- a/app/scripts/modules/core/src/pipeline/config/copyStage/copyStage.modal.controller.ts +++ b/app/scripts/modules/core/src/pipeline/config/copyStage/copyStage.modal.controller.ts @@ -24,6 +24,7 @@ class CopyStageModalCtrl implements IController { private uncopiableStageTypes: Set = new Set(['deploy']); + public static $inject = ['$q', 'application', '$uibModalInstance', 'forStrategyConfig']; constructor( private $q: IQService, public application: Application, diff --git a/app/scripts/modules/core/src/pipeline/config/parameters/parameter.js b/app/scripts/modules/core/src/pipeline/config/parameters/parameter.js index b4d83784506..6cf9ed7d783 100644 --- a/app/scripts/modules/core/src/pipeline/config/parameters/parameter.js +++ b/app/scripts/modules/core/src/pipeline/config/parameters/parameter.js @@ -15,7 +15,7 @@ module.exports = angular templateUrl: require('./parameter.html'), }; }) - .controller('ParameterCtrl', function($scope) { + .controller('ParameterCtrl', ['$scope', function($scope) { this.remove = function(parameter) { var index = $scope.pipeline.parameterConfig.indexOf(parameter); $scope.pipeline.parameterConfig.splice(index, 1); @@ -35,4 +35,4 @@ module.exports = angular this.removeOption = function(index, parameter) { parameter.options.splice(index, 1); }; - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/parameters/parameters.directive.js b/app/scripts/modules/core/src/pipeline/config/parameters/parameters.directive.js index 3798e34098c..64b1b3d518d 100644 --- a/app/scripts/modules/core/src/pipeline/config/parameters/parameters.directive.js +++ b/app/scripts/modules/core/src/pipeline/config/parameters/parameters.directive.js @@ -15,7 +15,7 @@ module.exports = angular templateUrl: require('./parameters.html'), }; }) - .controller('parametersCtrl', function($scope) { + .controller('parametersCtrl', ['$scope', function($scope) { this.addParameter = function() { if (!$scope.pipeline.parameterConfig) { $scope.pipeline.parameterConfig = []; @@ -29,4 +29,4 @@ module.exports = angular delay: 150, handle: '.glyphicon-resize-vertical', }; - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/pipelineConfig.controller.js b/app/scripts/modules/core/src/pipeline/config/pipelineConfig.controller.js index 27bdf2f1ec3..730029ccea6 100644 --- a/app/scripts/modules/core/src/pipeline/config/pipelineConfig.controller.js +++ b/app/scripts/modules/core/src/pipeline/config/pipelineConfig.controller.js @@ -9,7 +9,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.pipeline.config.controller', [require('@uirouter/angularjs').default]) - .controller('PipelineConfigCtrl', function($scope, $stateParams, app) { + .controller('PipelineConfigCtrl', ['$scope', '$stateParams', 'app', function($scope, $stateParams, app) { this.application = app; this.state = { pipelinesLoaded: false, @@ -100,4 +100,4 @@ module.exports = angular .then(this.initialize) .then(() => (this.state.pipelinesLoaded = true)); } - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/pipelineConfigurer.js b/app/scripts/modules/core/src/pipeline/config/pipelineConfigurer.js index 02e933d3a42..908dd612f29 100644 --- a/app/scripts/modules/core/src/pipeline/config/pipelineConfigurer.js +++ b/app/scripts/modules/core/src/pipeline/config/pipelineConfigurer.js @@ -32,7 +32,7 @@ module.exports = angular templateUrl: require('./pipelineConfigurer.html'), }; }) - .controller('PipelineConfigurerCtrl', function( + .controller('PipelineConfigurerCtrl', ['$scope', '$uibModal', '$timeout', '$window', '$q', 'executionService', 'overrideRegistry', '$location', function( $scope, $uibModal, $timeout, @@ -527,4 +527,4 @@ module.exports = angular if ($scope.isTemplatedPipeline && $scope.pipeline.isNew && !$scope.hasDynamicSource) { this.configureTemplate(); } - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/preconditions/modal/editPrecondition.controller.modal.js b/app/scripts/modules/core/src/pipeline/config/preconditions/modal/editPrecondition.controller.modal.js index b9ab836244c..16a1ed1f595 100644 --- a/app/scripts/modules/core/src/pipeline/config/preconditions/modal/editPrecondition.controller.modal.js +++ b/app/scripts/modules/core/src/pipeline/config/preconditions/modal/editPrecondition.controller.modal.js @@ -6,7 +6,7 @@ require('./editPrecondition.html'); module.exports = angular .module('spinnaker.core.pipeline.config.preconditions.modal.controller', []) - .controller('EditPreconditionController', function($scope, $uibModalInstance, precondition, strategy, application) { + .controller('EditPreconditionController', ['$scope', '$uibModalInstance', 'precondition', 'strategy', 'application', function($scope, $uibModalInstance, precondition, strategy, application) { var vm = this; vm.strategy = strategy; @@ -17,4 +17,4 @@ module.exports = angular }; return vm; - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/preconditions/preconditionList.directive.js b/app/scripts/modules/core/src/pipeline/config/preconditions/preconditionList.directive.js index 22c863f8481..5838e537caa 100644 --- a/app/scripts/modules/core/src/pipeline/config/preconditions/preconditionList.directive.js +++ b/app/scripts/modules/core/src/pipeline/config/preconditions/preconditionList.directive.js @@ -23,7 +23,7 @@ module.exports = angular controllerAs: 'preconditionListCtrl', }; }) - .controller('PreconditionListCtrl', function($scope, $uibModal) { + .controller('PreconditionListCtrl', ['$scope', '$uibModal', function($scope, $uibModal) { var vm = this; vm.editPrecondition = function(precondition, strategy) { @@ -79,4 +79,4 @@ module.exports = angular }; return vm; - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/preconditions/preconditionType.service.js b/app/scripts/modules/core/src/pipeline/config/preconditions/preconditionType.service.js index 142d72cd84d..10325f682fd 100644 --- a/app/scripts/modules/core/src/pipeline/config/preconditions/preconditionType.service.js +++ b/app/scripts/modules/core/src/pipeline/config/preconditions/preconditionType.service.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.pipeline.config.preconditions.service', [require('./preconditionTypeConfig.provider').name]) - .factory('preconditionTypeService', function(preconditionTypeConfig) { + .factory('preconditionTypeService', ['preconditionTypeConfig', function(preconditionTypeConfig) { function listPreconditionTypes() { return preconditionTypeConfig.listPreconditionTypes(); } @@ -17,4 +17,4 @@ module.exports = angular listPreconditionTypes: listPreconditionTypes, getPreconditionType: getPreconditionType, }; - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/preconditions/selector/preconditionSelector.directive.js b/app/scripts/modules/core/src/pipeline/config/preconditions/selector/preconditionSelector.directive.js index c2797c054db..c6a50e65273 100644 --- a/app/scripts/modules/core/src/pipeline/config/preconditions/selector/preconditionSelector.directive.js +++ b/app/scripts/modules/core/src/pipeline/config/preconditions/selector/preconditionSelector.directive.js @@ -21,7 +21,7 @@ module.exports = angular controllerAs: 'preconditionCtrl', }; }) - .controller('PreconditionSelectorCtrl', function($scope, preconditionTypeService) { + .controller('PreconditionSelectorCtrl', ['$scope', 'preconditionTypeService', function($scope, preconditionTypeService) { AccountService.listAccounts().then(accounts => { $scope.accounts = accounts; setClusterList(); @@ -93,4 +93,4 @@ module.exports = angular }; this.accountUpdated(); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/preconditions/types/clusterSize/clusterSize.precondition.type.module.js b/app/scripts/modules/core/src/pipeline/config/preconditions/types/clusterSize/clusterSize.precondition.type.module.js index e12d4cdd3d6..555eb4ba597 100644 --- a/app/scripts/modules/core/src/pipeline/config/preconditions/types/clusterSize/clusterSize.precondition.type.module.js +++ b/app/scripts/modules/core/src/pipeline/config/preconditions/types/clusterSize/clusterSize.precondition.type.module.js @@ -4,10 +4,10 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.pipeline.config.preconditions.types.clusterSize', []) - .config(function(preconditionTypeConfigProvider) { + .config(['preconditionTypeConfigProvider', function(preconditionTypeConfigProvider) { preconditionTypeConfigProvider.registerPreconditionType({ label: 'Cluster Size', key: 'clusterSize', contextTemplateUrl: require('./additionalFields.html'), }); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/preconditions/types/expression/expression.precondition.type.module.js b/app/scripts/modules/core/src/pipeline/config/preconditions/types/expression/expression.precondition.type.module.js index 7290de65622..3bce13edee9 100644 --- a/app/scripts/modules/core/src/pipeline/config/preconditions/types/expression/expression.precondition.type.module.js +++ b/app/scripts/modules/core/src/pipeline/config/preconditions/types/expression/expression.precondition.type.module.js @@ -4,10 +4,10 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.pipeline.config.preconditions.types.expression', []) - .config(function(preconditionTypeConfigProvider) { + .config(['preconditionTypeConfigProvider', function(preconditionTypeConfigProvider) { preconditionTypeConfigProvider.registerPreconditionType({ label: 'Expression', key: 'expression', contextTemplateUrl: require('./additionalFields.html'), }); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/bake/bakeStage.js b/app/scripts/modules/core/src/pipeline/config/stages/bake/bakeStage.js index 1f701fc60ca..f88e265285c 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/bake/bakeStage.js +++ b/app/scripts/modules/core/src/pipeline/config/stages/bake/bakeStage.js @@ -17,6 +17,6 @@ module.exports = angular manualExecutionComponent: ManualExecutionBake, }); }) - .run(function(bakeStageTransformer) { + .run(['bakeStageTransformer', function(bakeStageTransformer) { Registry.pipeline.registerTransformer(bakeStageTransformer); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/bake/modal/addExtendedAttribute.controller.modal.js b/app/scripts/modules/core/src/pipeline/config/stages/bake/modal/addExtendedAttribute.controller.modal.js index 5af755cc1b2..4ed41e5faee 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/bake/modal/addExtendedAttribute.controller.modal.js +++ b/app/scripts/modules/core/src/pipeline/config/stages/bake/modal/addExtendedAttribute.controller.modal.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.pipeline.stage.bake.modal.addExtendedAttribute', []) - .controller('bakeStageAddExtendedAttributeController', function($scope, $uibModalInstance, extendedAttribute) { + .controller('bakeStageAddExtendedAttributeController', ['$scope', '$uibModalInstance', 'extendedAttribute', function($scope, $uibModalInstance, extendedAttribute) { var vm = this; $scope.extendedAttribute = angular.copy(extendedAttribute); @@ -13,4 +13,4 @@ module.exports = angular }; return vm; - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/bakeManifest/bakeManifestConfig.controller.ts b/app/scripts/modules/core/src/pipeline/config/stages/bakeManifest/bakeManifestConfig.controller.ts index ab40013c5a8..6aeae51393d 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/bakeManifest/bakeManifestConfig.controller.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/bakeManifest/bakeManifestConfig.controller.ts @@ -39,6 +39,7 @@ export class BakeManifestConfigCtrl implements IController { return inputArtifact; } + public static $inject = ['$scope']; constructor(public $scope: IScope) { 'ngInject'; const { stage } = this.$scope; diff --git a/app/scripts/modules/core/src/pipeline/config/stages/baseProviderStage/baseProviderStage.js b/app/scripts/modules/core/src/pipeline/config/stages/baseProviderStage/baseProviderStage.js index 07eac0046ef..e9ee3adc80a 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/baseProviderStage/baseProviderStage.js +++ b/app/scripts/modules/core/src/pipeline/config/stages/baseProviderStage/baseProviderStage.js @@ -8,7 +8,7 @@ import { SETTINGS } from 'core/config/settings'; module.exports = angular .module('spinnaker.core.pipeline.stage.baseProviderStage', []) - .controller('BaseProviderStageCtrl', function($scope, stage) { + .controller('BaseProviderStageCtrl', ['$scope', 'stage', function($scope, stage) { // Docker Bake is wedged in here because it doesn't really fit our existing cloud provider paradigm let dockerBakeEnabled = SETTINGS.feature.dockerBake && stage.type === 'bake'; @@ -60,4 +60,4 @@ module.exports = angular } $scope.$watch('stage.cloudProviderType', loadProvider); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/checkPreconditions/checkPreconditionsStage.ts b/app/scripts/modules/core/src/pipeline/config/stages/checkPreconditions/checkPreconditionsStage.ts index 8210ad32ec4..b0f2e725593 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/checkPreconditions/checkPreconditionsStage.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/checkPreconditions/checkPreconditionsStage.ts @@ -21,6 +21,6 @@ module(CHECK_PRECONDITIONS_STAGE, []) strategy: true, }); }) - .controller('CheckPreconditionsStageCtrl', function($scope: IScope) { + .controller('CheckPreconditionsStageCtrl', ['$scope', function($scope: IScope) { $scope.stage.preconditions = $scope.stage.preconditions || []; - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/common/baseExecutionDetails.controller.ts b/app/scripts/modules/core/src/pipeline/config/stages/common/baseExecutionDetails.controller.ts index b607dac7562..8b087916029 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/common/baseExecutionDetails.controller.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/common/baseExecutionDetails.controller.ts @@ -12,6 +12,7 @@ export interface IExecutionDetailsScope extends IScope { } export class BaseExecutionDetailsCtrl { + public static $inject = ['$scope', '$stateParams', 'executionDetailsSectionService']; constructor( public $scope: IExecutionDetailsScope, protected $stateParams: StateParams, diff --git a/app/scripts/modules/core/src/pipeline/config/stages/createLoadBalancer/createLoadBalancerExecutionDetails.controller.ts b/app/scripts/modules/core/src/pipeline/config/stages/createLoadBalancer/createLoadBalancerExecutionDetails.controller.ts index 12752db45b4..8cb076e38f9 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/createLoadBalancer/createLoadBalancerExecutionDetails.controller.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/createLoadBalancer/createLoadBalancerExecutionDetails.controller.ts @@ -10,6 +10,7 @@ import { import { BaseExecutionDetailsCtrl, IExecutionDetailsScope } from '../common/baseExecutionDetails.controller'; export class CreateLoadBalancerDetailsCtrl extends BaseExecutionDetailsCtrl { + public static $inject = ['$scope', '$stateParams', 'executionDetailsSectionService']; constructor( public $scope: IExecutionDetailsScope, protected $stateParams: StateParams, diff --git a/app/scripts/modules/core/src/pipeline/config/stages/createLoadBalancer/createLoadBalancerStage.js b/app/scripts/modules/core/src/pipeline/config/stages/createLoadBalancer/createLoadBalancerStage.js index e41aa8c3d07..d3df092e38f 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/createLoadBalancer/createLoadBalancerStage.js +++ b/app/scripts/modules/core/src/pipeline/config/stages/createLoadBalancer/createLoadBalancerStage.js @@ -24,7 +24,7 @@ module.exports = angular }); } }) - .controller('createLoadBalancerStageCtrl', function($scope, $uibModal, providerSelectionService) { + .controller('createLoadBalancerStageCtrl', ['$scope', '$uibModal', 'providerSelectionService', function($scope, $uibModal, providerSelectionService) { function initializeCommand() { $scope.stage.loadBalancers = $scope.stage.loadBalancers || []; } @@ -82,4 +82,4 @@ module.exports = angular }; initializeCommand(); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployExecutionDetails.controller.js b/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployExecutionDetails.controller.js index e87de66f044..3266c95e838 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployExecutionDetails.controller.js +++ b/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployExecutionDetails.controller.js @@ -18,7 +18,7 @@ module.exports = angular require('@uirouter/angularjs').default, EXECUTION_DETAILS_SECTION_SERVICE, ]) - .controller('DeployExecutionDetailsCtrl', function($scope, $stateParams, executionDetailsSectionService) { + .controller('DeployExecutionDetailsCtrl', ['$scope', '$stateParams', 'executionDetailsSectionService', function($scope, $stateParams, executionDetailsSectionService) { $scope.configSections = ['deploymentConfig', 'taskStatus', 'artifactStatus']; function areJarDiffsEmpty() { @@ -172,4 +172,4 @@ module.exports = angular if (_.hasIn($scope.application, 'executions.onRefresh')) { $scope.application.executions.onRefresh($scope, initialize); } - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployStage.js b/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployStage.js index f600b75b21e..24af59a1c8f 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployStage.js +++ b/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployStage.js @@ -11,7 +11,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.pipeline.stage.deployStage', [SERVER_GROUP_COMMAND_BUILDER_SERVICE, CLUSTER_SERVICE]) - .config(function(clusterServiceProvider) { + .config(['clusterServiceProvider', function(clusterServiceProvider) { Registry.pipeline.registerStage({ label: 'Deploy', description: 'Deploys the previously baked or found image', @@ -56,8 +56,8 @@ module.exports = angular }, strategy: true, }); - }) - .controller('DeployStageCtrl', function( + }]) + .controller('DeployStageCtrl', ['$injector', '$scope', '$uibModal', 'stage', 'providerSelectionService', 'serverGroupCommandBuilder', 'serverGroupTransformer', function( $injector, $scope, $uibModal, @@ -233,4 +233,4 @@ module.exports = angular function providerFilterFn(application, account, provider) { return !provider.unsupportedStageTypes || provider.unsupportedStageTypes.indexOf('deploy') === -1; } - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployStage.module.js b/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployStage.module.js index f3e10a55c42..9931d0a9058 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployStage.module.js +++ b/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployStage.module.js @@ -16,6 +16,6 @@ module.exports = angular CLUSTER_NAME_FILTER, STAGE_COMMON_MODULE, ]) - .run(function(deployStageTransformer) { + .run(['deployStageTransformer', function(deployStageTransformer) { Registry.pipeline.registerTransformer(deployStageTransformer); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/atlasGraph.component.ts b/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/atlasGraph.component.ts index 8dac5239f7f..d7d2401310e 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/atlasGraph.component.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/atlasGraph.component.ts @@ -88,6 +88,7 @@ class ExecutionWindowAtlasGraphController implements IController { // Used to determine how tall to make the execution window bars - it's just the max of the SPS data private maxCount = 0; + public static $inject = ['$http', '$filter']; public constructor(private $http: ng.IHttpService, private $filter: any) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/executionWindows.controller.js b/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/executionWindows.controller.js index c56681ce517..af1b64ab83d 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/executionWindows.controller.js +++ b/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/executionWindows.controller.js @@ -13,7 +13,7 @@ module.exports = angular EXECUTION_WINDOWS_DAY_PICKER, EXECUTION_WINDOW_ATLAS_GRAPH, ]) - .controller('ExecutionWindowsCtrl', function($scope) { + .controller('ExecutionWindowsCtrl', ['$scope', function($scope) { this.windowsUpdatedStream = new Subject(); this.enableCustomSkipWindowText = false; @@ -153,4 +153,4 @@ module.exports = angular $scope.$watch('stage.restrictedExecutionWindow.whitelist', this.updateTimelineWindows, true); $scope.$watch('stage.restrictExecutionDuringTimeWindow', this.toggleWindowRestriction); $scope.$watch('stage.restrictedExecutionWindow.jitter.enabled', this.toggleWindowJitter); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/executionWindowsStage.ts b/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/executionWindowsStage.ts index 47c3a06ebd6..2e57c9a34b3 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/executionWindowsStage.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/executionWindowsStage.ts @@ -17,6 +17,6 @@ module(EXECUTION_WINDOWS_STAGE, []) executionDetailsSections: [ExecutionWindowExecutionDetails, ExecutionDetailsTasks], }); }) - .run((executionWindowsTransformer: any) => { + .run(['executionWindowsTransformer', (executionWindowsTransformer: any) => { Registry.pipeline.registerTransformer(executionWindowsTransformer); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/findArtifactFromExecution/findArtifactFromExecution.controller.ts b/app/scripts/modules/core/src/pipeline/config/stages/findArtifactFromExecution/findArtifactFromExecution.controller.ts index fcc0cca57f5..8c2403f1419 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/findArtifactFromExecution/findArtifactFromExecution.controller.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/findArtifactFromExecution/findArtifactFromExecution.controller.ts @@ -29,6 +29,7 @@ export class FindArtifactFromExecutionCtrl implements IController { }, }; + public static $inject = ['$scope']; constructor(private $scope: IScope) { 'ngInject'; this.stage = this.$scope.stage as IFindArtifactFromExecutionStage; diff --git a/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsExecutionDetails.controller.js b/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsExecutionDetails.controller.js index 8717956607a..98633bd3660 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsExecutionDetails.controller.js +++ b/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsExecutionDetails.controller.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.pipeline.stage.jenkins.executionDetails.controller', [require('@uirouter/angularjs').default]) - .controller('JenkinsExecutionDetailsCtrl', function($scope, $stateParams, executionDetailsSectionService) { + .controller('JenkinsExecutionDetailsCtrl', ['$scope', '$stateParams', 'executionDetailsSectionService', function($scope, $stateParams, executionDetailsSectionService) { $scope.configSections = ['jenkinsConfig', 'taskStatus']; let initialized = () => { @@ -40,4 +40,4 @@ module.exports = angular initialize(); $scope.$on('$stateChangeSuccess', initialize); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsStage.js b/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsStage.js index d359b0ba559..0a6dd33da98 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsStage.js +++ b/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsStage.js @@ -34,7 +34,7 @@ module.exports = angular strategy: true, }); }) - .controller('JenkinsStageCtrl', function($scope, stage) { + .controller('JenkinsStageCtrl', ['$scope', 'stage', function($scope, stage) { $scope.stage = stage; $scope.stage.failPipeline = $scope.stage.failPipeline === undefined ? true : $scope.stage.failPipeline; $scope.stage.continuePipeline = $scope.stage.continuePipeline === undefined ? false : $scope.stage.continuePipeline; @@ -136,4 +136,4 @@ module.exports = angular $scope.$watch('stage.master', updateJobsList); $scope.$watch('stage.job', updateJobConfig); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/manualJudgment/manualJudgment.service.ts b/app/scripts/modules/core/src/pipeline/config/stages/manualJudgment/manualJudgment.service.ts index 6a7e86800ab..de33abb28d6 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/manualJudgment/manualJudgment.service.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/manualJudgment/manualJudgment.service.ts @@ -5,6 +5,7 @@ import { IExecution, IExecutionStage } from 'core/domain'; import { Application } from 'core/application'; export class ManualJudgmentService { + public static $inject = ['executionService']; constructor(private executionService: ExecutionService) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/pipeline/config/stages/manualJudgment/manualJudgmentStage.js b/app/scripts/modules/core/src/pipeline/config/stages/manualJudgment/manualJudgmentStage.js index 26b0d419fbe..5ec3ca8ffdc 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/manualJudgment/manualJudgmentStage.js +++ b/app/scripts/modules/core/src/pipeline/config/stages/manualJudgment/manualJudgmentStage.js @@ -30,7 +30,7 @@ module.exports = angular disableNotifications: true, }); }) - .controller('ManualJudgmentStageCtrl', function($scope, $uibModal) { + .controller('ManualJudgmentStageCtrl', ['$scope', '$uibModal', function($scope, $uibModal) { $scope.authEnabled = SETTINGS.authEnabled; $scope.stage.notifications = $scope.stage.notifications || []; $scope.stage.judgmentInputs = $scope.stage.judgmentInputs || []; @@ -109,4 +109,4 @@ module.exports = angular this.removeJudgmentInput = function(idx) { $scope.stage.judgmentInputs.splice(idx, 1); }; - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/optionalStage/optionalStage.directive.js b/app/scripts/modules/core/src/pipeline/config/stages/optionalStage/optionalStage.directive.js index 6fa3acc51c2..2921c79884c 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/optionalStage/optionalStage.directive.js +++ b/app/scripts/modules/core/src/pipeline/config/stages/optionalStage/optionalStage.directive.js @@ -15,7 +15,7 @@ module.exports = angular controllerAs: 'optionalStageCtrl', }; }) - .controller('OptionalStageCtrl', function($scope) { + .controller('OptionalStageCtrl', ['$scope', function($scope) { this.isOptional = function() { return $scope.stage && $scope.stage.stageEnabled; }; @@ -29,4 +29,4 @@ module.exports = angular }; } }; - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/overrideFailure/overrideFailure.component.js b/app/scripts/modules/core/src/pipeline/config/stages/overrideFailure/overrideFailure.component.js index 2fb0e80d39f..0b549abc3e5 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/overrideFailure/overrideFailure.component.js +++ b/app/scripts/modules/core/src/pipeline/config/stages/overrideFailure/overrideFailure.component.js @@ -7,7 +7,7 @@ module.exports = angular.module('spinnaker.core.pipeline.stage.overrideFailure', stage: '=', }, templateUrl: require('./overrideFailure.component.html'), - controller: function($scope) { + controller: ['$scope', function($scope) { this.viewState = {}; this.failureOptionChanged = () => { @@ -45,5 +45,5 @@ module.exports = angular.module('spinnaker.core.pipeline.stage.overrideFailure', }; $scope.$watch(() => this.stage, this.initializeFailureOption); - }, + }], }); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/overrideTimeout/overrideTimeout.directive.js b/app/scripts/modules/core/src/pipeline/config/stages/overrideTimeout/overrideTimeout.directive.js index c472ee926cd..f13c94d690e 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/overrideTimeout/overrideTimeout.directive.js +++ b/app/scripts/modules/core/src/pipeline/config/stages/overrideTimeout/overrideTimeout.directive.js @@ -18,7 +18,7 @@ module.exports = angular controllerAs: 'overrideTimeoutCtrl', }; }) - .controller('OverrideTimeoutCtrl', function($scope) { + .controller('OverrideTimeoutCtrl', ['$scope', function($scope) { function toHoursAndMinutes(ms) { if (!ms) { return { hours: 0, minutes: 0 }; @@ -65,4 +65,4 @@ module.exports = angular }; $scope.$watch('stage', this.setOverrideValues, true); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineExecutionDetails.controller.js b/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineExecutionDetails.controller.js index 60db5a36e9e..5eabbf3b98b 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineExecutionDetails.controller.js +++ b/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineExecutionDetails.controller.js @@ -10,7 +10,7 @@ module.exports = angular require('@uirouter/angularjs').default, EXECUTION_DETAILS_SECTION_SERVICE, ]) - .controller('pipelineExecutionDetailsCtrl', function($scope, $stateParams, executionDetailsSectionService) { + .controller('pipelineExecutionDetailsCtrl', ['$scope', '$stateParams', 'executionDetailsSectionService', function($scope, $stateParams, executionDetailsSectionService) { $scope.configSections = ['pipelineConfig', 'taskStatus']; let initialized = () => { @@ -31,4 +31,4 @@ module.exports = angular initialize(); $scope.$on('$stateChangeSuccess', initialize); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.js b/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.js index 3c0e6715c19..73f94d8c03f 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.js +++ b/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.js @@ -23,7 +23,7 @@ module.exports = angular validators: [{ type: 'requiredField', fieldName: 'pipeline' }], }); }) - .controller('pipelineStageCtrl', function($scope, stage) { + .controller('pipelineStageCtrl', ['$scope', 'stage', function($scope, stage) { $scope.stage = stage; $scope.stage.failPipeline = $scope.stage.failPipeline === undefined ? true : $scope.stage.failPipeline; $scope.stage.waitForCompletion = @@ -118,4 +118,4 @@ module.exports = angular $scope.$watch('stage.application', initializeMasters); $scope.$watch('stage.pipeline', updatePipelineConfig); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/script/scriptStage.ts b/app/scripts/modules/core/src/pipeline/config/stages/script/scriptStage.ts index 7fc413cd173..006ae6ad68e 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/script/scriptStage.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/script/scriptStage.ts @@ -24,7 +24,7 @@ module(SCRIPT_STAGE, []) validators: [{ type: 'requiredField', fieldName: 'command' }], }); }) - .controller('ScriptStageCtrl', function($scope: IScope, stage: IStage) { + .controller('ScriptStageCtrl', ['$scope', 'stage', function($scope: IScope, stage: IStage) { $scope.stage = stage; $scope.stage.failPipeline = $scope.stage.failPipeline === undefined ? true : $scope.stage.failPipeline; $scope.stage.waitForCompletion = @@ -37,4 +37,4 @@ module(SCRIPT_STAGE, []) $scope.viewState = { loading: false, }; - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/stage.module.js b/app/scripts/modules/core/src/pipeline/config/stages/stage.module.js index 28c5db2e924..a93bb599bfc 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/stage.module.js +++ b/app/scripts/modules/core/src/pipeline/config/stages/stage.module.js @@ -44,7 +44,7 @@ module.exports = angular }, }; }) - .controller('StageConfigCtrl', function($scope, $element, $compile, $controller, $templateCache) { + .controller('StageConfigCtrl', ['$scope', '$element', '$compile', '$controller', '$templateCache', function($scope, $element, $compile, $controller, $templateCache) { var lastStageScope, reactComponentMounted; $scope.options = { @@ -247,8 +247,8 @@ module.exports = angular $scope.$watch('stage.type', this.selectStage); $scope.$watch('viewState.stageIndex', this.selectStage); $scope.$watch('stage.refId', this.selectStage); - }) - .controller('RestartStageCtrl', function($scope, $stateParams, confirmationModalService) { + }]) + .controller('RestartStageCtrl', ['$scope', '$stateParams', 'confirmationModalService', function($scope, $stateParams, confirmationModalService) { var restartStage = function() { return API.one('pipelines') .one($stateParams.executionId) @@ -274,7 +274,7 @@ module.exports = angular submitMethod: restartStage, }); }; - }) + }]) .filter('stageTypeMatch', () => { return (stageTypes, search) => { const q = search.toLowerCase(); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/travis/modal/addParameter.controller.modal.ts b/app/scripts/modules/core/src/pipeline/config/stages/travis/modal/addParameter.controller.modal.ts index 0d309743e64..929a0b6c726 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/travis/modal/addParameter.controller.modal.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/travis/modal/addParameter.controller.modal.ts @@ -2,6 +2,7 @@ import { IController, module } from 'angular'; import { IModalInstanceService } from 'angular-ui-bootstrap'; export class TravisStageAddParameter implements IController { + public static $inject = ['$scope', '$uibModalInstance']; constructor(private $scope: ng.IScope, private $uibModalInstance: IModalInstanceService) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/pipeline/config/stages/travis/travisExecutionDetails.controller.ts b/app/scripts/modules/core/src/pipeline/config/stages/travis/travisExecutionDetails.controller.ts index 9556b660c01..bf8290581b1 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/travis/travisExecutionDetails.controller.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/travis/travisExecutionDetails.controller.ts @@ -13,6 +13,7 @@ export class TravisExecutionDetailsCtrl implements IController { public failureMessage: string; public stage: any; + public static $inject = ['$stateParams', 'executionDetailsSectionService', '$scope']; constructor( private $stateParams: StateParams, private executionDetailsSectionService: ExecutionDetailsSectionService, diff --git a/app/scripts/modules/core/src/pipeline/config/stages/travis/travisStage.ts b/app/scripts/modules/core/src/pipeline/config/stages/travis/travisStage.ts index 03d3a2a9b0f..6edde928bbc 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/travis/travisStage.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/travis/travisStage.ts @@ -35,6 +35,7 @@ export class TravisStage implements IController { public filterLimit = 100; private filterThreshold = 500; + public static $inject = ['stage', '$scope', '$uibModal']; constructor(public stage: any, $scope: IScope, private $uibModal: IModalService) { this.stage.failPipeline = this.stage.failPipeline === undefined ? true : this.stage.failPipeline; this.stage.continuePipeline = this.stage.continuePipeline === undefined ? false : this.stage.continuePipeline; diff --git a/app/scripts/modules/core/src/pipeline/config/stages/unmatchedStageTypeStage/unmatchedStageTypeStage.controller.ts b/app/scripts/modules/core/src/pipeline/config/stages/unmatchedStageTypeStage/unmatchedStageTypeStage.controller.ts index f33d9a5d9c3..44ee602e540 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/unmatchedStageTypeStage/unmatchedStageTypeStage.controller.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/unmatchedStageTypeStage/unmatchedStageTypeStage.controller.ts @@ -23,6 +23,7 @@ export class UnmatchedStageTypeStageCtrl implements IController { 'name', ]); + public static $inject = ['$scope']; constructor(public $scope: IScope) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/pipeline/config/stages/waitForParentTasks/waitForParentTasks.js b/app/scripts/modules/core/src/pipeline/config/stages/waitForParentTasks/waitForParentTasks.js index 92e46fa2cbc..fe9f95e850b 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/waitForParentTasks/waitForParentTasks.js +++ b/app/scripts/modules/core/src/pipeline/config/stages/waitForParentTasks/waitForParentTasks.js @@ -13,6 +13,6 @@ module.exports = angular executionDetailsUrl: require('./waitForParentTasksExecutionDetails.html'), }); }) - .run(function(waitForParentTasksTransformer) { + .run(['waitForParentTasksTransformer', function(waitForParentTasksTransformer) { Registry.pipeline.registerTransformer(waitForParentTasksTransformer); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/stages/webhook/modal/addCustomHeader.controller.modal.ts b/app/scripts/modules/core/src/pipeline/config/stages/webhook/modal/addCustomHeader.controller.modal.ts index 8eb0e02ec03..86e10c0bff1 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/webhook/modal/addCustomHeader.controller.modal.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/webhook/modal/addCustomHeader.controller.modal.ts @@ -2,6 +2,7 @@ import { IController, module } from 'angular'; import { IModalInstanceService } from 'angular-ui-bootstrap'; export class WebhookStageAddCustomHeader implements IController { + public static $inject = ['$scope', '$uibModalInstance']; constructor(private $scope: ng.IScope, private $uibModalInstance: IModalInstanceService) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/pipeline/config/stages/webhook/webhookExecutionDetails.controller.ts b/app/scripts/modules/core/src/pipeline/config/stages/webhook/webhookExecutionDetails.controller.ts index 086c514863e..efe6be3c9ee 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/webhook/webhookExecutionDetails.controller.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/webhook/webhookExecutionDetails.controller.ts @@ -18,6 +18,7 @@ export class WebhookExecutionDetailsCtrl implements IController { public stage: any; public payload: string; + public static $inject = ['$stateParams', 'executionDetailsSectionService', '$scope']; constructor( private $stateParams: StateParams, private executionDetailsSectionService: ExecutionDetailsSectionService, diff --git a/app/scripts/modules/core/src/pipeline/config/stages/webhook/webhookStage.ts b/app/scripts/modules/core/src/pipeline/config/stages/webhook/webhookStage.ts index 12bca519294..c0039302509 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/webhook/webhookStage.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/webhook/webhookStage.ts @@ -48,6 +48,7 @@ export class WebhookStage implements IController { public noUserConfigurableFields: boolean; public parameters: IWebhookParameter[] = []; + public static $inject = ['stage', '$uibModal']; constructor(public stage: any, private $uibModal: IModalService) { 'ngInject'; this.methods = ['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE']; diff --git a/app/scripts/modules/core/src/pipeline/config/stages/wercker/modal/addParameter.controller.modal.ts b/app/scripts/modules/core/src/pipeline/config/stages/wercker/modal/addParameter.controller.modal.ts index a552fdbd783..e8e31f192c1 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/wercker/modal/addParameter.controller.modal.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/wercker/modal/addParameter.controller.modal.ts @@ -2,6 +2,7 @@ import { IController, module } from 'angular'; import { IModalInstanceService } from 'angular-ui-bootstrap'; export class WerckerStageAddParameter implements IController { + public static $inject = ['$scope', '$uibModalInstance']; constructor(private $scope: ng.IScope, private $uibModalInstance: IModalInstanceService) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerExecutionDetails.controller.ts b/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerExecutionDetails.controller.ts index db377ce4210..8c7d983d987 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerExecutionDetails.controller.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerExecutionDetails.controller.ts @@ -13,6 +13,7 @@ export class WerckerExecutionDetailsCtrl implements IController { public failureMessage: string; public stage: any; + public static $inject = ['$stateParams', 'executionDetailsSectionService', '$scope']; constructor( private $stateParams: StateParams, private executionDetailsSectionService: ExecutionDetailsSectionService, diff --git a/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerStage.ts b/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerStage.ts index b1934df62c1..50ca219e621 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerStage.ts +++ b/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerStage.ts @@ -40,6 +40,7 @@ export class WerckerStage implements IController { public pipeline: string; public job: string; + public static $inject = ['stage', '$scope', '$uibModal']; constructor(public stage: any, $scope: IScope, private $uibModal: IModalService) { this.stage.failPipeline = this.stage.failPipeline === undefined ? true : this.stage.failPipeline; this.stage.continuePipeline = this.stage.continuePipeline === undefined ? false : this.stage.continuePipeline; diff --git a/app/scripts/modules/core/src/pipeline/config/templates/configurePipelineTemplateModal.controller.ts b/app/scripts/modules/core/src/pipeline/config/templates/configurePipelineTemplateModal.controller.ts index 36e78108c62..e417dae2f34 100644 --- a/app/scripts/modules/core/src/pipeline/config/templates/configurePipelineTemplateModal.controller.ts +++ b/app/scripts/modules/core/src/pipeline/config/templates/configurePipelineTemplateModal.controller.ts @@ -49,6 +49,7 @@ export class ConfigurePipelineTemplateModalController implements IController { private template: IPipelineTemplate; private source: string; + public static $inject = ['$scope', '$uibModalInstance', 'application', 'pipelineTemplateConfig', 'isNew', 'pipelineId', 'executionId']; constructor( private $scope: IScope, private $uibModalInstance: IModalInstanceService, diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/artifact.component.ts b/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/artifact.component.ts index 20f7e88e750..686cf33e6ef 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/artifact.component.ts +++ b/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/artifact.component.ts @@ -23,6 +23,7 @@ class ArtifactCtrl implements IController { private isDefault: boolean; private artifactAccounts?: IArtifactAccount[]; + public static $inject = ['$attrs', '$controller', '$compile', '$element', '$rootScope', '$scope']; constructor( private $attrs: IAttributes, private $controller: IControllerService, diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/custom/custom.artifact.ts b/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/custom/custom.artifact.ts index 10b6dff6d83..17b60bffbd3 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/custom/custom.artifact.ts +++ b/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/custom/custom.artifact.ts @@ -5,6 +5,7 @@ import { Registry } from 'core/registry'; import { CustomArtifactEditor } from './CustomArtifactEditor'; class CustomArtifactController implements IController { + public static $inject = ['artifact']; constructor(public artifact: IArtifact) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/expectedArtifact.component.ts b/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/expectedArtifact.component.ts index d91e2d626ca..4ce207b3aa1 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/expectedArtifact.component.ts +++ b/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/expectedArtifact.component.ts @@ -9,6 +9,7 @@ class ExpectedArtifactController implements IComponentController { public removeExpectedArtifact: any; public context: any; + public static $inject = ['$attrs']; public constructor(private $attrs: IAttributes) { 'nginject'; diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/http/http.artifact.ts b/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/http/http.artifact.ts index f27c5278465..9338ead91fd 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/http/http.artifact.ts +++ b/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/http/http.artifact.ts @@ -5,6 +5,7 @@ import { Registry } from 'core/registry'; import { HttpArtifactEditor } from './HttpArtifactEditor'; class HttpArtifactController implements IController { + public static $inject = ['artifact']; constructor(public artifact: IArtifact) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/ivy/ivy.artifact.ts b/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/ivy/ivy.artifact.ts index 478cea1cf5e..73dc0c2d952 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/ivy/ivy.artifact.ts +++ b/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/ivy/ivy.artifact.ts @@ -5,6 +5,7 @@ import { Registry } from 'core/registry'; import { IvyArtifactEditor } from './IvyArtifactEditor'; class IvyArtifactController implements IController { + public static $inject = ['artifact']; constructor(public artifact: IArtifact) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/maven/maven.artifact.ts b/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/maven/maven.artifact.ts index f8f25de3b88..4ba5b34a964 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/maven/maven.artifact.ts +++ b/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/maven/maven.artifact.ts @@ -5,6 +5,7 @@ import { Registry } from 'core/registry'; import { MavenArtifactEditor } from './MavenArtifactEditor'; class MavenArtifactController implements IController { + public static $inject = ['artifact']; constructor(public artifact: IArtifact) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/cron/cronTrigger.module.js b/app/scripts/modules/core/src/pipeline/config/triggers/cron/cronTrigger.module.js index 78f44fbb945..bc4467daf14 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/cron/cronTrigger.module.js +++ b/app/scripts/modules/core/src/pipeline/config/triggers/cron/cronTrigger.module.js @@ -34,7 +34,7 @@ module.exports = angular ], }); }) - .controller('CronTriggerCtrl', function(trigger) { + .controller('CronTriggerCtrl', ['trigger', function(trigger) { this.trigger = trigger; this.fiatEnabled = SETTINGS.feature.fiatEnabled; @@ -53,7 +53,7 @@ module.exports = angular hideSeconds: true, use24HourTime: true, }; - }) - .run($templateCache => - $templateCache.put('spinnaker-custom-cron-picker-template', $templateCache.get(require('./cronPicker.html'))), + }]) + .run(['$templateCache', $templateCache => + $templateCache.put('spinnaker-custom-cron-picker-template', $templateCache.get(require('./cronPicker.html')))], ); diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/git/git.trigger.ts b/app/scripts/modules/core/src/pipeline/config/triggers/git/git.trigger.ts index 512a23f8138..4fdb09f1f8a 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/git/git.trigger.ts +++ b/app/scripts/modules/core/src/pipeline/config/triggers/git/git.trigger.ts @@ -38,6 +38,7 @@ class GitTriggerController implements IController { }, }; + public static $inject = ['trigger', '$scope']; constructor(public trigger: IGitTrigger, private $scope: IScope) { 'ngInject'; this.initialize(); diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/jenkins/jenkinsTrigger.module.js b/app/scripts/modules/core/src/pipeline/config/triggers/jenkins/jenkinsTrigger.module.js index 849d198b1cf..03a6ed5e74c 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/jenkins/jenkinsTrigger.module.js +++ b/app/scripts/modules/core/src/pipeline/config/triggers/jenkins/jenkinsTrigger.module.js @@ -38,7 +38,7 @@ module.exports = angular ], }); }) - .controller('JenkinsTriggerCtrl', function($scope, trigger) { + .controller('JenkinsTriggerCtrl', ['$scope', 'trigger', function($scope, trigger) { $scope.trigger = trigger; this.fiatEnabled = SETTINGS.feature.fiatEnabled; ServiceAccountReader.getServiceAccounts().then(accounts => { @@ -88,4 +88,4 @@ module.exports = angular initializeMasters(); $scope.$watch('trigger.master', updateJobsList); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/pipeline/pipelineTrigger.module.js b/app/scripts/modules/core/src/pipeline/config/triggers/pipeline/pipelineTrigger.module.js index 1ce2281e0bf..4eaf0f26541 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/pipeline/pipelineTrigger.module.js +++ b/app/scripts/modules/core/src/pipeline/config/triggers/pipeline/pipelineTrigger.module.js @@ -26,7 +26,7 @@ module.exports = angular executionTriggerLabel: () => 'Pipeline', }); }) - .controller('pipelineTriggerCtrl', function($scope, trigger) { + .controller('pipelineTriggerCtrl', ['$scope', 'trigger', function($scope, trigger) { $scope.trigger = trigger; this.fiatEnabled = SETTINGS.feature.fiatEnabled; @@ -93,4 +93,4 @@ module.exports = angular init(); $scope.$watch('trigger.application', init); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/pubsub/pubsub.trigger.ts b/app/scripts/modules/core/src/pipeline/config/triggers/pubsub/pubsub.trigger.ts index 12ddde17e35..f778335be5d 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/pubsub/pubsub.trigger.ts +++ b/app/scripts/modules/core/src/pipeline/config/triggers/pubsub/pubsub.trigger.ts @@ -13,6 +13,7 @@ class PubsubTriggerController implements IController { public subscriptionsLoaded = false; public serviceAccounts: string[]; + public static $inject = ['trigger']; constructor(public trigger: IPubsubTrigger) { 'ngInject'; diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/travis/travisTrigger.module.ts b/app/scripts/modules/core/src/pipeline/config/triggers/travis/travisTrigger.module.ts index 1283dd49467..f2b5aa12ccc 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/travis/travisTrigger.module.ts +++ b/app/scripts/modules/core/src/pipeline/config/triggers/travis/travisTrigger.module.ts @@ -24,6 +24,7 @@ export class TravisTrigger implements IController { public fiatEnabled: boolean; public serviceAccounts: string[]; + public static $inject = ['$scope', 'trigger']; constructor($scope: IScope, public trigger: IBuildTrigger) { 'ngInject'; this.fiatEnabled = SETTINGS.feature.fiatEnabled; diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/trigger.directive.js b/app/scripts/modules/core/src/pipeline/config/triggers/trigger.directive.js index 1561e278f25..e01aca6936b 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/trigger.directive.js +++ b/app/scripts/modules/core/src/pipeline/config/triggers/trigger.directive.js @@ -27,7 +27,7 @@ module.exports = angular }, }; }) - .controller('TriggerCtrl', function($scope, $element, $compile, $controller, $templateCache) { + .controller('TriggerCtrl', ['$scope', '$element', '$compile', '$controller', '$templateCache', function($scope, $element, $compile, $controller, $templateCache) { let reactComponentMounted; var triggerTypes = Registry.pipeline.getTriggerTypes(); $scope.options = triggerTypes; @@ -87,4 +87,4 @@ module.exports = angular }; this.loadTrigger(); - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/triggers.directive.js b/app/scripts/modules/core/src/pipeline/config/triggers/triggers.directive.js index e7002b0febb..baa7531dcb6 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/triggers.directive.js +++ b/app/scripts/modules/core/src/pipeline/config/triggers/triggers.directive.js @@ -22,7 +22,7 @@ module.exports = angular templateUrl: require('./triggers.html'), }; }) - .controller('triggersCtrl', function($scope) { + .controller('triggersCtrl', ['$scope', function($scope) { this.showProperties = SETTINGS.feature.quietPeriod || SETTINGS.feature.managedServiceAccounts; this.addTrigger = function() { var triggerTypes = Registry.pipeline.getTriggerTypes(), @@ -70,4 +70,4 @@ module.exports = angular */ this.checkFeatureFlag = flag => !!SETTINGS.feature[flag]; - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/webhook/webhook.trigger.ts b/app/scripts/modules/core/src/pipeline/config/triggers/webhook/webhook.trigger.ts index 6a6d22510fd..c359ed64175 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/webhook/webhook.trigger.ts +++ b/app/scripts/modules/core/src/pipeline/config/triggers/webhook/webhook.trigger.ts @@ -9,6 +9,7 @@ class WebhookTriggerController implements IController { public fiatEnabled: boolean; public serviceAccounts: string[]; + public static $inject = ['trigger']; constructor(public trigger: IWebhookTrigger) { 'ngInject'; this.fiatEnabled = SETTINGS.feature.fiatEnabled; diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/wercker/werckerTrigger.module.ts b/app/scripts/modules/core/src/pipeline/config/triggers/wercker/werckerTrigger.module.ts index 5a01d1967e4..1e306541f2e 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/wercker/werckerTrigger.module.ts +++ b/app/scripts/modules/core/src/pipeline/config/triggers/wercker/werckerTrigger.module.ts @@ -29,6 +29,7 @@ export class WerckerTrigger implements IController { public fiatEnabled: boolean; public serviceAccounts: string[]; + public static $inject = ['$scope', 'trigger']; constructor($scope: IScope, public trigger: IWerckerTrigger) { 'ngInject'; this.fiatEnabled = SETTINGS.feature.fiatEnabled; diff --git a/app/scripts/modules/core/src/pipeline/details/executionDetailsSection.service.ts b/app/scripts/modules/core/src/pipeline/details/executionDetailsSection.service.ts index f1c894bab19..1ef061948cc 100644 --- a/app/scripts/modules/core/src/pipeline/details/executionDetailsSection.service.ts +++ b/app/scripts/modules/core/src/pipeline/details/executionDetailsSection.service.ts @@ -4,6 +4,7 @@ import { StateParams, StateService } from '@uirouter/angularjs'; export class ExecutionDetailsSectionService { private pendingOnComplete: IPromise; + public static $inject = ['$stateParams', '$state', '$timeout']; public constructor( private $stateParams: StateParams, private $state: StateService, diff --git a/app/scripts/modules/core/src/pipeline/details/stageSummary.component.ts b/app/scripts/modules/core/src/pipeline/details/stageSummary.component.ts index feab20cb6a1..3e7d5e6d78d 100644 --- a/app/scripts/modules/core/src/pipeline/details/stageSummary.component.ts +++ b/app/scripts/modules/core/src/pipeline/details/stageSummary.component.ts @@ -18,6 +18,7 @@ export class StageSummaryController implements IController { private parser: Parser = new Parser(); private renderer: HtmlRenderer = new HtmlRenderer(); + public static $inject = ['$scope', '$stateParams', '$state', 'confirmationModalService', 'executionService']; constructor( private $scope: IScope, private $stateParams: StateParams, diff --git a/app/scripts/modules/core/src/pipeline/details/stepExecutionDetails.component.ts b/app/scripts/modules/core/src/pipeline/details/stepExecutionDetails.component.ts index e81bdd7203f..4db610efe09 100644 --- a/app/scripts/modules/core/src/pipeline/details/stepExecutionDetails.component.ts +++ b/app/scripts/modules/core/src/pipeline/details/stepExecutionDetails.component.ts @@ -11,6 +11,7 @@ export class StepExecutionDetailsController implements IController { public sourceUrl: string; public stage: IExecutionStage; + public static $inject = ['$scope']; constructor(private $scope: IScope) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/pipeline/manualExecution/manualPipelineExecution.controller.js b/app/scripts/modules/core/src/pipeline/manualExecution/manualPipelineExecution.controller.js index efc09e28583..976ab7b8afa 100644 --- a/app/scripts/modules/core/src/pipeline/manualExecution/manualPipelineExecution.controller.js +++ b/app/scripts/modules/core/src/pipeline/manualExecution/manualPipelineExecution.controller.js @@ -21,7 +21,7 @@ module.exports = angular TRIGGER_TEMPLATE, STAGE_MANUAL_COMPONENTS, ]) - .controller('ManualPipelineExecutionCtrl', function($scope, $uibModalInstance, pipeline, application, trigger) { + .controller('ManualPipelineExecutionCtrl', ['$scope', '$uibModalInstance', 'pipeline', 'application', 'trigger', function($scope, $uibModalInstance, pipeline, application, trigger) { let applicationNotifications = []; let pipelineNotifications = []; @@ -290,4 +290,4 @@ module.exports = angular if (!pipeline) { this.pipelineOptions = application.pipelineConfigs.data.filter(c => !c.disabled); } - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/pipeline.dataSource.js b/app/scripts/modules/core/src/pipeline/pipeline.dataSource.js index 6171565dc57..cb5ce2900e2 100644 --- a/app/scripts/modules/core/src/pipeline/pipeline.dataSource.js +++ b/app/scripts/modules/core/src/pipeline/pipeline.dataSource.js @@ -10,7 +10,7 @@ import { CLUSTER_SERVICE } from 'core/cluster/cluster.service'; module.exports = angular .module('spinnaker.core.pipeline.dataSource', [EXECUTION_SERVICE, CLUSTER_SERVICE]) - .run(function($q, executionService, clusterService) { + .run(['$q', 'executionService', 'clusterService', function($q, executionService, clusterService) { let addExecutions = (application, executions) => { executionService.transformExecutions(application, executions, application.executions.data); return $q.when(executionService.addExecutionsToApplication(application, executions)); @@ -94,4 +94,4 @@ module.exports = angular afterLoad: runningExecutionsLoaded, }); } - }); + }]); diff --git a/app/scripts/modules/core/src/pipeline/pipeline.states.ts b/app/scripts/modules/core/src/pipeline/pipeline.states.ts index 63d117c53c0..981b961ef23 100644 --- a/app/scripts/modules/core/src/pipeline/pipeline.states.ts +++ b/app/scripts/modules/core/src/pipeline/pipeline.states.ts @@ -9,7 +9,7 @@ import { SingleExecutionDetails } from 'core/pipeline/details/SingleExecutionDet export const PIPELINE_STATES = 'spinnaker.core.pipeline.states'; module(PIPELINE_STATES, [APPLICATION_STATE_PROVIDER]).config( - (applicationStateProvider: ApplicationStateProvider, stateConfigProvider: StateConfigProvider) => { + ['applicationStateProvider', 'stateConfigProvider', (applicationStateProvider: ApplicationStateProvider, stateConfigProvider: StateConfigProvider) => { const pipelineConfig: INestedState = { name: 'pipelineConfig', url: '/configure/:pipelineId?executionId', @@ -87,5 +87,5 @@ module(PIPELINE_STATES, [APPLICATION_STATE_PROVIDER]).config( }; applicationStateProvider.addChildState(pipelines); - }, + }], ); diff --git a/app/scripts/modules/core/src/pipeline/service/execution.service.ts b/app/scripts/modules/core/src/pipeline/service/execution.service.ts index 2775bd2bf73..dc9b52409e1 100644 --- a/app/scripts/modules/core/src/pipeline/service/execution.service.ts +++ b/app/scripts/modules/core/src/pipeline/service/execution.service.ts @@ -609,8 +609,8 @@ export class ExecutionService { export const EXECUTION_SERVICE = 'spinnaker.core.pipeline.executions.service'; module(EXECUTION_SERVICE, [require('@uirouter/angularjs').default]).factory( 'executionService', - ($http: IHttpService, $q: IQService, $state: StateService, $timeout: ITimeoutService) => - new ExecutionService($http, $q, $state, $timeout), + ['$http', '$q', '$state', '$timeout', ($http: IHttpService, $q: IQService, $state: StateService, $timeout: ITimeoutService) => + new ExecutionService($http, $q, $state, $timeout)], ); DebugWindow.addInjectable('executionService'); diff --git a/app/scripts/modules/core/src/presentation/autoScroll/autoScroll.directive.ts b/app/scripts/modules/core/src/presentation/autoScroll/autoScroll.directive.ts index 36166380d6a..8a6b9996a31 100644 --- a/app/scripts/modules/core/src/presentation/autoScroll/autoScroll.directive.ts +++ b/app/scripts/modules/core/src/presentation/autoScroll/autoScroll.directive.ts @@ -51,6 +51,7 @@ export class AutoScrollController implements IController { this.$scope.$on('$destroy', () => this.scrollableContainer.off(this.containerEvent)); } + public static $inject = ['$timeout']; public constructor(private $timeout: ITimeoutService) {} } diff --git a/app/scripts/modules/core/src/presentation/navigation/pageNavigator.component.ts b/app/scripts/modules/core/src/presentation/navigation/pageNavigator.component.ts index 82ce0e35e10..a60917c67de 100644 --- a/app/scripts/modules/core/src/presentation/navigation/pageNavigator.component.ts +++ b/app/scripts/modules/core/src/presentation/navigation/pageNavigator.component.ts @@ -20,6 +20,7 @@ class PageNavigatorController implements IController { return `scroll.pageNavigation.${this.id}`; } + public static $inject = ['$element', '$state', '$stateParams']; public constructor(private $element: JQuery, private $state: StateService, private $stateParams: StateParams) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/presentation/replace.filter.ts b/app/scripts/modules/core/src/presentation/replace.filter.ts index 58d6478df97..44ce8729dc6 100644 --- a/app/scripts/modules/core/src/presentation/replace.filter.ts +++ b/app/scripts/modules/core/src/presentation/replace.filter.ts @@ -13,6 +13,7 @@ function replace($log: ILogService): Function { } }; } +replace.$inject = ['$log']; export const REPLACE_FILTER = 'spinnaker.core.replace.filter'; module(REPLACE_FILTER, []).filter('replace', replace); diff --git a/app/scripts/modules/core/src/projects/dashboard/cluster/projectCluster.directive.js b/app/scripts/modules/core/src/projects/dashboard/cluster/projectCluster.directive.js index ae5537a81cd..bd20bd992ce 100644 --- a/app/scripts/modules/core/src/projects/dashboard/cluster/projectCluster.directive.js +++ b/app/scripts/modules/core/src/projects/dashboard/cluster/projectCluster.directive.js @@ -30,7 +30,7 @@ module.exports = angular controllerAs: 'vm', }; }) - .controller('ProjectClusterCtrl', function($scope, regionFilterService) { + .controller('ProjectClusterCtrl', ['$scope', 'regionFilterService', function($scope, regionFilterService) { let stateCache = CollapsibleSectionStateCache; let getCacheKey = () => [this.project.name, this.cluster.account, this.cluster.stack].join(':'); @@ -171,4 +171,4 @@ module.exports = angular }; this.$onInit = () => initialize(); - }); + }]); diff --git a/app/scripts/modules/core/src/projects/dashboard/dashboard.controller.js b/app/scripts/modules/core/src/projects/dashboard/dashboard.controller.js index 88100d9c83a..6179869ad9e 100644 --- a/app/scripts/modules/core/src/projects/dashboard/dashboard.controller.js +++ b/app/scripts/modules/core/src/projects/dashboard/dashboard.controller.js @@ -19,7 +19,7 @@ module.exports = angular require('./regionFilter/regionFilter.component').name, require('./regionFilter/regionFilter.service').name, ]) - .controller('ProjectDashboardCtrl', function( + .controller('ProjectDashboardCtrl', ['$scope', '$rootScope', 'projectConfiguration', 'executionService', 'regionFilterService', '$q', function( $scope, $rootScope, projectConfiguration, @@ -154,4 +154,4 @@ module.exports = angular regionFilterService.runCallbacks(); }), ); - }); + }]); diff --git a/app/scripts/modules/core/src/projects/dashboard/regionFilter/regionFilter.component.js b/app/scripts/modules/core/src/projects/dashboard/regionFilter/regionFilter.component.js index 812faf8a499..54c65f55f01 100644 --- a/app/scripts/modules/core/src/projects/dashboard/regionFilter/regionFilter.component.js +++ b/app/scripts/modules/core/src/projects/dashboard/regionFilter/regionFilter.component.js @@ -12,9 +12,9 @@ module.exports = angular regions: '=', }, templateUrl: require('./regionFilter.component.html'), - controller: function(regionFilterService) { + controller: ['regionFilterService', function(regionFilterService) { this.clearFilter = regionFilterService.clearFilter; this.toggleRegion = regionFilterService.toggleRegion; this.sortFilter = regionFilterService.sortFilter; - }, + }], }); diff --git a/app/scripts/modules/core/src/projects/projects.controller.js b/app/scripts/modules/core/src/projects/projects.controller.js index e0d3a0598f8..3c721c8f67f 100644 --- a/app/scripts/modules/core/src/projects/projects.controller.js +++ b/app/scripts/modules/core/src/projects/projects.controller.js @@ -15,7 +15,7 @@ module.exports = angular require('../presentation/sortToggle/sorttoggle.directive').name, INSIGHT_MENU_DIRECTIVE, ]) - .controller('ProjectsCtrl', function($scope, $uibModal, $log, $filter) { + .controller('ProjectsCtrl', ['$scope', '$uibModal', '$log', '$filter', function($scope, $uibModal, $log, $filter) { var projectsViewStateCache = ViewStateCache.get('projects') || ViewStateCache.createCache('projects', { version: 1 }); @@ -89,4 +89,4 @@ module.exports = angular $scope.$watch('viewState', cacheViewState, true); initializeViewState(); - }); + }]); diff --git a/app/scripts/modules/core/src/projects/projects.states.ts b/app/scripts/modules/core/src/projects/projects.states.ts index 8eefc924f56..e542cdedbe3 100644 --- a/app/scripts/modules/core/src/projects/projects.states.ts +++ b/app/scripts/modules/core/src/projects/projects.states.ts @@ -16,7 +16,7 @@ module(PROJECTS_STATES_CONFIG, [ require('./dashboard/dashboard.controller').name, APPLICATION_STATE_PROVIDER, STATE_CONFIG_PROVIDER, -]).config((stateConfigProvider: StateConfigProvider, applicationStateProvider: ApplicationStateProvider) => { +]).config(['stateConfigProvider', 'applicationStateProvider', (stateConfigProvider: StateConfigProvider, applicationStateProvider: ApplicationStateProvider) => { const dashboard: INestedState = { name: 'dashboard', url: '/dashboard', @@ -99,4 +99,4 @@ module(PROJECTS_STATES_CONFIG, [ '/projects/{project}/applications/{application}', '/projects/{project}/applications/{application}/clusters', ); -}); +}]); diff --git a/app/scripts/modules/core/src/reactShims/react.module.ts b/app/scripts/modules/core/src/reactShims/react.module.ts index 00f1537c273..07679cd3e1b 100644 --- a/app/scripts/modules/core/src/reactShims/react.module.ts +++ b/app/scripts/modules/core/src/reactShims/react.module.ts @@ -7,9 +7,9 @@ import { NgReact } from './ngReact'; import './react.uirouter.css'; export const REACT_MODULE = 'spinnaker.core.react'; -module(REACT_MODULE, ['bcherny/ngimport', 'ui.router', STATE_EVENTS]).run(function($injector: any) { +module(REACT_MODULE, ['bcherny/ngimport', 'ui.router', STATE_EVENTS]).run(['$injector', function($injector: any) { // Make angular services importable and Convert angular components to react ReactInjector.initialize($injector); ModalInjector.initialize($injector); NgReact.initialize($injector); -}); +}]); diff --git a/app/scripts/modules/core/src/reactShims/state.events.ts b/app/scripts/modules/core/src/reactShims/state.events.ts index 16eed31cc5c..5811756b5c0 100644 --- a/app/scripts/modules/core/src/reactShims/state.events.ts +++ b/app/scripts/modules/core/src/reactShims/state.events.ts @@ -12,6 +12,7 @@ export interface IStateChange { export class StateEvents { public stateChangeSuccess: Subject = new Subject(); + public static $inject = ['$rootScope']; constructor(private $rootScope: IRootScopeService) { 'ngInject'; const onChangeSuccess = ( diff --git a/app/scripts/modules/core/src/search/infrastructure/infrastructure.controller.js b/app/scripts/modules/core/src/search/infrastructure/infrastructure.controller.js index 58d61c2d160..594a9bdefe9 100644 --- a/app/scripts/modules/core/src/search/infrastructure/infrastructure.controller.js +++ b/app/scripts/modules/core/src/search/infrastructure/infrastructure.controller.js @@ -31,7 +31,7 @@ module.exports = angular RECENTLY_VIEWED_ITEMS_COMPONENT, SPINNER_COMPONENT, ]) - .controller('InfrastructureCtrl', function( + .controller('InfrastructureCtrl', ['$scope', 'infrastructureSearchService', '$stateParams', '$location', 'cacheInitializer', 'overrideRegistry', 'pageTitleService', '$uibModal', '$state', function( $scope, infrastructureSearchService, $stateParams, @@ -166,7 +166,7 @@ module.exports = angular !$scope.viewState.searching && !$scope.projects.length && $scope.categories.every(category => !category.results.length); - }) + }]) .directive('infrastructureSearchV1', function() { return { restrict: 'E', diff --git a/app/scripts/modules/core/src/search/infrastructure/infrastructure.states.ts b/app/scripts/modules/core/src/search/infrastructure/infrastructure.states.ts index bd9ef6f7cb9..5ec46991aa8 100644 --- a/app/scripts/modules/core/src/search/infrastructure/infrastructure.states.ts +++ b/app/scripts/modules/core/src/search/infrastructure/infrastructure.states.ts @@ -4,7 +4,7 @@ import { STATE_CONFIG_PROVIDER, StateConfigProvider } from 'core/navigation/stat import { SETTINGS } from 'core/config/settings'; export const INFRASTRUCTURE_STATES = 'spinnaker.core.search.states'; -module(INFRASTRUCTURE_STATES, [STATE_CONFIG_PROVIDER]).config((stateConfigProvider: StateConfigProvider) => { +module(INFRASTRUCTURE_STATES, [STATE_CONFIG_PROVIDER]).config(['stateConfigProvider', (stateConfigProvider: StateConfigProvider) => { 'ngInject'; stateConfigProvider.addToRootState({ @@ -41,4 +41,4 @@ module(INFRASTRUCTURE_STATES, [STATE_CONFIG_PROVIDER]).config((stateConfigProvid stateConfigProvider.addRewriteRule('/infrastructure?q', '/search?q'); stateConfigProvider.addRewriteRule('', '/search'); stateConfigProvider.addRewriteRule('/', '/search'); -}); +}]); diff --git a/app/scripts/modules/core/src/search/infrastructure/infrastructureSearch.service.ts b/app/scripts/modules/core/src/search/infrastructure/infrastructureSearch.service.ts index c3cd8e9a530..7c25f039d5e 100644 --- a/app/scripts/modules/core/src/search/infrastructure/infrastructureSearch.service.ts +++ b/app/scripts/modules/core/src/search/infrastructure/infrastructureSearch.service.ts @@ -74,6 +74,7 @@ export class InfrastructureSearcher { } export class InfrastructureSearchService { + public static $inject = ['$q', 'providerServiceDelegate']; constructor(private $q: IQService, private providerServiceDelegate: any) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/securityGroup/AllSecurityGroupsCtrl.js b/app/scripts/modules/core/src/securityGroup/AllSecurityGroupsCtrl.js index 1b1113fccdb..e41f2a032c2 100644 --- a/app/scripts/modules/core/src/securityGroup/AllSecurityGroupsCtrl.js +++ b/app/scripts/modules/core/src/securityGroup/AllSecurityGroupsCtrl.js @@ -17,7 +17,7 @@ module.exports = angular SKIN_SELECTION_SERVICE, require('angular-ui-bootstrap'), ]) - .controller('AllSecurityGroupsCtrl', function( + .controller('AllSecurityGroupsCtrl', ['$scope', 'app', '$uibModal', '$timeout', 'skinSelectionService', 'providerSelectionService', function( $scope, app, $uibModal, @@ -111,4 +111,4 @@ module.exports = angular }; this.updateSecurityGroups = _.debounce(updateSecurityGroups, 200); - }); + }]); diff --git a/app/scripts/modules/core/src/securityGroup/filter/securityGroup.filter.component.ts b/app/scripts/modules/core/src/securityGroup/filter/securityGroup.filter.component.ts index e6878d0a8af..14b40633fb0 100644 --- a/app/scripts/modules/core/src/securityGroup/filter/securityGroup.filter.component.ts +++ b/app/scripts/modules/core/src/securityGroup/filter/securityGroup.filter.component.ts @@ -34,6 +34,7 @@ export class SecurityGroupFilterCtrl { private groupsUpdatedSubscription: Subscription; private locationChangeUnsubscribe: () => void; + public static $inject = ['$scope', '$rootScope']; constructor(private $scope: IScope, private $rootScope: IScope) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/securityGroup/securityGroup.dataSource.ts b/app/scripts/modules/core/src/securityGroup/securityGroup.dataSource.ts index 037745a2d5b..9e5dd481b7b 100644 --- a/app/scripts/modules/core/src/securityGroup/securityGroup.dataSource.ts +++ b/app/scripts/modules/core/src/securityGroup/securityGroup.dataSource.ts @@ -8,7 +8,7 @@ import { EntityTagsReader } from 'core/entityTag/EntityTagsReader'; import { ISecurityGroup } from 'core/domain'; export const SECURITY_GROUP_DATA_SOURCE = 'spinnaker.core.securityGroup.dataSource'; -module(SECURITY_GROUP_DATA_SOURCE, [SECURITY_GROUP_READER]).run((securityGroupReader: SecurityGroupReader) => { +module(SECURITY_GROUP_DATA_SOURCE, [SECURITY_GROUP_READER]).run(['securityGroupReader', (securityGroupReader: SecurityGroupReader) => { const loadSecurityGroups = (application: Application) => { return securityGroupReader.loadSecurityGroupsByApplicationName(application.name); }; @@ -36,4 +36,4 @@ module(SECURITY_GROUP_DATA_SOURCE, [SECURITY_GROUP_READER]).run((securityGroupRe regionField: 'region', description: 'Network traffic access management', }); -}); +}]); diff --git a/app/scripts/modules/core/src/securityGroup/securityGroup.states.ts b/app/scripts/modules/core/src/securityGroup/securityGroup.states.ts index 18c65572d92..56d20f52c0b 100644 --- a/app/scripts/modules/core/src/securityGroup/securityGroup.states.ts +++ b/app/scripts/modules/core/src/securityGroup/securityGroup.states.ts @@ -18,7 +18,7 @@ import { SecurityGroupDetails } from './SecurityGroupDetails'; export const SECURITY_GROUP_STATES = 'spinnaker.core.securityGroup.states'; module(SECURITY_GROUP_STATES, [APPLICATION_STATE_PROVIDER, STATE_CONFIG_PROVIDER, APPLICATION_MODEL_BUILDER]).config( - (applicationStateProvider: ApplicationStateProvider, stateConfigProvider: StateConfigProvider) => { + ['applicationStateProvider', 'stateConfigProvider', (applicationStateProvider: ApplicationStateProvider, stateConfigProvider: StateConfigProvider) => { const firewallDetails: INestedState = { name: 'firewallDetails', url: '/firewallDetails/:provider/:accountId/:region/:vpcId/:name', @@ -163,5 +163,5 @@ module(SECURITY_GROUP_STATES, [APPLICATION_STATE_PROVIDER, STATE_CONFIG_PROVIDER stateConfigProvider.addRewriteRule(/(.+?)\/securityGroupDetails\/(.*)/, ($match: string[]) => { return `${$match[1]}/firewallDetails/${$match[2]}`; }); - }, + }], ); diff --git a/app/scripts/modules/core/src/securityGroup/securityGroupReader.service.ts b/app/scripts/modules/core/src/securityGroup/securityGroupReader.service.ts index 6c6164b8454..47b8663f484 100644 --- a/app/scripts/modules/core/src/securityGroup/securityGroupReader.service.ts +++ b/app/scripts/modules/core/src/securityGroup/securityGroupReader.service.ts @@ -270,6 +270,7 @@ export class SecurityGroupReader { } } + public static $inject = ['$log', '$q', 'securityGroupTransformer', 'providerServiceDelegate']; constructor( private $log: ILogService, private $q: IQService, diff --git a/app/scripts/modules/core/src/securityGroup/securityGroupTransformer.service.ts b/app/scripts/modules/core/src/securityGroup/securityGroupTransformer.service.ts index 4e4d7b08df6..600eeb441a2 100644 --- a/app/scripts/modules/core/src/securityGroup/securityGroupTransformer.service.ts +++ b/app/scripts/modules/core/src/securityGroup/securityGroupTransformer.service.ts @@ -5,6 +5,7 @@ import { ISecurityGroup } from 'core/domain'; import { ProviderServiceDelegate, PROVIDER_SERVICE_DELEGATE } from 'core/cloudProvider/providerService.delegate'; export class SecurityGroupTransformerService { + public static $inject = ['providerServiceDelegate']; constructor(private providerServiceDelegate: ProviderServiceDelegate) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/serverGroup/configure/common/basicSettingsMixin.controller.js b/app/scripts/modules/core/src/serverGroup/configure/common/basicSettingsMixin.controller.js index 3a8962be83e..264e2ed32a2 100644 --- a/app/scripts/modules/core/src/serverGroup/configure/common/basicSettingsMixin.controller.js +++ b/app/scripts/modules/core/src/serverGroup/configure/common/basicSettingsMixin.controller.js @@ -13,7 +13,7 @@ module.exports = angular require('@uirouter/angularjs').default, IMAGE_READER, ]) - .controller('BasicSettingsMixin', function($scope, imageReader, $uibModalStack, $state) { + .controller('BasicSettingsMixin', ['$scope', 'imageReader', '$uibModalStack', '$state', function($scope, imageReader, $uibModalStack, $state) { this.createsNewCluster = function() { var name = this.getNamePreview(); $scope.latestServerGroup = this.getLatestServerGroup(); @@ -92,4 +92,4 @@ module.exports = angular let isNotExpressionLanguage = field => { return field && !field.includes('${'); }; - }); + }]); diff --git a/app/scripts/modules/core/src/serverGroup/configure/common/deployInitializer.component.ts b/app/scripts/modules/core/src/serverGroup/configure/common/deployInitializer.component.ts index 92cf785c760..7c3232970c2 100644 --- a/app/scripts/modules/core/src/serverGroup/configure/common/deployInitializer.component.ts +++ b/app/scripts/modules/core/src/serverGroup/configure/common/deployInitializer.component.ts @@ -42,6 +42,7 @@ export class DeployInitializerController implements IController { private noTemplate: IDeployTemplate = { label: 'None', serverGroup: null, cluster: null }; + public static $inject = ['providerServiceDelegate']; constructor(private providerServiceDelegate: ProviderServiceDelegate) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/serverGroup/configure/common/instanceArchetypeSelector.js b/app/scripts/modules/core/src/serverGroup/configure/common/instanceArchetypeSelector.js index 96bf3c9a700..340d77b295a 100644 --- a/app/scripts/modules/core/src/serverGroup/configure/common/instanceArchetypeSelector.js +++ b/app/scripts/modules/core/src/serverGroup/configure/common/instanceArchetypeSelector.js @@ -21,7 +21,7 @@ module.exports = angular controllerAs: 'instanceArchetypeCtrl', }; }) - .controller('InstanceArchetypeSelectorCtrl', function($scope, instanceTypeService, serverGroupConfigurationService) { + .controller('InstanceArchetypeSelectorCtrl', ['$scope', 'instanceTypeService', 'serverGroupConfigurationService', function($scope, instanceTypeService, serverGroupConfigurationService) { var controller = this; instanceTypeService.getCategories($scope.command.selectedProvider).then(function(categories) { $scope.instanceProfiles = categories; @@ -101,4 +101,4 @@ module.exports = angular controller.refreshInstanceTypes(); } }); - }); + }]); diff --git a/app/scripts/modules/core/src/serverGroup/configure/common/instanceTypeSelector.js b/app/scripts/modules/core/src/serverGroup/configure/common/instanceTypeSelector.js index e0fe5d2bb8f..5000b43e04d 100644 --- a/app/scripts/modules/core/src/serverGroup/configure/common/instanceTypeSelector.js +++ b/app/scripts/modules/core/src/serverGroup/configure/common/instanceTypeSelector.js @@ -16,7 +16,7 @@ module.exports = angular controller: 'InstanceTypeSelectorCtrl as instanceTypeCtrl', }; }) - .controller('InstanceTypeSelectorCtrl', function($scope, instanceTypeService) { + .controller('InstanceTypeSelectorCtrl', ['$scope', 'instanceTypeService', function($scope, instanceTypeService) { function updateFamilies() { let availableTypes = $scope.command.backingData.filtered.instanceTypes; instanceTypeService.getCategories($scope.command.selectedProvider).then(function(categories) { @@ -65,4 +65,4 @@ module.exports = angular ? 'instanceType.storageOverridden' : null; }; - }); + }]); diff --git a/app/scripts/modules/core/src/serverGroup/configure/common/serverGroupCommandBuilder.service.ts b/app/scripts/modules/core/src/serverGroup/configure/common/serverGroupCommandBuilder.service.ts index 98b72b232f4..7f1eef9399a 100644 --- a/app/scripts/modules/core/src/serverGroup/configure/common/serverGroupCommandBuilder.service.ts +++ b/app/scripts/modules/core/src/serverGroup/configure/common/serverGroupCommandBuilder.service.ts @@ -145,6 +145,7 @@ export class ServerGroupCommandBuilderService { return this.providerServiceDelegate.getDelegate(provider, 'serverGroup.commandBuilder', skin); } + public static $inject = ['providerServiceDelegate']; constructor(private providerServiceDelegate: ProviderServiceDelegate) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/serverGroup/configure/common/serverGroupConfiguration.service.ts b/app/scripts/modules/core/src/serverGroup/configure/common/serverGroupConfiguration.service.ts index 7cde892a664..25659910447 100644 --- a/app/scripts/modules/core/src/serverGroup/configure/common/serverGroupConfiguration.service.ts +++ b/app/scripts/modules/core/src/serverGroup/configure/common/serverGroupConfiguration.service.ts @@ -4,6 +4,7 @@ import { ProviderServiceDelegate, PROVIDER_SERVICE_DELEGATE } from 'core/cloudPr import { IServerGroupCommand } from './serverGroupCommandBuilder.service'; export class ServerGroupConfigurationService { + public static $inject = ['providerServiceDelegate']; constructor(private providerServiceDelegate: ProviderServiceDelegate) { 'ngImport'; } diff --git a/app/scripts/modules/core/src/serverGroup/configure/common/v2InstanceTypeSelector.component.ts b/app/scripts/modules/core/src/serverGroup/configure/common/v2InstanceTypeSelector.component.ts index df96ddccf59..12084a1bcf3 100644 --- a/app/scripts/modules/core/src/serverGroup/configure/common/v2InstanceTypeSelector.component.ts +++ b/app/scripts/modules/core/src/serverGroup/configure/common/v2InstanceTypeSelector.component.ts @@ -13,6 +13,7 @@ class V2InstanceTypeSelectorController implements IComponentController { private instanceProfile: string; private instanceTypes: any; + public static $inject = ['$scope', 'instanceTypeService']; constructor(private $scope: IScope, private instanceTypeService: InstanceTypeService) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/serverGroup/configure/common/v2instanceArchetypeSelector.component.ts b/app/scripts/modules/core/src/serverGroup/configure/common/v2instanceArchetypeSelector.component.ts index 6fb78f627a7..ab6b0229d22 100644 --- a/app/scripts/modules/core/src/serverGroup/configure/common/v2instanceArchetypeSelector.component.ts +++ b/app/scripts/modules/core/src/serverGroup/configure/common/v2instanceArchetypeSelector.component.ts @@ -16,6 +16,7 @@ class V2InstanceArchetypeSelectorController implements IComponentController { public onProfileChanged: any; public onTypeChanged: any; + public static $inject = ['$scope', 'instanceTypeService', 'serverGroupConfigurationService']; public constructor( public $scope: IScope, private instanceTypeService: InstanceTypeService, diff --git a/app/scripts/modules/core/src/serverGroup/details/multipleServerGroups.controller.js b/app/scripts/modules/core/src/serverGroup/details/multipleServerGroups.controller.js index 4df2db7ec7d..28e766e1f24 100644 --- a/app/scripts/modules/core/src/serverGroup/details/multipleServerGroups.controller.js +++ b/app/scripts/modules/core/src/serverGroup/details/multipleServerGroups.controller.js @@ -15,7 +15,7 @@ module.exports = angular PROVIDER_SERVICE_DELEGATE, require('./multipleServerGroup.component').name, ]) - .controller('MultipleServerGroupsCtrl', function( + .controller('MultipleServerGroupsCtrl', ['$scope', '$state', 'confirmationModalService', 'serverGroupWriter', 'providerServiceDelegate', 'app', function( $scope, $state, confirmationModalService, @@ -133,4 +133,4 @@ module.exports = angular } multiselectWatcher.unsubscribe(); }); - }); + }]); diff --git a/app/scripts/modules/core/src/serverGroup/details/scalingActivities/scalingActivities.controller.ts b/app/scripts/modules/core/src/serverGroup/details/scalingActivities/scalingActivities.controller.ts index 0cb6525325b..ba2d6ed299f 100644 --- a/app/scripts/modules/core/src/serverGroup/details/scalingActivities/scalingActivities.controller.ts +++ b/app/scripts/modules/core/src/serverGroup/details/scalingActivities/scalingActivities.controller.ts @@ -35,6 +35,7 @@ export class ScalingActivitiesCtrl implements IController { public viewState: IScalingActivitiesViewState; public activities: IScalingEventSummary[] = []; + public static $inject = ['$uibModalInstance', 'serverGroup']; public constructor(private $uibModalInstance: IModalServiceInstance, public serverGroup: IServerGroup) { 'ngInject'; this.serverGroup = serverGroup; diff --git a/app/scripts/modules/core/src/serverGroup/details/scalingActivities/viewScalingActivitiesLink.component.ts b/app/scripts/modules/core/src/serverGroup/details/scalingActivities/viewScalingActivitiesLink.component.ts index 25d5813d22e..352e586a548 100644 --- a/app/scripts/modules/core/src/serverGroup/details/scalingActivities/viewScalingActivitiesLink.component.ts +++ b/app/scripts/modules/core/src/serverGroup/details/scalingActivities/viewScalingActivitiesLink.component.ts @@ -5,6 +5,7 @@ import { SCALING_ACTIVITIES_CTRL, ScalingActivitiesCtrl } from './scalingActivit class ViewScalingActivitiesLinkCtrl implements IController { public serverGroup: any; + public static $inject = ['$uibModal']; public constructor(private $uibModal: IModalService) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/serverGroup/pod/runningTasksTag.directive.js b/app/scripts/modules/core/src/serverGroup/pod/runningTasksTag.directive.js index ec2e7c991fe..c95a1b1f825 100644 --- a/app/scripts/modules/core/src/serverGroup/pod/runningTasksTag.directive.js +++ b/app/scripts/modules/core/src/serverGroup/pod/runningTasksTag.directive.js @@ -16,10 +16,10 @@ module.exports = angular controller: 'RunningTaskTagController', }; }) - .controller('RunningTaskTagController', function($scope) { + .controller('RunningTaskTagController', ['$scope', function($scope) { $scope.popoverTemplate = require('./runningTasksPopover.html'); $scope.popover = { show: false }; $scope.runningExecutions = function() { return ($scope.executions || []).filter(e => e.isRunning || e.hasNotStarted); }; - }); + }]); diff --git a/app/scripts/modules/core/src/serverGroup/serverGroup.dataSource.ts b/app/scripts/modules/core/src/serverGroup/serverGroup.dataSource.ts index 86caa9a0357..c1b2910dcf0 100644 --- a/app/scripts/modules/core/src/serverGroup/serverGroup.dataSource.ts +++ b/app/scripts/modules/core/src/serverGroup/serverGroup.dataSource.ts @@ -9,7 +9,7 @@ import { IServerGroup } from 'core/domain'; export const SERVER_GROUP_DATA_SOURCE = 'spinnaker.core.serverGroup.dataSource'; -module(SERVER_GROUP_DATA_SOURCE, [CLUSTER_SERVICE]).run(($q: IQService, clusterService: ClusterService) => { +module(SERVER_GROUP_DATA_SOURCE, [CLUSTER_SERVICE]).run(['$q', 'clusterService', ($q: IQService, clusterService: ClusterService) => { const loadServerGroups = (application: Application) => { return clusterService.loadServerGroups(application); }; @@ -49,4 +49,4 @@ module(SERVER_GROUP_DATA_SOURCE, [CLUSTER_SERVICE]).run(($q: IQService, clusterS regionField: 'region', description: 'Collections of server groups or jobs', }); -}); +}]); diff --git a/app/scripts/modules/core/src/serverGroup/serverGroup.states.ts b/app/scripts/modules/core/src/serverGroup/serverGroup.states.ts index af76bd081ff..ec11c317147 100644 --- a/app/scripts/modules/core/src/serverGroup/serverGroup.states.ts +++ b/app/scripts/modules/core/src/serverGroup/serverGroup.states.ts @@ -10,7 +10,7 @@ import { ServerGroupDetailsWrapper } from './details/ServerGroupDetailsWrapper'; export const SERVER_GROUP_STATES = 'spinnaker.core.serverGroup.states'; module(SERVER_GROUP_STATES, [APPLICATION_STATE_PROVIDER, STATE_CONFIG_PROVIDER]).config( - (applicationStateProvider: ApplicationStateProvider, stateConfigProvider: StateConfigProvider) => { + ['applicationStateProvider', 'stateConfigProvider', (applicationStateProvider: ApplicationStateProvider, stateConfigProvider: StateConfigProvider) => { const clusters: INestedState = { name: 'clusters', url: `/clusters?${stateConfigProvider.paramsToQuery(filterModelConfig)}`, @@ -102,5 +102,5 @@ module(SERVER_GROUP_STATES, [APPLICATION_STATE_PROVIDER, STATE_CONFIG_PROVIDER]) applicationStateProvider.addInsightDetailState(multipleServerGroups); stateConfigProvider.addRewriteRule('/applications/{application}', '/applications/{application}/clusters'); - }, + }], ); diff --git a/app/scripts/modules/core/src/serverGroup/serverGroup.transformer.js b/app/scripts/modules/core/src/serverGroup/serverGroup.transformer.js index 3d01df1234e..1d9b89f3620 100644 --- a/app/scripts/modules/core/src/serverGroup/serverGroup.transformer.js +++ b/app/scripts/modules/core/src/serverGroup/serverGroup.transformer.js @@ -7,7 +7,7 @@ import { AccountService } from 'core/account/AccountService'; module.exports = angular .module('spinnaker.core.serverGroup.transformer', [PROVIDER_SERVICE_DELEGATE]) - .factory('serverGroupTransformer', function(providerServiceDelegate, $q) { + .factory('serverGroupTransformer', ['providerServiceDelegate', '$q', function(providerServiceDelegate, $q) { function normalizeServerGroup(serverGroup, application) { const account = serverGroup.account; if (account) { @@ -57,4 +57,4 @@ module.exports = angular convertServerGroupCommandToDeployConfiguration: convertServerGroupCommandToDeployConfiguration, jsonReplacer: jsonReplacer, }; - }); + }]); diff --git a/app/scripts/modules/core/src/serverGroup/serverGroupWriter.service.ts b/app/scripts/modules/core/src/serverGroup/serverGroupWriter.service.ts index de082d5572a..a261bc68072 100644 --- a/app/scripts/modules/core/src/serverGroup/serverGroupWriter.service.ts +++ b/app/scripts/modules/core/src/serverGroup/serverGroupWriter.service.ts @@ -27,6 +27,7 @@ export interface IServerGroupJob extends IJob { } export class ServerGroupWriter { + public static $inject = ['serverGroupTransformer']; constructor(private serverGroupTransformer: any) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/serverGroupManager/serverGroupManager.dataSource.ts b/app/scripts/modules/core/src/serverGroupManager/serverGroupManager.dataSource.ts index 5ae5e5f5427..dfaf8e86e62 100644 --- a/app/scripts/modules/core/src/serverGroupManager/serverGroupManager.dataSource.ts +++ b/app/scripts/modules/core/src/serverGroupManager/serverGroupManager.dataSource.ts @@ -6,7 +6,7 @@ import { IServerGroupManager } from 'core/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: IQService) => { +module(SERVER_GROUP_MANAGER_DATA_SOURCE, []).run(['$q', ($q: IQService) => { 'ngInject'; const loader = (application: Application) => @@ -26,4 +26,4 @@ module(SERVER_GROUP_MANAGER_DATA_SOURCE, []).run(($q: IQService) => { onLoad, afterLoad: addTags, }); -}); +}]); diff --git a/app/scripts/modules/core/src/serverGroupManager/serverGroupManager.states.ts b/app/scripts/modules/core/src/serverGroupManager/serverGroupManager.states.ts index 8d30d35ff91..1021e47f0ad 100644 --- a/app/scripts/modules/core/src/serverGroupManager/serverGroupManager.states.ts +++ b/app/scripts/modules/core/src/serverGroupManager/serverGroupManager.states.ts @@ -14,7 +14,7 @@ export interface IServerGroupManagerStateParams { export const SERVER_GROUP_MANAGER_STATES = 'spinnaker.core.serverGroupManager.states'; module(SERVER_GROUP_MANAGER_STATES, [APPLICATION_STATE_PROVIDER]).config( - (applicationStateProvider: ApplicationStateProvider) => { + ['applicationStateProvider', (applicationStateProvider: ApplicationStateProvider) => { const serverGroupManagerDetails: INestedState = { name: 'serverGroupManager', url: '/serverGroupManagerDetails/:provider/:accountId/:region/:serverGroupManager', @@ -42,5 +42,5 @@ module(SERVER_GROUP_MANAGER_STATES, [APPLICATION_STATE_PROVIDER]).config( }; applicationStateProvider.addInsightDetailState(serverGroupManagerDetails); - }, + }], ); diff --git a/app/scripts/modules/core/src/snapshot/diff/snapshotDiff.modal.controller.js b/app/scripts/modules/core/src/snapshot/diff/snapshotDiff.modal.controller.js index 6e4235267da..5fe4b4690cc 100644 --- a/app/scripts/modules/core/src/snapshot/diff/snapshotDiff.modal.controller.js +++ b/app/scripts/modules/core/src/snapshot/diff/snapshotDiff.modal.controller.js @@ -17,7 +17,7 @@ module.exports = angular require('../../pipeline/config/actions/history/diffSummary.component').name, DIFF_VIEW_COMPONENT, ]) - .controller('SnapshotDiffModalCtrl', function( + .controller('SnapshotDiffModalCtrl', ['availableAccounts', 'application', '$filter', '$uibModalInstance', 'confirmationModalService', function( availableAccounts, application, $filter, @@ -128,4 +128,4 @@ module.exports = angular this.getSnapshotHistoryForAccount(this.selectedAccount); this.close = $uibModalInstance.dismiss; - }); + }]); diff --git a/app/scripts/modules/core/src/snapshot/diff/viewSnapshotDiffButton.component.js b/app/scripts/modules/core/src/snapshot/diff/viewSnapshotDiffButton.component.js index 1e5380fa417..633e7f3dafe 100644 --- a/app/scripts/modules/core/src/snapshot/diff/viewSnapshotDiffButton.component.js +++ b/app/scripts/modules/core/src/snapshot/diff/viewSnapshotDiffButton.component.js @@ -16,7 +16,7 @@ module.exports = angular template: ``, - controller: function($q, $uibModal) { + controller: ['$q', '$uibModal', function($q, $uibModal) { function getSnapshotEnabledAccounts(application) { return AccountService.listProviders(application) .then(providers => providers.filter(provider => CloudProviderRegistry.getValue(provider, 'snapshotsEnabled'))) @@ -43,5 +43,5 @@ module.exports = angular }, }); }; - }, + }], }); diff --git a/app/scripts/modules/core/src/styleguide/styleguide.states.ts b/app/scripts/modules/core/src/styleguide/styleguide.states.ts index 7888b0472e4..3d839f96cd3 100644 --- a/app/scripts/modules/core/src/styleguide/styleguide.states.ts +++ b/app/scripts/modules/core/src/styleguide/styleguide.states.ts @@ -4,7 +4,7 @@ import { STATE_CONFIG_PROVIDER, INestedState, StateConfigProvider } from 'core/n export const STYLEGUIDE_STATES = 'spinnaker.core.styleguide.states'; -angular.module(STYLEGUIDE_STATES, [STATE_CONFIG_PROVIDER]).config((stateConfigProvider: StateConfigProvider) => { +angular.module(STYLEGUIDE_STATES, [STATE_CONFIG_PROVIDER]).config(['stateConfigProvider', (stateConfigProvider: StateConfigProvider) => { const styleguideState: INestedState = { url: '/styleguide', name: 'styleguide', @@ -20,4 +20,4 @@ angular.module(STYLEGUIDE_STATES, [STATE_CONFIG_PROVIDER]).config((stateConfigPr }, }; stateConfigProvider.addToRootState(styleguideState); -}); +}]); diff --git a/app/scripts/modules/core/src/task/task.dataSource.js b/app/scripts/modules/core/src/task/task.dataSource.js index 9875c6eadcd..e84db2f0e32 100644 --- a/app/scripts/modules/core/src/task/task.dataSource.js +++ b/app/scripts/modules/core/src/task/task.dataSource.js @@ -4,7 +4,7 @@ import { CLUSTER_SERVICE } from 'core/cluster/cluster.service'; const angular = require('angular'); -module.exports = angular.module('spinnaker.core.task.dataSource', [CLUSTER_SERVICE]).run(function($q, clusterService) { +module.exports = angular.module('spinnaker.core.task.dataSource', [CLUSTER_SERVICE]).run(['$q', 'clusterService', function($q, clusterService) { let addTasks = (application, tasks) => { return $q.when(angular.isArray(tasks) ? tasks : []); }; @@ -45,4 +45,4 @@ module.exports = angular.module('spinnaker.core.task.dataSource', [CLUSTER_SERVI loader: loadRunningTasks, onLoad: addRunningTasks, }); -}); +}]); diff --git a/app/scripts/modules/core/src/task/task.states.ts b/app/scripts/modules/core/src/task/task.states.ts index b1587e6a529..73b9f6289e7 100644 --- a/app/scripts/modules/core/src/task/task.states.ts +++ b/app/scripts/modules/core/src/task/task.states.ts @@ -4,7 +4,7 @@ import { INestedState } from 'core/navigation/state.provider'; import { APPLICATION_STATE_PROVIDER, ApplicationStateProvider } from 'core/application/application.state.provider'; export const TASK_STATES = 'spinnaker.core.task.states'; -module(TASK_STATES, [APPLICATION_STATE_PROVIDER]).config((applicationStateProvider: ApplicationStateProvider) => { +module(TASK_STATES, [APPLICATION_STATE_PROVIDER]).config(['applicationStateProvider', (applicationStateProvider: ApplicationStateProvider) => { const taskDetails: INestedState = { name: 'taskDetails', url: '/:taskId', @@ -39,4 +39,4 @@ module(TASK_STATES, [APPLICATION_STATE_PROVIDER]).config((applicationStateProvid }; applicationStateProvider.addChildState(tasks); -}); +}]); diff --git a/app/scripts/modules/core/src/task/tasks.controller.js b/app/scripts/modules/core/src/task/tasks.controller.js index 440215e1fca..ef0a703c808 100644 --- a/app/scripts/modules/core/src/task/tasks.controller.js +++ b/app/scripts/modules/core/src/task/tasks.controller.js @@ -17,7 +17,7 @@ module.exports = angular CONFIRMATION_MODAL_SERVICE, DISPLAYABLE_TASKS_FILTER, ]) - .controller('TasksCtrl', function($scope, $state, $stateParams, $q, app, confirmationModalService) { + .controller('TasksCtrl', ['$scope', '$state', '$stateParams', '$q', 'app', 'confirmationModalService', function($scope, $state, $stateParams, $q, app, confirmationModalService) { if (app.notFound) { return; } @@ -292,4 +292,4 @@ module.exports = angular $scope.$on('$stateChangeSuccess', (_event, _toState, toParams) => this.stateChanged(toParams.q)); this.application.tasks.onRefresh($scope, this.sortTasks); - }); + }]); diff --git a/app/scripts/modules/core/src/task/verification/userVerification.directive.js b/app/scripts/modules/core/src/task/verification/userVerification.directive.js index cf856fdd53a..79be33ceffb 100644 --- a/app/scripts/modules/core/src/task/verification/userVerification.directive.js +++ b/app/scripts/modules/core/src/task/verification/userVerification.directive.js @@ -26,7 +26,7 @@ module.exports = angular controller: 'UserVerificationCtrl', }; }) - .controller('UserVerificationCtrl', function($scope) { + .controller('UserVerificationCtrl', ['$scope', function($scope) { this.$onInit = () => { this.label = this.label || @@ -54,4 +54,4 @@ module.exports = angular this.verify = () => { this.verification.verified = this.userVerification.toUpperCase() === this.verification.toVerify.toUpperCase(); }; - }); + }]); diff --git a/app/scripts/modules/core/src/utils/clipboard/copyToClipboard.component.ts b/app/scripts/modules/core/src/utils/clipboard/copyToClipboard.component.ts index 49c24d69a6a..8cac2764af6 100644 --- a/app/scripts/modules/core/src/utils/clipboard/copyToClipboard.component.ts +++ b/app/scripts/modules/core/src/utils/clipboard/copyToClipboard.component.ts @@ -11,6 +11,7 @@ export class CopyToClipboardController implements IController { public isOpen = false; + public static $inject = ['$scope', '$element', '$timeout']; constructor(private $scope: IScope, private $element: JQuery, private $timeout: ITimeoutService) { 'ngInject'; } diff --git a/app/scripts/modules/core/src/utils/consoleDebug.ts b/app/scripts/modules/core/src/utils/consoleDebug.ts index 4daa3432ec4..9ab4f633a62 100644 --- a/app/scripts/modules/core/src/utils/consoleDebug.ts +++ b/app/scripts/modules/core/src/utils/consoleDebug.ts @@ -20,7 +20,7 @@ export const DebugWindow = new ConsoleDebugWindow(); (window as any).spinnaker = DebugWindow; export const DEBUG_WINDOW = 'spinnaker.core.utils.consoleDebug'; -module(DEBUG_WINDOW, []).run(($injector: IInjectorService) => { +module(DEBUG_WINDOW, []).run(['$injector', ($injector: IInjectorService) => { DebugWindow.$injector = $injector; injectables.forEach(k => (DebugWindow[k] = $injector.get(k))); -}); +}]); diff --git a/app/scripts/modules/core/src/utils/uibModalRejections.ts b/app/scripts/modules/core/src/utils/uibModalRejections.ts index 88da5526676..7b60fe3faad 100644 --- a/app/scripts/modules/core/src/utils/uibModalRejections.ts +++ b/app/scripts/modules/core/src/utils/uibModalRejections.ts @@ -2,10 +2,9 @@ import { module } from 'angular'; import { IModalInstanceService, IModalService } from 'angular-ui-bootstrap'; export const UIB_MODAL_REJECTIONS = 'spinnaker.core.utils.uibModalRejections'; -const mod = module(UIB_MODAL_REJECTIONS, []); // Avoid "Possibly unhandled rejection" in console when closing a uibModal -mod.decorator('$uibModal', function($delegate: IModalService) { +module(UIB_MODAL_REJECTIONS, []).decorator('$uibModal', ['$delegate', function($delegate: IModalService) { const realOpen = $delegate.open; $delegate.open = function() { const modalInstance: IModalInstanceService = realOpen.apply(this, arguments); @@ -13,4 +12,4 @@ mod.decorator('$uibModal', function($delegate: IModalService) { return modalInstance; }; return $delegate; -}); +}]); diff --git a/app/scripts/modules/core/src/widgets/spelText/spelAutocomplete.service.js b/app/scripts/modules/core/src/widgets/spelText/spelAutocomplete.service.js index 459edb4602a..b70ba2153fa 100644 --- a/app/scripts/modules/core/src/widgets/spelText/spelAutocomplete.service.js +++ b/app/scripts/modules/core/src/widgets/spelText/spelAutocomplete.service.js @@ -7,7 +7,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.core.widget.spelAutocomplete', [EXECUTION_SERVICE]) - .factory('spelAutocomplete', function($q, executionService) { + .factory('spelAutocomplete', ['$q', 'executionService', function($q, executionService) { let brackets = [{ open: '(', close: ')' }, { open: '[', close: ']' }]; let quotes = [{ open: "'", close: "'" }, { open: '"', close: '"' }]; let helperFunctions = [ @@ -409,4 +409,4 @@ module.exports = angular textcompleteConfig: textcompleteConfig, addPipelineInfo: addPipelineInfo, }; - }); + }]); diff --git a/app/scripts/modules/core/src/widgets/spelText/spelText.decorator.js b/app/scripts/modules/core/src/widgets/spelText/spelText.decorator.js index 4fa10e69a93..70f21e08c8b 100644 --- a/app/scripts/modules/core/src/widgets/spelText/spelText.decorator.js +++ b/app/scripts/modules/core/src/widgets/spelText/spelText.decorator.js @@ -57,11 +57,12 @@ let decorateFn = function($delegate, spelAutocomplete) { }; return $delegate; -}; +} +decorateFn.$inject = ['$delegate', 'spelAutocomplete'];; module.exports = angular .module('spinnaker.core.widget.spelText', [require('./spelAutocomplete.service').name]) - .config(function($provide) { + .config(['$provide', function($provide) { $provide.decorator('inputDirective', decorateFn); $provide.decorator('textareaDirective', decorateFn); - }); + }]); diff --git a/app/scripts/modules/dcos/instance/details/details.controller.js b/app/scripts/modules/dcos/instance/details/details.controller.js index 29f07f914ef..2338c12bf38 100644 --- a/app/scripts/modules/dcos/instance/details/details.controller.js +++ b/app/scripts/modules/dcos/instance/details/details.controller.js @@ -15,7 +15,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.dcos.instance.details.controller', [INSTANCE_WRITE_SERVICE, CONFIRMATION_MODAL_SERVICE]) - .controller('dcosInstanceDetailsController', function( + .controller('dcosInstanceDetailsController', ['$scope', '$state', '$uibModal', 'instanceWriter', 'confirmationModalService', 'instance', 'app', 'dcosProxyUiService', '$q', function( $scope, $state, $uibModal, @@ -211,4 +211,4 @@ module.exports = angular }); $scope.account = instance.account; - }); + }]); diff --git a/app/scripts/modules/dcos/loadBalancer/configure/wizard/upsert.controller.js b/app/scripts/modules/dcos/loadBalancer/configure/wizard/upsert.controller.js index f5b854a3c30..d7498ed81be 100644 --- a/app/scripts/modules/dcos/loadBalancer/configure/wizard/upsert.controller.js +++ b/app/scripts/modules/dcos/loadBalancer/configure/wizard/upsert.controller.js @@ -9,7 +9,7 @@ module.exports = angular LOAD_BALANCER_READ_SERVICE, require('../../transformer').name, ]) - .controller('dcosUpsertLoadBalancerController', function( + .controller('dcosUpsertLoadBalancerController', ['$scope', '$uibModalInstance', '$state', 'application', 'loadBalancer', 'isNew', 'loadBalancerReader', 'dcosLoadBalancerTransformer', function( $scope, $uibModalInstance, $state, @@ -154,4 +154,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/dcos/loadBalancer/details/details.controller.js b/app/scripts/modules/dcos/loadBalancer/details/details.controller.js index 686c1133194..ad9419f0e1c 100644 --- a/app/scripts/modules/dcos/loadBalancer/details/details.controller.js +++ b/app/scripts/modules/dcos/loadBalancer/details/details.controller.js @@ -6,7 +6,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.dcos.loadBalancer.details.controller', [CONFIRMATION_MODAL_SERVICE]) - .controller('dcosLoadBalancerDetailsController', function( + .controller('dcosLoadBalancerDetailsController', ['$scope', '$state', '$uibModal', 'loadBalancer', 'app', 'confirmationModalService', 'dcosProxyUiService', '$q', function( $scope, $state, $uibModal, @@ -117,4 +117,4 @@ module.exports = angular submitMethod: submitMethod, }); }; - }); + }]); diff --git a/app/scripts/modules/dcos/loadBalancer/transformer.js b/app/scripts/modules/dcos/loadBalancer/transformer.js index a23202f1faa..2a9e13a1de0 100644 --- a/app/scripts/modules/dcos/loadBalancer/transformer.js +++ b/app/scripts/modules/dcos/loadBalancer/transformer.js @@ -9,7 +9,7 @@ import { DcosProviderSettings } from '../dcos.settings'; module.exports = angular .module('spinnaker.dcos.loadBalancer.transformer', []) - .factory('dcosLoadBalancerTransformer', function($q) { + .factory('dcosLoadBalancerTransformer', ['$q', function($q) { function normalizeLoadBalancer(loadBalancer) { loadBalancer.provider = loadBalancer.type; loadBalancer.instances = []; @@ -112,4 +112,4 @@ module.exports = angular constructNewLoadBalancerTemplate: constructNewLoadBalancerTemplate, convertLoadBalancerForEditing: convertLoadBalancerForEditing, }; - }); + }]); diff --git a/app/scripts/modules/dcos/pipeline/stages/destroyAsg/dcosDestroyAsgStage.js b/app/scripts/modules/dcos/pipeline/stages/destroyAsg/dcosDestroyAsgStage.js index 7223d1363e6..6e2f4a229e0 100644 --- a/app/scripts/modules/dcos/pipeline/stages/destroyAsg/dcosDestroyAsgStage.js +++ b/app/scripts/modules/dcos/pipeline/stages/destroyAsg/dcosDestroyAsgStage.js @@ -26,7 +26,7 @@ module.exports = angular ], }); }) - .controller('dcosDestroyAsgStageCtrl', function($scope) { + .controller('dcosDestroyAsgStageCtrl', ['$scope', function($scope) { let stage = $scope.stage; $scope.state = { @@ -54,4 +54,4 @@ module.exports = angular if (!stage.target) { stage.target = $scope.targets[0].val; } - }); + }]); diff --git a/app/scripts/modules/dcos/pipeline/stages/disableAsg/dcosDisableAsgStage.js b/app/scripts/modules/dcos/pipeline/stages/disableAsg/dcosDisableAsgStage.js index 8fa30fd64d3..4fdc2b32a93 100644 --- a/app/scripts/modules/dcos/pipeline/stages/disableAsg/dcosDisableAsgStage.js +++ b/app/scripts/modules/dcos/pipeline/stages/disableAsg/dcosDisableAsgStage.js @@ -26,7 +26,7 @@ module.exports = angular ], }); }) - .controller('dcosDisableAsgStageCtrl', function($scope) { + .controller('dcosDisableAsgStageCtrl', ['$scope', function($scope) { let stage = $scope.stage; $scope.state = { @@ -54,4 +54,4 @@ module.exports = angular if (!stage.target) { stage.target = $scope.targets[0].val; } - }); + }]); diff --git a/app/scripts/modules/dcos/pipeline/stages/disableCluster/dcosDisableClusterStage.js b/app/scripts/modules/dcos/pipeline/stages/disableCluster/dcosDisableClusterStage.js index 0d7dffe9a4a..0404f0dce21 100644 --- a/app/scripts/modules/dcos/pipeline/stages/disableCluster/dcosDisableClusterStage.js +++ b/app/scripts/modules/dcos/pipeline/stages/disableCluster/dcosDisableClusterStage.js @@ -23,7 +23,7 @@ module.exports = angular ], }); }) - .controller('dcosDisableClusterStageCtrl', function($scope) { + .controller('dcosDisableClusterStageCtrl', ['$scope', function($scope) { var ctrl = this; let stage = $scope.stage; @@ -68,4 +68,4 @@ module.exports = angular stage.preferLargerOverNewer = 'false'; } stage.preferLargerOverNewer = stage.preferLargerOverNewer.toString(); - }); + }]); diff --git a/app/scripts/modules/dcos/pipeline/stages/findAmi/dcosFindAmiStage.js b/app/scripts/modules/dcos/pipeline/stages/findAmi/dcosFindAmiStage.js index 2cbb2c0075b..b63e63f7620 100644 --- a/app/scripts/modules/dcos/pipeline/stages/findAmi/dcosFindAmiStage.js +++ b/app/scripts/modules/dcos/pipeline/stages/findAmi/dcosFindAmiStage.js @@ -17,7 +17,7 @@ module.exports = angular ], }); }) - .controller('dcosFindAmiStageController', function($scope) { + .controller('dcosFindAmiStageController', ['$scope', function($scope) { let stage = $scope.stage; $scope.state = { @@ -65,4 +65,4 @@ module.exports = angular } $scope.$watch('stage.credentials', $scope.accountUpdated); - }); + }]); diff --git a/app/scripts/modules/dcos/pipeline/stages/resizeAsg/dcosResizeAsgStage.js b/app/scripts/modules/dcos/pipeline/stages/resizeAsg/dcosResizeAsgStage.js index 7ac0193d2a6..fabd01327bd 100644 --- a/app/scripts/modules/dcos/pipeline/stages/resizeAsg/dcosResizeAsgStage.js +++ b/app/scripts/modules/dcos/pipeline/stages/resizeAsg/dcosResizeAsgStage.js @@ -28,7 +28,7 @@ module.exports = angular ], }); }) - .controller('dcosResizeAsgStageCtrl', function($scope) { + .controller('dcosResizeAsgStageCtrl', ['$scope', function($scope) { var ctrl = this; let stage = $scope.stage; @@ -108,4 +108,4 @@ module.exports = angular } } }; - }); + }]); diff --git a/app/scripts/modules/dcos/pipeline/stages/runJob/runJobStage.js b/app/scripts/modules/dcos/pipeline/stages/runJob/runJobStage.js index d2f6b2fa61d..b63c8e140af 100644 --- a/app/scripts/modules/dcos/pipeline/stages/runJob/runJobStage.js +++ b/app/scripts/modules/dcos/pipeline/stages/runJob/runJobStage.js @@ -26,7 +26,7 @@ module.exports = angular validators: [{ type: 'requiredField', fieldName: 'account' }, { type: 'requiredField', fieldName: 'general.id' }], }); }) - .controller('dcosRunJobStageCtrl', function($scope, $q) { + .controller('dcosRunJobStageCtrl', ['$scope', '$q', function($scope, $q) { let stage = $scope.stage; this.stage = $scope.stage; @@ -118,4 +118,4 @@ module.exports = angular setRegistry(); this.updateRegions(); }); - }); + }]); diff --git a/app/scripts/modules/dcos/pipeline/stages/scaleDownCluster/dcosScaleDownClusterStage.js b/app/scripts/modules/dcos/pipeline/stages/scaleDownCluster/dcosScaleDownClusterStage.js index 9c78619bca6..5dfbf65c5c6 100644 --- a/app/scripts/modules/dcos/pipeline/stages/scaleDownCluster/dcosScaleDownClusterStage.js +++ b/app/scripts/modules/dcos/pipeline/stages/scaleDownCluster/dcosScaleDownClusterStage.js @@ -24,7 +24,7 @@ module.exports = angular strategy: true, }); }) - .controller('dcosScaleDownClusterStageCtrl', function($scope) { + .controller('dcosScaleDownClusterStageCtrl', ['$scope', function($scope) { var ctrl = this; let stage = $scope.stage; @@ -68,4 +68,4 @@ module.exports = angular stage.preferLargerOverNewer = 'false'; } stage.preferLargerOverNewer = stage.preferLargerOverNewer.toString(); - }); + }]); diff --git a/app/scripts/modules/dcos/pipeline/stages/shrinkCluster/dcosShrinkClusterStage.js b/app/scripts/modules/dcos/pipeline/stages/shrinkCluster/dcosShrinkClusterStage.js index 071e6ee633a..3cb7dd5b29e 100644 --- a/app/scripts/modules/dcos/pipeline/stages/shrinkCluster/dcosShrinkClusterStage.js +++ b/app/scripts/modules/dcos/pipeline/stages/shrinkCluster/dcosShrinkClusterStage.js @@ -19,7 +19,7 @@ module.exports = angular ], }); }) - .controller('dcosShrinkClusterStageCtrl', function($scope) { + .controller('dcosShrinkClusterStageCtrl', ['$scope', function($scope) { var ctrl = this; let stage = $scope.stage; @@ -63,4 +63,4 @@ module.exports = angular stage.retainLargerOverNewer = 'false'; } stage.retainLargerOverNewer = stage.retainLargerOverNewer.toString(); - }); + }]); diff --git a/app/scripts/modules/dcos/search/resultFormatter.js b/app/scripts/modules/dcos/search/resultFormatter.js index 080ffe3bc99..8564538cf67 100644 --- a/app/scripts/modules/dcos/search/resultFormatter.js +++ b/app/scripts/modules/dcos/search/resultFormatter.js @@ -4,7 +4,7 @@ let angular = require('angular'); module.exports = angular .module('spinnaker.dcos.search.formatter', []) - .factory('dcosSearchResultFormatter', function($q) { + .factory('dcosSearchResultFormatter', ['$q', function($q) { return { instances: function(entry) { return $q.when((entry.name || entry.instanceId) + ' (' + entry.namespace + ')'); @@ -16,4 +16,4 @@ module.exports = angular return $q.when(entry.name + ' (' + (entry.namespace || entry.region) + ')'); }, }; - }); + }]); diff --git a/app/scripts/modules/dcos/serverGroup/configure/CommandBuilder.js b/app/scripts/modules/dcos/serverGroup/configure/CommandBuilder.js index 0c8b39a95e7..ca28ff9b724 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/CommandBuilder.js +++ b/app/scripts/modules/dcos/serverGroup/configure/CommandBuilder.js @@ -8,7 +8,7 @@ import { DcosProviderSettings } from '../../dcos.settings'; module.exports = angular .module('spinnaker.dcos.serverGroupCommandBuilder.service', []) - .factory('dcosServerGroupCommandBuilder', function($q) { + .factory('dcosServerGroupCommandBuilder', ['$q', function($q) { function attemptToSetValidAccount(application, defaultAccount, defaultDcosCluster, command) { return AccountService.getCredentialsKeyedByAccount('dcos').then(function(dcosAccountsByName) { var dcosAccountNames = _.keys(dcosAccountsByName); @@ -265,4 +265,4 @@ module.exports = angular buildServerGroupCommandFromExisting: buildServerGroupCommandFromExisting, buildServerGroupCommandFromPipeline: buildServerGroupCommandFromPipeline, }; - }); + }]); diff --git a/app/scripts/modules/dcos/serverGroup/configure/configuration.service.js b/app/scripts/modules/dcos/serverGroup/configure/configuration.service.js index e4edaeffd04..338e926b7d5 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/configuration.service.js +++ b/app/scripts/modules/dcos/serverGroup/configure/configuration.service.js @@ -8,7 +8,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.dcos.serverGroup.configure.configuration.service', [require('../../image/image.reader').name]) - .factory('dcosServerGroupConfigurationService', function($q, dcosImageReader) { + .factory('dcosServerGroupConfigurationService', ['$q', 'dcosImageReader', function($q, dcosImageReader) { function configureCommand(application, command, query = '') { let queries = command.docker.image ? [grabImageAndTag(command.docker.image.imageId)] : []; @@ -246,4 +246,4 @@ module.exports = angular configureSecrets: configureSecrets, buildImageId: buildImageId, }; - }); + }]); diff --git a/app/scripts/modules/dcos/serverGroup/configure/wizard/Clone.controller.js b/app/scripts/modules/dcos/serverGroup/configure/wizard/Clone.controller.js index c685893c51a..9eac3cf6c5e 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/wizard/Clone.controller.js +++ b/app/scripts/modules/dcos/serverGroup/configure/wizard/Clone.controller.js @@ -6,7 +6,7 @@ import { ModalWizard, SERVER_GROUP_WRITER, TaskMonitor } from '@spinnaker/core'; module.exports = angular .module('spinnaker.dcos.serverGroup.configure.clone', [SERVER_GROUP_WRITER, require('../configuration.service').name]) - .controller('dcosCloneServerGroupController', function( + .controller('dcosCloneServerGroupController', ['$scope', '$uibModalInstance', '$q', '$state', 'serverGroupWriter', 'dcosServerGroupConfigurationService', 'serverGroupCommand', 'application', 'title', '$timeout', 'wizardSubFormValidation', function( $scope, $uibModalInstance, $q, @@ -114,4 +114,4 @@ module.exports = angular $scope.state.requiresTemplateSelection = false; configureCommand(); }; - }); + }]); diff --git a/app/scripts/modules/dcos/serverGroup/configure/wizard/basicSettings.controller.js b/app/scripts/modules/dcos/serverGroup/configure/wizard/basicSettings.controller.js index c00ad3f8d32..a0558ebf1da 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/wizard/basicSettings.controller.js +++ b/app/scripts/modules/dcos/serverGroup/configure/wizard/basicSettings.controller.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.dcos.serverGroup.configure.basicSettings', []) - .controller('dcosServerGroupBasicSettingsController', function( + .controller('dcosServerGroupBasicSettingsController', ['$scope', '$controller', '$uibModalStack', '$state', 'dcosImageReader', function( $scope, $controller, $uibModalStack, @@ -43,4 +43,4 @@ module.exports = angular return pattern.test(detail); }, }; - }); + }]); diff --git a/app/scripts/modules/dcos/serverGroup/configure/wizard/containerSettings.controller.js b/app/scripts/modules/dcos/serverGroup/configure/wizard/containerSettings.controller.js index 8d14440e0d8..9a0f26f42a9 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/wizard/containerSettings.controller.js +++ b/app/scripts/modules/dcos/serverGroup/configure/wizard/containerSettings.controller.js @@ -5,7 +5,7 @@ import { Observable, Subject } from 'rxjs'; module.exports = angular .module('spinnaker.dcos.serverGroup.configure.containerSettings', []) - .controller('dcosServerGroupContainerSettingsController', function($scope, dcosServerGroupConfigurationService) { + .controller('dcosServerGroupContainerSettingsController', ['$scope', 'dcosServerGroupConfigurationService', function($scope, dcosServerGroupConfigurationService) { this.groupByRegistry = function(image) { if (image) { if (image.fromContext) { @@ -53,4 +53,4 @@ module.exports = angular this.removeParameter = function(index) { $scope.command.docker.parameters.splice(index, 1); }; - }); + }]); diff --git a/app/scripts/modules/dcos/serverGroup/configure/wizard/environmentVariables.controller.js b/app/scripts/modules/dcos/serverGroup/configure/wizard/environmentVariables.controller.js index b454c57581a..5e523df507b 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/wizard/environmentVariables.controller.js +++ b/app/scripts/modules/dcos/serverGroup/configure/wizard/environmentVariables.controller.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.dcos.serverGroup.configure.environmentVariables', []) - .controller('dcosServerGroupEnvironmentVariablesController', function($scope) { + .controller('dcosServerGroupEnvironmentVariablesController', ['$scope', function($scope) { $scope.command.viewModel.env = []; this.isEnvironmentValid = function(env) { @@ -94,4 +94,4 @@ module.exports = angular }); }; $scope.$watch(() => JSON.stringify($scope.command.viewModel.env), this.synchronize); - }); + }]); diff --git a/app/scripts/modules/dcos/serverGroup/configure/wizard/healthChecks.controller.js b/app/scripts/modules/dcos/serverGroup/configure/wizard/healthChecks.controller.js index d64294a36d5..dc86b5a5780 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/wizard/healthChecks.controller.js +++ b/app/scripts/modules/dcos/serverGroup/configure/wizard/healthChecks.controller.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.dcos.serverGroup.configure.healthChecks', []) - .controller('dcosServerGroupHealthChecksController', function($scope) { + .controller('dcosServerGroupHealthChecksController', ['$scope', function($scope) { var HTTP_PROTOCOL = 'HTTP'; var HTTPS_PROTOCOL = 'HTTPS'; var TCP_PROTOCOL = 'TCP'; @@ -75,4 +75,4 @@ module.exports = angular this.removeHealthCheck = function(index) { $scope.command.healthChecks.splice(index, 1); }; - }); + }]); diff --git a/app/scripts/modules/dcos/serverGroup/configure/wizard/network.controller.js b/app/scripts/modules/dcos/serverGroup/configure/wizard/network.controller.js index cf60270d0e9..751e845f3d7 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/wizard/network.controller.js +++ b/app/scripts/modules/dcos/serverGroup/configure/wizard/network.controller.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.dcos.serverGroup.configure.network', []) - .controller('dcosServerGroupNetworkController', function($scope) { + .controller('dcosServerGroupNetworkController', ['$scope', function($scope) { var HOST_NETWORK = 'HOST'; var BRIDGE_NETWORK = 'BRIDGE'; var USER_NETWORK = 'USER'; @@ -62,4 +62,4 @@ module.exports = angular endpoint.networkType = $scope.command.networkType; }); }; - }); + }]); diff --git a/app/scripts/modules/dcos/serverGroup/configure/wizard/optional.controller.js b/app/scripts/modules/dcos/serverGroup/configure/wizard/optional.controller.js index 9e2baebdfbe..ed650135dfd 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/wizard/optional.controller.js +++ b/app/scripts/modules/dcos/serverGroup/configure/wizard/optional.controller.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.dcos.serverGroup.configure.optional', []) - .controller('dcosServerGroupOptionalController', function($scope) { + .controller('dcosServerGroupOptionalController', ['$scope', function($scope) { // Taken from jquery-validate plugin var urlRegex = /^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})).?)(?::\d{2,5})?(?:[/?#]\S*)?(,)?$/; @@ -33,4 +33,4 @@ module.exports = angular } }; $scope.$watch(() => JSON.stringify($scope.command.viewModel.fetch), this.synchronize); - }); + }]); diff --git a/app/scripts/modules/dcos/serverGroup/configure/wizard/volumes.controller.js b/app/scripts/modules/dcos/serverGroup/configure/wizard/volumes.controller.js index d73ee593b84..95bed2201d3 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/wizard/volumes.controller.js +++ b/app/scripts/modules/dcos/serverGroup/configure/wizard/volumes.controller.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.dcos.serverGroup.configure.volumes', []) - .controller('dcosServerGroupVolumesController', function($scope) { + .controller('dcosServerGroupVolumesController', ['$scope', function($scope) { this.volumeModes = [ { mode: 'RW', @@ -75,4 +75,4 @@ module.exports = angular this.removeExternalVolume = function(index) { $scope.command.externalVolumes.splice(index, 1); }; - }); + }]); diff --git a/app/scripts/modules/dcos/serverGroup/details/details.controller.js b/app/scripts/modules/dcos/serverGroup/details/details.controller.js index d7d9e1f5009..b6168aa3edc 100644 --- a/app/scripts/modules/dcos/serverGroup/details/details.controller.js +++ b/app/scripts/modules/dcos/serverGroup/details/details.controller.js @@ -18,7 +18,7 @@ module.exports = angular SERVER_GROUP_WRITER, require('../paramsMixin').name, ]) - .controller('dcosServerGroupDetailsController', function( + .controller('dcosServerGroupDetailsController', ['$scope', '$state', 'app', 'serverGroup', '$uibModal', 'serverGroupWriter', 'dcosServerGroupCommandBuilder', 'dcosServerGroupParamsMixin', 'confirmationModalService', 'dcosProxyUiService', function( $scope, $state, app, @@ -237,4 +237,4 @@ module.exports = angular }, }); }; - }); + }]); diff --git a/app/scripts/modules/dcos/serverGroup/details/resize/resize.controller.js b/app/scripts/modules/dcos/serverGroup/details/resize/resize.controller.js index fab6bf32cd8..627c9386e43 100644 --- a/app/scripts/modules/dcos/serverGroup/details/resize/resize.controller.js +++ b/app/scripts/modules/dcos/serverGroup/details/resize/resize.controller.js @@ -6,7 +6,7 @@ import { SERVER_GROUP_WRITER, TaskMonitor } from '@spinnaker/core'; module.exports = angular .module('spinnaker.dcos.serverGroup.details.resize.controller', [SERVER_GROUP_WRITER]) - .controller('dcosResizeServerGroupController', function( + .controller('dcosResizeServerGroupController', ['$scope', '$uibModalInstance', 'serverGroupWriter', 'application', 'serverGroup', function( $scope, $uibModalInstance, serverGroupWriter, @@ -68,4 +68,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/dcos/serverGroup/transformer.js b/app/scripts/modules/dcos/serverGroup/transformer.js index 219e88fb2e2..0072e9f73e3 100644 --- a/app/scripts/modules/dcos/serverGroup/transformer.js +++ b/app/scripts/modules/dcos/serverGroup/transformer.js @@ -6,7 +6,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.dcos.serverGroup.transformer', []) - .factory('dcosServerGroupTransformer', function($q) { + .factory('dcosServerGroupTransformer', ['$q', function($q) { function normalizeServerGroup(serverGroup) { return $q.when(serverGroup); // no-op } @@ -36,4 +36,4 @@ module.exports = angular convertServerGroupCommandToDeployConfiguration: convertServerGroupCommandToDeployConfiguration, normalizeServerGroup: normalizeServerGroup, }; - }); + }]); diff --git a/app/scripts/modules/dcos/validation/applicationName.validator.js b/app/scripts/modules/dcos/validation/applicationName.validator.js index 6d02be05a48..bf149242f84 100644 --- a/app/scripts/modules/dcos/validation/applicationName.validator.js +++ b/app/scripts/modules/dcos/validation/applicationName.validator.js @@ -46,6 +46,6 @@ module.exports = angular validate: validate, }; }) - .run(function(dcosApplicationNameValidator) { + .run(['dcosApplicationNameValidator', function(dcosApplicationNameValidator) { ApplicationNameValidator.registerValidator('dcos', dcosApplicationNameValidator); - }); + }]); diff --git a/app/scripts/modules/docker/src/pipeline/stages/bake/bakeExecutionDetails.controller.js b/app/scripts/modules/docker/src/pipeline/stages/bake/bakeExecutionDetails.controller.js index 27780733bd9..2c3857fca9a 100644 --- a/app/scripts/modules/docker/src/pipeline/stages/bake/bakeExecutionDetails.controller.js +++ b/app/scripts/modules/docker/src/pipeline/stages/bake/bakeExecutionDetails.controller.js @@ -6,7 +6,7 @@ import { SETTINGS } from '@spinnaker/core'; module.exports = angular .module('spinnaker.docker.pipeline.stage.bake.executionDetails.controller', [require('@uirouter/angularjs').default]) - .controller('dockerBakeExecutionDetailsCtrl', function( + .controller('dockerBakeExecutionDetailsCtrl', ['$scope', '$stateParams', 'executionDetailsSectionService', '$interpolate', function( $scope, $stateParams, executionDetailsSectionService, @@ -25,4 +25,4 @@ module.exports = angular initialize(); $scope.$on('$stateChangeSuccess', initialize); - }); + }]); diff --git a/app/scripts/modules/docker/src/pipeline/stages/bake/dockerBakeStage.js b/app/scripts/modules/docker/src/pipeline/stages/bake/dockerBakeStage.js index 2b138118096..73ff6835e1b 100644 --- a/app/scripts/modules/docker/src/pipeline/stages/bake/dockerBakeStage.js +++ b/app/scripts/modules/docker/src/pipeline/stages/bake/dockerBakeStage.js @@ -29,7 +29,7 @@ module.exports = angular restartable: true, }); }) - .controller('dockerBakeStageCtrl', function($scope, $q) { + .controller('dockerBakeStageCtrl', ['$scope', '$q', function($scope, $q) { var stage = $scope.stage; stage.region = 'global'; @@ -72,4 +72,4 @@ module.exports = angular $scope.$watch('stage', deleteEmptyProperties, true); initialize(); - }); + }]); diff --git a/app/scripts/modules/ecs/src/instance/details/instance.details.controller.js b/app/scripts/modules/ecs/src/instance/details/instance.details.controller.js index d9c40a80318..ebb6c46d44b 100644 --- a/app/scripts/modules/ecs/src/instance/details/instance.details.controller.js +++ b/app/scripts/modules/ecs/src/instance/details/instance.details.controller.js @@ -17,7 +17,7 @@ module.exports = angular require('angular-ui-bootstrap'), CONFIRMATION_MODAL_SERVICE, ]) - .controller('ecsInstanceDetailsCtrl', function( + .controller('ecsInstanceDetailsCtrl', ['$scope', '$state', '$uibModal', 'confirmationModalService', 'instanceWriter', 'instance', 'app', 'moniker', 'environment', '$q', 'overrides', function( $scope, $state, $uibModal, @@ -348,4 +348,4 @@ module.exports = angular }); $scope.account = instance.account; - }); + }]); diff --git a/app/scripts/modules/ecs/src/pipeline/stages/cloneServerGroup/ecsCloneServerGroupStage.js b/app/scripts/modules/ecs/src/pipeline/stages/cloneServerGroup/ecsCloneServerGroupStage.js index 9dea420cf74..ab24310449c 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/cloneServerGroup/ecsCloneServerGroupStage.js +++ b/app/scripts/modules/ecs/src/pipeline/stages/cloneServerGroup/ecsCloneServerGroupStage.js @@ -22,7 +22,7 @@ module.exports = angular ], }); }) - .controller('ecsCloneServerGroupStageCtrl', function($scope) { + .controller('ecsCloneServerGroupStageCtrl', ['$scope', function($scope) { let stage = $scope.stage; $scope.viewState = { @@ -86,4 +86,4 @@ module.exports = angular this.processIsSuspended = process => { return stage.suspendedProcesses && stage.suspendedProcesses.includes(process); }; - }); + }]); diff --git a/app/scripts/modules/ecs/src/pipeline/stages/destroyAsg/ecsDestroyAsgStage.js b/app/scripts/modules/ecs/src/pipeline/stages/destroyAsg/ecsDestroyAsgStage.js index dc90ed6bd5d..cebf092c96d 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/destroyAsg/ecsDestroyAsgStage.js +++ b/app/scripts/modules/ecs/src/pipeline/stages/destroyAsg/ecsDestroyAsgStage.js @@ -28,7 +28,7 @@ module.exports = angular ], }); }) - .controller('ecsDestroyAsgStageCtrl', function($scope) { + .controller('ecsDestroyAsgStageCtrl', ['$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/ecs/src/pipeline/stages/disableAsg/ecsDisableAsgStage.js b/app/scripts/modules/ecs/src/pipeline/stages/disableAsg/ecsDisableAsgStage.js index f26ecf02ae3..9dd1459aea4 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/disableAsg/ecsDisableAsgStage.js +++ b/app/scripts/modules/ecs/src/pipeline/stages/disableAsg/ecsDisableAsgStage.js @@ -27,7 +27,7 @@ module.exports = angular ], }); }) - .controller('ecsDisableAsgStageCtrl', function($scope) { + .controller('ecsDisableAsgStageCtrl', ['$scope', function($scope) { let stage = $scope.stage; $scope.state = { @@ -63,4 +63,4 @@ module.exports = angular if (!stage.target) { stage.target = $scope.targets[0].val; } - }); + }]); diff --git a/app/scripts/modules/ecs/src/pipeline/stages/disableCluster/ecsDisableClusterStage.js b/app/scripts/modules/ecs/src/pipeline/stages/disableCluster/ecsDisableClusterStage.js index 8cb6096fc38..6b4a39aef8d 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/disableCluster/ecsDisableClusterStage.js +++ b/app/scripts/modules/ecs/src/pipeline/stages/disableCluster/ecsDisableClusterStage.js @@ -23,7 +23,7 @@ module.exports = angular ], }); }) - .controller('ecsDisableClusterStageCtrl', function($scope) { + .controller('ecsDisableClusterStageCtrl', ['$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/ecs/src/pipeline/stages/enableAsg/ecsEnableAsgStage.js b/app/scripts/modules/ecs/src/pipeline/stages/enableAsg/ecsEnableAsgStage.js index 9f675980800..86c3952eed0 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/enableAsg/ecsEnableAsgStage.js +++ b/app/scripts/modules/ecs/src/pipeline/stages/enableAsg/ecsEnableAsgStage.js @@ -21,7 +21,7 @@ module.exports = angular ], }); }) - .controller('ecsEnableAsgStageCtrl', function($scope) { + .controller('ecsEnableAsgStageCtrl', ['$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/ecs/src/pipeline/stages/findImageFromTags/ecsFindImageFromTagStage.js b/app/scripts/modules/ecs/src/pipeline/stages/findImageFromTags/ecsFindImageFromTagStage.js index caeb6e34b48..d5b83cef08d 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/findImageFromTags/ecsFindImageFromTagStage.js +++ b/app/scripts/modules/ecs/src/pipeline/stages/findImageFromTags/ecsFindImageFromTagStage.js @@ -16,6 +16,6 @@ module.exports = angular validators: [{ type: 'requiredField', fieldName: 'imageLabelOrSha' }], }); }) - .controller('ecsFindImageFromTagsStageCtrl', function($scope) { + .controller('ecsFindImageFromTagsStageCtrl', ['$scope', function($scope) { $scope.stage.cloudProvider = $scope.stage.cloudProvider || 'ecs'; - }); + }]); diff --git a/app/scripts/modules/ecs/src/pipeline/stages/resizeAsg/ecsResizeAsgStage.js b/app/scripts/modules/ecs/src/pipeline/stages/resizeAsg/ecsResizeAsgStage.js index 2b52d0d84d5..415f44dd945 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/resizeAsg/ecsResizeAsgStage.js +++ b/app/scripts/modules/ecs/src/pipeline/stages/resizeAsg/ecsResizeAsgStage.js @@ -30,7 +30,7 @@ module.exports = angular ], }); }) - .controller('ecsResizeAsgStageCtrl', function($scope) { + .controller('ecsResizeAsgStageCtrl', ['$scope', function($scope) { var ctrl = this; let stage = $scope.stage; @@ -121,4 +121,4 @@ module.exports = angular } } }; - }); + }]); diff --git a/app/scripts/modules/ecs/src/pipeline/stages/scaleDownCluster/ecsScaleDownClusterStage.js b/app/scripts/modules/ecs/src/pipeline/stages/scaleDownCluster/ecsScaleDownClusterStage.js index 7aef497618a..d6f1a3a52de 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/scaleDownCluster/ecsScaleDownClusterStage.js +++ b/app/scripts/modules/ecs/src/pipeline/stages/scaleDownCluster/ecsScaleDownClusterStage.js @@ -26,7 +26,7 @@ module.exports = angular strategy: true, }); }) - .controller('ecsScaleDownClusterStageCtrl', function($scope) { + .controller('ecsScaleDownClusterStageCtrl', ['$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/ecs/src/pipeline/stages/shrinkCluster/ecsShrinkClusterStage.js b/app/scripts/modules/ecs/src/pipeline/stages/shrinkCluster/ecsShrinkClusterStage.js index 9ab32096e43..0f32ca7a530 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/shrinkCluster/ecsShrinkClusterStage.js +++ b/app/scripts/modules/ecs/src/pipeline/stages/shrinkCluster/ecsShrinkClusterStage.js @@ -21,7 +21,7 @@ module.exports = angular ], }); }) - .controller('ecsShrinkClusterStageCtrl', function($scope) { + .controller('ecsShrinkClusterStageCtrl', ['$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/ecs/src/serverGroup/configure/serverGroupCommandBuilder.service.js b/app/scripts/modules/ecs/src/serverGroup/configure/serverGroupCommandBuilder.service.js index b8865f1321c..32afbfc5302 100644 --- a/app/scripts/modules/ecs/src/serverGroup/configure/serverGroupCommandBuilder.service.js +++ b/app/scripts/modules/ecs/src/serverGroup/configure/serverGroupCommandBuilder.service.js @@ -12,7 +12,7 @@ module.exports = angular INSTANCE_TYPE_SERVICE, ECS_SERVER_GROUP_CONFIGURATION_SERVICE, ]) - .factory('ecsServerGroupCommandBuilder', function($q, instanceTypeService, ecsServerGroupConfigurationService) { + .factory('ecsServerGroupCommandBuilder', ['$q', 'instanceTypeService', 'ecsServerGroupConfigurationService', function($q, instanceTypeService, ecsServerGroupConfigurationService) { const CLOUD_PROVIDER = 'ecs'; function buildNewServerGroupCommand(application, defaults) { @@ -231,4 +231,4 @@ module.exports = angular buildServerGroupCommandFromPipeline: buildServerGroupCommandFromPipeline, buildUpdateServerGroupCommand: buildUpdateServerGroupCommand, }; - }); + }]); diff --git a/app/scripts/modules/ecs/src/serverGroup/configure/serverGroupConfiguration.service.ts b/app/scripts/modules/ecs/src/serverGroup/configure/serverGroupConfiguration.service.ts index 5e0746e1550..8d277987457 100644 --- a/app/scripts/modules/ecs/src/serverGroup/configure/serverGroupConfiguration.service.ts +++ b/app/scripts/modules/ecs/src/serverGroup/configure/serverGroupConfiguration.service.ts @@ -85,6 +85,7 @@ export class EcsServerGroupConfigurationService { // private terminationPolicies = ['OldestInstance', 'NewestInstance', 'OldestLaunchConfiguration', 'ClosestToNextInstanceHour', 'Default']; private launchTypes = ['EC2', 'FARGATE']; + public static $inject = ['$q', 'cacheInitializer', 'loadBalancerReader', 'serverGroupCommandRegistry', 'iamRoleReader', 'ecsClusterReader', 'metricAlarmReader', 'placementStrategyService', 'securityGroupReader', 'secretReader']; constructor( private $q: IQService, private cacheInitializer: CacheInitializerService, diff --git a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/CloneServerGroup.ecs.controller.js b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/CloneServerGroup.ecs.controller.js index ec15e5a1243..46cbfb91210 100644 --- a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/CloneServerGroup.ecs.controller.js +++ b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/CloneServerGroup.ecs.controller.js @@ -26,7 +26,7 @@ module.exports = angular ECS_CLUSTER_READ_SERVICE, ECS_SECRET_READ_SERVICE, ]) - .controller('ecsCloneServerGroupCtrl', function( + .controller('ecsCloneServerGroupCtrl', ['$scope', '$uibModalInstance', '$q', '$state', 'serverGroupWriter', 'overrideRegistry', 'ecsServerGroupConfigurationService', 'serverGroupCommandRegistry', 'serverGroupCommand', 'iamRoleReader', 'ecsClusterReader', 'secretReader', 'application', 'title', function( $scope, $uibModalInstance, $q, @@ -209,4 +209,4 @@ module.exports = angular $scope.state.requiresTemplateSelection = false; configureCommand(); }; - }); + }]); diff --git a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/location/ServerGroupBasicSettings.controller.js b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/location/ServerGroupBasicSettings.controller.js index 8e589b80c13..d89811f61c5 100644 --- a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/location/ServerGroupBasicSettings.controller.js +++ b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/location/ServerGroupBasicSettings.controller.js @@ -9,7 +9,7 @@ module.exports = angular require('@uirouter/angularjs').default, require('angular-ui-bootstrap'), ]) - .controller('ecsServerGroupBasicSettingsCtrl', function($scope, $controller, $uibModalStack, $state) { + .controller('ecsServerGroupBasicSettingsCtrl', ['$scope', '$controller', '$uibModalStack', '$state', function($scope, $controller, $uibModalStack, $state) { angular.extend( this, $controller('BasicSettingsMixin', { @@ -27,4 +27,4 @@ module.exports = angular ModalWizard.markIncomplete('location'); } }); - }); + }]); diff --git a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/networking/networkingSelector.component.ts b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/networking/networkingSelector.component.ts index 67a673cd20e..c817a1ea850 100644 --- a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/networking/networkingSelector.component.ts +++ b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/networking/networkingSelector.component.ts @@ -13,6 +13,7 @@ class LoadBalancerSelectorController implements IController { public refreshTime: number; public refreshing = false; + public static $inject = ['ecsServerGroupConfigurationService']; constructor(private ecsServerGroupConfigurationService: EcsServerGroupConfigurationService) { 'ngInject'; diff --git a/app/scripts/modules/ecs/src/serverGroup/details/resize/resizeServerGroup.controller.js b/app/scripts/modules/ecs/src/serverGroup/details/resize/resizeServerGroup.controller.js index 34e9fffe88f..4a26789edbf 100644 --- a/app/scripts/modules/ecs/src/serverGroup/details/resize/resizeServerGroup.controller.js +++ b/app/scripts/modules/ecs/src/serverGroup/details/resize/resizeServerGroup.controller.js @@ -8,7 +8,7 @@ import { ECS_RESIZE_CAPACITY_COMPONENT } from './resizeCapacity.component'; module.exports = angular .module('spinnaker.ecs.serverGroup.details.resize.controller', [SERVER_GROUP_WRITER, ECS_RESIZE_CAPACITY_COMPONENT]) - .controller('ecsResizeServerGroupCtrl', function( + .controller('ecsResizeServerGroupCtrl', ['$scope', '$uibModalInstance', 'serverGroupWriter', 'application', 'serverGroup', function( $scope, $uibModalInstance, serverGroupWriter, @@ -75,4 +75,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/ecs/src/serverGroup/details/rollback/rollbackServerGroup.controller.js b/app/scripts/modules/ecs/src/serverGroup/details/rollback/rollbackServerGroup.controller.js index c4f7e84a66a..ed83dfff757 100644 --- a/app/scripts/modules/ecs/src/serverGroup/details/rollback/rollbackServerGroup.controller.js +++ b/app/scripts/modules/ecs/src/serverGroup/details/rollback/rollbackServerGroup.controller.js @@ -6,7 +6,7 @@ import { SERVER_GROUP_WRITER, TaskMonitor } from '@spinnaker/core'; module.exports = angular .module('spinnaker.ecs.serverGroup.details.rollback.controller', [SERVER_GROUP_WRITER]) - .controller('ecsRollbackServerGroupCtrl', function( + .controller('ecsRollbackServerGroupCtrl', ['$scope', '$uibModalInstance', 'serverGroupWriter', 'application', 'serverGroup', 'disabledServerGroups', 'allServerGroups', function( $scope, $uibModalInstance, serverGroupWriter, @@ -81,4 +81,4 @@ module.exports = angular this.group = function(serverGroup) { return serverGroup.isDisabled ? 'Disabled Server Groups' : 'Enabled Server Groups'; }; - }); + }]); diff --git a/app/scripts/modules/ecs/src/serverGroup/details/serverGroupDetails.ecs.controller.js b/app/scripts/modules/ecs/src/serverGroup/details/serverGroupDetails.ecs.controller.js index e715810ad07..e6705496349 100644 --- a/app/scripts/modules/ecs/src/serverGroup/details/serverGroupDetails.ecs.controller.js +++ b/app/scripts/modules/ecs/src/serverGroup/details/serverGroupDetails.ecs.controller.js @@ -27,7 +27,7 @@ module.exports = angular require('./resize/resizeServerGroup.controller').name, require('./rollback/rollbackServerGroup.controller').name, ]) - .controller('ecsServerGroupDetailsCtrl', function( + .controller('ecsServerGroupDetailsCtrl', ['$scope', '$state', 'app', 'serverGroup', 'ecsServerGroupCommandBuilder', '$uibModal', 'confirmationModalService', 'serverGroupWriter', 'ecsServerGroupTransformer', 'overrideRegistry', function( $scope, $state, app, @@ -345,4 +345,4 @@ module.exports = angular serverGroup.accountDetails = details; }); }; - }); + }]); diff --git a/app/scripts/modules/ecs/src/serverGroup/events/events.component.ts b/app/scripts/modules/ecs/src/serverGroup/events/events.component.ts index 7e09189ab48..74611e09d5b 100644 --- a/app/scripts/modules/ecs/src/serverGroup/events/events.component.ts +++ b/app/scripts/modules/ecs/src/serverGroup/events/events.component.ts @@ -5,6 +5,7 @@ import { EVENTS_CTRL, EventsController } from './events.controller'; class ViewEventsLinkCtrl implements IController { public serverGroup: any; + public static $inject = ['$uibModal']; public constructor(private $uibModal: IModalService) { 'ngInject'; } diff --git a/app/scripts/modules/ecs/src/serverGroup/events/events.controller.ts b/app/scripts/modules/ecs/src/serverGroup/events/events.controller.ts index 17a87549da7..d0c4afe48a5 100644 --- a/app/scripts/modules/ecs/src/serverGroup/events/events.controller.ts +++ b/app/scripts/modules/ecs/src/serverGroup/events/events.controller.ts @@ -13,6 +13,7 @@ export class EventsController implements IController { public viewState: IScalingActivitiesViewState; public events: IEventDescription[] = []; + public static $inject = ['$uibModalInstance', 'serverGroup']; public constructor(private $uibModalInstance: IModalServiceInstance, public serverGroup: IServerGroup) { 'ngInject'; } diff --git a/app/scripts/modules/google/src/cache/cacheConfigurer.service.js b/app/scripts/modules/google/src/cache/cacheConfigurer.service.js index 3d5292df0eb..e95dcfc570b 100644 --- a/app/scripts/modules/google/src/cache/cacheConfigurer.service.js +++ b/app/scripts/modules/google/src/cache/cacheConfigurer.service.js @@ -21,7 +21,7 @@ module.exports = angular INSTANCE_TYPE_SERVICE, LOAD_BALANCER_READ_SERVICE, ]) - .factory('gceCacheConfigurer', function( + .factory('gceCacheConfigurer', ['gceAddressReader', 'gceBackendServiceReader', 'gceCertificateReader', 'gceHealthCheckReader', 'instanceTypeService', 'loadBalancerReader', function( gceAddressReader, gceBackendServiceReader, gceCertificateReader, @@ -68,4 +68,4 @@ module.exports = angular }; return config; - }); + }]); diff --git a/app/scripts/modules/google/src/cache/cacheRefresh.component.ts b/app/scripts/modules/google/src/cache/cacheRefresh.component.ts index 6790bea3d24..f3ff344b612 100644 --- a/app/scripts/modules/google/src/cache/cacheRefresh.component.ts +++ b/app/scripts/modules/google/src/cache/cacheRefresh.component.ts @@ -12,6 +12,7 @@ class GceCacheRefreshCtrl implements IController { private cacheKey: string; private cacheKeyAlias: string; + public static $inject = ['cacheInitializer']; constructor(private cacheInitializer: CacheInitializerService) { 'ngInject'; } diff --git a/app/scripts/modules/google/src/instance/custom/customInstance.filter.js b/app/scripts/modules/google/src/instance/custom/customInstance.filter.js index 2f41b259e14..1f8b8dbc2ae 100644 --- a/app/scripts/modules/google/src/instance/custom/customInstance.filter.js +++ b/app/scripts/modules/google/src/instance/custom/customInstance.filter.js @@ -6,7 +6,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.gce.customInstance.filter', [require('./customInstanceBuilder.gce.service').name]) - .filter('customInstanceFilter', function(gceCustomInstanceBuilderService) { + .filter('customInstanceFilter', ['gceCustomInstanceBuilderService', function(gceCustomInstanceBuilderService) { return function(instanceTypeString) { if (_.startsWith(instanceTypeString, 'custom')) { const { vCpuCount, memory } = gceCustomInstanceBuilderService.parseInstanceTypeString(instanceTypeString); @@ -14,4 +14,4 @@ module.exports = angular } return instanceTypeString; }; - }); + }]); diff --git a/app/scripts/modules/google/src/instance/details/instance.details.controller.js b/app/scripts/modules/google/src/instance/details/instance.details.controller.js index dc6ae4eea4a..e1c5261ea0c 100644 --- a/app/scripts/modules/google/src/instance/details/instance.details.controller.js +++ b/app/scripts/modules/google/src/instance/details/instance.details.controller.js @@ -23,7 +23,7 @@ module.exports = angular CONFIRMATION_MODAL_SERVICE, GCE_HTTP_LOAD_BALANCER_UTILS, ]) - .controller('gceInstanceDetailsCtrl', function( + .controller('gceInstanceDetailsCtrl', ['$scope', '$state', '$uibModal', 'instanceWriter', 'confirmationModalService', 'instance', 'app', 'moniker', 'environment', '$q', 'gceHttpLoadBalancerUtils', 'gceXpnNamingService', function( $scope, $state, $uibModal, @@ -510,4 +510,4 @@ module.exports = angular }); $scope.account = instance.account; - }); + }]); diff --git a/app/scripts/modules/google/src/instance/gceInstanceType.service.js b/app/scripts/modules/google/src/instance/gceInstanceType.service.js index dbf09c4bca7..0c43e05f23e 100644 --- a/app/scripts/modules/google/src/instance/gceInstanceType.service.js +++ b/app/scripts/modules/google/src/instance/gceInstanceType.service.js @@ -7,7 +7,7 @@ import { AccountService, SETTINGS } from '@spinnaker/core'; module.exports = angular .module('spinnaker.gce.instanceType.service', []) - .factory('gceInstanceTypeService', function($http, $q, $log) { + .factory('gceInstanceTypeService', ['$http', '$q', '$log', function($http, $q, $log) { const cachedResult = null; const n1standard = { @@ -339,4 +339,4 @@ module.exports = angular getAvailableTypesForLocations: getAvailableTypesForLocations, resolveInstanceTypeDetails: resolveInstanceTypeDetails, }; - }); + }]); diff --git a/app/scripts/modules/google/src/interceptors/iap.interceptor.ts b/app/scripts/modules/google/src/interceptors/iap.interceptor.ts index ab8ea43ea9c..5d0a7a39315 100644 --- a/app/scripts/modules/google/src/interceptors/iap.interceptor.ts +++ b/app/scripts/modules/google/src/interceptors/iap.interceptor.ts @@ -27,6 +27,6 @@ export class IapInterceptor implements IHttpInterceptor { export const IAP_INTERCEPTOR = 'spinnaker.gce.iap.interceptor'; module(IAP_INTERCEPTOR, []) .service('iapInterceptor', IapInterceptor) - .config(($httpProvider: IHttpProvider) => { + .config(['$httpProvider', ($httpProvider: IHttpProvider) => { $httpProvider.interceptors.push('iapInterceptor'); - }); + }]); diff --git a/app/scripts/modules/google/src/loadBalancer/configure/choice/gceLoadBalancerChoice.modal.ts b/app/scripts/modules/google/src/loadBalancer/configure/choice/gceLoadBalancerChoice.modal.ts index d92aaa85748..3e4674d6fa4 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/choice/gceLoadBalancerChoice.modal.ts +++ b/app/scripts/modules/google/src/loadBalancer/configure/choice/gceLoadBalancerChoice.modal.ts @@ -13,6 +13,7 @@ class GceLoadBalancerChoiceCtrl implements IController { public choices: string[]; public choice = 'Network'; + public static $inject = ['$uibModal', '$uibModalInstance', 'application', 'loadBalancerTypeToWizardMap']; constructor( public $uibModal: IModalService, public $uibModalInstance: IModalInstanceService, diff --git a/app/scripts/modules/google/src/loadBalancer/configure/common/commonLoadBalancer.controller.ts b/app/scripts/modules/google/src/loadBalancer/configure/common/commonLoadBalancer.controller.ts index 802d2423d26..b01ced034c9 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/common/commonLoadBalancer.controller.ts +++ b/app/scripts/modules/google/src/loadBalancer/configure/common/commonLoadBalancer.controller.ts @@ -8,6 +8,7 @@ import { Application, InfrastructureCaches } from '@spinnaker/core'; import { IGceLoadBalancer } from 'google/domain/loadBalancer'; export class CommonGceLoadBalancerCtrl { + public static $inject = ['$scope', 'application', '$uibModalInstance', '$state']; constructor( public $scope: IScope, public application: Application, diff --git a/app/scripts/modules/google/src/loadBalancer/configure/common/commonLoadBalancerCommandBuilder.service.ts b/app/scripts/modules/google/src/loadBalancer/configure/common/commonLoadBalancerCommandBuilder.service.ts index d63aac9e7c3..f3c70a927a1 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/common/commonLoadBalancerCommandBuilder.service.ts +++ b/app/scripts/modules/google/src/loadBalancer/configure/common/commonLoadBalancerCommandBuilder.service.ts @@ -44,6 +44,7 @@ export class GceCommonLoadBalancerCommandBuilder { certificates: (): IPromise => this.gceCertificateReader.listCertificates(), }; + public static $inject = ['$q', 'loadBalancerReader', 'gceHealthCheckReader', 'gceCertificateReader']; constructor( private $q: ng.IQService, private loadBalancerReader: LoadBalancerReader, diff --git a/app/scripts/modules/google/src/loadBalancer/configure/common/healthCheck.component.ts b/app/scripts/modules/google/src/loadBalancer/configure/common/healthCheck.component.ts index 56cb355fb1b..fdd98da4642 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/common/healthCheck.component.ts +++ b/app/scripts/modules/google/src/loadBalancer/configure/common/healthCheck.component.ts @@ -12,6 +12,7 @@ class HealthCheckCreateCtrl implements IController { public credentials: string; public max = Number.MAX_SAFE_INTEGER; + public static $inject = ['$scope']; constructor(private $scope: ng.IScope) {} public $onInit(): void { diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/commandBuilder.service.js b/app/scripts/modules/google/src/loadBalancer/configure/http/commandBuilder.service.js index 61b3ea1955a..d8bd6bbdec9 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/commandBuilder.service.js +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/commandBuilder.service.js @@ -23,7 +23,7 @@ module.exports = angular GCE_HEALTH_CHECK_READER, require('./transformer.service').name, ]) - .factory('gceHttpLoadBalancerCommandBuilder', function( + .factory('gceHttpLoadBalancerCommandBuilder', ['$q', 'gceHttpLoadBalancerUtils', 'gceBackendServiceReader', 'gceCertificateReader', 'gceHealthCheckReader', 'gceHttpLoadBalancerTransformer', 'loadBalancerReader', 'gceAddressReader', function( $q, gceHttpLoadBalancerUtils, gceBackendServiceReader, @@ -331,4 +331,4 @@ module.exports = angular } return { buildCommand }; - }); + }]); diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/createHttpLoadBalancer.controller.js b/app/scripts/modules/google/src/loadBalancer/configure/http/createHttpLoadBalancer.controller.js index 2a3de7979b7..8151e5f51d4 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/createHttpLoadBalancer.controller.js +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/createHttpLoadBalancer.controller.js @@ -24,7 +24,7 @@ module.exports = angular require('./listeners/listener.component').name, require('./transformer.service').name, ]) - .controller('gceCreateHttpLoadBalancerCtrl', function( + .controller('gceCreateHttpLoadBalancerCtrl', ['$scope', '$uibModal', '$uibModalInstance', 'application', 'loadBalancer', 'isNew', 'gceHttpLoadBalancerWriter', '$state', 'wizardSubFormValidation', 'gceHttpLoadBalancerCommandBuilder', 'gceHttpLoadBalancerTransformer', function( $scope, $uibModal, $uibModalInstance, @@ -134,4 +134,4 @@ module.exports = angular }); this.cancel = $uibModalInstance.dismiss; - }); + }]); diff --git a/app/scripts/modules/google/src/loadBalancer/configure/internal/gceCreateInternalLoadBalancer.controller.ts b/app/scripts/modules/google/src/loadBalancer/configure/internal/gceCreateInternalLoadBalancer.controller.ts index 1c2fb4ebcef..76b2f98b9d1 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/internal/gceCreateInternalLoadBalancer.controller.ts +++ b/app/scripts/modules/google/src/loadBalancer/configure/internal/gceCreateInternalLoadBalancer.controller.ts @@ -85,6 +85,7 @@ class InternalLoadBalancerCtrl extends CommonGceLoadBalancerCtrl implements ICon private sessionAffinityModelToViewMap: any = _.invert(this.sessionAffinityViewToModelMap); + public static $inject = ['$scope', 'application', '$uibModalInstance', 'loadBalancer', 'gceCommonLoadBalancerCommandBuilder', 'isNew', 'wizardSubFormValidation', 'gceXpnNamingService', '$state']; constructor( public $scope: IPrivateScope, public application: Application, diff --git a/app/scripts/modules/google/src/loadBalancer/configure/network/createLoadBalancer.controller.js b/app/scripts/modules/google/src/loadBalancer/configure/network/createLoadBalancer.controller.js index 3979caa3bc9..514be3fd3c4 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/network/createLoadBalancer.controller.js +++ b/app/scripts/modules/google/src/loadBalancer/configure/network/createLoadBalancer.controller.js @@ -10,7 +10,7 @@ module.exports = angular require('../../loadBalancer.transformer').name, require('../../../gceRegionSelectField.directive').name, ]) - .controller('gceCreateLoadBalancerCtrl', function( + .controller('gceCreateLoadBalancerCtrl', ['$scope', '$uibModalInstance', '$state', 'gceLoadBalancerTransformer', 'application', 'loadBalancer', 'isNew', function( $scope, $uibModalInstance, $state, @@ -207,4 +207,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/google/src/loadBalancer/configure/ssl/gceCreateSslLoadBalancer.controller.ts b/app/scripts/modules/google/src/loadBalancer/configure/ssl/gceCreateSslLoadBalancer.controller.ts index 76a4529a9fb..dd402685761 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/ssl/gceCreateSslLoadBalancer.controller.ts +++ b/app/scripts/modules/google/src/loadBalancer/configure/ssl/gceCreateSslLoadBalancer.controller.ts @@ -87,6 +87,7 @@ class SslLoadBalancerCtrl extends CommonGceLoadBalancerCtrl implements IControll private sessionAffinityModelToViewMap: any = _.invert(this.sessionAffinityViewToModelMap); + public static $inject = ['$scope', 'application', '$uibModalInstance', 'loadBalancer', 'gceCommonLoadBalancerCommandBuilder', 'isNew', 'wizardSubFormValidation', '$state']; constructor( public $scope: IScope, public application: Application, diff --git a/app/scripts/modules/google/src/loadBalancer/configure/tcp/gceCreateTcpLoadBalancer.controller.ts b/app/scripts/modules/google/src/loadBalancer/configure/tcp/gceCreateTcpLoadBalancer.controller.ts index 5528154a0bd..b096a31a13f 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/tcp/gceCreateTcpLoadBalancer.controller.ts +++ b/app/scripts/modules/google/src/loadBalancer/configure/tcp/gceCreateTcpLoadBalancer.controller.ts @@ -85,6 +85,7 @@ class TcpLoadBalancerCtrl extends CommonGceLoadBalancerCtrl implements ng.ICompo private sessionAffinityModelToViewMap: any = _.invert(this.sessionAffinityViewToModelMap); + public static $inject = ['$scope', 'application', '$uibModalInstance', 'loadBalancer', 'gceCommonLoadBalancerCommandBuilder', 'isNew', 'wizardSubFormValidation', '$state']; constructor( public $scope: IScope, public application: Application, diff --git a/app/scripts/modules/google/src/loadBalancer/details/deleteModal/deleteModal.controller.ts b/app/scripts/modules/google/src/loadBalancer/details/deleteModal/deleteModal.controller.ts index 798afd9e5ec..e76337e3c65 100644 --- a/app/scripts/modules/google/src/loadBalancer/details/deleteModal/deleteModal.controller.ts +++ b/app/scripts/modules/google/src/loadBalancer/details/deleteModal/deleteModal.controller.ts @@ -28,6 +28,7 @@ class DeleteLoadBalancerModalController implements IController { public params: Params = new Params(); public taskMonitor: any; + public static $inject = ['application', 'gceHttpLoadBalancerUtils', 'gceHttpLoadBalancerWriter', 'loadBalancer', '$uibModalInstance']; constructor( private application: Application, private gceHttpLoadBalancerUtils: GceHttpLoadBalancerUtils, diff --git a/app/scripts/modules/google/src/loadBalancer/details/hostAndPathRules/hostAndPathRules.controller.js b/app/scripts/modules/google/src/loadBalancer/details/hostAndPathRules/hostAndPathRules.controller.js index 1fa53db152f..a65a547081e 100644 --- a/app/scripts/modules/google/src/loadBalancer/details/hostAndPathRules/hostAndPathRules.controller.js +++ b/app/scripts/modules/google/src/loadBalancer/details/hostAndPathRules/hostAndPathRules.controller.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.deck.gce.loadBalancer.hostAndPathRules.controller', [require('./hostAndPathRules.service').name]) - .controller('gceHostAndPathRulesCtrl', function( + .controller('gceHostAndPathRulesCtrl', ['hostRules', 'defaultService', 'loadBalancerName', '$uibModalInstance', 'hostAndPathRulesService', function( hostRules, defaultService, loadBalancerName, @@ -14,4 +14,4 @@ module.exports = angular this.table = hostAndPathRulesService.buildTable(hostRules, defaultService); this.loadBalancerName = loadBalancerName; this.close = $uibModalInstance.dismiss; - }); + }]); diff --git a/app/scripts/modules/google/src/loadBalancer/details/hostAndPathRules/hostAndPathRulesButton.component.js b/app/scripts/modules/google/src/loadBalancer/details/hostAndPathRules/hostAndPathRulesButton.component.js index aa7d9fb687f..55113713741 100644 --- a/app/scripts/modules/google/src/loadBalancer/details/hostAndPathRules/hostAndPathRulesButton.component.js +++ b/app/scripts/modules/google/src/loadBalancer/details/hostAndPathRules/hostAndPathRulesButton.component.js @@ -14,7 +14,7 @@ module.exports = angular loadBalancerName: '=', }, template: 'View Host and Path Rules', - controller: function($uibModal) { + controller: ['$uibModal', function($uibModal) { this.viewHostAndPathRules = () => { $uibModal.open({ templateUrl: require('./hostAndPathRules.modal.html'), @@ -28,5 +28,5 @@ module.exports = angular }, }); }; - }, + }], }); diff --git a/app/scripts/modules/google/src/loadBalancer/details/loadBalancerDetail.controller.js b/app/scripts/modules/google/src/loadBalancer/details/loadBalancerDetail.controller.js index e3567f95e53..1343efb04d1 100644 --- a/app/scripts/modules/google/src/loadBalancer/details/loadBalancerDetail.controller.js +++ b/app/scripts/modules/google/src/loadBalancer/details/loadBalancerDetail.controller.js @@ -25,7 +25,7 @@ module.exports = angular SESSION_AFFINITY_FILTER, GCE_LOAD_BALANCER_TYPE_TO_WIZARD_CONSTANT, ]) - .controller('gceLoadBalancerDetailsCtrl', function( + .controller('gceLoadBalancerDetailsCtrl', ['$scope', '$state', '$uibModal', 'loadBalancer', 'app', 'gceHttpLoadBalancerUtils', 'loadBalancerReader', '$q', 'loadBalancerTypeToWizardMap', 'gceXpnNamingService', function( $scope, $state, $uibModal, @@ -235,4 +235,4 @@ module.exports = angular this.getSubnetId = function getSubnetId(loadBalancer) { return gceXpnNamingService.decorateXpnResourceIfNecessary(loadBalancer.project, loadBalancer.subnet); }; - }); + }]); diff --git a/app/scripts/modules/google/src/loadBalancer/loadBalancer.setTransformer.ts b/app/scripts/modules/google/src/loadBalancer/loadBalancer.setTransformer.ts index 333a2804aab..c0a8fb0e410 100644 --- a/app/scripts/modules/google/src/loadBalancer/loadBalancer.setTransformer.ts +++ b/app/scripts/modules/google/src/loadBalancer/loadBalancer.setTransformer.ts @@ -29,6 +29,7 @@ export class GceLoadBalancerSetTransformer { return portRange.split('-')[0]; } + public static $inject = ['gceHttpLoadBalancerUtils']; constructor(private gceHttpLoadBalancerUtils: GceHttpLoadBalancerUtils) { 'ngInject'; } diff --git a/app/scripts/modules/google/src/loadBalancer/loadBalancer.transformer.js b/app/scripts/modules/google/src/loadBalancer/loadBalancer.transformer.js index 12059a7498d..fa22201e74f 100644 --- a/app/scripts/modules/google/src/loadBalancer/loadBalancer.transformer.js +++ b/app/scripts/modules/google/src/loadBalancer/loadBalancer.transformer.js @@ -8,7 +8,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.gce.loadBalancer.transformer', []) - .factory('gceLoadBalancerTransformer', function($q) { + .factory('gceLoadBalancerTransformer', ['$q', function($q) { function updateHealthCounts(container) { const instances = container.instances; const serverGroups = container.serverGroups || [container]; @@ -166,4 +166,4 @@ module.exports = angular convertLoadBalancerForEditing: convertLoadBalancerForEditing, constructNewLoadBalancerTemplate: constructNewLoadBalancerTemplate, }; - }); + }]); diff --git a/app/scripts/modules/google/src/pipeline/stages/bake/bakeExecutionDetails.controller.js b/app/scripts/modules/google/src/pipeline/stages/bake/bakeExecutionDetails.controller.js index f9f28485af6..50a82b31f6a 100644 --- a/app/scripts/modules/google/src/pipeline/stages/bake/bakeExecutionDetails.controller.js +++ b/app/scripts/modules/google/src/pipeline/stages/bake/bakeExecutionDetails.controller.js @@ -6,7 +6,7 @@ import { SETTINGS } from '@spinnaker/core'; module.exports = angular .module('spinnaker.gce.pipeline.stage.bake.executionDetails.controller', [require('@uirouter/angularjs').default]) - .controller('gceBakeExecutionDetailsCtrl', function( + .controller('gceBakeExecutionDetailsCtrl', ['$scope', '$stateParams', 'executionDetailsSectionService', '$interpolate', function( $scope, $stateParams, executionDetailsSectionService, @@ -26,4 +26,4 @@ module.exports = angular initialize(); $scope.$on('$stateChangeSuccess', initialize); - }); + }]); diff --git a/app/scripts/modules/google/src/pipeline/stages/bake/gceBakeStage.js b/app/scripts/modules/google/src/pipeline/stages/bake/gceBakeStage.js index 846afd1336b..f232369716f 100644 --- a/app/scripts/modules/google/src/pipeline/stages/bake/gceBakeStage.js +++ b/app/scripts/modules/google/src/pipeline/stages/bake/gceBakeStage.js @@ -44,7 +44,7 @@ module.exports = angular artifactRemover: ArtifactReferenceService.removeArtifactFromFields(['packageArtifactIds']), }); }) - .controller('gceBakeStageCtrl', function($scope, $q, $uibModal) { + .controller('gceBakeStageCtrl', ['$scope', '$q', '$uibModal', function($scope, $q, $uibModal) { $scope.stage.extendedAttributes = $scope.stage.extendedAttributes || {}; $scope.stage.region = 'global'; @@ -151,4 +151,4 @@ module.exports = angular $scope.$watch('stage', deleteEmptyProperties, true); initialize(); - }); + }]); diff --git a/app/scripts/modules/google/src/pipeline/stages/cloneServerGroup/gceCloneServerGroupStage.js b/app/scripts/modules/google/src/pipeline/stages/cloneServerGroup/gceCloneServerGroupStage.js index c076ee25a2e..a4013a5a3d4 100644 --- a/app/scripts/modules/google/src/pipeline/stages/cloneServerGroup/gceCloneServerGroupStage.js +++ b/app/scripts/modules/google/src/pipeline/stages/cloneServerGroup/gceCloneServerGroupStage.js @@ -21,7 +21,7 @@ module.exports = angular ], }); }) - .controller('gceCloneServerGroupStageCtrl', function($scope) { + .controller('gceCloneServerGroupStageCtrl', ['$scope', function($scope) { const stage = $scope.stage; $scope.viewState = { @@ -75,4 +75,4 @@ module.exports = angular this.toggleDisableTraffic = () => { stage.disableTraffic = !stage.disableTraffic; }; - }); + }]); diff --git a/app/scripts/modules/google/src/pipeline/stages/destroyAsg/gceDestroyAsgStage.js b/app/scripts/modules/google/src/pipeline/stages/destroyAsg/gceDestroyAsgStage.js index 80cb6541feb..aa5d4b0a569 100644 --- a/app/scripts/modules/google/src/pipeline/stages/destroyAsg/gceDestroyAsgStage.js +++ b/app/scripts/modules/google/src/pipeline/stages/destroyAsg/gceDestroyAsgStage.js @@ -27,7 +27,7 @@ module.exports = angular ], }); }) - .controller('gceDestroyAsgStageCtrl', function($scope) { + .controller('gceDestroyAsgStageCtrl', ['$scope', function($scope) { const stage = $scope.stage; $scope.state = { @@ -55,4 +55,4 @@ module.exports = angular if (!stage.target) { stage.target = $scope.targets[0].val; } - }); + }]); diff --git a/app/scripts/modules/google/src/pipeline/stages/disableAsg/gceDisableAsgStage.js b/app/scripts/modules/google/src/pipeline/stages/disableAsg/gceDisableAsgStage.js index 1e1878d00a5..f5b1d1594ec 100644 --- a/app/scripts/modules/google/src/pipeline/stages/disableAsg/gceDisableAsgStage.js +++ b/app/scripts/modules/google/src/pipeline/stages/disableAsg/gceDisableAsgStage.js @@ -25,7 +25,7 @@ module.exports = angular ], }); }) - .controller('gceDisableAsgStageCtrl', function($scope) { + .controller('gceDisableAsgStageCtrl', ['$scope', function($scope) { const stage = $scope.stage; $scope.state = { @@ -61,4 +61,4 @@ module.exports = angular if (!stage.target) { stage.target = $scope.targets[0].val; } - }); + }]); diff --git a/app/scripts/modules/google/src/pipeline/stages/disableCluster/gceDisableClusterStage.js b/app/scripts/modules/google/src/pipeline/stages/disableCluster/gceDisableClusterStage.js index 8ac21448505..18c0a7e4010 100644 --- a/app/scripts/modules/google/src/pipeline/stages/disableCluster/gceDisableClusterStage.js +++ b/app/scripts/modules/google/src/pipeline/stages/disableCluster/gceDisableClusterStage.js @@ -23,7 +23,7 @@ module.exports = angular ], }); }) - .controller('gceDisableClusterStageCtrl', function($scope) { + .controller('gceDisableClusterStageCtrl', ['$scope', function($scope) { const ctrl = this; const stage = $scope.stage; @@ -71,4 +71,4 @@ module.exports = angular stage.preferLargerOverNewer = 'false'; } stage.preferLargerOverNewer = stage.preferLargerOverNewer.toString(); - }); + }]); diff --git a/app/scripts/modules/google/src/pipeline/stages/enableAsg/gceEnableAsgStage.js b/app/scripts/modules/google/src/pipeline/stages/enableAsg/gceEnableAsgStage.js index 979e85d4183..bee9369a1cd 100644 --- a/app/scripts/modules/google/src/pipeline/stages/enableAsg/gceEnableAsgStage.js +++ b/app/scripts/modules/google/src/pipeline/stages/enableAsg/gceEnableAsgStage.js @@ -20,7 +20,7 @@ module.exports = angular ], }); }) - .controller('gceEnableAsgStageCtrl', function($scope) { + .controller('gceEnableAsgStageCtrl', ['$scope', function($scope) { const stage = $scope.stage; $scope.state = { @@ -58,4 +58,4 @@ module.exports = angular } $scope.$watch('stage.credentials', $scope.accountUpdated); - }); + }]); diff --git a/app/scripts/modules/google/src/pipeline/stages/findAmi/gceFindAmiStage.js b/app/scripts/modules/google/src/pipeline/stages/findAmi/gceFindAmiStage.js index f7654bd7375..7ada4218163 100644 --- a/app/scripts/modules/google/src/pipeline/stages/findAmi/gceFindAmiStage.js +++ b/app/scripts/modules/google/src/pipeline/stages/findAmi/gceFindAmiStage.js @@ -19,7 +19,7 @@ module.exports = angular ], }); }) - .controller('gceFindAmiStageCtrl', function($scope) { + .controller('gceFindAmiStageCtrl', ['$scope', function($scope) { const stage = $scope.stage; $scope.state = { @@ -71,4 +71,4 @@ module.exports = angular } $scope.$watch('stage.credentials', $scope.accountUpdated); - }); + }]); diff --git a/app/scripts/modules/google/src/pipeline/stages/findImageFromTags/gceFindImageFromTagsStage.js b/app/scripts/modules/google/src/pipeline/stages/findImageFromTags/gceFindImageFromTagsStage.js index 0748d75a8b3..b9ba9a3f13a 100644 --- a/app/scripts/modules/google/src/pipeline/stages/findImageFromTags/gceFindImageFromTagsStage.js +++ b/app/scripts/modules/google/src/pipeline/stages/findImageFromTags/gceFindImageFromTagsStage.js @@ -16,7 +16,7 @@ module.exports = angular validators: [{ type: 'requiredField', fieldName: 'packageName' }, { type: 'requiredField', fieldName: 'tags' }], }); }) - .controller('gceFindImageFromTagsStageCtrl', function($scope) { + .controller('gceFindImageFromTagsStageCtrl', ['$scope', function($scope) { $scope.stage.tags = $scope.stage.tags || {}; $scope.stage.regions = $scope.stage.regions || []; $scope.stage.cloudProvider = $scope.stage.cloudProvider || 'gce'; @@ -24,4 +24,4 @@ module.exports = angular BakeryReader.getRegions('gce').then(function(regions) { $scope.regions = regions; }); - }); + }]); diff --git a/app/scripts/modules/google/src/pipeline/stages/resizeAsg/gceResizeAsgStage.js b/app/scripts/modules/google/src/pipeline/stages/resizeAsg/gceResizeAsgStage.js index c3a34d2fc7a..a6966069cd5 100644 --- a/app/scripts/modules/google/src/pipeline/stages/resizeAsg/gceResizeAsgStage.js +++ b/app/scripts/modules/google/src/pipeline/stages/resizeAsg/gceResizeAsgStage.js @@ -29,7 +29,7 @@ module.exports = angular ], }); }) - .controller('gceResizeAsgStageCtrl', function($scope) { + .controller('gceResizeAsgStageCtrl', ['$scope', function($scope) { const ctrl = this; const stage = $scope.stage; @@ -118,4 +118,4 @@ module.exports = angular } } }; - }); + }]); diff --git a/app/scripts/modules/google/src/pipeline/stages/scaleDownCluster/gceScaleDownClusterStage.js b/app/scripts/modules/google/src/pipeline/stages/scaleDownCluster/gceScaleDownClusterStage.js index c39884c1808..d6b0ab12548 100644 --- a/app/scripts/modules/google/src/pipeline/stages/scaleDownCluster/gceScaleDownClusterStage.js +++ b/app/scripts/modules/google/src/pipeline/stages/scaleDownCluster/gceScaleDownClusterStage.js @@ -26,7 +26,7 @@ module.exports = angular strategy: true, }); }) - .controller('gceScaleDownClusterStageCtrl', function($scope) { + .controller('gceScaleDownClusterStageCtrl', ['$scope', function($scope) { const ctrl = this; const stage = $scope.stage; @@ -70,4 +70,4 @@ module.exports = angular stage.preferLargerOverNewer = 'false'; } stage.preferLargerOverNewer = stage.preferLargerOverNewer.toString(); - }); + }]); diff --git a/app/scripts/modules/google/src/pipeline/stages/shrinkCluster/gceShrinkClusterStage.js b/app/scripts/modules/google/src/pipeline/stages/shrinkCluster/gceShrinkClusterStage.js index 51aff5434b9..f86368a26d7 100644 --- a/app/scripts/modules/google/src/pipeline/stages/shrinkCluster/gceShrinkClusterStage.js +++ b/app/scripts/modules/google/src/pipeline/stages/shrinkCluster/gceShrinkClusterStage.js @@ -21,7 +21,7 @@ module.exports = angular ], }); }) - .controller('gceShrinkClusterStageCtrl', function($scope) { + .controller('gceShrinkClusterStageCtrl', ['$scope', function($scope) { const ctrl = this; const stage = $scope.stage; @@ -65,4 +65,4 @@ module.exports = angular stage.retainLargerOverNewer = 'false'; } stage.retainLargerOverNewer = stage.retainLargerOverNewer.toString(); - }); + }]); diff --git a/app/scripts/modules/google/src/pipeline/stages/tagImage/gceTagImageStage.js b/app/scripts/modules/google/src/pipeline/stages/tagImage/gceTagImageStage.js index 6ddde6548cc..d628d42526c 100644 --- a/app/scripts/modules/google/src/pipeline/stages/tagImage/gceTagImageStage.js +++ b/app/scripts/modules/google/src/pipeline/stages/tagImage/gceTagImageStage.js @@ -15,7 +15,7 @@ module.exports = angular executionConfigSections: ['tagImageConfig', 'taskStatus'], }); }) - .controller('gceTagImageStageCtrl', $scope => { + .controller('gceTagImageStageCtrl', ['$scope', $scope => { AccountService.listAccounts('gce').then(accounts => ($scope.accounts = accounts)); $scope.stage.tags = $scope.stage.tags || {}; @@ -29,4 +29,4 @@ module.exports = angular $scope.consideredStages = new Map(upstreamDependencies.map(stage => [stage.refId, stage.name])); }; $scope.$watch('pipeline.stages', initUpstreamStages); - }); + }]); diff --git a/app/scripts/modules/google/src/securityGroup/clone/cloneSecurityGroup.controller.js b/app/scripts/modules/google/src/securityGroup/clone/cloneSecurityGroup.controller.js index 09c0546f2e5..199e8d65ed8 100644 --- a/app/scripts/modules/google/src/securityGroup/clone/cloneSecurityGroup.controller.js +++ b/app/scripts/modules/google/src/securityGroup/clone/cloneSecurityGroup.controller.js @@ -9,7 +9,7 @@ module.exports = angular .module('spinnaker.google.securityGroup.clone.controller', [ require('../configure/ConfigSecurityGroupMixin.controller').name, ]) - .controller('gceCloneSecurityGroupController', function( + .controller('gceCloneSecurityGroupController', ['$scope', '$uibModalInstance', '$controller', 'securityGroup', 'application', function( $scope, $uibModalInstance, $controller, @@ -77,4 +77,4 @@ module.exports = angular }; vm.initializeSecurityGroups(); - }); + }]); diff --git a/app/scripts/modules/google/src/securityGroup/configure/ConfigSecurityGroupMixin.controller.js b/app/scripts/modules/google/src/securityGroup/configure/ConfigSecurityGroupMixin.controller.js index b8dff4dade2..dc8b6a081cd 100644 --- a/app/scripts/modules/google/src/securityGroup/configure/ConfigSecurityGroupMixin.controller.js +++ b/app/scripts/modules/google/src/securityGroup/configure/ConfigSecurityGroupMixin.controller.js @@ -22,7 +22,7 @@ module.exports = angular SECURITY_GROUP_READER, GCE_SECURITY_GROUP_HELP_TEXT_SERVICE, ]) - .controller('gceConfigSecurityGroupMixin', function( + .controller('gceConfigSecurityGroupMixin', ['$scope', '$state', '$uibModalInstance', 'application', 'securityGroup', 'securityGroupReader', 'cacheInitializer', 'gceSecurityGroupHelpTextService', 'mode', function( $scope, $state, $uibModalInstance, @@ -302,4 +302,4 @@ module.exports = angular ctrl.removeSourceTag = function(index) { $scope.securityGroup.sourceTags.splice(index, 1); }; - }); + }]); diff --git a/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroup.controller.js b/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroup.controller.js index 0135c7370e8..b877e57678e 100644 --- a/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroup.controller.js +++ b/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroup.controller.js @@ -6,7 +6,7 @@ import { AccountService, InfrastructureCaches } from '@spinnaker/core'; module.exports = angular .module('spinnaker.gce.securityGroup.create.controller', [require('@uirouter/angularjs').default]) - .controller('gceCreateSecurityGroupCtrl', function( + .controller('gceCreateSecurityGroupCtrl', ['$scope', '$uibModalInstance', '$state', '$controller', 'application', 'securityGroup', function( $scope, $uibModalInstance, $state, @@ -54,4 +54,4 @@ module.exports = angular }; ctrl.initializeSecurityGroups(); - }); + }]); diff --git a/app/scripts/modules/google/src/securityGroup/configure/editSecurityGroup.controller.js b/app/scripts/modules/google/src/securityGroup/configure/editSecurityGroup.controller.js index e19d9f53061..f7420aab598 100644 --- a/app/scripts/modules/google/src/securityGroup/configure/editSecurityGroup.controller.js +++ b/app/scripts/modules/google/src/securityGroup/configure/editSecurityGroup.controller.js @@ -6,7 +6,7 @@ import { FirewallLabels, InfrastructureCaches, SecurityGroupWriter, TaskMonitor module.exports = angular .module('spinnaker.google.securityGroup.edit.controller', [require('@uirouter/angularjs').default]) - .controller('gceEditSecurityGroupCtrl', function( + .controller('gceEditSecurityGroupCtrl', ['$scope', '$uibModalInstance', '$state', 'application', 'securityGroup', '$controller', function( $scope, $uibModalInstance, $state, @@ -124,4 +124,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/google/src/securityGroup/details/securityGroupDetail.controller.js b/app/scripts/modules/google/src/securityGroup/details/securityGroupDetail.controller.js index 56fe1ae075f..4a83e02375b 100644 --- a/app/scripts/modules/google/src/securityGroup/details/securityGroupDetail.controller.js +++ b/app/scripts/modules/google/src/securityGroup/details/securityGroupDetail.controller.js @@ -22,7 +22,7 @@ module.exports = angular require('../clone/cloneSecurityGroup.controller').name, GCE_SECURITY_GROUP_HELP_TEXT_SERVICE, ]) - .controller('gceSecurityGroupDetailsCtrl', function( + .controller('gceSecurityGroupDetailsCtrl', ['$scope', '$state', 'resolvedSecurityGroup', 'app', 'confirmationModalService', 'securityGroupReader', '$uibModal', 'gceSecurityGroupHelpTextService', function( $scope, $state, resolvedSecurityGroup, @@ -231,4 +231,4 @@ module.exports = angular refresh: extractSecurityGroup, }; } - }); + }]); diff --git a/app/scripts/modules/google/src/securityGroup/securityGroup.transformer.js b/app/scripts/modules/google/src/securityGroup/securityGroup.transformer.js index e814452fe0c..26c32e32df2 100644 --- a/app/scripts/modules/google/src/securityGroup/securityGroup.transformer.js +++ b/app/scripts/modules/google/src/securityGroup/securityGroup.transformer.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.gce.securityGroup.transformer', []) - .factory('gceSecurityGroupTransformer', function($q) { + .factory('gceSecurityGroupTransformer', ['$q', function($q) { function normalizeSecurityGroup(securityGroup) { return $q.when(securityGroup); // no-op } @@ -12,4 +12,4 @@ module.exports = angular return { normalizeSecurityGroup: normalizeSecurityGroup, }; - }); + }]); diff --git a/app/scripts/modules/google/src/serverGroup/configure/serverGroupCommandBuilder.service.js b/app/scripts/modules/google/src/serverGroup/configure/serverGroupCommandBuilder.service.js index 2c191724c86..171fd02b041 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/serverGroupCommandBuilder.service.js +++ b/app/scripts/modules/google/src/serverGroup/configure/serverGroupCommandBuilder.service.js @@ -13,7 +13,7 @@ module.exports = angular require('./../../instance/custom/customInstanceBuilder.gce.service').name, require('./wizard/hiddenMetadataKeys.value').name, ]) - .factory('gceServerGroupCommandBuilder', function( + .factory('gceServerGroupCommandBuilder', ['$q', 'instanceTypeService', 'gceCustomInstanceBuilderService', 'gceServerGroupHiddenMetadataKeys', 'gceXpnNamingService', function( $q, instanceTypeService, gceCustomInstanceBuilderService, @@ -537,4 +537,4 @@ module.exports = angular buildServerGroupCommandFromExisting: buildServerGroupCommandFromExisting, buildServerGroupCommandFromPipeline: buildServerGroupCommandFromPipeline, }; - }); + }]); diff --git a/app/scripts/modules/google/src/serverGroup/configure/serverGroupConfiguration.service.js b/app/scripts/modules/google/src/serverGroup/configure/serverGroupConfiguration.service.js index 871324b8e53..d06725111e0 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/serverGroupConfiguration.service.js +++ b/app/scripts/modules/google/src/serverGroup/configure/serverGroupConfiguration.service.js @@ -31,7 +31,7 @@ module.exports = angular GCE_HEALTH_CHECK_READER, require('./wizard/securityGroups/tagManager.service').name, ]) - .factory('gceServerGroupConfigurationService', function( + .factory('gceServerGroupConfigurationService', ['gceImageReader', 'securityGroupReader', 'gceInstanceTypeService', 'cacheInitializer', '$q', 'loadBalancerReader', 'gceCustomInstanceBuilderService', 'gceHttpLoadBalancerUtils', 'gceHealthCheckReader', 'gceTagManager', 'gceLoadBalancerSetTransformer', function( gceImageReader, securityGroupReader, gceInstanceTypeService, @@ -778,4 +778,4 @@ module.exports = angular refreshInstanceTypes: refreshInstanceTypes, refreshHealthChecks: refreshHealthChecks, }; - }); + }]); diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/advancedSettings/advancedSettingsSelector.directive.js b/app/scripts/modules/google/src/serverGroup/configure/wizard/advancedSettings/advancedSettingsSelector.directive.js index 71951e4e0bd..c5ea49578a8 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/advancedSettings/advancedSettingsSelector.directive.js +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/advancedSettings/advancedSettingsSelector.directive.js @@ -19,7 +19,7 @@ module.exports = angular controller: 'gceServerGroupAdvancedSettingsSelectorCtrl', }; }) - .controller('gceServerGroupAdvancedSettingsSelectorCtrl', function(gceTagManager) { + .controller('gceServerGroupAdvancedSettingsSelectorCtrl', ['gceTagManager', function(gceTagManager) { this.addTag = () => { this.command.tags.push({}); }; @@ -46,4 +46,4 @@ module.exports = angular this.command.onHostMaintenance = 'MIGRATE'; } }; - }); + }]); diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/cloneServerGroup.gce.controller.js b/app/scripts/modules/google/src/serverGroup/configure/wizard/cloneServerGroup.gce.controller.js index 233631d8c90..de6e16e5d8a 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/cloneServerGroup.gce.controller.js +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/cloneServerGroup.gce.controller.js @@ -15,7 +15,7 @@ module.exports = angular require('./hiddenMetadataKeys.value').name, require('./securityGroups/tagManager.service').name, ]) - .controller('gceCloneServerGroupCtrl', function( + .controller('gceCloneServerGroupCtrl', ['$scope', '$uibModalInstance', '$q', '$state', '$log', 'serverGroupWriter', 'gceServerGroupConfigurationService', 'serverGroupCommand', 'application', 'title', 'gceCustomInstanceBuilderService', 'instanceTypeService', 'wizardSubFormValidation', 'gceServerGroupHiddenMetadataKeys', 'gceTagManager', function( $scope, $uibModalInstance, $q, @@ -437,4 +437,4 @@ module.exports = angular }; $scope.$on('$destroy', gceTagManager.reset); - }); + }]); diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancers/elSevenOptions/backendServiceSelector.component.js b/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancers/elSevenOptions/backendServiceSelector.component.js index 4b77e336eab..5d71464f487 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancers/elSevenOptions/backendServiceSelector.component.js +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancers/elSevenOptions/backendServiceSelector.component.js @@ -12,7 +12,7 @@ module.exports = angular loadBalancerName: '=', }, templateUrl: require('./backendServiceSelector.component.html'), - controller: function($scope) { + controller: ['$scope', function($scope) { $scope.$on('$destroy', () => { if (this.command.backendServices) { delete this.command.backendServices[this.loadBalancerName]; @@ -22,5 +22,5 @@ module.exports = angular $scope.$on('uis:select', function(event) { event.preventDefault(); }); - }, + }], }); diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.js b/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.js index 239cc5e9caf..5dfc93d60d9 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.js +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.js @@ -24,7 +24,7 @@ module.exports = angular controller: 'gceServerGroupLoadBalancerSelectorCtrl', }; }) - .controller('gceServerGroupLoadBalancerSelectorCtrl', function( + .controller('gceServerGroupLoadBalancerSelectorCtrl', ['gceHttpLoadBalancerUtils', 'gceServerGroupConfigurationService', function( gceHttpLoadBalancerUtils, gceServerGroupConfigurationService, ) { @@ -58,4 +58,4 @@ module.exports = angular }; this.isHttpLoadBalancer = lb => gceHttpLoadBalancerUtils.isHttpLoadBalancer(lb); - }); + }]); diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancingPolicy/loadBalancingPolicySelector.component.ts b/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancingPolicy/loadBalancingPolicySelector.component.ts index 4021adc3a84..937e1b0d559 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancingPolicy/loadBalancingPolicySelector.component.ts +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancingPolicy/loadBalancingPolicySelector.component.ts @@ -9,6 +9,7 @@ class GceLoadBalancingPolicySelectorController implements IController { [key: string]: any; public globalBackendServices: IGceBackendService[]; + public static $inject = ['gceBackendServiceReader']; constructor(private gceBackendServiceReader: any) { 'ngInject'; } diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/location/basicSettings.controller.js b/app/scripts/modules/google/src/serverGroup/configure/wizard/location/basicSettings.controller.js index 03975780c04..4335319bf18 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/location/basicSettings.controller.js +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/location/basicSettings.controller.js @@ -14,7 +14,7 @@ module.exports = angular require('../../../../gceNetworkSelectField.directive').name, require('../../../../subnet/subnetSelectField.directive').name, ]) - .controller('gceServerGroupBasicSettingsCtrl', function($scope, $controller, $uibModalStack, $state, imageReader) { + .controller('gceServerGroupBasicSettingsCtrl', ['$scope', '$controller', '$uibModalStack', '$state', 'imageReader', function($scope, $controller, $uibModalStack, $state, imageReader) { function searchImages(q) { $scope.command.backingData.filtered.images = [ { @@ -100,4 +100,4 @@ module.exports = angular delegate: gceImageDelegate, controller: new ExpectedArtifactSelectorViewController(gceImageDelegate), }; - }); + }]); diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/securityGroupSelector.directive.js b/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/securityGroupSelector.directive.js index ee3509da8b4..b6fa94fb0f5 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/securityGroupSelector.directive.js +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/securityGroupSelector.directive.js @@ -22,7 +22,7 @@ module.exports = angular controller: 'gceServerGroupSecurityGroupsSelectorCtrl', }; }) - .controller('gceServerGroupSecurityGroupsSelectorCtrl', function(gceServerGroupConfigurationService, gceTagManager) { + .controller('gceServerGroupSecurityGroupsSelectorCtrl', ['gceServerGroupConfigurationService', 'gceTagManager', function(gceServerGroupConfigurationService, gceTagManager) { this.getSecurityGroupRefreshTime = () => { return InfrastructureCaches.get('securityGroups').getStats().ageMax; }; @@ -35,4 +35,4 @@ module.exports = angular }; this.onRemove = gceTagManager.removeSecurityGroup; - }); + }]); diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/tagSelector.component.js b/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/tagSelector.component.js index 8f901535fa0..bf0deeac828 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/tagSelector.component.js +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/tagSelector.component.js @@ -10,7 +10,7 @@ module.exports = angular securityGroupId: '=', }, templateUrl: require('./tagSelector.component.html'), - controller: function($scope, gceTagManager) { + controller: ['$scope', 'gceTagManager', function($scope, gceTagManager) { this.securityGroup = gceTagManager.securityGroupObjectsKeyedById[this.securityGroupId]; this.onSelect = gceTagManager.addTag; this.onRemove = gceTagManager.removeTag; @@ -18,5 +18,5 @@ module.exports = angular $scope.$on('uis:select', function(event) { event.preventDefault(); }); - }, + }], }); diff --git a/app/scripts/modules/google/src/serverGroup/details/autoHealingPolicy/addAutoHealingPolicyButton.component.ts b/app/scripts/modules/google/src/serverGroup/details/autoHealingPolicy/addAutoHealingPolicyButton.component.ts index 96d9e8a8b48..105d7cffd78 100644 --- a/app/scripts/modules/google/src/serverGroup/details/autoHealingPolicy/addAutoHealingPolicyButton.component.ts +++ b/app/scripts/modules/google/src/serverGroup/details/autoHealingPolicy/addAutoHealingPolicyButton.component.ts @@ -7,6 +7,7 @@ class GceAddAutoHealingPolicyButtonCtrl implements IController { public application: Application; public serverGroup: IServerGroup; + public static $inject = ['$uibModal']; constructor(private $uibModal: IModalService) { 'ngInject'; } diff --git a/app/scripts/modules/google/src/serverGroup/details/autoHealingPolicy/autoHealingPolicy.component.ts b/app/scripts/modules/google/src/serverGroup/details/autoHealingPolicy/autoHealingPolicy.component.ts index a84ab4ac384..2252bd031e7 100644 --- a/app/scripts/modules/google/src/serverGroup/details/autoHealingPolicy/autoHealingPolicy.component.ts +++ b/app/scripts/modules/google/src/serverGroup/details/autoHealingPolicy/autoHealingPolicy.component.ts @@ -9,6 +9,7 @@ class GceAutoHealingPolicyDetailsCtrl implements IController { public serverGroup: IGceServerGroup; public application: Application; + public static $inject = ['$uibModal', 'confirmationModalService', 'gceAutoscalingPolicyWriter']; constructor( private $uibModal: IModalService, private confirmationModalService: ConfirmationModalService, diff --git a/app/scripts/modules/google/src/serverGroup/details/autoHealingPolicy/modal/upsertAutoHealingPolicy.modal.controller.ts b/app/scripts/modules/google/src/serverGroup/details/autoHealingPolicy/modal/upsertAutoHealingPolicy.modal.controller.ts index 11f9365604c..332eeba3040 100644 --- a/app/scripts/modules/google/src/serverGroup/details/autoHealingPolicy/modal/upsertAutoHealingPolicy.modal.controller.ts +++ b/app/scripts/modules/google/src/serverGroup/details/autoHealingPolicy/modal/upsertAutoHealingPolicy.modal.controller.ts @@ -18,6 +18,7 @@ class GceUpsertAutoHealingPolicyModalCtrl implements IController { public isNew: boolean; public submitButtonLabel: string; + public static $inject = ['$uibModalInstance', 'application', 'serverGroup', 'gceHealthCheckReader', 'gceAutoscalingPolicyWriter']; constructor( private $uibModalInstance: IModalServiceInstance, private application: Application, diff --git a/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/addAutoscalingPolicyButton.component.js b/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/addAutoscalingPolicyButton.component.js index 131b6b62356..8c292ea7ab0 100644 --- a/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/addAutoscalingPolicyButton.component.js +++ b/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/addAutoscalingPolicyButton.component.js @@ -13,7 +13,7 @@ module.exports = angular application: '=', }, template: 'Create new scaling policy', - controller: function($uibModal) { + controller: ['$uibModal', function($uibModal) { this.addAutoscalingPolicy = () => { $uibModal.open({ templateUrl: require('./modal/upsertAutoscalingPolicy.modal.html'), @@ -27,5 +27,5 @@ module.exports = angular }, }); }; - }, + }], }); diff --git a/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/autoscalingPolicy.directive.js b/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/autoscalingPolicy.directive.js index 61b4916f420..7a3f085f69b 100644 --- a/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/autoscalingPolicy.directive.js +++ b/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/autoscalingPolicy.directive.js @@ -18,7 +18,7 @@ module.exports = angular serverGroup: '=', }, templateUrl: require('./autoscalingPolicy.directive.html'), - controller: function($uibModal, gceAutoscalingPolicyWriter, confirmationModalService) { + controller: ['$uibModal', 'gceAutoscalingPolicyWriter', 'confirmationModalService', function($uibModal, gceAutoscalingPolicyWriter, confirmationModalService) { const policy = this.policy; policy.bases = []; @@ -102,5 +102,5 @@ module.exports = angular submitMethod: () => gceAutoscalingPolicyWriter.deleteAutoscalingPolicy(this.application, this.serverGroup), }); }; - }, + }], }); diff --git a/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/modal/upsertAutoscalingPolicy.modal.controller.js b/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/modal/upsertAutoscalingPolicy.modal.controller.js index 0901f34076f..f3eab3404ba 100644 --- a/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/modal/upsertAutoscalingPolicy.modal.controller.js +++ b/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/modal/upsertAutoscalingPolicy.modal.controller.js @@ -12,7 +12,7 @@ module.exports = angular require('google/autoscalingPolicy/components/basicSettings/basicSettings.component').name, require('google/autoscalingPolicy/components/metricSettings/metricSettings.component').name, ]) - .controller('gceUpsertAutoscalingPolicyModalCtrl', function( + .controller('gceUpsertAutoscalingPolicyModalCtrl', ['policy', 'application', 'serverGroup', '$uibModalInstance', 'gceAutoscalingPolicyWriter', function( policy, application, serverGroup, @@ -36,4 +36,4 @@ module.exports = angular this.taskMonitor.submit(submitMethod); }; - }); + }]); diff --git a/app/scripts/modules/google/src/serverGroup/details/resize/resizeAutoscalingPolicy.component.js b/app/scripts/modules/google/src/serverGroup/details/resize/resizeAutoscalingPolicy.component.js index 523b86e49b3..aa8711b2edf 100644 --- a/app/scripts/modules/google/src/serverGroup/details/resize/resizeAutoscalingPolicy.component.js +++ b/app/scripts/modules/google/src/serverGroup/details/resize/resizeAutoscalingPolicy.component.js @@ -16,7 +16,7 @@ module.exports = angular application: '=', }, templateUrl: require('./resizeAutoscalingPolicy.component.html'), - controller: function($scope, gceAutoscalingPolicyWriter) { + controller: ['$scope', 'gceAutoscalingPolicyWriter', function($scope, gceAutoscalingPolicyWriter) { const newPolicyBounds = ['newMinNumReplicas', 'newMaxNumReplicas']; newPolicyBounds.forEach(prop => (this.command[prop] = null)); @@ -44,5 +44,5 @@ module.exports = angular ); }, }); - }, + }], }); diff --git a/app/scripts/modules/google/src/serverGroup/details/resize/resizeCapacity.component.js b/app/scripts/modules/google/src/serverGroup/details/resize/resizeCapacity.component.js index 00c7b8780d5..6ddfa1df5d5 100644 --- a/app/scripts/modules/google/src/serverGroup/details/resize/resizeCapacity.component.js +++ b/app/scripts/modules/google/src/serverGroup/details/resize/resizeCapacity.component.js @@ -15,7 +15,7 @@ module.exports = angular formMethods: '=', }, templateUrl: require('./resizeCapacity.component.html'), - controller: function($scope, serverGroupWriter) { + controller: ['$scope', 'serverGroupWriter', function($scope, serverGroupWriter) { this.command.newSize = null; angular.extend(this.formMethods, { @@ -31,5 +31,5 @@ module.exports = angular }); }, }); - }, + }], }); diff --git a/app/scripts/modules/google/src/serverGroup/details/resize/resizeServerGroup.controller.js b/app/scripts/modules/google/src/serverGroup/details/resize/resizeServerGroup.controller.js index fe8fc9c36d2..f732f761c0e 100644 --- a/app/scripts/modules/google/src/serverGroup/details/resize/resizeServerGroup.controller.js +++ b/app/scripts/modules/google/src/serverGroup/details/resize/resizeServerGroup.controller.js @@ -10,7 +10,7 @@ module.exports = angular require('./resizeAutoscalingPolicy.component').name, require('../../../common/footer.directive').name, ]) - .controller('gceResizeServerGroupCtrl', function($scope, $uibModalInstance, application, serverGroup) { + .controller('gceResizeServerGroupCtrl', ['$scope', '$uibModalInstance', 'application', 'serverGroup', function($scope, $uibModalInstance, application, serverGroup) { $scope.serverGroup = serverGroup; $scope.application = application; $scope.verification = {}; @@ -50,4 +50,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/google/src/serverGroup/details/rollback/rollbackServerGroup.controller.js b/app/scripts/modules/google/src/serverGroup/details/rollback/rollbackServerGroup.controller.js index ffb8c496e27..3d98490017b 100644 --- a/app/scripts/modules/google/src/serverGroup/details/rollback/rollbackServerGroup.controller.js +++ b/app/scripts/modules/google/src/serverGroup/details/rollback/rollbackServerGroup.controller.js @@ -9,7 +9,7 @@ module.exports = angular SERVER_GROUP_WRITER, require('../../../common/footer.directive').name, ]) - .controller('gceRollbackServerGroupCtrl', function( + .controller('gceRollbackServerGroupCtrl', ['$scope', '$uibModalInstance', 'serverGroupWriter', 'application', 'serverGroup', 'disabledServerGroups', function( $scope, $uibModalInstance, serverGroupWriter, @@ -67,4 +67,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/google/src/serverGroup/details/serverGroupDetails.gce.controller.js b/app/scripts/modules/google/src/serverGroup/details/serverGroupDetails.gce.controller.js index e8f1f1e1c8f..a0240a20dd2 100644 --- a/app/scripts/modules/google/src/serverGroup/details/serverGroupDetails.gce.controller.js +++ b/app/scripts/modules/google/src/serverGroup/details/serverGroupDetails.gce.controller.js @@ -30,7 +30,7 @@ module.exports = angular require('./autoscalingPolicy/autoscalingPolicy.directive').name, require('./autoscalingPolicy/addAutoscalingPolicyButton.component').name, ]) - .controller('gceServerGroupDetailsCtrl', function( + .controller('gceServerGroupDetailsCtrl', ['$scope', '$state', '$templateCache', '$interpolate', 'app', 'serverGroup', 'gceServerGroupCommandBuilder', '$uibModal', 'confirmationModalService', 'serverGroupWriter', 'gceXpnNamingService', function( $scope, $state, $templateCache, @@ -542,4 +542,4 @@ module.exports = angular const configureEntityTagTargets = () => { this.entityTagTargets = ClusterTargetBuilder.buildClusterTargets(this.serverGroup); }; - }); + }]); diff --git a/app/scripts/modules/google/src/serverGroup/serverGroup.transformer.js b/app/scripts/modules/google/src/serverGroup/serverGroup.transformer.js index b012714e3ce..ddbfd875260 100644 --- a/app/scripts/modules/google/src/serverGroup/serverGroup.transformer.js +++ b/app/scripts/modules/google/src/serverGroup/serverGroup.transformer.js @@ -7,7 +7,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.gce.serverGroup.transformer', [GCE_HTTP_LOAD_BALANCER_UTILS]) - .factory('gceServerGroupTransformer', function(gceHttpLoadBalancerUtils) { + .factory('gceServerGroupTransformer', ['gceHttpLoadBalancerUtils', function(gceHttpLoadBalancerUtils) { function normalizeServerGroup(serverGroup, application) { return application .getDataSource('loadBalancers') @@ -55,4 +55,4 @@ module.exports = angular convertServerGroupCommandToDeployConfiguration: convertServerGroupCommandToDeployConfiguration, normalizeServerGroup: normalizeServerGroup, }; - }); + }]); diff --git a/app/scripts/modules/google/src/validation/applicationName.validator.js b/app/scripts/modules/google/src/validation/applicationName.validator.js index 47306c609e1..86b6e31615a 100644 --- a/app/scripts/modules/google/src/validation/applicationName.validator.js +++ b/app/scripts/modules/google/src/validation/applicationName.validator.js @@ -105,6 +105,6 @@ module.exports = angular validate: validate, }; }) - .run(function(gceApplicationNameValidator) { + .run(['gceApplicationNameValidator', function(gceApplicationNameValidator) { ApplicationNameValidator.registerValidator('gce', gceApplicationNameValidator); - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/cache/configurer.service.js b/app/scripts/modules/kubernetes/src/cache/configurer.service.js index 938930b97e0..d7fa2863c7f 100644 --- a/app/scripts/modules/kubernetes/src/cache/configurer.service.js +++ b/app/scripts/modules/kubernetes/src/cache/configurer.service.js @@ -6,7 +6,7 @@ import { AccountService, LOAD_BALANCER_READ_SERVICE } from '@spinnaker/core'; module.exports = angular .module('spinnaker.kubernetes.cache.initializer', [LOAD_BALANCER_READ_SERVICE]) - .factory('kubernetesCacheConfigurer', function(loadBalancerReader) { + .factory('kubernetesCacheConfigurer', ['loadBalancerReader', function(loadBalancerReader) { let config = Object.create(null); config.account = { @@ -18,4 +18,4 @@ module.exports = angular }; return config; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/container/configurer.directive.js b/app/scripts/modules/kubernetes/src/container/configurer.directive.js index e84d2ba07ca..cbb16616bb4 100644 --- a/app/scripts/modules/kubernetes/src/container/configurer.directive.js +++ b/app/scripts/modules/kubernetes/src/container/configurer.directive.js @@ -22,7 +22,7 @@ module.exports = angular }, }; }) - .controller('kubernetesContainerConfigurerController', function($scope) { + .controller('kubernetesContainerConfigurerController', ['$scope', function($scope) { this.cpuPattern = /^\d+(m)?$/; this.memoryPattern = /^\d+(Mi|Gi)?$/; this.pullPolicies = ['IFNOTPRESENT', 'ALWAYS', 'NEVER']; @@ -75,4 +75,4 @@ module.exports = angular } $scope.container.lifecycle.preStop = handler; }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/container/probe.directive.js b/app/scripts/modules/kubernetes/src/container/probe.directive.js index 64cd8580884..05ff734b726 100644 --- a/app/scripts/modules/kubernetes/src/container/probe.directive.js +++ b/app/scripts/modules/kubernetes/src/container/probe.directive.js @@ -16,7 +16,7 @@ module.exports = angular }, }; }) - .controller('kubernetesContainerProbeController', function($scope) { + .controller('kubernetesContainerProbeController', ['$scope', function($scope) { this.uriSchemes = ['HTTP', 'HTTPS']; this.maxPort = 65535; this.handlers = ['EXEC', 'HTTP', 'TCP']; @@ -105,4 +105,4 @@ module.exports = angular }; this.prepareProbe(); - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/event/event.directive.js b/app/scripts/modules/kubernetes/src/event/event.directive.js index 2e341cdce58..a75988886d3 100644 --- a/app/scripts/modules/kubernetes/src/event/event.directive.js +++ b/app/scripts/modules/kubernetes/src/event/event.directive.js @@ -15,7 +15,7 @@ module.exports = angular }, }; }) - .controller('kubernetesEventController', function($scope, $uibModal) { + .controller('kubernetesEventController', ['$scope', '$uibModal', function($scope, $uibModal) { if ($scope.event.message) { this.displayMessage = $scope.event.message.substring(0, 40); } @@ -34,4 +34,4 @@ module.exports = angular scope: $scope, }); }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/instance/details/details.controller.js b/app/scripts/modules/kubernetes/src/instance/details/details.controller.js index e3adb254835..5251dd34bd4 100644 --- a/app/scripts/modules/kubernetes/src/instance/details/details.controller.js +++ b/app/scripts/modules/kubernetes/src/instance/details/details.controller.js @@ -19,7 +19,7 @@ module.exports = angular INSTANCE_WRITE_SERVICE, CONFIRMATION_MODAL_SERVICE, ]) - .controller('kubernetesInstanceDetailsController', function( + .controller('kubernetesInstanceDetailsController', ['$scope', '$state', '$uibModal', 'instanceWriter', 'confirmationModalService', 'instance', 'app', 'moniker', 'environment', 'kubernetesProxyUiService', '$q', function( $scope, $state, $uibModal, @@ -300,4 +300,4 @@ module.exports = angular }); $scope.account = instance.account; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/advancedSettings.controller.js b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/advancedSettings.controller.js index dee88c54a27..46ddc4ff2e5 100644 --- a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/advancedSettings.controller.js +++ b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/advancedSettings.controller.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.loadBalancer.configure.kubernetes.advancedSettings', []) - .controller('kubernetesLoadBalancerAdvancedSettingsController', function($scope) { + .controller('kubernetesLoadBalancerAdvancedSettingsController', ['$scope', function($scope) { this.addExternalIp = function() { $scope.loadBalancer.externalIps.push({}); }; @@ -15,4 +15,4 @@ module.exports = angular this.sessionAffinities = ['None', 'ClientIP']; this.types = ['ClusterIP', 'LoadBalancer', 'NodePort']; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/ports.controller.js b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/ports.controller.js index 3e394f3e6b3..8c8b8ec97cf 100644 --- a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/ports.controller.js +++ b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/ports.controller.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.loadBalancer.configure.kubernetes.ports', []) - .controller('kubernetesLoadBalancerPortsController', function($scope) { + .controller('kubernetesLoadBalancerPortsController', ['$scope', function($scope) { this.addPort = function() { $scope.loadBalancer.ports.push({}); }; @@ -15,4 +15,4 @@ module.exports = angular this.protocols = ['TCP', 'UDP']; this.maxPort = 65535; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/upsert.controller.js b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/upsert.controller.js index ad0d8c9fb30..b9d1f3acb33 100644 --- a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/upsert.controller.js +++ b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/upsert.controller.js @@ -10,7 +10,7 @@ module.exports = angular require('../../../namespace/selectField.directive').name, require('../../transformer').name, ]) - .controller('kubernetesUpsertLoadBalancerController', function( + .controller('kubernetesUpsertLoadBalancerController', ['$scope', '$uibModalInstance', '$state', 'application', 'loadBalancer', 'isNew', 'kubernetesLoadBalancerTransformer', function( $scope, $uibModalInstance, $state, @@ -154,4 +154,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/details/details.controller.js b/app/scripts/modules/kubernetes/src/loadBalancer/details/details.controller.js index cf141678c5b..c882129b531 100644 --- a/app/scripts/modules/kubernetes/src/loadBalancer/details/details.controller.js +++ b/app/scripts/modules/kubernetes/src/loadBalancer/details/details.controller.js @@ -12,7 +12,7 @@ module.exports = angular require('@uirouter/angularjs').default, CONFIRMATION_MODAL_SERVICE, ]) - .controller('kubernetesLoadBalancerDetailsController', function( + .controller('kubernetesLoadBalancerDetailsController', ['$interpolate', '$scope', '$state', '$uibModal', 'loadBalancer', 'app', 'confirmationModalService', 'kubernetesProxyUiService', function( $interpolate, $scope, $state, @@ -134,4 +134,4 @@ module.exports = angular submitMethod: submitMethod, }); }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/transformer.js b/app/scripts/modules/kubernetes/src/loadBalancer/transformer.js index 9dae35854ff..972b34d4ab6 100644 --- a/app/scripts/modules/kubernetes/src/loadBalancer/transformer.js +++ b/app/scripts/modules/kubernetes/src/loadBalancer/transformer.js @@ -8,7 +8,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.kubernetes.loadBalancer.transformer', []) - .factory('kubernetesLoadBalancerTransformer', function($q) { + .factory('kubernetesLoadBalancerTransformer', ['$q', function($q) { function normalizeLoadBalancer(loadBalancer) { loadBalancer.provider = loadBalancer.type; loadBalancer.instances = []; @@ -75,4 +75,4 @@ module.exports = angular constructNewLoadBalancerTemplate: constructNewLoadBalancerTemplate, convertLoadBalancerForEditing: convertLoadBalancerForEditing, }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/kubernetesDestroyAsgStage.js b/app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/kubernetesDestroyAsgStage.js index 548bc864109..57ff1c99259 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/kubernetesDestroyAsgStage.js +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/kubernetesDestroyAsgStage.js @@ -28,7 +28,7 @@ module.exports = angular ], }); }) - .controller('kubernetesDestroyAsgStageCtrl', function($scope) { + .controller('kubernetesDestroyAsgStageCtrl', ['$scope', function($scope) { let stage = $scope.stage; $scope.state = { @@ -55,4 +55,4 @@ module.exports = angular if (!stage.target) { stage.target = $scope.targets[0].val; } - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/kubernetesDisableAsgStage.js b/app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/kubernetesDisableAsgStage.js index e2e384993eb..fe8136e93eb 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/kubernetesDisableAsgStage.js +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/kubernetesDisableAsgStage.js @@ -26,7 +26,7 @@ module.exports = angular ], }); }) - .controller('kubernetesDisableAsgStageController', function($scope) { + .controller('kubernetesDisableAsgStageController', ['$scope', function($scope) { let stage = $scope.stage; $scope.state = { @@ -53,4 +53,4 @@ module.exports = angular if (!stage.target) { stage.target = $scope.targets[0].val; } - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/disableCluster/kubernetesDisableClusterStage.js b/app/scripts/modules/kubernetes/src/pipeline/stages/disableCluster/kubernetesDisableClusterStage.js index 4f5f4511591..6fa1a6c4926 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/disableCluster/kubernetesDisableClusterStage.js +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/disableCluster/kubernetesDisableClusterStage.js @@ -25,7 +25,7 @@ module.exports = angular ], }); }) - .controller('kubernetesDisableClusterStageCtrl', function($scope) { + .controller('kubernetesDisableClusterStageCtrl', ['$scope', function($scope) { var ctrl = this; let stage = $scope.stage; @@ -63,4 +63,4 @@ module.exports = angular stage.preferLargerOverNewer = 'false'; } stage.preferLargerOverNewer = stage.preferLargerOverNewer.toString(); - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/kubernetesEnableAsgStage.js b/app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/kubernetesEnableAsgStage.js index 1373e35f962..7459d003e32 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/kubernetesEnableAsgStage.js +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/kubernetesEnableAsgStage.js @@ -22,7 +22,7 @@ module.exports = angular ], }); }) - .controller('kubernetesEnableAsgStageCtrl', function($scope) { + .controller('kubernetesEnableAsgStageCtrl', ['$scope', function($scope) { let stage = $scope.stage; $scope.state = { @@ -50,4 +50,4 @@ module.exports = angular } $scope.$watch('stage.credentials', $scope.accountUpdated); - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/findAmi/kubernetesFindAmiStage.js b/app/scripts/modules/kubernetes/src/pipeline/stages/findAmi/kubernetesFindAmiStage.js index 1234926ac2e..891c4d8eed7 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/findAmi/kubernetesFindAmiStage.js +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/findAmi/kubernetesFindAmiStage.js @@ -20,7 +20,7 @@ module.exports = angular ], }); }) - .controller('kubernetesFindAmiStageController', function($scope) { + .controller('kubernetesFindAmiStageController', ['$scope', function($scope) { let stage = $scope.stage; $scope.state = { @@ -69,4 +69,4 @@ module.exports = angular } $scope.$watch('stage.credentials', $scope.accountUpdated); - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStage.js b/app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStage.js index e9476e967ef..001956bd223 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStage.js +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStage.js @@ -29,7 +29,7 @@ module.exports = angular ], }); }) - .controller('kubernetesResizeStageController', function($scope) { + .controller('kubernetesResizeStageController', ['$scope', function($scope) { var ctrl = this; let stage = $scope.stage; @@ -109,4 +109,4 @@ module.exports = angular } } }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/configureJob.controller.js b/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/configureJob.controller.js index 5f8fad3f526..52538cde493 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/configureJob.controller.js +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/configureJob.controller.js @@ -19,7 +19,7 @@ module.exports = angular KUBERNETES_LIFECYCLE_HOOK_CONFIGURER, KUBERNETES_CONTAINER_ENVIRONMENT_FROM, ]) - .controller('kubernetesConfigureJobController', function( + .controller('kubernetesConfigureJobController', ['$scope', '$uibModalInstance', 'kubernetesImageReader', '$filter', 'stage', 'pipeline', function( $scope, $uibModalInstance, kubernetesImageReader, @@ -182,4 +182,4 @@ module.exports = angular this.cancel = () => { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobExecutionDetails.controller.js b/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobExecutionDetails.controller.js index 6dadc6f2a1f..5e3d7d3bd07 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobExecutionDetails.controller.js +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobExecutionDetails.controller.js @@ -8,7 +8,7 @@ module.exports = angular .module('spinnaker.kubernetes.pipeline.stage.disableCluster.runJobExecutionDetails.controller', [ require('@uirouter/angularjs').default, ]) - .controller('kubernetesRunJobExecutionDetailsCtrl', function( + .controller('kubernetesRunJobExecutionDetailsCtrl', ['$scope', '$stateParams', 'executionService', 'executionDetailsSectionService', '$uibModal', function( $scope, $stateParams, executionService, @@ -55,4 +55,4 @@ module.exports = angular }); } }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobStage.js b/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobStage.js index 21ee8a9d024..a3d47062653 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobStage.js +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobStage.js @@ -30,7 +30,7 @@ module.exports = angular validators: [{ type: 'requiredField', fieldName: 'account' }, { type: 'requiredField', fieldName: 'namespace' }], }); }) - .controller('kubernetesRunJobStageCtrl', function($scope, $uibModal) { + .controller('kubernetesRunJobStageCtrl', ['$scope', '$uibModal', function($scope, $uibModal) { this.stage = $scope.stage; this.pipeline = $scope.pipeline; this.stage.cloudProvider = 'kubernetes'; @@ -58,4 +58,4 @@ module.exports = angular }) .catch(() => {}); }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.js b/app/scripts/modules/kubernetes/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.js index 7ac417b68aa..478613aff53 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.js +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.js @@ -25,7 +25,7 @@ module.exports = angular strategy: true, }); }) - .controller('kubernetesScaleDownClusterStageCtrl', function($scope) { + .controller('kubernetesScaleDownClusterStageCtrl', ['$scope', function($scope) { var ctrl = this; let stage = $scope.stage; @@ -66,4 +66,4 @@ module.exports = angular stage.preferLargerOverNewer = 'false'; } stage.preferLargerOverNewer = stage.preferLargerOverNewer.toString(); - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/shrinkCluster/shrinkClusterStage.js b/app/scripts/modules/kubernetes/src/pipeline/stages/shrinkCluster/shrinkClusterStage.js index a21df8f3830..b80e9e8d154 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/shrinkCluster/shrinkClusterStage.js +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/shrinkCluster/shrinkClusterStage.js @@ -22,7 +22,7 @@ module.exports = angular ], }); }) - .controller('kubernetesShrinkClusterStageCtrl', function($scope) { + .controller('kubernetesShrinkClusterStageCtrl', ['$scope', function($scope) { var ctrl = this; let stage = $scope.stage; @@ -63,4 +63,4 @@ module.exports = angular stage.retainLargerOverNewer = 'false'; } stage.retainLargerOverNewer = stage.retainLargerOverNewer.toString(); - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/proxy/ui.service.js b/app/scripts/modules/kubernetes/src/proxy/ui.service.js index e225fa7e1ff..cbe4ab48607 100644 --- a/app/scripts/modules/kubernetes/src/proxy/ui.service.js +++ b/app/scripts/modules/kubernetes/src/proxy/ui.service.js @@ -6,7 +6,7 @@ import { KubernetesProviderSettings } from '../kubernetes.settings'; module.exports = angular .module('spinnaker.proxy.kubernetes.ui.service', []) - .factory('kubernetesProxyUiService', function($interpolate) { + .factory('kubernetesProxyUiService', ['$interpolate', function($interpolate) { function getHost(accountName) { let host = KubernetesProviderSettings.defaults.proxy; let account = KubernetesProviderSettings[accountName]; @@ -44,4 +44,4 @@ module.exports = angular buildLink: buildLink, getInstanceLink: getInstanceLink, }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/search/resultFormatter.js b/app/scripts/modules/kubernetes/src/search/resultFormatter.js index 5357f7a7ff1..e285d92e495 100644 --- a/app/scripts/modules/kubernetes/src/search/resultFormatter.js +++ b/app/scripts/modules/kubernetes/src/search/resultFormatter.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.kubernetes.search.formatter', []) - .factory('kubernetesSearchResultFormatter', function($q) { + .factory('kubernetesSearchResultFormatter', ['$q', function($q) { return { instances: function(entry) { return $q.when((entry.name || entry.instanceId) + ' (' + entry.namespace + ')'); @@ -16,4 +16,4 @@ module.exports = angular return $q.when(entry.name + ' (' + (entry.namespace || entry.region) + ')'); }, }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/rules.controller.js b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/rules.controller.js index e2740f92beb..0505c145163 100644 --- a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/rules.controller.js +++ b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/rules.controller.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.securityGroup.configure.kubernetes.ports', [require('../../transformer').name]) - .controller('kubernetesSecurityGroupRulesController', function($scope, kubernetesSecurityGroupTransformer) { + .controller('kubernetesSecurityGroupRulesController', ['$scope', 'kubernetesSecurityGroupTransformer', function($scope, kubernetesSecurityGroupTransformer) { this.addRule = function() { $scope.securityGroup.rules.push(kubernetesSecurityGroupTransformer.constructNewIngressRule()); }; @@ -22,4 +22,4 @@ module.exports = angular }; this.maxPort = 65535; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/tls.controller.js b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/tls.controller.js index 6952259cd7a..a656d618c08 100644 --- a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/tls.controller.js +++ b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/tls.controller.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.securityGroup.configure.kubernetes.tls', [require('../../transformer').name]) - .controller('kubernetesSecurityGroupTLSController', function($scope, kubernetesSecurityGroupTransformer) { + .controller('kubernetesSecurityGroupTLSController', ['$scope', 'kubernetesSecurityGroupTransformer', function($scope, kubernetesSecurityGroupTransformer) { this.addTLSEntry = function() { $scope.securityGroup.tls.push(kubernetesSecurityGroupTransformer.constructNewIngressTLS()); }; @@ -12,4 +12,4 @@ module.exports = angular this.removeTLSEntry = function(i) { $scope.securityGroup.tls.splice(i, 1); }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/upsert.controller.js b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/upsert.controller.js index 3a80f7508d7..fe8df717740 100644 --- a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/upsert.controller.js +++ b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/upsert.controller.js @@ -19,7 +19,7 @@ module.exports = angular require('../../../namespace/selectField.directive').name, require('../../transformer').name, ]) - .controller('kubernetesUpsertSecurityGroupController', function( + .controller('kubernetesUpsertSecurityGroupController', ['$q', '$scope', '$uibModalInstance', '$state', 'application', 'securityGroup', 'kubernetesSecurityGroupTransformer', 'securityGroupReader', 'loadBalancerReader', function( $q, $scope, $uibModalInstance, @@ -213,4 +213,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/securityGroup/details/details.controller.js b/app/scripts/modules/kubernetes/src/securityGroup/details/details.controller.js index aae6e3bc55c..37f830ab2b5 100644 --- a/app/scripts/modules/kubernetes/src/securityGroup/details/details.controller.js +++ b/app/scripts/modules/kubernetes/src/securityGroup/details/details.controller.js @@ -18,7 +18,7 @@ module.exports = angular SECURITY_GROUP_READER, CONFIRMATION_MODAL_SERVICE, ]) - .controller('kubernetesSecurityGroupDetailsController', function( + .controller('kubernetesSecurityGroupDetailsController', ['$scope', '$state', 'resolvedSecurityGroup', 'app', 'confirmationModalService', 'securityGroupReader', '$uibModal', function( $scope, $state, resolvedSecurityGroup, @@ -140,4 +140,4 @@ module.exports = angular refresh: extractSecurityGroup, }; } - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/securityGroup/transformer.js b/app/scripts/modules/kubernetes/src/securityGroup/transformer.js index 24d40500f52..4755a6d5459 100644 --- a/app/scripts/modules/kubernetes/src/securityGroup/transformer.js +++ b/app/scripts/modules/kubernetes/src/securityGroup/transformer.js @@ -6,7 +6,7 @@ import { KubernetesProviderSettings } from '../kubernetes.settings'; module.exports = angular .module('spinnaker.kubernetes.securityGroup.transformer', []) - .factory('kubernetesSecurityGroupTransformer', function($q) { + .factory('kubernetesSecurityGroupTransformer', ['$q', function($q) { function normalizeSecurityGroup(securityGroup) { return $q.when(securityGroup); // no-op } @@ -63,4 +63,4 @@ module.exports = angular constructNewIngressPath: constructNewIngressPath, constructNewIngressTLS: constructNewIngressTLS, }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/CommandBuilder.js b/app/scripts/modules/kubernetes/src/serverGroup/configure/CommandBuilder.js index 636b3b27142..82c671d6719 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/configure/CommandBuilder.js +++ b/app/scripts/modules/kubernetes/src/serverGroup/configure/CommandBuilder.js @@ -6,7 +6,7 @@ module.exports = angular .module('spinnaker.kubernetes.serverGroupCommandBuilder.service', [ require('../../cluster/cluster.kubernetes.module').name, ]) - .factory('kubernetesServerGroupCommandBuilder', function($q, kubernetesClusterCommandBuilder) { + .factory('kubernetesServerGroupCommandBuilder', ['$q', 'kubernetesClusterCommandBuilder', function($q, kubernetesClusterCommandBuilder) { function buildNewServerGroupCommand(application, defaults) { if (defaults == null) { defaults = {}; @@ -45,4 +45,4 @@ module.exports = angular buildNewServerGroupCommandForPipeline: buildNewServerGroupCommandForPipeline, buildServerGroupCommandFromPipeline: buildServerGroupCommandFromPipeline, }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/configuration.service.js b/app/scripts/modules/kubernetes/src/serverGroup/configure/configuration.service.js index 1e9ab5249d2..a160d1f5328 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/configure/configuration.service.js +++ b/app/scripts/modules/kubernetes/src/serverGroup/configure/configuration.service.js @@ -11,7 +11,7 @@ module.exports = angular LOAD_BALANCER_READ_SERVICE, require('../../image/image.reader').name, ]) - .factory('kubernetesServerGroupConfigurationService', function( + .factory('kubernetesServerGroupConfigurationService', ['$q', 'kubernetesImageReader', 'loadBalancerReader', 'cacheInitializer', function( $q, kubernetesImageReader, loadBalancerReader, @@ -312,4 +312,4 @@ module.exports = angular configureAccount: configureAccount, refreshLoadBalancers: refreshLoadBalancers, }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/BasicSettings.controller.js b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/BasicSettings.controller.js index 887922643a9..15e6875f9fd 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/BasicSettings.controller.js +++ b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/BasicSettings.controller.js @@ -8,7 +8,7 @@ module.exports = angular require('@uirouter/angularjs').default, require('angular-ui-bootstrap'), ]) - .controller('kubernetesServerGroupBasicSettingsController', function( + .controller('kubernetesServerGroupBasicSettingsController', ['$scope', '$controller', '$uibModalStack', '$state', 'kubernetesImageReader', 'kubernetesServerGroupConfigurationService', function( $scope, $controller, $uibModalStack, @@ -47,4 +47,4 @@ module.exports = angular $state: $state, }), ); - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/Clone.controller.js b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/Clone.controller.js index f97a2546dfe..8d5ec742199 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/Clone.controller.js +++ b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/Clone.controller.js @@ -10,7 +10,7 @@ module.exports = angular SERVER_GROUP_WRITER, require('../configuration.service').name, ]) - .controller('kubernetesCloneServerGroupController', function( + .controller('kubernetesCloneServerGroupController', ['$scope', '$uibModalInstance', '$q', '$state', 'serverGroupWriter', 'kubernetesServerGroupConfigurationService', 'serverGroupCommand', 'application', 'title', '$timeout', 'wizardSubFormValidation', function( $scope, $uibModalInstance, $q, @@ -136,4 +136,4 @@ module.exports = angular $scope.state.requiresTemplateSelection = false; configureCommand(); }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/advancedSettings.controller.js b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/advancedSettings.controller.js index f13a3f9ed42..47637864420 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/advancedSettings.controller.js +++ b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/advancedSettings.controller.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.serverGroup.configure.kubernetes.advancedSettings', []) - .controller('kubernetesServerGroupAdvancedSettingsController', function($scope) { + .controller('kubernetesServerGroupAdvancedSettingsController', ['$scope', function($scope) { if (!$scope.command.dnsPolicy) { $scope.command.dnsPolicy = 'ClusterFirst'; } @@ -15,4 +15,4 @@ module.exports = angular $scope.command.tolerations = tolerations; $scope.$applyAsync(); }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/deployment.controller.js b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/deployment.controller.js index 6e23ef56c5d..264bafd8ea8 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/deployment.controller.js +++ b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/deployment.controller.js @@ -6,7 +6,7 @@ import { NameUtils } from '@spinnaker/core'; module.exports = angular .module('spinnaker.serverGroup.configure.kubernetes.deployment', []) - .controller('kubernetesServerGroupDeploymentController', function($scope) { + .controller('kubernetesServerGroupDeploymentController', ['$scope', function($scope) { this.strategyTypes = ['RollingUpdate', 'Recreate']; this.deploymentConfigWarning = function() { @@ -53,4 +53,4 @@ module.exports = angular return undefined; } }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/loadBalancers.controller.js b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/loadBalancers.controller.js index 31d8751970a..5edac392178 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/loadBalancers.controller.js +++ b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/loadBalancers.controller.js @@ -8,7 +8,7 @@ module.exports = angular .module('spinnaker.kubernetes.serverGroup.configure.loadBalancers.controller', [ require('../configuration.service').name, ]) - .controller('kubernetesServerGroupLoadBalancersController', function( + .controller('kubernetesServerGroupLoadBalancersController', ['kubernetesServerGroupConfigurationService', '$scope', function( kubernetesServerGroupConfigurationService, $scope, ) { @@ -19,4 +19,4 @@ module.exports = angular this.getLoadBalancerRefreshTime = function() { return InfrastructureCaches.get('loadBalancers').getStats().ageMax; }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/volumes.controller.js b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/volumes.controller.js index 262ae4f42e2..ac7ae1d9bd8 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/volumes.controller.js +++ b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/volumes.controller.js @@ -4,7 +4,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.serverGroup.configure.kubernetes.volumes', []) - .controller('kubernetesServerGroupVolumesController', function($scope) { + .controller('kubernetesServerGroupVolumesController', ['$scope', function($scope) { this.volumeTypes = [ 'CONFIGMAP', 'EMPTYDIR', @@ -139,4 +139,4 @@ module.exports = angular }; this.prepVolumes(); - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/serverGroup/details/details.controller.js b/app/scripts/modules/kubernetes/src/serverGroup/details/details.controller.js index 340c4bdde17..3448ab20d08 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/details/details.controller.js +++ b/app/scripts/modules/kubernetes/src/serverGroup/details/details.controller.js @@ -19,7 +19,7 @@ module.exports = angular SERVER_GROUP_WRITER, require('../paramsMixin').name, ]) - .controller('kubernetesServerGroupDetailsController', function( + .controller('kubernetesServerGroupDetailsController', ['$scope', '$state', 'app', 'serverGroup', '$uibModal', 'serverGroupWriter', 'kubernetesServerGroupCommandBuilder', 'kubernetesServerGroupParamsMixin', 'confirmationModalService', 'kubernetesProxyUiService', function( $scope, $state, app, @@ -280,4 +280,4 @@ module.exports = angular }, }); }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/serverGroup/details/resize/resize.controller.js b/app/scripts/modules/kubernetes/src/serverGroup/details/resize/resize.controller.js index 45cfcd925b3..30f45c05f91 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/details/resize/resize.controller.js +++ b/app/scripts/modules/kubernetes/src/serverGroup/details/resize/resize.controller.js @@ -7,7 +7,7 @@ import { SERVER_GROUP_WRITER, TaskMonitor } from '@spinnaker/core'; module.exports = angular .module('spinnaker.kubernetes.serverGroup.details.resize.controller', [SERVER_GROUP_WRITER]) - .controller('kubernetesResizeServerGroupController', function( + .controller('kubernetesResizeServerGroupController', ['$scope', '$uibModalInstance', 'serverGroupWriter', 'application', 'serverGroup', 'kubernetesAutoscalerWriter', function( $scope, $uibModalInstance, serverGroupWriter, @@ -93,4 +93,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/serverGroup/details/rollback/rollback.controller.js b/app/scripts/modules/kubernetes/src/serverGroup/details/rollback/rollback.controller.js index cdcf7e46c20..e24e90de2a3 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/details/rollback/rollback.controller.js +++ b/app/scripts/modules/kubernetes/src/serverGroup/details/rollback/rollback.controller.js @@ -6,7 +6,7 @@ import { SERVER_GROUP_WRITER, TaskMonitor } from '@spinnaker/core'; module.exports = angular .module('spinnaker.kubernetes.serverGroup.details.rollback.controller', [SERVER_GROUP_WRITER]) - .controller('kubernetesRollbackServerGroupController', function( + .controller('kubernetesRollbackServerGroupController', ['$scope', '$uibModalInstance', 'serverGroupWriter', 'application', 'serverGroup', 'disabledServerGroups', function( $scope, $uibModalInstance, serverGroupWriter, @@ -61,4 +61,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/serverGroup/transformer.js b/app/scripts/modules/kubernetes/src/serverGroup/transformer.js index ff900741785..58e5562a377 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/transformer.js +++ b/app/scripts/modules/kubernetes/src/serverGroup/transformer.js @@ -6,7 +6,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.kubernetes.serverGroup.transformer', []) - .factory('kubernetesServerGroupTransformer', function($q) { + .factory('kubernetesServerGroupTransformer', ['$q', function($q) { function normalizeServerGroup(serverGroup) { return $q.when(serverGroup); // no-op } @@ -41,4 +41,4 @@ module.exports = angular convertServerGroupCommandToDeployConfiguration: convertServerGroupCommandToDeployConfiguration, normalizeServerGroup: normalizeServerGroup, }; - }); + }]); diff --git a/app/scripts/modules/kubernetes/src/v2/instance/details/details.controller.ts b/app/scripts/modules/kubernetes/src/v2/instance/details/details.controller.ts index 17e30eaa0ab..1d73a224603 100644 --- a/app/scripts/modules/kubernetes/src/v2/instance/details/details.controller.ts +++ b/app/scripts/modules/kubernetes/src/v2/instance/details/details.controller.ts @@ -40,6 +40,7 @@ class KubernetesInstanceDetailsController implements IController { public manifest: IManifest; public consoleOutputInstance: IConsoleOutputInstance; + public static $inject = ['instance', '$uibModal', '$q', '$scope', 'app']; constructor( instance: InstanceFromStateParams, private $uibModal: IModalService, diff --git a/app/scripts/modules/kubernetes/src/v2/loadBalancer/details/details.controller.ts b/app/scripts/modules/kubernetes/src/v2/loadBalancer/details/details.controller.ts index 76f8e947a3d..39987446706 100644 --- a/app/scripts/modules/kubernetes/src/v2/loadBalancer/details/details.controller.ts +++ b/app/scripts/modules/kubernetes/src/v2/loadBalancer/details/details.controller.ts @@ -21,6 +21,7 @@ class KubernetesLoadBalancerDetailsController implements IController { private loadBalancerFromParams: ILoadBalancerFromStateParams; public loadBalancer: IKubernetesLoadBalancer; + public static $inject = ['$uibModal', '$state', '$scope', 'loadBalancer', 'app']; constructor( private $uibModal: IModalService, private $state: StateService, diff --git a/app/scripts/modules/kubernetes/src/v2/loadBalancer/transformer.ts b/app/scripts/modules/kubernetes/src/v2/loadBalancer/transformer.ts index be83bf3dd2b..0d3f1e223e7 100644 --- a/app/scripts/modules/kubernetes/src/v2/loadBalancer/transformer.ts +++ b/app/scripts/modules/kubernetes/src/v2/loadBalancer/transformer.ts @@ -6,6 +6,7 @@ import { IServerGroup, IInstanceCounts } from '@spinnaker/core'; import { IKubernetesLoadBalancer } from './details/IKubernetesLoadBalancer'; class KubernetesV2LoadBalancerTransformer { + public static $inject = ['$q']; constructor(private $q: IQService) { 'ngInject'; } diff --git a/app/scripts/modules/kubernetes/src/v2/manifest/delete/delete.controller.ts b/app/scripts/modules/kubernetes/src/v2/manifest/delete/delete.controller.ts index f1484ee1bde..6c2cbabb542 100644 --- a/app/scripts/modules/kubernetes/src/v2/manifest/delete/delete.controller.ts +++ b/app/scripts/modules/kubernetes/src/v2/manifest/delete/delete.controller.ts @@ -25,6 +25,7 @@ class KubernetesManifestDeleteController implements IController { verified: false, }; + public static $inject = ['coordinates', '$uibModalInstance', 'application', 'manifestController']; constructor( coordinates: IManifestCoordinates, private $uibModalInstance: IModalServiceInstance, diff --git a/app/scripts/modules/kubernetes/src/v2/manifest/rollout/pause.controller.ts b/app/scripts/modules/kubernetes/src/v2/manifest/rollout/pause.controller.ts index d9a2eaca3aa..5ebcdef214c 100644 --- a/app/scripts/modules/kubernetes/src/v2/manifest/rollout/pause.controller.ts +++ b/app/scripts/modules/kubernetes/src/v2/manifest/rollout/pause.controller.ts @@ -18,6 +18,7 @@ class KubernetesManifestPauseRolloutController implements IController { verified: false, }; + public static $inject = ['coordinates', '$uibModalInstance', 'application']; constructor( coordinates: IManifestCoordinates, private $uibModalInstance: IModalServiceInstance, diff --git a/app/scripts/modules/kubernetes/src/v2/manifest/rollout/resume.controller.ts b/app/scripts/modules/kubernetes/src/v2/manifest/rollout/resume.controller.ts index 278dab95b5e..e110af9e51e 100644 --- a/app/scripts/modules/kubernetes/src/v2/manifest/rollout/resume.controller.ts +++ b/app/scripts/modules/kubernetes/src/v2/manifest/rollout/resume.controller.ts @@ -18,6 +18,7 @@ class KubernetesManifestResumeRolloutController implements IController { verified: false, }; + public static $inject = ['coordinates', '$uibModalInstance', 'application']; constructor( coordinates: IManifestCoordinates, private $uibModalInstance: IModalServiceInstance, diff --git a/app/scripts/modules/kubernetes/src/v2/manifest/rollout/undo.controller.ts b/app/scripts/modules/kubernetes/src/v2/manifest/rollout/undo.controller.ts index daf505a25a6..3d0ea03f08a 100644 --- a/app/scripts/modules/kubernetes/src/v2/manifest/rollout/undo.controller.ts +++ b/app/scripts/modules/kubernetes/src/v2/manifest/rollout/undo.controller.ts @@ -24,6 +24,7 @@ class KubernetesManifestUndoRolloutController implements IController { verified: false, }; + public static $inject = ['coordinates', 'revisions', '$uibModalInstance', 'application']; constructor( coordinates: IManifestCoordinates, public revisions: IRolloutRevision[], diff --git a/app/scripts/modules/kubernetes/src/v2/manifest/scale/scale.controller.ts b/app/scripts/modules/kubernetes/src/v2/manifest/scale/scale.controller.ts index 85fd1bbb1e0..c57ac5b3403 100644 --- a/app/scripts/modules/kubernetes/src/v2/manifest/scale/scale.controller.ts +++ b/app/scripts/modules/kubernetes/src/v2/manifest/scale/scale.controller.ts @@ -20,6 +20,7 @@ class KubernetesManifestScaleController implements IController { verified: false, }; + public static $inject = ['coordinates', 'currentReplicas', '$uibModalInstance', 'application']; constructor( coordinates: IManifestCoordinates, currentReplicas: number, diff --git a/app/scripts/modules/kubernetes/src/v2/manifest/wizard/manifestEntry.component.ts b/app/scripts/modules/kubernetes/src/v2/manifest/wizard/manifestEntry.component.ts index 7aee1f94378..54563d047af 100644 --- a/app/scripts/modules/kubernetes/src/v2/manifest/wizard/manifestEntry.component.ts +++ b/app/scripts/modules/kubernetes/src/v2/manifest/wizard/manifestEntry.component.ts @@ -12,6 +12,7 @@ class KubernetesManifestCtrl implements IController { public manifests: IManifest[]; public rawManifest: string; + public static $inject = ['$scope']; constructor(private $scope: IScope) { 'ngInject'; } diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deleteManifest/deleteManifestConfig.controller.ts b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deleteManifest/deleteManifestConfig.controller.ts index a2c636e26e6..4cafe8b134c 100644 --- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deleteManifest/deleteManifestConfig.controller.ts +++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deleteManifest/deleteManifestConfig.controller.ts @@ -4,6 +4,7 @@ import { IMultiManifestSelector } from 'kubernetes/v2/manifest/selector/IManifes import { IDeleteOptions } from 'kubernetes/v2/manifest/delete/delete.controller'; export class KubernetesV2DeleteManifestConfigCtrl implements IController { + public static $inject = ['$scope']; constructor(private $scope: IScope) { 'ngInject'; if (this.$scope.stage.isNew) { diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/deployManifestConfig.controller.ts b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/deployManifestConfig.controller.ts index 19e7380c85e..bb3c2ca20cc 100644 --- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/deployManifestConfig.controller.ts +++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/deployManifestConfig.controller.ts @@ -21,6 +21,7 @@ export class KubernetesV2DeployManifestConfigCtrl implements IController { public manifestArtifactDelegate: NgGenericArtifactDelegate; public manifestArtifactController: ExpectedArtifactSelectorViewController; + public static $inject = ['$scope']; constructor(private $scope: IScope) { 'ngInject'; KubernetesManifestCommandBuilder.buildNewManifestCommand( diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/findArtifactsFromResource/findArtifactsFromResourceConfig.controller.ts b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/findArtifactsFromResource/findArtifactsFromResourceConfig.controller.ts index 36dd88fe38a..60b041ec67b 100644 --- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/findArtifactsFromResource/findArtifactsFromResourceConfig.controller.ts +++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/findArtifactsFromResource/findArtifactsFromResourceConfig.controller.ts @@ -6,6 +6,7 @@ import { Application } from '@spinnaker/core'; export class KubernetesV2FindArtifactsFromResourceConfigCtrl implements IController { public application: Application; + public static $inject = ['$scope']; constructor(private $scope: IScope) { 'ngInject'; if (this.$scope.stage.isNew) { diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchManifestConfig.controller.ts b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchManifestConfig.controller.ts index 4fa9fe9aed1..c5674082c04 100644 --- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchManifestConfig.controller.ts +++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchManifestConfig.controller.ts @@ -34,6 +34,7 @@ export class KubernetesV2PatchManifestConfigCtrl implements IController { private manifestArtifactDelegate: NgGenericArtifactDelegate; private manifestArtifactController: ExpectedArtifactSelectorViewController; + public static $inject = ['$scope']; constructor(private $scope: IScope) { 'ngInject'; diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/scaleManifest/scaleManifestConfig.controller.ts b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/scaleManifest/scaleManifestConfig.controller.ts index c5e80d9c635..914b3b95b91 100644 --- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/scaleManifest/scaleManifestConfig.controller.ts +++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/scaleManifest/scaleManifestConfig.controller.ts @@ -7,6 +7,7 @@ import { Application } from '@spinnaker/core'; export class KubernetesV2ScaleManifestConfigCtrl implements IController { public application: Application; + public static $inject = ['$scope']; constructor(private $scope: IScope) { 'ngInject'; if (this.$scope.stage.isNew) { diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/undoRolloutManifest/undoRolloutManifestConfig.controller.ts b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/undoRolloutManifest/undoRolloutManifestConfig.controller.ts index 28484a74dd2..488aa7c739a 100644 --- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/undoRolloutManifest/undoRolloutManifestConfig.controller.ts +++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/undoRolloutManifest/undoRolloutManifestConfig.controller.ts @@ -1,6 +1,7 @@ import { IController, IScope } from 'angular'; export class KubernetesV2UndoRolloutManifestConfigCtrl implements IController { + public static $inject = ['$scope']; constructor(private $scope: IScope) { 'ngInject'; if (this.$scope.stage.isNew) { diff --git a/app/scripts/modules/kubernetes/src/v2/resources/resources.state.ts b/app/scripts/modules/kubernetes/src/v2/resources/resources.state.ts index 18e42bec377..d0f012f68bd 100644 --- a/app/scripts/modules/kubernetes/src/v2/resources/resources.state.ts +++ b/app/scripts/modules/kubernetes/src/v2/resources/resources.state.ts @@ -11,7 +11,7 @@ export interface IKubernetesResourceStateParams { export const KUBERNETES_V2_RESOURCE_STATES = 'spinnaker.core.kubernetesResource.states'; module(KUBERNETES_V2_RESOURCE_STATES, [APPLICATION_STATE_PROVIDER]).config( - (applicationStateProvider: ApplicationStateProvider) => { + ['applicationStateProvider', (applicationStateProvider: ApplicationStateProvider) => { const kubernetesResourceDetails: INestedState = { name: 'kubernetesResource', url: '/manifest/:provider/:accountId/:region/:kubernetesResource', @@ -39,5 +39,5 @@ module(KUBERNETES_V2_RESOURCE_STATES, [APPLICATION_STATE_PROVIDER]).config( }; applicationStateProvider.addInsightDetailState(kubernetesResourceDetails); - }, + }], ); diff --git a/app/scripts/modules/kubernetes/src/v2/securityGroup/details/details.controller.ts b/app/scripts/modules/kubernetes/src/v2/securityGroup/details/details.controller.ts index 0fc5c0a85f5..d05ec121a93 100644 --- a/app/scripts/modules/kubernetes/src/v2/securityGroup/details/details.controller.ts +++ b/app/scripts/modules/kubernetes/src/v2/securityGroup/details/details.controller.ts @@ -19,6 +19,7 @@ class KubernetesSecurityGroupDetailsController implements IController { private securityGroupFromParams: ISecurityGroupFromStateParams; public securityGroup: IKubernetesSecurityGroup; + public static $inject = ['$uibModal', '$state', '$scope', 'securityGroupReader', 'resolvedSecurityGroup', 'app']; constructor( private $uibModal: IModalService, private $state: StateService, diff --git a/app/scripts/modules/kubernetes/src/v2/securityGroup/transformer.ts b/app/scripts/modules/kubernetes/src/v2/securityGroup/transformer.ts index 3137d3c75d3..bab62b5eb2c 100644 --- a/app/scripts/modules/kubernetes/src/v2/securityGroup/transformer.ts +++ b/app/scripts/modules/kubernetes/src/v2/securityGroup/transformer.ts @@ -3,6 +3,7 @@ import { module, IQService, IPromise } from 'angular'; import { ISecurityGroup } from '@spinnaker/core'; class KubernetesV2SecurityGroupTransformer { + public static $inject = ['$q']; constructor(private $q: IQService) { 'ngInject'; } diff --git a/app/scripts/modules/kubernetes/src/v2/serverGroup/details/details.controller.ts b/app/scripts/modules/kubernetes/src/v2/serverGroup/details/details.controller.ts index 05cd3ac6525..fe528f87962 100644 --- a/app/scripts/modules/kubernetes/src/v2/serverGroup/details/details.controller.ts +++ b/app/scripts/modules/kubernetes/src/v2/serverGroup/details/details.controller.ts @@ -32,6 +32,7 @@ class KubernetesServerGroupDetailsController implements IController { public manifest: IManifest; public entityTagTargets: IOwnerOption[]; + public static $inject = ['serverGroup', 'app', '$uibModal', '$scope', 'confirmationModalService']; constructor( serverGroup: IServerGroupFromStateParams, public app: Application, diff --git a/app/scripts/modules/kubernetes/src/v2/serverGroup/details/resize/resize.controller.ts b/app/scripts/modules/kubernetes/src/v2/serverGroup/details/resize/resize.controller.ts index 3939ea816a6..5d2b61e4438 100644 --- a/app/scripts/modules/kubernetes/src/v2/serverGroup/details/resize/resize.controller.ts +++ b/app/scripts/modules/kubernetes/src/v2/serverGroup/details/resize/resize.controller.ts @@ -17,6 +17,7 @@ class KubernetesServerGroupResizeController implements IController { verified: false, }; + public static $inject = ['serverGroup', '$uibModalInstance', 'serverGroupWriter', 'application']; constructor( public serverGroup: IKubernetesServerGroup, private $uibModalInstance: IModalServiceInstance, diff --git a/app/scripts/modules/kubernetes/src/v2/serverGroup/serverGroupTransformer.service.ts b/app/scripts/modules/kubernetes/src/v2/serverGroup/serverGroupTransformer.service.ts index 1d12b18804e..d59037969eb 100644 --- a/app/scripts/modules/kubernetes/src/v2/serverGroup/serverGroupTransformer.service.ts +++ b/app/scripts/modules/kubernetes/src/v2/serverGroup/serverGroupTransformer.service.ts @@ -2,6 +2,7 @@ import { IPromise, IQService, module } from 'angular'; import { IKubernetesServerGroup } from 'kubernetes/v2/serverGroup/details/IKubernetesServerGroup'; export class KubernetesV2ServerGroupTransformer { + public static $inject = ['$q']; constructor(private $q: IQService) { 'ngInject'; } diff --git a/app/scripts/modules/kubernetes/src/v2/serverGroupManager/details/details.controller.ts b/app/scripts/modules/kubernetes/src/v2/serverGroupManager/details/details.controller.ts index 0df10413cb7..aa020249da5 100644 --- a/app/scripts/modules/kubernetes/src/v2/serverGroupManager/details/details.controller.ts +++ b/app/scripts/modules/kubernetes/src/v2/serverGroupManager/details/details.controller.ts @@ -23,6 +23,7 @@ class KubernetesServerGroupManagerDetailsController implements IController { public manifest: IManifest; public entityTagTargets: IOwnerOption[]; + public static $inject = ['serverGroupManager', '$scope', '$uibModal', 'app']; constructor( serverGroupManager: IServerGroupManagerStateParams, private $scope: IScope, diff --git a/app/scripts/modules/kubernetes/src/validation/applicationName.validator.js b/app/scripts/modules/kubernetes/src/validation/applicationName.validator.js index 0be783fb617..575f9f352b0 100644 --- a/app/scripts/modules/kubernetes/src/validation/applicationName.validator.js +++ b/app/scripts/modules/kubernetes/src/validation/applicationName.validator.js @@ -70,6 +70,6 @@ module.exports = angular validate: validate, }; }) - .run(function(kubernetesApplicationNameValidator) { + .run(['kubernetesApplicationNameValidator', function(kubernetesApplicationNameValidator) { ApplicationNameValidator.registerValidator('kubernetes', kubernetesApplicationNameValidator); - }); + }]); diff --git a/app/scripts/modules/openstack/src/cache/cacheConfigurer.service.js b/app/scripts/modules/openstack/src/cache/cacheConfigurer.service.js index 28f17413fea..11717f9960c 100644 --- a/app/scripts/modules/openstack/src/cache/cacheConfigurer.service.js +++ b/app/scripts/modules/openstack/src/cache/cacheConfigurer.service.js @@ -6,7 +6,7 @@ import { AccountService, LOAD_BALANCER_READ_SERVICE, NetworkReader, SubnetReader module.exports = angular .module('spinnaker.openstack.cache.initializer', [LOAD_BALANCER_READ_SERVICE]) - .factory('openstackCacheConfigurer', function(loadBalancerReader) { + .factory('openstackCacheConfigurer', ['loadBalancerReader', function(loadBalancerReader) { let config = Object.create(null); config.credentials = { @@ -30,4 +30,4 @@ module.exports = angular }; return config; - }); + }]); diff --git a/app/scripts/modules/openstack/src/common/selectField.component.js b/app/scripts/modules/openstack/src/common/selectField.component.js index cad3cdee667..3b703c6a9a8 100644 --- a/app/scripts/modules/openstack/src/common/selectField.component.js +++ b/app/scripts/modules/openstack/src/common/selectField.component.js @@ -140,3 +140,4 @@ function SelectFieldController($scope, $element, $attrs, $timeout, $q, $rootScop $scope.$on('updateOptions', updateOptions); } +SelectFieldController.$inject = ['$scope', '$element', '$attrs', '$timeout', '$q', '$rootScope', 'cacheInitializer']; diff --git a/app/scripts/modules/openstack/src/instance/details/instance.details.controller.js b/app/scripts/modules/openstack/src/instance/details/instance.details.controller.js index 95fd0c15382..bf35ce7d111 100644 --- a/app/scripts/modules/openstack/src/instance/details/instance.details.controller.js +++ b/app/scripts/modules/openstack/src/instance/details/instance.details.controller.js @@ -20,7 +20,7 @@ module.exports = angular INSTANCE_WRITE_SERVICE, CONFIRMATION_MODAL_SERVICE, ]) - .controller('openstackInstanceDetailsCtrl', function( + .controller('openstackInstanceDetailsCtrl', ['$scope', '$state', '$uibModal', 'instanceWriter', 'confirmationModalService', 'instance', 'app', 'moniker', 'environment', '$q', 'overrides', function( $scope, $state, $uibModal, @@ -318,4 +318,4 @@ module.exports = angular }); $scope.account = instance.account; - }); + }]); diff --git a/app/scripts/modules/openstack/src/instance/openstackInstanceType.service.js b/app/scripts/modules/openstack/src/instance/openstackInstanceType.service.js index 9aa0d17ee42..8fb2fd0cd17 100644 --- a/app/scripts/modules/openstack/src/instance/openstackInstanceType.service.js +++ b/app/scripts/modules/openstack/src/instance/openstackInstanceType.service.js @@ -7,7 +7,7 @@ import { API, InfrastructureCaches } from '@spinnaker/core'; module.exports = angular .module('spinnaker.openstack.instanceType.service', []) - .factory('openstackInstanceTypeService', function($http, $q) { + .factory('openstackInstanceTypeService', ['$http', '$q', function($http, $q) { var categories = [ { type: 'custom', @@ -75,4 +75,4 @@ module.exports = angular getAllTypesByRegion: getAllTypesByRegion, filterInstanceTypesByVirtualizationType: filterInstanceTypesByVirtualizationType, }; - }); + }]); diff --git a/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/upsert.controller.js b/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/upsert.controller.js index 61612588009..71dfb2ee1dc 100644 --- a/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/upsert.controller.js +++ b/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/upsert.controller.js @@ -22,7 +22,7 @@ module.exports = angular require('../../../common/isolateForm.directive').name, SECURITY_GROUP_READER, ]) - .controller('openstackUpsertLoadBalancerController', function( + .controller('openstackUpsertLoadBalancerController', ['$scope', '$uibModalInstance', '$state', 'application', 'loadBalancer', 'isNew', 'openstackLoadBalancerTransformer', 'securityGroupReader', function( $scope, $uibModalInstance, $state, @@ -264,4 +264,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/openstack/src/loadBalancer/details/details.controller.js b/app/scripts/modules/openstack/src/loadBalancer/details/details.controller.js index dade1b42ee5..0f2ba9b7292 100644 --- a/app/scripts/modules/openstack/src/loadBalancer/details/details.controller.js +++ b/app/scripts/modules/openstack/src/loadBalancer/details/details.controller.js @@ -9,7 +9,7 @@ module.exports = angular require('@uirouter/angularjs').default, CONFIRMATION_MODAL_SERVICE, ]) - .controller('openstackLoadBalancerDetailsController', function( + .controller('openstackLoadBalancerDetailsController', ['$scope', '$state', '$uibModal', 'loadBalancer', 'app', 'confirmationModalService', '$q', function( $scope, $state, $uibModal, @@ -118,4 +118,4 @@ module.exports = angular submitMethod: submitMethod, }); }; - }); + }]); diff --git a/app/scripts/modules/openstack/src/loadBalancer/transformer.js b/app/scripts/modules/openstack/src/loadBalancer/transformer.js index 7ec19daded8..a5357a164ad 100644 --- a/app/scripts/modules/openstack/src/loadBalancer/transformer.js +++ b/app/scripts/modules/openstack/src/loadBalancer/transformer.js @@ -8,7 +8,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.openstack.loadBalancer.transformer', []) - .factory('openstackLoadBalancerTransformer', function($q) { + .factory('openstackLoadBalancerTransformer', ['$q', function($q) { var defaults = { provider: 'openstack', account: OpenStackProviderSettings.defaults.account, @@ -126,4 +126,4 @@ module.exports = angular constructNewLoadBalancerTemplate: constructNewLoadBalancerTemplate, convertLoadBalancerForEditing: convertLoadBalancerForEditing, }; - }); + }]); diff --git a/app/scripts/modules/openstack/src/pipeline/stages/bake/bakeExecutionDetails.controller.js b/app/scripts/modules/openstack/src/pipeline/stages/bake/bakeExecutionDetails.controller.js index 4e576a34734..c047f52617e 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/bake/bakeExecutionDetails.controller.js +++ b/app/scripts/modules/openstack/src/pipeline/stages/bake/bakeExecutionDetails.controller.js @@ -8,7 +8,7 @@ module.exports = angular .module('spinnaker.openstack.pipeline.stage.bake.executionDetails.controller', [ require('@uirouter/angularjs').default, ]) - .controller('openstackBakeExecutionDetailsCtrl', function( + .controller('openstackBakeExecutionDetailsCtrl', ['$scope', '$stateParams', 'executionDetailsSectionService', '$interpolate', function( $scope, $stateParams, executionDetailsSectionService, @@ -28,4 +28,4 @@ module.exports = angular initialize(); $scope.$on('$stateChangeSuccess', initialize); - }); + }]); diff --git a/app/scripts/modules/openstack/src/pipeline/stages/bake/openstackBakeStage.js b/app/scripts/modules/openstack/src/pipeline/stages/bake/openstackBakeStage.js index 5239adbbef5..9e81e13aad1 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/bake/openstackBakeStage.js +++ b/app/scripts/modules/openstack/src/pipeline/stages/bake/openstackBakeStage.js @@ -44,7 +44,7 @@ module.exports = angular restartable: true, }); }) - .controller('openstackBakeStageCtrl', function($scope, $q, $uibModal) { + .controller('openstackBakeStageCtrl', ['$scope', '$q', '$uibModal', function($scope, $q, $uibModal) { $scope.stage.extendedAttributes = $scope.stage.extendedAttributes || {}; $scope.stage.regions = $scope.stage.regions || []; @@ -140,4 +140,4 @@ module.exports = angular $scope.$watch('stage', deleteEmptyProperties, true); initialize(); - }); + }]); diff --git a/app/scripts/modules/openstack/src/pipeline/stages/cloneServerGroup/openstackCloneServerGroupStage.js b/app/scripts/modules/openstack/src/pipeline/stages/cloneServerGroup/openstackCloneServerGroupStage.js index f0afe3a58b9..6d900eddab3 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/cloneServerGroup/openstackCloneServerGroupStage.js +++ b/app/scripts/modules/openstack/src/pipeline/stages/cloneServerGroup/openstackCloneServerGroupStage.js @@ -21,7 +21,7 @@ module.exports = angular ], }); }) - .controller('openstackCloneServerGroupStageCtrl', function($scope) { + .controller('openstackCloneServerGroupStageCtrl', ['$scope', function($scope) { let stage = $scope.stage; $scope.viewState = { @@ -85,4 +85,4 @@ module.exports = angular this.processIsSuspended = process => { return stage.suspendedProcesses && stage.suspendedProcesses.includes(process); }; - }); + }]); diff --git a/app/scripts/modules/openstack/src/pipeline/stages/destroyAsg/openstackDestroyAsgStage.js b/app/scripts/modules/openstack/src/pipeline/stages/destroyAsg/openstackDestroyAsgStage.js index 0cdfbaefc40..7efb7cd2115 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/destroyAsg/openstackDestroyAsgStage.js +++ b/app/scripts/modules/openstack/src/pipeline/stages/destroyAsg/openstackDestroyAsgStage.js @@ -27,7 +27,7 @@ module.exports = angular ], }); }) - .controller('openstackDestroyAsgStageCtrl', function($scope) { + .controller('openstackDestroyAsgStageCtrl', ['$scope', function($scope) { let stage = $scope.stage; $scope.state = { @@ -55,4 +55,4 @@ module.exports = angular if (!stage.target) { stage.target = $scope.targets[0].val; } - }); + }]); diff --git a/app/scripts/modules/openstack/src/pipeline/stages/disableAsg/openstackDisableAsgStage.js b/app/scripts/modules/openstack/src/pipeline/stages/disableAsg/openstackDisableAsgStage.js index 08c5679f30e..7cbb6d12a7d 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/disableAsg/openstackDisableAsgStage.js +++ b/app/scripts/modules/openstack/src/pipeline/stages/disableAsg/openstackDisableAsgStage.js @@ -25,7 +25,7 @@ module.exports = angular ], }); }) - .controller('openstackDisableAsgStageCtrl', function($scope) { + .controller('openstackDisableAsgStageCtrl', ['$scope', function($scope) { let stage = $scope.stage; $scope.state = { @@ -53,4 +53,4 @@ module.exports = angular if (!stage.target) { stage.target = $scope.targets[0].val; } - }); + }]); diff --git a/app/scripts/modules/openstack/src/pipeline/stages/disableCluster/openstackDisableClusterStage.js b/app/scripts/modules/openstack/src/pipeline/stages/disableCluster/openstackDisableClusterStage.js index 96a7b150fe3..36076fd9241 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/disableCluster/openstackDisableClusterStage.js +++ b/app/scripts/modules/openstack/src/pipeline/stages/disableCluster/openstackDisableClusterStage.js @@ -23,7 +23,7 @@ module.exports = angular ], }); }) - .controller('openstackDisableClusterStageCtrl', function($scope) { + .controller('openstackDisableClusterStageCtrl', ['$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/openstack/src/pipeline/stages/enableAsg/openstackEnableAsgStage.js b/app/scripts/modules/openstack/src/pipeline/stages/enableAsg/openstackEnableAsgStage.js index a4b8c0dc676..683249639dc 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/enableAsg/openstackEnableAsgStage.js +++ b/app/scripts/modules/openstack/src/pipeline/stages/enableAsg/openstackEnableAsgStage.js @@ -21,7 +21,7 @@ module.exports = angular ], }); }) - .controller('openstackEnableAsgStageCtrl', function($scope) { + .controller('openstackEnableAsgStageCtrl', ['$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/openstack/src/pipeline/stages/findAmi/openstackFindAmiStage.js b/app/scripts/modules/openstack/src/pipeline/stages/findAmi/openstackFindAmiStage.js index 7920a14f0c8..c410bd90bba 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/findAmi/openstackFindAmiStage.js +++ b/app/scripts/modules/openstack/src/pipeline/stages/findAmi/openstackFindAmiStage.js @@ -19,7 +19,7 @@ module.exports = angular ], }); }) - .controller('openstackFindAmiStageCtrl', function($scope) { + .controller('openstackFindAmiStageCtrl', ['$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/app/scripts/modules/openstack/src/pipeline/stages/resizeAsg/openstackResizeAsgStage.js b/app/scripts/modules/openstack/src/pipeline/stages/resizeAsg/openstackResizeAsgStage.js index 55a8f31534a..25b65d10a98 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/resizeAsg/openstackResizeAsgStage.js +++ b/app/scripts/modules/openstack/src/pipeline/stages/resizeAsg/openstackResizeAsgStage.js @@ -29,7 +29,7 @@ module.exports = angular ], }); }) - .controller('openstackResizeAsgStageCtrl', function($scope) { + .controller('openstackResizeAsgStageCtrl', ['$scope', function($scope) { var ctrl = this; let stage = $scope.stage; @@ -113,4 +113,4 @@ module.exports = angular } } }; - }); + }]); diff --git a/app/scripts/modules/openstack/src/pipeline/stages/scaleDownCluster/openstackScaleDownClusterStage.js b/app/scripts/modules/openstack/src/pipeline/stages/scaleDownCluster/openstackScaleDownClusterStage.js index 5ebc618d604..2209c424906 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/scaleDownCluster/openstackScaleDownClusterStage.js +++ b/app/scripts/modules/openstack/src/pipeline/stages/scaleDownCluster/openstackScaleDownClusterStage.js @@ -26,7 +26,7 @@ module.exports = angular strategy: true, }); }) - .controller('OpenstackScaleDownClusterStageCtrl', function($scope) { + .controller('OpenstackScaleDownClusterStageCtrl', ['$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/openstack/src/pipeline/stages/shrinkCluster/openstackShrinkClusterStage.js b/app/scripts/modules/openstack/src/pipeline/stages/shrinkCluster/openstackShrinkClusterStage.js index 8ef7bd8449a..431e14f6187 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/shrinkCluster/openstackShrinkClusterStage.js +++ b/app/scripts/modules/openstack/src/pipeline/stages/shrinkCluster/openstackShrinkClusterStage.js @@ -21,7 +21,7 @@ module.exports = angular ], }); }) - .controller('OpenstackShrinkClusterStageCtrl', function($scope) { + .controller('OpenstackShrinkClusterStageCtrl', ['$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/openstack/src/search/resultFormatter.js b/app/scripts/modules/openstack/src/search/resultFormatter.js index 13d31052b7e..12afdefbeec 100644 --- a/app/scripts/modules/openstack/src/search/resultFormatter.js +++ b/app/scripts/modules/openstack/src/search/resultFormatter.js @@ -4,10 +4,10 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.openstack.search.resultFormatter', []) - .factory('openstackSearchResultFormatter', function($q) { + .factory('openstackSearchResultFormatter', ['$q', function($q) { return { securityGroups: function(entry) { return $q.when((entry.name || entry.securityGroup) + ' (' + entry.region + ')'); }, }; - }); + }]); diff --git a/app/scripts/modules/openstack/src/securityGroup/configure/wizard/rules.controller.js b/app/scripts/modules/openstack/src/securityGroup/configure/wizard/rules.controller.js index 0a2f1172e2a..d43f15c9538 100644 --- a/app/scripts/modules/openstack/src/securityGroup/configure/wizard/rules.controller.js +++ b/app/scripts/modules/openstack/src/securityGroup/configure/wizard/rules.controller.js @@ -10,7 +10,7 @@ module.exports = angular require('../../../common/validateType.directive').name, SECURITY_GROUP_READER, ]) - .controller('openstackSecurityGroupRulesController', function( + .controller('openstackSecurityGroupRulesController', ['$scope', 'openstackSecurityGroupTransformer', 'securityGroupReader', 'cacheInitializer', function( $scope, openstackSecurityGroupTransformer, securityGroupReader, @@ -112,4 +112,4 @@ module.exports = angular $scope.initializeSecurityGroups(); } }; - }); + }]); diff --git a/app/scripts/modules/openstack/src/securityGroup/configure/wizard/upsert.controller.js b/app/scripts/modules/openstack/src/securityGroup/configure/wizard/upsert.controller.js index 6c8bdc9f427..012d5c83cc7 100644 --- a/app/scripts/modules/openstack/src/securityGroup/configure/wizard/upsert.controller.js +++ b/app/scripts/modules/openstack/src/securityGroup/configure/wizard/upsert.controller.js @@ -18,7 +18,7 @@ module.exports = angular require('../../../region/regionSelectField.directive').name, require('../../transformer').name, ]) - .controller('openstackUpsertSecurityGroupController', function( + .controller('openstackUpsertSecurityGroupController', ['$q', '$scope', '$uibModalInstance', '$state', 'application', 'securityGroup', 'openstackSecurityGroupTransformer', 'securityGroupReader', function( $q, $scope, $uibModalInstance, @@ -195,4 +195,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/openstack/src/securityGroup/details/details.controller.js b/app/scripts/modules/openstack/src/securityGroup/details/details.controller.js index 92c8df0f798..18844487c53 100644 --- a/app/scripts/modules/openstack/src/securityGroup/details/details.controller.js +++ b/app/scripts/modules/openstack/src/securityGroup/details/details.controller.js @@ -17,7 +17,7 @@ module.exports = angular CONFIRMATION_MODAL_SERVICE, SECURITY_GROUP_READER, ]) - .controller('openstackSecurityGroupDetailsController', function( + .controller('openstackSecurityGroupDetailsController', ['$scope', '$state', 'resolvedSecurityGroup', 'app', 'confirmationModalService', 'securityGroupReader', '$uibModal', function( $scope, $state, resolvedSecurityGroup, @@ -125,4 +125,4 @@ module.exports = angular refresh: extractSecurityGroup, }; } - }); + }]); diff --git a/app/scripts/modules/openstack/src/securityGroup/transformer.js b/app/scripts/modules/openstack/src/securityGroup/transformer.js index 7220d4c22a2..9d0cf08e765 100644 --- a/app/scripts/modules/openstack/src/securityGroup/transformer.js +++ b/app/scripts/modules/openstack/src/securityGroup/transformer.js @@ -6,7 +6,7 @@ import { OpenStackProviderSettings } from '../openstack.settings'; module.exports = angular .module('spinnaker.openstack.securityGroup.transformer', []) - .factory('openstackSecurityGroupTransformer', function($q) { + .factory('openstackSecurityGroupTransformer', ['$q', function($q) { function normalizeSecurityGroup(securityGroup) { return $q.when(securityGroup); } @@ -74,4 +74,4 @@ module.exports = angular prepareForEdit: prepareForEdit, prepareForSaving: prepareForSaving, }; - }); + }]); diff --git a/app/scripts/modules/openstack/src/serverGroup/configure/ServerGroupCommandBuilder.js b/app/scripts/modules/openstack/src/serverGroup/configure/ServerGroupCommandBuilder.js index 1b86434973d..cff3033e3ef 100644 --- a/app/scripts/modules/openstack/src/serverGroup/configure/ServerGroupCommandBuilder.js +++ b/app/scripts/modules/openstack/src/serverGroup/configure/ServerGroupCommandBuilder.js @@ -10,7 +10,7 @@ import { OpenStackProviderSettings } from '../../openstack.settings'; module.exports = angular .module('spinnaker.openstack.serverGroupCommandBuilder.service', [require('../../image/image.reader').name]) - .factory('openstackServerGroupCommandBuilder', function($q, openstackImageReader, loadBalancerReader) { + .factory('openstackServerGroupCommandBuilder', ['$q', 'openstackImageReader', 'loadBalancerReader', function($q, openstackImageReader, loadBalancerReader) { function buildNewServerGroupCommand(application, defaults) { defaults = defaults || {}; @@ -147,4 +147,4 @@ module.exports = angular buildNewServerGroupCommandForPipeline: buildNewServerGroupCommandForPipeline, buildServerGroupCommandFromPipeline: buildServerGroupCommandFromPipeline, }; - }); + }]); diff --git a/app/scripts/modules/openstack/src/serverGroup/configure/serverGroupConfiguration.service.js b/app/scripts/modules/openstack/src/serverGroup/configure/serverGroupConfiguration.service.js index b407b9a9d54..b2fe10697cb 100644 --- a/app/scripts/modules/openstack/src/serverGroup/configure/serverGroupConfiguration.service.js +++ b/app/scripts/modules/openstack/src/serverGroup/configure/serverGroupConfiguration.service.js @@ -17,7 +17,7 @@ module.exports = angular SECURITY_GROUP_READER, CACHE_INITIALIZER_SERVICE, ]) - .factory('openstackServerGroupConfigurationService', function( + .factory('openstackServerGroupConfigurationService', ['$q', 'openstackImageReader', 'securityGroupReader', 'cacheInitializer', 'loadBalancerReader', function( $q, openstackImageReader, securityGroupReader, @@ -249,4 +249,4 @@ module.exports = angular refreshSecurityGroups: refreshSecurityGroups, getRegionalSecurityGroups: getRegionalSecurityGroups, }; - }); + }]); diff --git a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/Clone.controller.js b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/Clone.controller.js index 8d8cf15f30f..288477062dc 100644 --- a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/Clone.controller.js +++ b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/Clone.controller.js @@ -10,7 +10,7 @@ module.exports = angular SERVER_GROUP_WRITER, require('../serverGroupConfiguration.service').name, ]) - .controller('openstackCloneServerGroupCtrl', function( + .controller('openstackCloneServerGroupCtrl', ['$scope', '$uibModalInstance', '$q', '$state', 'serverGroupWriter', 'openstackServerGroupConfigurationService', 'serverGroupCommand', 'application', 'title', function( $scope, $uibModalInstance, $q, @@ -119,4 +119,4 @@ module.exports = angular $scope.state.requiresTemplateSelection = false; configureCommand(); }; - }); + }]); diff --git a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/ServerGroupBasicSettings.controller.js b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/ServerGroupBasicSettings.controller.js index 9c94bf19e87..acc1b8bbf33 100644 --- a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/ServerGroupBasicSettings.controller.js +++ b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/ServerGroupBasicSettings.controller.js @@ -10,7 +10,7 @@ module.exports = angular require('angular-ui-bootstrap'), IMAGE_READER, ]) - .controller('openstackServerGroupBasicSettingsCtrl', function( + .controller('openstackServerGroupBasicSettingsCtrl', ['$scope', '$controller', '$uibModalStack', '$state', 'imageReader', function( $scope, $controller, $uibModalStack, @@ -41,4 +41,4 @@ module.exports = angular $state: $state, }), ); - }); + }]); diff --git a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/access/AccessSettings.controller.js b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/access/AccessSettings.controller.js index 82417ab28b9..fb36a334162 100644 --- a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/access/AccessSettings.controller.js +++ b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/access/AccessSettings.controller.js @@ -10,7 +10,7 @@ module.exports = angular require('angular-ui-bootstrap'), require('../../../../common/cacheBackedMultiSelectField.directive').name, ]) - .controller('openstackServerGroupAccessSettingsCtrl', function($scope) { + .controller('openstackServerGroupAccessSettingsCtrl', ['$scope', function($scope) { $scope.firewallsLabel = FirewallLabels.get('Firewalls'); // Loads all load balancers in the current application, region, and account @@ -62,4 +62,4 @@ module.exports = angular $scope.command.floatingNetworkId = undefined; } } - }); + }]); diff --git a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/advanced/advancedSettings.controller.js b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/advanced/advancedSettings.controller.js index e634b4c63ab..97e7d155f7b 100644 --- a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/advanced/advancedSettings.controller.js +++ b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/advanced/advancedSettings.controller.js @@ -8,7 +8,7 @@ module.exports = angular require('angular-ui-bootstrap'), require('../../../../common/cacheBackedMultiSelectField.directive').name, ]) - .controller('openstackServerGroupAdvancedSettingsCtrl', function($scope) { + .controller('openstackServerGroupAdvancedSettingsCtrl', ['$scope', function($scope) { $scope.selectedAZs = $scope.command.zones ? $scope.command.zones.map(i => { return { id: i, name: i }; @@ -54,4 +54,4 @@ module.exports = angular }); } } - }); + }]); diff --git a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/instance/ServerGroupInstanceSettings.controller.js b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/instance/ServerGroupInstanceSettings.controller.js index 886a26a3b2e..c91c4aeeecf 100644 --- a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/instance/ServerGroupInstanceSettings.controller.js +++ b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/instance/ServerGroupInstanceSettings.controller.js @@ -12,7 +12,7 @@ module.exports = angular IMAGE_READER, require('../../../../instance/osInstanceTypeSelectField.directive').name, ]) - .controller('openstackServerGroupInstanceSettingsCtrl', function( + .controller('openstackServerGroupInstanceSettingsCtrl', ['$scope', '$controller', '$uibModalStack', '$state', 'imageReader', function( $scope, $controller, $uibModalStack, @@ -67,4 +67,4 @@ module.exports = angular ModalWizard.markIncomplete('instance-settings'); } }); - }); + }]); diff --git a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/location/ServerGroupBasicSettings.controller.js b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/location/ServerGroupBasicSettings.controller.js index c6451ccfe63..3675b271c06 100644 --- a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/location/ServerGroupBasicSettings.controller.js +++ b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/location/ServerGroupBasicSettings.controller.js @@ -9,7 +9,7 @@ module.exports = angular require('@uirouter/angularjs').default, require('angular-ui-bootstrap'), ]) - .controller('openstackServerGroupBasicSettingsCtrl', function($scope, $controller, $uibModalStack, $state) { + .controller('openstackServerGroupBasicSettingsCtrl', ['$scope', '$controller', '$uibModalStack', '$state', function($scope, $controller, $uibModalStack, $state) { angular.extend( this, $controller('BasicSettingsMixin', { @@ -51,4 +51,4 @@ module.exports = angular ModalWizard.markIncomplete('location'); } }); - }); + }]); diff --git a/app/scripts/modules/openstack/src/serverGroup/details/resize/resizeServerGroup.controller.js b/app/scripts/modules/openstack/src/serverGroup/details/resize/resizeServerGroup.controller.js index 08f160aa132..a5abcfa1a61 100644 --- a/app/scripts/modules/openstack/src/serverGroup/details/resize/resizeServerGroup.controller.js +++ b/app/scripts/modules/openstack/src/serverGroup/details/resize/resizeServerGroup.controller.js @@ -6,7 +6,7 @@ import { SERVER_GROUP_WRITER, TaskMonitor } from '@spinnaker/core'; module.exports = angular .module('spinnaker.openstack.serverGroup.details.resize.controller', [SERVER_GROUP_WRITER]) - .controller('openstackResizeServerGroupCtrl', function( + .controller('openstackResizeServerGroupCtrl', ['$scope', '$uibModalInstance', 'serverGroupWriter', 'application', 'serverGroup', function( $scope, $uibModalInstance, serverGroupWriter, @@ -80,4 +80,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/openstack/src/serverGroup/details/rollback/rollbackServerGroup.controller.js b/app/scripts/modules/openstack/src/serverGroup/details/rollback/rollbackServerGroup.controller.js index b1508d9a8d3..fbc270b9455 100644 --- a/app/scripts/modules/openstack/src/serverGroup/details/rollback/rollbackServerGroup.controller.js +++ b/app/scripts/modules/openstack/src/serverGroup/details/rollback/rollbackServerGroup.controller.js @@ -9,7 +9,7 @@ module.exports = angular SERVER_GROUP_WRITER, require('../../../common/footer.directive').name, ]) - .controller('openstackRollbackServerGroupCtrl', function( + .controller('openstackRollbackServerGroupCtrl', ['$scope', '$uibModalInstance', 'serverGroupWriter', 'application', 'serverGroup', 'disabledServerGroups', function( $scope, $uibModalInstance, serverGroupWriter, @@ -66,4 +66,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/openstack/src/serverGroup/details/serverGroupDetails.openstack.controller.js b/app/scripts/modules/openstack/src/serverGroup/details/serverGroupDetails.openstack.controller.js index a01cebe6139..d0a89bcb95c 100644 --- a/app/scripts/modules/openstack/src/serverGroup/details/serverGroupDetails.openstack.controller.js +++ b/app/scripts/modules/openstack/src/serverGroup/details/serverGroupDetails.openstack.controller.js @@ -28,7 +28,7 @@ module.exports = angular require('../configure/ServerGroupCommandBuilder').name, require('../serverGroup.transformer').name, ]) - .controller('openstackServerGroupDetailsCtrl', function( + .controller('openstackServerGroupDetailsCtrl', ['$scope', '$state', 'app', 'serverGroup', 'openstackServerGroupCommandBuilder', '$uibModal', 'confirmationModalService', 'serverGroupWriter', 'securityGroupReader', 'loadBalancerReader', 'openstackServerGroupTransformer', 'overrideRegistry', function( $scope, $state, app, @@ -356,4 +356,4 @@ module.exports = angular ).name; }); }; - }); + }]); diff --git a/app/scripts/modules/openstack/src/serverGroup/serverGroup.transformer.js b/app/scripts/modules/openstack/src/serverGroup/serverGroup.transformer.js index 4a47d1d9d0f..6744190d8ba 100644 --- a/app/scripts/modules/openstack/src/serverGroup/serverGroup.transformer.js +++ b/app/scripts/modules/openstack/src/serverGroup/serverGroup.transformer.js @@ -6,7 +6,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.openstack.serverGroup.transformer', []) - .factory('openstackServerGroupTransformer', function($q) { + .factory('openstackServerGroupTransformer', ['$q', function($q) { function normalizeServerGroup(serverGroup) { if (serverGroup.loadBalancers) { serverGroup.loadBalancerIds = _.map(serverGroup.loadBalancers, function(lb) { @@ -62,4 +62,4 @@ module.exports = angular convertServerGroupCommandToDeployConfiguration: convertServerGroupCommandToDeployConfiguration, normalizeServerGroup: normalizeServerGroup, }; - }); + }]); diff --git a/app/scripts/modules/openstack/src/validation/applicationName.validator.js b/app/scripts/modules/openstack/src/validation/applicationName.validator.js index 47b8611a155..6b8040315bb 100644 --- a/app/scripts/modules/openstack/src/validation/applicationName.validator.js +++ b/app/scripts/modules/openstack/src/validation/applicationName.validator.js @@ -53,6 +53,6 @@ module.exports = angular validate: validate, }; }) - .run(function(openstackApplicationNameValidator) { + .run(['openstackApplicationNameValidator', function(openstackApplicationNameValidator) { ApplicationNameValidator.registerValidator('openstack', openstackApplicationNameValidator); - }); + }]); diff --git a/app/scripts/modules/oracle/src/instance/details/instance.details.controller.js b/app/scripts/modules/oracle/src/instance/details/instance.details.controller.js index 4af1a912d28..e0beadc1ac2 100644 --- a/app/scripts/modules/oracle/src/instance/details/instance.details.controller.js +++ b/app/scripts/modules/oracle/src/instance/details/instance.details.controller.js @@ -9,7 +9,7 @@ module.exports = angular require('@uirouter/angularjs').default, INSTANCE_WRITE_SERVICE, ]) - .controller('oracleInstanceDetailsCtrl', function($scope, $q, instanceWriter, app, instance) { + .controller('oracleInstanceDetailsCtrl', ['$scope', '$q', 'instanceWriter', 'app', 'instance', function($scope, $q, instanceWriter, app, instance) { $scope.application = app; let initialize = app.isStandalone ? retrieveInstance() : $q.all([app.serverGroups.ready()]).then(retrieveInstance); @@ -44,4 +44,4 @@ module.exports = angular Object.assign($scope.instance, instanceDetails); }); } - }); + }]); diff --git a/app/scripts/modules/oracle/src/loadBalancer/configure/createLoadBalancer.controller.ts b/app/scripts/modules/oracle/src/loadBalancer/configure/createLoadBalancer.controller.ts index 67d675b4aa4..7605b3480ec 100644 --- a/app/scripts/modules/oracle/src/loadBalancer/configure/createLoadBalancer.controller.ts +++ b/app/scripts/modules/oracle/src/loadBalancer/configure/createLoadBalancer.controller.ts @@ -60,6 +60,7 @@ export class OracleLoadBalancerController implements IController { public backendSets: IOracleBackEndSet[] = []; public certificates: IOracleListenerCertificate[] = []; + public static $inject = ['$scope', '$uibModalInstance', '$state', 'oracleLoadBalancerTransformer', 'application', 'loadBalancer', 'isNew']; constructor( private $scope: ng.IScope, private $uibModalInstance: IModalServiceInstance, diff --git a/app/scripts/modules/oracle/src/loadBalancer/details/loadBalancerDetail.controller.ts b/app/scripts/modules/oracle/src/loadBalancer/details/loadBalancerDetail.controller.ts index 07fa35ab8cc..ae86afa4e05 100644 --- a/app/scripts/modules/oracle/src/loadBalancer/details/loadBalancerDetail.controller.ts +++ b/app/scripts/modules/oracle/src/loadBalancer/details/loadBalancerDetail.controller.ts @@ -19,6 +19,7 @@ import { sortBy } from 'lodash'; import { OracleLoadBalancerController } from 'oracle/loadBalancer/configure/createLoadBalancer.controller'; export class OracleLoadBalancerDetailController implements IController { + public static $inject = ['$scope', '$state', '$uibModal', 'loadBalancer', 'app', 'securityGroupReader', 'confirmationModalService', 'loadBalancerReader', '$q']; constructor( private $scope: ng.IScope, private $state: StateService, diff --git a/app/scripts/modules/oracle/src/pipeline/disableAsg/disableAsgStage.js b/app/scripts/modules/oracle/src/pipeline/disableAsg/disableAsgStage.js index 7732f8ac427..3b0b373f3a4 100644 --- a/app/scripts/modules/oracle/src/pipeline/disableAsg/disableAsgStage.js +++ b/app/scripts/modules/oracle/src/pipeline/disableAsg/disableAsgStage.js @@ -27,7 +27,7 @@ module.exports = angular ], }); }) - .controller('oracleDisableAsgStageCtrl', function($scope) { + .controller('oracleDisableAsgStageCtrl', ['$scope', function($scope) { let stage = $scope.stage; let provider = 'oracle'; @@ -57,4 +57,4 @@ module.exports = angular if (!stage.target) { stage.target = $scope.targets[0].val; } - }); + }]); diff --git a/app/scripts/modules/oracle/src/pipeline/stages/bake/bakeExecutionDetails.controller.js b/app/scripts/modules/oracle/src/pipeline/stages/bake/bakeExecutionDetails.controller.js index 4fb2f78716a..86ab8973546 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/bake/bakeExecutionDetails.controller.js +++ b/app/scripts/modules/oracle/src/pipeline/stages/bake/bakeExecutionDetails.controller.js @@ -9,7 +9,7 @@ module.exports = angular EXECUTION_DETAILS_SECTION_SERVICE, require('@uirouter/angularjs').default, ]) - .controller('oracleBakeExecutionDetailsCtrl', function( + .controller('oracleBakeExecutionDetailsCtrl', ['$log', '$scope', '$stateParams', 'executionDetailsSectionService', '$interpolate', function( $log, $scope, $stateParams, @@ -30,4 +30,4 @@ module.exports = angular initialize(); $scope.$on('$stateChangeSuccess', initialize); - }); + }]); diff --git a/app/scripts/modules/oracle/src/pipeline/stages/bake/ociBakeStage.js b/app/scripts/modules/oracle/src/pipeline/stages/bake/ociBakeStage.js index 648f703c52c..6d3b4fba95f 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/bake/ociBakeStage.js +++ b/app/scripts/modules/oracle/src/pipeline/stages/bake/ociBakeStage.js @@ -27,7 +27,7 @@ module.exports = angular restartable: true, }); }) - .controller('oracleBakeStageCtrl', function($scope, $q) { + .controller('oracleBakeStageCtrl', ['$scope', '$q', function($scope, $q) { const provider = 'oracle'; if (!$scope.stage.cloudProvider) { @@ -98,4 +98,4 @@ module.exports = angular $scope.$watch('stage.accountName', $scope.accountUpdated); initialize(); - }); + }]); diff --git a/app/scripts/modules/oracle/src/pipeline/stages/destroyAsg/destroyAsgStage.js b/app/scripts/modules/oracle/src/pipeline/stages/destroyAsg/destroyAsgStage.js index b03cb17d38f..e3ab6ccaf85 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/destroyAsg/destroyAsgStage.js +++ b/app/scripts/modules/oracle/src/pipeline/stages/destroyAsg/destroyAsgStage.js @@ -25,7 +25,7 @@ module.exports = angular ], }); }) - .controller('oracleDestroyAsgStageCtrl', function($scope) { + .controller('oracleDestroyAsgStageCtrl', ['$scope', function($scope) { let stage = $scope.stage; let provider = 'oracle'; @@ -57,4 +57,4 @@ module.exports = angular stage.target = $scope.targets[0].val; } } - }); + }]); diff --git a/app/scripts/modules/oracle/src/pipeline/stages/disableAsg/disableAsgStage.js b/app/scripts/modules/oracle/src/pipeline/stages/disableAsg/disableAsgStage.js index 8be8d9de63f..2e324622cfb 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/disableAsg/disableAsgStage.js +++ b/app/scripts/modules/oracle/src/pipeline/stages/disableAsg/disableAsgStage.js @@ -25,7 +25,7 @@ module.exports = angular ], }); }) - .controller('oracleDisableAsgStageCtrl', function($scope) { + .controller('oracleDisableAsgStageCtrl', ['$scope', function($scope) { let stage = $scope.stage; const provider = 'oracle'; @@ -56,4 +56,4 @@ module.exports = angular if (!stage.target) { stage.target = $scope.targets[0].val; } - }); + }]); diff --git a/app/scripts/modules/oracle/src/pipeline/stages/findAmi/findAmiStage.js b/app/scripts/modules/oracle/src/pipeline/stages/findAmi/findAmiStage.js index 5970b1c33ef..ee4c01aeae6 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/findAmi/findAmiStage.js +++ b/app/scripts/modules/oracle/src/pipeline/stages/findAmi/findAmiStage.js @@ -19,7 +19,7 @@ module.exports = angular ], }); }) - .controller('oracleFindAmiStageCtrl', $scope => { + .controller('oracleFindAmiStageCtrl', ['$scope', $scope => { const provider = 'oracle'; let stage = $scope.stage; @@ -74,4 +74,4 @@ module.exports = angular } $scope.$watch('stage.credentials', $scope.accountUpdated); - }); + }]); diff --git a/app/scripts/modules/oracle/src/pipeline/stages/findImageFromTags/oracleFindImageFromTagsStage.js b/app/scripts/modules/oracle/src/pipeline/stages/findImageFromTags/oracleFindImageFromTagsStage.js index 5802be978c9..4dbf59357f6 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/findImageFromTags/oracleFindImageFromTagsStage.js +++ b/app/scripts/modules/oracle/src/pipeline/stages/findImageFromTags/oracleFindImageFromTagsStage.js @@ -19,7 +19,7 @@ module.exports = angular ], }); }) - .controller('oracleFindImageFromTagsStageCtrl', function($scope) { + .controller('oracleFindImageFromTagsStageCtrl', ['$scope', function($scope) { $scope.stage.packageName = $scope.stage.packageName || '*'; $scope.stage.tags = $scope.stage.tags || {}; $scope.stage.regions = $scope.stage.regions || []; @@ -28,4 +28,4 @@ module.exports = angular BakeryReader.getRegions('oracle').then(function(regions) { $scope.regions = regions; }); - }); + }]); diff --git a/app/scripts/modules/oracle/src/pipeline/stages/resizeAsg/resizeAsgStage.js b/app/scripts/modules/oracle/src/pipeline/stages/resizeAsg/resizeAsgStage.js index 729204b1299..e6c8b7fc94b 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/resizeAsg/resizeAsgStage.js +++ b/app/scripts/modules/oracle/src/pipeline/stages/resizeAsg/resizeAsgStage.js @@ -28,7 +28,7 @@ module.exports = angular ], }); }) - .controller('oracleResizeAsgStageCtrl', function($scope) { + .controller('oracleResizeAsgStageCtrl', ['$scope', function($scope) { let ctrl = this; let provider = 'oracle'; @@ -93,4 +93,4 @@ module.exports = angular } } }; - }); + }]); diff --git a/app/scripts/modules/oracle/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.js b/app/scripts/modules/oracle/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.js index c08d40b69d1..3a3b65a0b96 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.js +++ b/app/scripts/modules/oracle/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.js @@ -24,7 +24,7 @@ module.exports = angular strategy: true, }); }) - .controller('oracleScaleDownClusterStageCtrl', function($scope) { + .controller('oracleScaleDownClusterStageCtrl', ['$scope', function($scope) { let stage = $scope.stage; const provider = 'oracle'; @@ -67,4 +67,4 @@ module.exports = angular }; stage.preferLargerOverNewer = stage.preferLargerOverNewer.toString(); - }); + }]); diff --git a/app/scripts/modules/oracle/src/pipeline/stages/shrinkCluster/shrinkClusterStage.js b/app/scripts/modules/oracle/src/pipeline/stages/shrinkCluster/shrinkClusterStage.js index d8372e8ee94..e0424ce6914 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/shrinkCluster/shrinkClusterStage.js +++ b/app/scripts/modules/oracle/src/pipeline/stages/shrinkCluster/shrinkClusterStage.js @@ -19,7 +19,7 @@ module.exports = angular ], }); }) - .controller('oracleShrinkClusterStageCtrl', function($scope) { + .controller('oracleShrinkClusterStageCtrl', ['$scope', function($scope) { let ctrl = this; let stage = $scope.stage; @@ -63,4 +63,4 @@ module.exports = angular } stage.retainLargerOverNewer = stage.retainLargerOverNewer.toString(); - }); + }]); diff --git a/app/scripts/modules/oracle/src/securityGroup/configure/createSecurityGroup.controller.js b/app/scripts/modules/oracle/src/securityGroup/configure/createSecurityGroup.controller.js index f58dc63c427..a4f94b2863b 100644 --- a/app/scripts/modules/oracle/src/securityGroup/configure/createSecurityGroup.controller.js +++ b/app/scripts/modules/oracle/src/securityGroup/configure/createSecurityGroup.controller.js @@ -6,9 +6,9 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.oracle.securityGroup.create.controller', []) - .controller('oracleCreateSecurityGroupCtrl', function($scope, $uibModalInstance) { + .controller('oracleCreateSecurityGroupCtrl', ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) { this.cancel = () => { $uibModalInstance.dismiss(); }; $scope.firewallLabel = FirewallLabels.get('Firewall'); - }); + }]); diff --git a/app/scripts/modules/oracle/src/serverGroup/configure/serverGroupCommandBuilder.service.js b/app/scripts/modules/oracle/src/serverGroup/configure/serverGroupCommandBuilder.service.js index 1c2fc40a15a..9d7bcd58f94 100644 --- a/app/scripts/modules/oracle/src/serverGroup/configure/serverGroupCommandBuilder.service.js +++ b/app/scripts/modules/oracle/src/serverGroup/configure/serverGroupCommandBuilder.service.js @@ -9,7 +9,7 @@ import { OracleProviderSettings } from '../../oracle.settings'; module.exports = angular .module('spinnaker.oracle.serverGroupCommandBuilder.service', []) - .factory('oracleServerGroupCommandBuilder', function($q) { + .factory('oracleServerGroupCommandBuilder', ['$q', function($q) { let oracle = 'oracle'; function buildNewServerGroupCommand(application, defaults) { @@ -96,4 +96,4 @@ module.exports = angular buildNewServerGroupCommandForPipeline: buildNewServerGroupCommandForPipeline, buildServerGroupCommandFromPipeline: buildServerGroupCommandFromPipeline, }; - }); + }]); diff --git a/app/scripts/modules/oracle/src/serverGroup/configure/serverGroupConfiguration.service.js b/app/scripts/modules/oracle/src/serverGroup/configure/serverGroupConfiguration.service.js index c451c782733..cca8e97386b 100644 --- a/app/scripts/modules/oracle/src/serverGroup/configure/serverGroupConfiguration.service.js +++ b/app/scripts/modules/oracle/src/serverGroup/configure/serverGroupConfiguration.service.js @@ -8,7 +8,7 @@ import { OracleProviderSettings } from '../../oracle.settings'; module.exports = angular .module('spinnaker.oracle.serverGroup.configure.configuration.service', [SECURITY_GROUP_READER]) - .factory('oracleServerGroupConfigurationService', function($q, oracleImageReader, securityGroupReader) { + .factory('oracleServerGroupConfigurationService', ['$q', 'oracleImageReader', 'securityGroupReader', function($q, oracleImageReader, securityGroupReader) { let oracle = 'oracle'; let getShapes = image => { @@ -212,4 +212,4 @@ module.exports = angular return { configureCommand: configureCommand, }; - }); + }]); diff --git a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/basicSettings/basicSettings.controller.js b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/basicSettings/basicSettings.controller.js index 8c9aa517672..e28d3cb6c45 100644 --- a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/basicSettings/basicSettings.controller.js +++ b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/basicSettings/basicSettings.controller.js @@ -10,7 +10,7 @@ module.exports = angular require('angular-ui-bootstrap'), IMAGE_READER, ]) - .controller('oracleServerGroupBasicSettingsCtrl', function($scope, $state, $uibModalStack, $controller, imageReader) { + .controller('oracleServerGroupBasicSettingsCtrl', ['$scope', '$state', '$uibModalStack', '$controller', 'imageReader', function($scope, $state, $uibModalStack, $controller, imageReader) { angular.extend( this, $controller('BasicSettingsMixin', { @@ -20,4 +20,4 @@ module.exports = angular $state: $state, }), ); - }); + }]); diff --git a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/cloneServerGroup.controller.js b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/cloneServerGroup.controller.js index 341ebf4b625..3481954c148 100644 --- a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/cloneServerGroup.controller.js +++ b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/cloneServerGroup.controller.js @@ -5,7 +5,7 @@ import { FirewallLabels, ModalWizard, TaskMonitor } from '@spinnaker/core'; module.exports = angular .module('spinnaker.oracle.serverGroup.configure.cloneServerGroup', [require('@uirouter/angularjs').default]) - .controller('oracleCloneServerGroupCtrl', function( + .controller('oracleCloneServerGroupCtrl', ['$scope', '$uibModalInstance', '$q', 'application', 'serverGroupWriter', 'serverGroupCommand', 'oracleServerGroupConfigurationService', 'title', function( $scope, $uibModalInstance, $q, @@ -90,4 +90,4 @@ module.exports = angular $scope.state.requiresTemplateSelection = false; configureCommand(); }; - }); + }]); diff --git a/app/scripts/modules/oracle/src/serverGroup/details/resize/resizeCapacity.component.js b/app/scripts/modules/oracle/src/serverGroup/details/resize/resizeCapacity.component.js index 87e2d344276..7879c052b73 100644 --- a/app/scripts/modules/oracle/src/serverGroup/details/resize/resizeCapacity.component.js +++ b/app/scripts/modules/oracle/src/serverGroup/details/resize/resizeCapacity.component.js @@ -15,7 +15,7 @@ module.exports = angular formMethods: '=', }, templateUrl: require('./resizeCapacity.component.html'), - controller: function($scope, serverGroupWriter) { + controller: ['$scope', 'serverGroupWriter', function($scope, serverGroupWriter) { this.command.newSize = null; angular.extend(this.formMethods, { @@ -31,5 +31,5 @@ module.exports = angular }); }, }); - }, + }], }); diff --git a/app/scripts/modules/oracle/src/serverGroup/details/resize/resizeServerGroup.controller.js b/app/scripts/modules/oracle/src/serverGroup/details/resize/resizeServerGroup.controller.js index 84a94951331..c6f05f47035 100644 --- a/app/scripts/modules/oracle/src/serverGroup/details/resize/resizeServerGroup.controller.js +++ b/app/scripts/modules/oracle/src/serverGroup/details/resize/resizeServerGroup.controller.js @@ -9,7 +9,7 @@ module.exports = angular require('./resizeCapacity.component').name, require('oracle/common/footer.component').name, ]) - .controller('oracleResizeServerGroupCtrl', function($scope, $uibModalInstance, application, serverGroup) { + .controller('oracleResizeServerGroupCtrl', ['$scope', '$uibModalInstance', 'application', 'serverGroup', function($scope, $uibModalInstance, application, serverGroup) { $scope.serverGroup = serverGroup; $scope.application = application; $scope.verification = {}; @@ -49,4 +49,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/oracle/src/serverGroup/details/rollback/rollbackServerGroup.controller.js b/app/scripts/modules/oracle/src/serverGroup/details/rollback/rollbackServerGroup.controller.js index b12f3f0b06c..0440bc032e4 100644 --- a/app/scripts/modules/oracle/src/serverGroup/details/rollback/rollbackServerGroup.controller.js +++ b/app/scripts/modules/oracle/src/serverGroup/details/rollback/rollbackServerGroup.controller.js @@ -9,7 +9,7 @@ module.exports = angular SERVER_GROUP_WRITER, require('oracle/common/footer.component').name, ]) - .controller('oracleRollbackServerGroupCtrl', function( + .controller('oracleRollbackServerGroupCtrl', ['$scope', '$uibModalInstance', 'serverGroupWriter', 'application', 'serverGroup', 'disabledServerGroups', function( $scope, $uibModalInstance, serverGroupWriter, @@ -67,4 +67,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/oracle/src/serverGroup/details/serverGroupDetails.controller.js b/app/scripts/modules/oracle/src/serverGroup/details/serverGroupDetails.controller.js index bde261fef09..0b6d45068c4 100644 --- a/app/scripts/modules/oracle/src/serverGroup/details/serverGroupDetails.controller.js +++ b/app/scripts/modules/oracle/src/serverGroup/details/serverGroupDetails.controller.js @@ -20,7 +20,7 @@ module.exports = angular require('./resize/resizeServerGroup.controller').name, require('./rollback/rollbackServerGroup.controller').name, ]) - .controller('oracleServerGroupDetailsCtrl', function( + .controller('oracleServerGroupDetailsCtrl', ['$scope', '$state', '$uibModal', 'app', 'serverGroup', 'confirmationModalService', 'serverGroupWriter', 'oracleImageReader', function( $scope, $state, $uibModal, @@ -223,4 +223,4 @@ module.exports = angular app.serverGroups.onRefresh($scope, retrieveServerGroup); } }); - }); + }]); diff --git a/app/scripts/modules/oracle/src/serverGroup/serverGroup.transformer.js b/app/scripts/modules/oracle/src/serverGroup/serverGroup.transformer.js index c061da97fe9..e772000d036 100644 --- a/app/scripts/modules/oracle/src/serverGroup/serverGroup.transformer.js +++ b/app/scripts/modules/oracle/src/serverGroup/serverGroup.transformer.js @@ -6,7 +6,7 @@ import _ from 'lodash'; module.exports = angular .module('spinnaker.oracle.serverGroup.transformer', []) - .factory('oracleServerGroupTransformer', function($q) { + .factory('oracleServerGroupTransformer', ['$q', function($q) { let PROVIDER = 'oracle'; function normalizeServerGroup(serverGroup) { @@ -23,4 +23,4 @@ module.exports = angular convertServerGroupCommandToDeployConfiguration, normalizeServerGroup, }; - }); + }]); diff --git a/app/scripts/modules/titus/src/instance/details/instance.details.controller.js b/app/scripts/modules/titus/src/instance/details/instance.details.controller.js index 92391327232..97a5d9e7c30 100644 --- a/app/scripts/modules/titus/src/instance/details/instance.details.controller.js +++ b/app/scripts/modules/titus/src/instance/details/instance.details.controller.js @@ -22,7 +22,7 @@ module.exports = angular CONFIRMATION_MODAL_SERVICE, require('../../securityGroup/securityGroup.read.service').name, ]) - .controller('titusInstanceDetailsCtrl', function( + .controller('titusInstanceDetailsCtrl', ['$scope', '$q', '$state', '$uibModal', 'instanceWriter', 'confirmationModalService', 'instance', 'app', 'moniker', 'environment', function( $scope, $q, $state, @@ -309,4 +309,4 @@ module.exports = angular }); $scope.account = instance.account; - }); + }]); diff --git a/app/scripts/modules/titus/src/loadBalancers/loadBalancerSelector.component.ts b/app/scripts/modules/titus/src/loadBalancers/loadBalancerSelector.component.ts index 6032e294516..bfa8fbb7f5f 100644 --- a/app/scripts/modules/titus/src/loadBalancers/loadBalancerSelector.component.ts +++ b/app/scripts/modules/titus/src/loadBalancers/loadBalancerSelector.component.ts @@ -12,6 +12,7 @@ class LoadBalancerSelectorController implements IController { public refreshTime: number; public refreshing = false; + public static $inject = ['titusServerGroupConfigurationService']; public constructor(private titusServerGroupConfigurationService: TitusServerGroupConfigurationService) { 'ngInject'; } diff --git a/app/scripts/modules/titus/src/pipeline/stages/bake/bakeExecutionDetails.controller.js b/app/scripts/modules/titus/src/pipeline/stages/bake/bakeExecutionDetails.controller.js index f1cf556596d..3e391e0b401 100644 --- a/app/scripts/modules/titus/src/pipeline/stages/bake/bakeExecutionDetails.controller.js +++ b/app/scripts/modules/titus/src/pipeline/stages/bake/bakeExecutionDetails.controller.js @@ -6,7 +6,7 @@ import { SETTINGS } from '@spinnaker/core'; module.exports = angular .module('spinnaker.titus.pipeline.stage.bake.executionDetails.controller', [require('@uirouter/angularjs').default]) - .controller('titusBakeExecutionDetailsCtrl', function( + .controller('titusBakeExecutionDetailsCtrl', ['$scope', '$stateParams', 'executionDetailsSectionService', '$interpolate', function( $scope, $stateParams, executionDetailsSectionService, @@ -25,4 +25,4 @@ module.exports = angular initialize(); $scope.$on('$stateChangeSuccess', initialize); - }); + }]); diff --git a/app/scripts/modules/titus/src/pipeline/stages/bake/titusBakeStage.js b/app/scripts/modules/titus/src/pipeline/stages/bake/titusBakeStage.js index c7e5f798146..252d7ef3b28 100644 --- a/app/scripts/modules/titus/src/pipeline/stages/bake/titusBakeStage.js +++ b/app/scripts/modules/titus/src/pipeline/stages/bake/titusBakeStage.js @@ -16,7 +16,7 @@ module.exports = angular validators: [], }); }) - .controller('titusBakeCtrl', function($scope) { + .controller('titusBakeCtrl', ['$scope', function($scope) { let stage = $scope.stage; if (!stage.user) { @@ -95,4 +95,4 @@ module.exports = angular $scope.$watch('stage.repository', this.updateRepository, true, true); $scope.$watch('stage.image', this.updateImage, true, true); - }); + }]); diff --git a/app/scripts/modules/titus/src/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.controller.js b/app/scripts/modules/titus/src/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.controller.js index e80e8e69adf..31a831ffba2 100644 --- a/app/scripts/modules/titus/src/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.controller.js +++ b/app/scripts/modules/titus/src/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.controller.js @@ -9,7 +9,7 @@ module.exports = angular .module('spinnaker.titus.pipeline.stage.cloneServerGroup.executionDetails.controller', [ require('@uirouter/angularjs').default, ]) - .controller('titusCloneServerGroupExecutionDetailsCtrl', function( + .controller('titusCloneServerGroupExecutionDetailsCtrl', ['$scope', '$stateParams', 'executionDetailsSectionService', function( $scope, $stateParams, executionDetailsSectionService, @@ -60,4 +60,4 @@ module.exports = angular initialize(); $scope.$on('$stateChangeSuccess', initialize); - }); + }]); diff --git a/app/scripts/modules/titus/src/pipeline/stages/cloneServerGroup/titusCloneServerGroupStage.js b/app/scripts/modules/titus/src/pipeline/stages/cloneServerGroup/titusCloneServerGroupStage.js index 178f82e5eba..ef6bf8f9fc4 100644 --- a/app/scripts/modules/titus/src/pipeline/stages/cloneServerGroup/titusCloneServerGroupStage.js +++ b/app/scripts/modules/titus/src/pipeline/stages/cloneServerGroup/titusCloneServerGroupStage.js @@ -24,7 +24,7 @@ module.exports = angular ], }); }) - .controller('titusCloneServerGroupStageCtrl', function($scope) { + .controller('titusCloneServerGroupStageCtrl', ['$scope', function($scope) { let stage = $scope.stage; $scope.viewState = { @@ -88,4 +88,4 @@ module.exports = angular this.processIsSuspended = process => { return stage.suspendedProcesses && stage.suspendedProcesses.includes(process); }; - }); + }]); diff --git a/app/scripts/modules/titus/src/pipeline/stages/destroyAsg/titusDestroyAsgStage.js b/app/scripts/modules/titus/src/pipeline/stages/destroyAsg/titusDestroyAsgStage.js index e98996d35dd..5bd4a95e12d 100644 --- a/app/scripts/modules/titus/src/pipeline/stages/destroyAsg/titusDestroyAsgStage.js +++ b/app/scripts/modules/titus/src/pipeline/stages/destroyAsg/titusDestroyAsgStage.js @@ -28,7 +28,7 @@ module.exports = angular ], }); }) - .controller('titusDestroyAsgStageCtrl', function($scope) { + .controller('titusDestroyAsgStageCtrl', ['$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/titus/src/pipeline/stages/disableAsg/titusDisableAsgStage.js b/app/scripts/modules/titus/src/pipeline/stages/disableAsg/titusDisableAsgStage.js index c4aba590d37..f644ee60132 100644 --- a/app/scripts/modules/titus/src/pipeline/stages/disableAsg/titusDisableAsgStage.js +++ b/app/scripts/modules/titus/src/pipeline/stages/disableAsg/titusDisableAsgStage.js @@ -26,7 +26,7 @@ module.exports = angular ], }); }) - .controller('titusDisableAsgStageCtrl', function($scope) { + .controller('titusDisableAsgStageCtrl', ['$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/titus/src/pipeline/stages/disableCluster/titusDisableClusterStage.js b/app/scripts/modules/titus/src/pipeline/stages/disableCluster/titusDisableClusterStage.js index 3d06beeae84..96f00f20ef1 100644 --- a/app/scripts/modules/titus/src/pipeline/stages/disableCluster/titusDisableClusterStage.js +++ b/app/scripts/modules/titus/src/pipeline/stages/disableCluster/titusDisableClusterStage.js @@ -24,7 +24,7 @@ module.exports = angular ], }); }) - .controller('titusDisableClusterStageCtrl', function($scope) { + .controller('titusDisableClusterStageCtrl', ['$scope', function($scope) { var ctrl = this; let stage = $scope.stage; @@ -77,4 +77,4 @@ module.exports = angular stage.preferLargerOverNewer = 'false'; } stage.preferLargerOverNewer = stage.preferLargerOverNewer.toString(); - }); + }]); diff --git a/app/scripts/modules/titus/src/pipeline/stages/enableAsg/titusEnableAsgStage.js b/app/scripts/modules/titus/src/pipeline/stages/enableAsg/titusEnableAsgStage.js index ef7e5ae2241..44e75dc2f12 100644 --- a/app/scripts/modules/titus/src/pipeline/stages/enableAsg/titusEnableAsgStage.js +++ b/app/scripts/modules/titus/src/pipeline/stages/enableAsg/titusEnableAsgStage.js @@ -21,7 +21,7 @@ module.exports = angular ], }); }) - .controller('titusEnableAsgStageCtrl', function($scope) { + .controller('titusEnableAsgStageCtrl', ['$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/titus/src/pipeline/stages/findAmi/titusFindAmiStage.js b/app/scripts/modules/titus/src/pipeline/stages/findAmi/titusFindAmiStage.js index 5232bd3f87c..45861300e85 100644 --- a/app/scripts/modules/titus/src/pipeline/stages/findAmi/titusFindAmiStage.js +++ b/app/scripts/modules/titus/src/pipeline/stages/findAmi/titusFindAmiStage.js @@ -19,7 +19,7 @@ module.exports = angular ], }); }) - .controller('titusFindAmiStageCtrl', function($scope) { + .controller('titusFindAmiStageCtrl', ['$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/app/scripts/modules/titus/src/pipeline/stages/resizeAsg/titusResizeAsgStage.js b/app/scripts/modules/titus/src/pipeline/stages/resizeAsg/titusResizeAsgStage.js index b75f0a972b6..e909e46085c 100644 --- a/app/scripts/modules/titus/src/pipeline/stages/resizeAsg/titusResizeAsgStage.js +++ b/app/scripts/modules/titus/src/pipeline/stages/resizeAsg/titusResizeAsgStage.js @@ -30,7 +30,7 @@ module.exports = angular ], }); }) - .controller('titusResizeAsgStageCtrl', function($scope) { + .controller('titusResizeAsgStageCtrl', ['$scope', function($scope) { var ctrl = this; let stage = $scope.stage; @@ -118,4 +118,4 @@ module.exports = angular } } }; - }); + }]); diff --git a/app/scripts/modules/titus/src/pipeline/stages/scaleDownCluster/titusScaleDownClusterStage.js b/app/scripts/modules/titus/src/pipeline/stages/scaleDownCluster/titusScaleDownClusterStage.js index a690652f13f..75ef4acf2d1 100644 --- a/app/scripts/modules/titus/src/pipeline/stages/scaleDownCluster/titusScaleDownClusterStage.js +++ b/app/scripts/modules/titus/src/pipeline/stages/scaleDownCluster/titusScaleDownClusterStage.js @@ -27,7 +27,7 @@ module.exports = angular strategy: true, }); }) - .controller('titusScaleDownClusterStageCtrl', function($scope) { + .controller('titusScaleDownClusterStageCtrl', ['$scope', function($scope) { var ctrl = this; let stage = $scope.stage; @@ -71,4 +71,4 @@ module.exports = angular stage.preferLargerOverNewer = 'false'; } stage.preferLargerOverNewer = stage.preferLargerOverNewer.toString(); - }); + }]); diff --git a/app/scripts/modules/titus/src/pipeline/stages/shrinkCluster/titusShrinkClusterStage.js b/app/scripts/modules/titus/src/pipeline/stages/shrinkCluster/titusShrinkClusterStage.js index 45280f95321..2696786c4a1 100644 --- a/app/scripts/modules/titus/src/pipeline/stages/shrinkCluster/titusShrinkClusterStage.js +++ b/app/scripts/modules/titus/src/pipeline/stages/shrinkCluster/titusShrinkClusterStage.js @@ -21,7 +21,7 @@ module.exports = angular ], }); }) - .controller('titusShrinkClusterStageCtrl', function($scope) { + .controller('titusShrinkClusterStageCtrl', ['$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/titus/src/reactShims/titus.react.module.ts b/app/scripts/modules/titus/src/reactShims/titus.react.module.ts index 140b27515bf..85b8fc59392 100644 --- a/app/scripts/modules/titus/src/reactShims/titus.react.module.ts +++ b/app/scripts/modules/titus/src/reactShims/titus.react.module.ts @@ -2,6 +2,6 @@ import { module } from 'angular'; import { TitusReactInjector } from './titus.react.injector'; export const TITUS_REACT_MODULE = 'spinnaker.titus.react'; -module(TITUS_REACT_MODULE, []).run(function($injector: any) { +module(TITUS_REACT_MODULE, []).run(['$injector', function($injector: any) { TitusReactInjector.initialize($injector); -}); +}]); diff --git a/app/scripts/modules/titus/src/serverGroup/configure/ServerGroupCommandBuilder.js b/app/scripts/modules/titus/src/serverGroup/configure/ServerGroupCommandBuilder.js index 59ce75b8d58..218b066c09d 100644 --- a/app/scripts/modules/titus/src/serverGroup/configure/ServerGroupCommandBuilder.js +++ b/app/scripts/modules/titus/src/serverGroup/configure/ServerGroupCommandBuilder.js @@ -7,7 +7,7 @@ import { TitusProviderSettings } from '../../titus.settings'; module.exports = angular .module('spinnaker.titus.serverGroupCommandBuilder.service', []) - .factory('titusServerGroupCommandBuilder', function($q) { + .factory('titusServerGroupCommandBuilder', ['$q', function($q) { function buildNewServerGroupCommand(application, defaults) { defaults = defaults || {}; @@ -188,4 +188,4 @@ module.exports = angular buildServerGroupCommandFromExisting: buildServerGroupCommandFromExisting, buildServerGroupCommandFromPipeline: buildServerGroupCommandFromPipeline, }; - }); + }]); diff --git a/app/scripts/modules/titus/src/serverGroup/configure/serverGroupConfiguration.service.ts b/app/scripts/modules/titus/src/serverGroup/configure/serverGroupConfiguration.service.ts index 37a79c7044f..ac63f073c8a 100644 --- a/app/scripts/modules/titus/src/serverGroup/configure/serverGroupConfiguration.service.ts +++ b/app/scripts/modules/titus/src/serverGroup/configure/serverGroupConfiguration.service.ts @@ -79,6 +79,7 @@ export interface ITitusServerGroupCommand extends IServerGroupCommand { } export class TitusServerGroupConfigurationService { + public static $inject = ['cacheInitializer', 'loadBalancerReader', 'securityGroupReader']; constructor( private cacheInitializer: CacheInitializerService, private loadBalancerReader: LoadBalancerReader, diff --git a/app/scripts/modules/titus/src/serverGroup/details/resize/resizeServerGroup.controller.js b/app/scripts/modules/titus/src/serverGroup/details/resize/resizeServerGroup.controller.js index e14bf842d8c..6ebc75c762d 100644 --- a/app/scripts/modules/titus/src/serverGroup/details/resize/resizeServerGroup.controller.js +++ b/app/scripts/modules/titus/src/serverGroup/details/resize/resizeServerGroup.controller.js @@ -6,7 +6,7 @@ import { SERVER_GROUP_WRITER, TaskMonitor } from '@spinnaker/core'; module.exports = angular .module('spinnaker.titus.serverGroup.details.resize.controller', [SERVER_GROUP_WRITER]) - .controller('titusResizeServerGroupCtrl', function( + .controller('titusResizeServerGroupCtrl', ['$scope', '$uibModalInstance', 'serverGroupWriter', 'application', 'serverGroup', function( $scope, $uibModalInstance, serverGroupWriter, @@ -71,4 +71,4 @@ module.exports = angular this.cancel = function() { $uibModalInstance.dismiss(); }; - }); + }]); diff --git a/app/scripts/modules/titus/src/serverGroup/details/rollback/rollbackServerGroup.controller.js b/app/scripts/modules/titus/src/serverGroup/details/rollback/rollbackServerGroup.controller.js index c7057f82ade..b9b129e20cc 100644 --- a/app/scripts/modules/titus/src/serverGroup/details/rollback/rollbackServerGroup.controller.js +++ b/app/scripts/modules/titus/src/serverGroup/details/rollback/rollbackServerGroup.controller.js @@ -7,7 +7,7 @@ import { SERVER_GROUP_WRITER, TaskMonitor } from '@spinnaker/core'; module.exports = angular .module('spinnaker.titus.serverGroup.details.rollback.controller', [SERVER_GROUP_WRITER]) - .controller('titusRollbackServerGroupCtrl', function( + .controller('titusRollbackServerGroupCtrl', ['$scope', '$uibModalInstance', 'serverGroupWriter', 'application', 'serverGroup', 'previousServerGroup', 'disabledServerGroups', 'allServerGroups', function( $scope, $uibModalInstance, serverGroupWriter, @@ -128,4 +128,4 @@ module.exports = angular this.group = function(serverGroup) { return serverGroup.isDisabled ? 'Disabled Server Groups' : 'Enabled Server Groups'; }; - }); + }]); diff --git a/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.js b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.js index f5333dd4753..2e51d571cfd 100644 --- a/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.js +++ b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.js @@ -18,7 +18,7 @@ module.exports = angular application: '=', }, templateUrl: require('./alarmBasedSummary.component.html'), - controller: function($uibModal, confirmationModalService) { + controller: ['$uibModal', 'confirmationModalService', function($uibModal, confirmationModalService) { this.$onInit = () => { AccountService.getAccountDetails(this.serverGroup.account).then(details => { // alarmServerGroup is used to trick the chart rendering into using AWS metrics @@ -80,5 +80,5 @@ module.exports = angular submitMethod: submitMethod, }); }; - }, + }], }); diff --git a/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.component.ts b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.component.ts index 7dbdcfa867d..e755a514162 100644 --- a/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.component.ts +++ b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.component.ts @@ -32,6 +32,7 @@ class TargetTrackingSummaryController implements IComponentController { public config: ITargetTrackingConfiguration; public popoverTemplate = require('./targetTrackingPopover.html'); + public static $inject = ['$uibModal', 'confirmationModalService']; constructor(private $uibModal: IModalService, private confirmationModalService: ConfirmationModalService) { 'ngInject'; } diff --git a/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.controller.ts b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.controller.ts index d844dd4040c..ea5eae4eda1 100644 --- a/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.controller.ts +++ b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.controller.ts @@ -40,6 +40,7 @@ export class UpsertTargetTrackingController implements IComponentController { public state: ITargetTrackingState; public command: ITargetTrackingPolicyCommand; + public static $inject = ['$uibModalInstance', 'policy', 'serverGroup', 'alarmServerGroup', 'application']; constructor( private $uibModalInstance: IModalServiceInstance, public policy: ITitusTargetTrackingPolicy, diff --git a/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.controller.js b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.controller.js index 8e6fb4e5229..645d51cf722 100644 --- a/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.controller.js +++ b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.controller.js @@ -7,7 +7,7 @@ import { ScalingPolicyWriter } from '@spinnaker/amazon'; module.exports = angular .module('spinnaker.titus.serverGroup.details.scalingPolicy.upsertScalingPolicy.controller', []) - .controller('titusUpsertScalingPolicyCtrl', function( + .controller('titusUpsertScalingPolicyCtrl', ['$uibModalInstance', 'alarmServerGroup', 'serverGroup', 'application', 'policy', function( $uibModalInstance, alarmServerGroup, serverGroup, @@ -159,4 +159,4 @@ module.exports = angular this.cancel = $uibModalInstance.dismiss; this.initialize(); - }); + }]); diff --git a/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.titus.controller.js b/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.titus.controller.js index d17e18bc3c1..dae92577ad9 100644 --- a/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.titus.controller.js +++ b/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.titus.controller.js @@ -36,7 +36,7 @@ module.exports = angular SCALING_POLICY_MODULE, TITUS_SECURITY_GROUPS_DETAILS, ]) - .controller('titusServerGroupDetailsCtrl', function( + .controller('titusServerGroupDetailsCtrl', ['$scope', '$state', '$templateCache', '$interpolate', 'app', 'serverGroup', 'titusServerGroupCommandBuilder', '$uibModal', 'confirmationModalService', 'serverGroupWriter', 'awsServerGroupTransformer', function( $scope, $state, $templateCache, @@ -428,4 +428,4 @@ module.exports = angular }, }); }; - }); + }]); diff --git a/app/scripts/modules/titus/src/serverGroup/serverGroup.transformer.js b/app/scripts/modules/titus/src/serverGroup/serverGroup.transformer.js index b9f3066f41b..445142de16b 100644 --- a/app/scripts/modules/titus/src/serverGroup/serverGroup.transformer.js +++ b/app/scripts/modules/titus/src/serverGroup/serverGroup.transformer.js @@ -6,7 +6,7 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.titus.serverGroup.transformer', []) - .factory('titusServerGroupTransformer', function($q) { + .factory('titusServerGroupTransformer', ['$q', function($q) { function normalizeServerGroup(serverGroup) { return $q.when(serverGroup); // no-op } @@ -77,4 +77,4 @@ module.exports = angular constructNewStepScalingPolicyTemplate, constructNewTargetTrackingPolicyTemplate, }; - }); + }]);