Merge pull request #1775 from anotherchrisberry/chaos-config

integrate chaos monkey configuration
spinnaker · Dec 3, 2015 · 1563008 · 1563008
2 parents 0fd7604 + 591c3d2
commit 1563008
Show file tree

Hide file tree

Showing 54 changed files with 1,555 additions and 468 deletions.
diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/CloneServerGroup.aws.controller.js b/app/scripts/modules/amazon/serverGroup/configure/wizard/CloneServerGroup.aws.controller.js
@@ -10,23 +10,23 @@ module.exports = angular.module('spinnaker.aws.cloneServerGroup.controller', [
   require('../../../../core/serverGroup/serverGroup.write.service.js'),
   require('../../../../core/task/monitor/taskMonitorService.js'),
   require('../../../../core/modal/wizard/modalWizard.service.js'),
-  require('../../../../core/templateOverride/templateOverride.registry.js'),
+  require('../../../../core/overrideRegistry/override.registry.js'),
   require('../../../../core/serverGroup/configure/common/serverGroupCommand.registry.js'),
 ])
   .controller('awsCloneServerGroupCtrl', function($scope, $modalInstance, _, $q, $state,
                                                   serverGroupWriter, modalWizardService, taskMonitorService,
-                                                  templateOverrideRegistry, awsServerGroupConfigurationService,
+                                                  overrideRegistry, awsServerGroupConfigurationService,
                                                   serverGroupCommandRegistry,
                                                   serverGroupCommand, application, title) {
     $scope.pages = {
-      templateSelection: templateOverrideRegistry.getTemplate('aws.serverGroup.templateSelection', require('./templateSelection.html')),
-      basicSettings: templateOverrideRegistry.getTemplate('aws.serverGroup.basicSettings', require('./basicSettings.html')),
-      loadBalancers: templateOverrideRegistry.getTemplate('aws.serverGroup.loadBalancers', require('./loadBalancers.html')),
-      securityGroups: templateOverrideRegistry.getTemplate('aws.serverGroup.securityGroups', require('./securityGroups/securityGroups.html')),
-      instanceArchetype: templateOverrideRegistry.getTemplate('aws.serverGroup.instanceArchetype', require('./instanceArchetype.html')),
-      instanceType: templateOverrideRegistry.getTemplate('aws.serverGroup.instanceType', require('./instanceType.html')),
-      capacity: templateOverrideRegistry.getTemplate('aws.serverGroup.capacity', require('./capacity/capacity.html')),
-      advancedSettings: templateOverrideRegistry.getTemplate('aws.serverGroup.advancedSettings', require('./advancedSettings.html')),
+      templateSelection: overrideRegistry.getTemplate('aws.serverGroup.templateSelection', require('./templateSelection.html')),
+      basicSettings: overrideRegistry.getTemplate('aws.serverGroup.basicSettings', require('./basicSettings.html')),
+      loadBalancers: overrideRegistry.getTemplate('aws.serverGroup.loadBalancers', require('./loadBalancers.html')),
+      securityGroups: overrideRegistry.getTemplate('aws.serverGroup.securityGroups', require('./securityGroups/securityGroups.html')),
+      instanceArchetype: overrideRegistry.getTemplate('aws.serverGroup.instanceArchetype', require('./instanceArchetype.html')),
+      instanceType: overrideRegistry.getTemplate('aws.serverGroup.instanceType', require('./instanceType.html')),
+      capacity: overrideRegistry.getTemplate('aws.serverGroup.capacity', require('./capacity/capacity.html')),
+      advancedSettings: overrideRegistry.getTemplate('aws.serverGroup.advancedSettings', require('./advancedSettings.html')),
     };
 
     $scope.title = title;

diff --git a/app/scripts/modules/amazon/serverGroup/details/serverGroupDetails.aws.controller.js b/app/scripts/modules/amazon/serverGroup/details/serverGroupDetails.aws.controller.js
@@ -10,7 +10,7 @@ module.exports = angular.module('spinnaker.serverGroup.details.aws.controller',
   require('../../../core/confirmationModal/confirmationModal.service.js'),
   require('../../../core/serverGroup/serverGroup.write.service.js'),
   require('../../../core/serverGroup/details/serverGroupWarningMessage.service.js'),
-  require('../../../core/templateOverride/templateOverride.registry.js'),
+  require('../../../core/overrideRegistry/override.registry.js'),
   require('../../../core/utils/lodash.js'),
   require('../../vpc/vpcTag.directive.js'),
   require('./scalingProcesses/autoScalingProcess.service.js'),
@@ -29,7 +29,7 @@ module.exports = angular.module('spinnaker.serverGroup.details.aws.controller',
   .controller('awsServerGroupDetailsCtrl', function ($scope, $state, $templateCache, $interpolate, app, serverGroup, InsightFilterStateModel,
                                                      serverGroupReader, awsServerGroupCommandBuilder, $uibModal, confirmationModalService, _, serverGroupWriter,
                                                      subnetReader, autoScalingProcessService, runningExecutionsService, serverGroupWarningMessageService,
-                                                     templateOverrideRegistry) {
+                                                     overrideRegistry) {
 
     $scope.state = {
       loading: true
@@ -272,7 +272,7 @@ module.exports = angular.module('spinnaker.serverGroup.details.aws.controller',
 
     this.rollbackServerGroup = function rollbackServerGroup() {
       $uibModal.open({
-        templateUrl: templateOverrideRegistry.getTemplate('aws.rollback.modal', require('./rollback/rollbackServerGroup.html')),
+        templateUrl: overrideRegistry.getTemplate('aws.rollback.modal', require('./rollback/rollbackServerGroup.html')),
         controller: 'awsRollbackServerGroupCtrl as ctrl',
         resolve: {
           serverGroup: function() { return $scope.serverGroup; },
@@ -299,7 +299,7 @@ module.exports = angular.module('spinnaker.serverGroup.details.aws.controller',
 
     this.resizeServerGroup = function resizeServerGroup() {
       $uibModal.open({
-        templateUrl: templateOverrideRegistry.getTemplate('aws.resize.modal', require('./resize/resizeServerGroup.html')),
+        templateUrl: overrideRegistry.getTemplate('aws.resize.modal', require('./resize/resizeServerGroup.html')),
         controller: 'awsResizeServerGroupCtrl as ctrl',
         resolve: {
           serverGroup: function() { return $scope.serverGroup; },

diff --git a/app/scripts/modules/core/application/application.controller.js b/app/scripts/modules/core/application/application.controller.js
@@ -9,10 +9,10 @@ module.exports = angular.module('spinnaker.application.controller', [
   require('exports?"cfp.hotkeys"!angular-hotkeys'),
   require('angular-ui-router'),
   require('../history/recentHistory.service.js'),
-  require('../templateOverride/templateOverride.registry.js'),
+  require('../overrideRegistry/override.registry.js'),
 ])
-  .controller('ApplicationCtrl', function($scope, $state, hotkeys, app, recentHistoryService, $window, templateOverrideRegistry) {
-    this.applicationNavTemplate = templateOverrideRegistry.getTemplate('applicationNavHeader', require('./applicationNav.html'));
+  .controller('ApplicationCtrl', function($scope, $state, hotkeys, app, recentHistoryService, $window, overrideRegistry) {
+    this.applicationNavTemplate = overrideRegistry.getTemplate('applicationNavHeader', require('./applicationNav.html'));
     $scope.$window = $window;
     $scope.application = app;
     $scope.insightTarget = app;

diff --git a/app/scripts/modules/core/application/application.module.js b/app/scripts/modules/core/application/application.module.js
@@ -6,6 +6,6 @@ module.exports = angular
   .module('spinnaker.application', [
     require('./application.controller.js'),
     require('./applications.controller.js'),
-    require('./applicationConfig.controller.js'),
+    require('./config/applicationConfig.controller.js'),
     require('./modal/createApplication.modal.controller.js'),
   ]).name;
diff --git a/app/scripts/modules/core/application/applicationConfig.controller.js b/app/scripts/modules/core/application/applicationConfig.controller.js
diff --git a/app/scripts/modules/core/application/applicationConfig.view.html b/app/scripts/modules/core/application/applicationConfig.view.html
diff --git a/app/scripts/modules/core/application/applications.controller.js b/app/scripts/modules/core/application/applications.controller.js
@@ -9,9 +9,10 @@ module.exports = angular.module('spinnaker.applications.controller', [
   require('../cache/viewStateCache.js'),
   require('../presentation/sortToggle/sorttoggle.directive.js'),
   require('../insight/insightmenu.directive.js'),
+  require('../overrideRegistry/override.registry.js'),
 ])
   .controller('ApplicationsCtrl', function($scope, $uibModal, $log, $filter, accountService,
-                                           $state, applicationReader, viewStateCache) {
+                                           $state, applicationReader, viewStateCache, overrideRegistry) {
 
     var applicationsViewStateCache = viewStateCache.applications || viewStateCache.createCache('applications', { version: 1 });
 
@@ -48,8 +49,8 @@ module.exports = angular.module('spinnaker.applications.controller', [
         action: function() {
           $uibModal.open({
             scope: $scope,
-            templateUrl: require('./modal/newapplication.html'),
-            controller: 'CreateApplicationModalCtrl',
+            templateUrl: overrideRegistry.getTemplate('createApplicationModal', require('./modal/newapplication.html')),
+            controller: overrideRegistry.getController('CreateApplicationModalCtrl'),
             controllerAs: 'newAppModal'
           }).result.then(routeToApplication);
         }