refactor(*): More execution details refactoring (spinnaker#4324)

christopherthielen · Oct 24, 2017 · ababde6 · ababde6
1 parent ce13de5
commit ababde6
Show file tree

Hide file tree

Showing 34 changed files with 49 additions and 172 deletions.
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/awsResizeAsgStage.js b/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/awsResizeAsgStage.js
@@ -12,7 +12,6 @@ module.exports = angular.module('spinnaker.amazon.pipeline.stage.aws.resizeAsgSt
       alias: 'resizeAsg',
       cloudProvider: 'aws',
       templateUrl: require('./resizeAsgStage.html'),
-      executionConfigSections: ['resizeServerGroupConfig', 'taskStatus'],
       executionStepLabelUrl: require('./resizeAsgStepLabel.html'),
       accountExtractor: (stage) => [stage.context.credentials],
       configAccountExtractor: (stage) => [stage.credentials],

diff --git a/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/awsScaleDownClusterStage.js b/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/awsScaleDownClusterStage.js
@@ -9,7 +9,6 @@ module.exports = angular.module('spinnaker.amazon.pipeline.stage.scaleDownCluste
       provides: 'scaleDownCluster',
       cloudProvider: 'aws',
       templateUrl: require('./scaleDownClusterStage.html'),
-      executionConfigSections: ['scaleDownClusterConfig', 'taskStatus'],
       accountExtractor: (stage) => [stage.context.credentials],
       configAccountExtractor: (stage) => [stage.credentials],
       validators: [

diff --git a/app/scripts/modules/cloudfoundry/pipeline/stages/resizeAsg/cfResizeAsgStage.js b/app/scripts/modules/cloudfoundry/pipeline/stages/resizeAsg/cfResizeAsgStage.js
@@ -13,7 +13,6 @@ module.exports = angular.module('spinnaker.cf.pipeline.stage.resizeAsgStage', [
       alias: 'resizeAsg',
       cloudProvider: 'cf',
       templateUrl: require('./resizeAsgStage.html'),
-      executionConfigSections: ['resizeServerGroupConfig', 'taskStatus'],
       executionStepLabelUrl: require('./resizeAsgStepLabel.html'),
       validators: [
         {

diff --git a/app/scripts/modules/cloudfoundry/pipeline/stages/scaleDownCluster/cfScaleDownClusterStage.js b/app/scripts/modules/cloudfoundry/pipeline/stages/scaleDownCluster/cfScaleDownClusterStage.js
@@ -12,7 +12,6 @@ module.exports = angular.module('spinnaker.cf.pipeline.stage.scaleDownClusterSta
       provides: 'scaleDownCluster',
       cloudProvider: 'cf',
       templateUrl: require('./scaleDownClusterStage.html'),
-      executionConfigSections: ['scaleDownClusterConfig', 'taskStatus'],
       accountExtractor: (stage) => [stage.context.credentials],
       configAccountExtractor: (stage) => [stage.credentials],
       validators: [

diff --git a/app/scripts/modules/core/src/pipeline/config/pipelineConfigProvider.ts b/app/scripts/modules/core/src/pipeline/config/pipelineConfigProvider.ts
@@ -43,6 +43,9 @@ export class PipelineConfigProvider implements IServiceProvider {
           if (parent.executionDetailsUrl && !stageType.executionDetailsUrl) {
             stageType.executionDetailsUrl = parent.executionDetailsUrl;
           }
+          if (parent.executionConfigSections && !stageType.executionConfigSections) {
+            stageType.executionConfigSections = parent.executionConfigSections;
+          }
         }
       });
   }

diff --git a/app/scripts/modules/core/src/pipeline/config/stages/core/baseExecutionDetails.controller.ts b/app/scripts/modules/core/src/pipeline/config/stages/core/baseExecutionDetails.controller.ts
@@ -21,10 +21,6 @@ export class BaseExecutionDetailsCtrl {
     this.initialize();
   }
 
-  protected setScopeConfigSections(sections: string[]): void {
-    this.$scope.configSections = sections;
-  }
-
   protected initialize(): void {
     this.executionDetailsSectionService.synchronizeSection(this.$scope.configSections, () => this.initialized());
   }

diff --git a/.../destroyAsgExecutionDetails.template.html → .../destroyAsgExecutionDetails.template.html b/.../destroyAsgExecutionDetails.template.html → .../destroyAsgExecutionDetails.template.html
@@ -1,4 +1,4 @@
-<div ng-controller="destroyAsgExecutionDetailsCtrl">
+<div ng-controller="BaseExecutionDetailsCtrl">
   <execution-details-section-nav sections="configSections"></execution-details-section-nav>
   <div class="step-section-details" ng-if="detailsSection === 'destroyServerGroupConfig'">
     <div class="row">

diff --git a/app/scripts/modules/core/src/pipeline/config/stages/destroyAsg/destroyAsgStage.ts b/app/scripts/modules/core/src/pipeline/config/stages/destroyAsg/destroyAsgStage.ts
@@ -1,17 +1,16 @@
 import { module } from 'angular';
 
-import { DESTROY_ASG_EXECUTION_DETAILS_CTRL } from './templates/destroyAsgExecutionDetails.controller';
 import { PIPELINE_CONFIG_PROVIDER, PipelineConfigProvider } from 'core/pipeline/config/pipelineConfigProvider';
 
 export const DESTROY_ASG_STAGE = 'spinnaker.core.pipeline.stage.destroyAsg';
 
 module(DESTROY_ASG_STAGE, [
-  DESTROY_ASG_EXECUTION_DETAILS_CTRL,
   PIPELINE_CONFIG_PROVIDER,
 ])
   .config((pipelineConfigProvider: PipelineConfigProvider) => {
     pipelineConfigProvider.registerStage({
-      executionDetailsUrl: require('./templates/destroyAsgExecutionDetails.template.html'),
+      executionConfigSections: ['destroyServerGroupConfig', 'taskStatus'],
+      executionDetailsUrl: require('./destroyAsgExecutionDetails.template.html'),
       useBaseProvider: true,
       key: 'destroyServerGroup',
       label: 'Destroy Server Group',

diff --git a/.../src/pipeline/config/stages/destroyAsg/templates/destroyAsgExecutionDetails.controller.ts b/.../src/pipeline/config/stages/destroyAsg/templates/destroyAsgExecutionDetails.controller.ts
diff --git a/.../disableAsgExecutionDetails.template.html → .../disableAsgExecutionDetails.template.html b/.../disableAsgExecutionDetails.template.html → .../disableAsgExecutionDetails.template.html
@@ -1,4 +1,4 @@
-<div ng-controller="disableAsgExecutionDetailsCtrl">
+<div ng-controller="BaseExecutionDetailsCtrl">
   <execution-details-section-nav sections="configSections"></execution-details-section-nav>
   <div class="step-section-details" ng-if="detailsSection === 'disableServerGroupConfig'">
     <div class="row">

diff --git a/app/scripts/modules/core/src/pipeline/config/stages/disableAsg/disableAsgStage.module.ts b/app/scripts/modules/core/src/pipeline/config/stages/disableAsg/disableAsgStage.module.ts
@@ -1,18 +1,17 @@
 import { module } from 'angular';
 
-import { DISABLE_ASG_EXECUTION_DETAILS_CTRL } from './templates/disableAsgStage.controller';
 import { PIPELINE_CONFIG_PROVIDER, PipelineConfigProvider } from 'core/pipeline/config/pipelineConfigProvider';
 
 export const DISABLE_ASG_STAGE_MODULE = 'spinnaker.core.pipeline.stage.disableAsg';
 
 module(DISABLE_ASG_STAGE_MODULE, [
-  DISABLE_ASG_EXECUTION_DETAILS_CTRL,
   PIPELINE_CONFIG_PROVIDER,
 ])
 .config((pipelineConfigProvider: PipelineConfigProvider) => {
   pipelineConfigProvider.registerStage({
     useBaseProvider: true,
-    executionDetailsUrl: require('./templates/disableAsgExecutionDetails.template.html'),
+    executionConfigSections: ['disableServerGroupConfig', 'taskStatus'],
+    executionDetailsUrl: require('./disableAsgExecutionDetails.template.html'),
     key: 'disableServerGroup',
     label: 'Disable Server Group',
     description: 'Disables a server group',

diff --git a/...odules/core/src/pipeline/config/stages/disableAsg/templates/disableAsgStage.controller.ts b/...odules/core/src/pipeline/config/stages/disableAsg/templates/disableAsgStage.controller.ts
diff --git a/...s/enableAsgExecutionDetails.template.html → ...g/enableAsgExecutionDetails.template.html b/...s/enableAsgExecutionDetails.template.html → ...g/enableAsgExecutionDetails.template.html
@@ -1,4 +1,4 @@
-<div ng-controller="enableAsgExecutionDetailsCtrl">
+<div ng-controller="BaseExecutionDetailsCtrl">
   <execution-details-section-nav sections="configSections"></execution-details-section-nav>
   <div class="step-section-details" ng-if="detailsSection === 'enableServerGroupConfig'">
     <div class="row">

diff --git a/...stages/enableAsg/enableAsgStage.module.ts → ...config/stages/enableAsg/enableAsgStage.ts b/...stages/enableAsg/enableAsgStage.module.ts → ...config/stages/enableAsg/enableAsgStage.ts
@@ -1,17 +1,16 @@
 import { module } from 'angular';
 
-import { ENABLE_ASG_EXECUTION_DETAILS_CTRL } from './templates/enableAsgStage.controller';
 import { PIPELINE_CONFIG_PROVIDER, PipelineConfigProvider } from 'core/pipeline/config/pipelineConfigProvider';
 
-export const ENABLE_ASG_STAGE_MODULE = 'spinnaker.core.pipeline.stage.enableAsg';
+export const ENABLE_ASG_STAGE = 'spinnaker.core.pipeline.stage.enableAsg';
 
-module(ENABLE_ASG_STAGE_MODULE, [
-  ENABLE_ASG_EXECUTION_DETAILS_CTRL,
+module(ENABLE_ASG_STAGE, [
   PIPELINE_CONFIG_PROVIDER,
 ]).config((pipelineConfigProvider: PipelineConfigProvider) => {
   pipelineConfigProvider.registerStage({
     useBaseProvider: true,
-    executionDetailsUrl: require('./templates/enableAsgExecutionDetails.template.html'),
+    executionConfigSections: ['enableServerGroupConfig', 'taskStatus'],
+    executionDetailsUrl: require('./enableAsgExecutionDetails.template.html'),
     key: 'enableServerGroup',
     label: 'Enable Server Group',
     description: 'Enables a server group',

diff --git a/.../modules/core/src/pipeline/config/stages/enableAsg/templates/enableAsgStage.controller.ts b/.../modules/core/src/pipeline/config/stages/enableAsg/templates/enableAsgStage.controller.ts
diff --git a/app/scripts/modules/core/src/pipeline/config/stages/resizeAsg/resizeAsgStage.ts b/app/scripts/modules/core/src/pipeline/config/stages/resizeAsg/resizeAsgStage.ts
@@ -9,6 +9,7 @@ module(RESIZE_ASG_STAGE, [
 ])
   .config((pipelineConfigProvider: PipelineConfigProvider) => {
     pipelineConfigProvider.registerStage({
+      executionConfigSections: ['resizeServerGroupConfig', 'taskStatus'],
       executionDetailsUrl: require('./resizeAsgExecutionDetails.html'),
       useBaseProvider: true,
       key: 'resizeServerGroup',

diff --git a/...scripts/modules/core/src/pipeline/config/stages/scaleDownCluster/scaleDownClusterStage.js b/...scripts/modules/core/src/pipeline/config/stages/scaleDownCluster/scaleDownClusterStage.js
diff --git a/.../modules/core/src/pipeline/config/stages/scaleDownCluster/scaleDownClusterStage.module.js b/.../modules/core/src/pipeline/config/stages/scaleDownCluster/scaleDownClusterStage.module.js
diff --git a/...scripts/modules/core/src/pipeline/config/stages/scaleDownCluster/scaleDownClusterStage.ts b/...scripts/modules/core/src/pipeline/config/stages/scaleDownCluster/scaleDownClusterStage.ts
@@ -0,0 +1,20 @@
+import { module } from 'angular';
+
+import { PIPELINE_CONFIG_PROVIDER, PipelineConfigProvider } from 'core/pipeline/config/pipelineConfigProvider';
+
+export const SCALE_DOWN_CLUSTER_STAGE = 'spinnaker.core.pipeline.stage.scaleDownClusterStage';
+module(SCALE_DOWN_CLUSTER_STAGE, [
+  PIPELINE_CONFIG_PROVIDER
+])
+  .config((pipelineConfigProvider: PipelineConfigProvider) => {
+    pipelineConfigProvider.registerStage({
+      executionConfigSections: ['scaleDownClusterConfig', 'taskStatus'],
+      executionDetailsUrl: require('./scaleDownClusterExecutionDetails.html'),
+      useBaseProvider: true,
+      key: 'scaleDownCluster',
+      label: 'Scale Down Cluster',
+      description: 'Scales down a cluster',
+      strategy: true,
+    });
+  });
+
diff --git a/...onfig/stages/script/scriptStage.module.js → ...onfig/stages/script/scriptStage.module.ts b/...onfig/stages/script/scriptStage.module.js → ...onfig/stages/script/scriptStage.module.ts
@@ -1,9 +1,9 @@
-'use strict';
+import { module } from 'angular';
 
-const angular = require('angular');
 import { SCRIPT_EXECUTION_DETAILS_CONTROLLER } from './scriptExecutionDetails.controller';
 
-module.exports = angular.module('spinnaker.core.pipeline.stage.script', [
+export const SCRIPT_STAGE_MODULE = 'spinnaker.core.pipeline.stage.script';
+module(SCRIPT_STAGE_MODULE, [
   require('./scriptStage.js').name,
   SCRIPT_EXECUTION_DETAILS_CONTROLLER,
 ]);
diff --git a/...rinkClusterExecutionDetails.template.html → ...rinkClusterExecutionDetails.template.html b/...rinkClusterExecutionDetails.template.html → ...rinkClusterExecutionDetails.template.html
@@ -1,4 +1,4 @@
-<div ng-controller="shrinkClusterExecutionDetailsCtrl">
+<div ng-controller="BaseExecutionDetailsCtrl">
   <execution-details-section-nav sections="configSections"></execution-details-section-nav>
   <div class="step-section-details" ng-if="detailsSection === 'shrinkClusterConfig'">
     <div class="row">

diff --git a/...cripts/modules/core/src/pipeline/config/stages/shrinkCluster/shrinkClusterStage.module.ts b/...cripts/modules/core/src/pipeline/config/stages/shrinkCluster/shrinkClusterStage.module.ts
diff --git a/app/scripts/modules/core/src/pipeline/config/stages/shrinkCluster/shrinkClusterStage.ts b/app/scripts/modules/core/src/pipeline/config/stages/shrinkCluster/shrinkClusterStage.ts
@@ -9,7 +9,8 @@ module(SHRINK_CLUSTER_STAGE, [
 ])
   .config((pipelineConfigProvider: PipelineConfigProvider) => {
     pipelineConfigProvider.registerStage({
-      executionDetailsUrl: require('./templates/shrinkClusterExecutionDetails.template.html'),
+      executionConfigSections: ['shrinkClusterConfig', 'taskStatus'],
+      executionDetailsUrl: require('./shrinkClusterExecutionDetails.template.html'),
       useBaseProvider: true,
       key: 'shrinkCluster',
       label: 'Shrink Cluster',

diff --git a/...ipeline/config/stages/shrinkCluster/templates/shrinkClusterExecutionDetails.controller.ts b/...ipeline/config/stages/shrinkCluster/templates/shrinkClusterExecutionDetails.controller.ts
diff --git a/app/scripts/modules/core/src/pipeline/pipelines.module.js b/app/scripts/modules/core/src/pipeline/pipelines.module.js
@@ -9,11 +9,13 @@ import { COPY_STAGE_MODAL_CONTROLLER } from './config/copyStage/copyStage.modal.
 import { CREATE_LOAD_BALANCER_STAGE } from './config/stages/createLoadBalancer/createLoadBalancerStage.module';
 import { DESTROY_ASG_STAGE } from './config/stages/destroyAsg/destroyAsgStage';
 import { DISABLE_ASG_STAGE_MODULE } from './config/stages/disableAsg/disableAsgStage.module';
-import { ENABLE_ASG_STAGE_MODULE } from './config/stages/enableAsg/enableAsgStage.module';
+import { ENABLE_ASG_STAGE } from './config/stages/enableAsg/enableAsgStage';
 import { FIND_AMI_STAGE } from './config/stages/findAmi/findAmiStage';
 import { GROUP_STAGE_MODULE } from './config/stages/group/groupStage.module';
 import { RESIZE_ASG_STAGE } from './config/stages/resizeAsg/resizeAsgStage';
-import { SHRINK_CLUSTER_STAGE_MODULE } from './config/stages/shrinkCluster/shrinkClusterStage.module';
+import { SCALE_DOWN_CLUSTER_STAGE } from './config/stages/scaleDownCluster/scaleDownClusterStage';
+import { SCRIPT_STAGE_MODULE } from './config/stages/script/scriptStage.module';
+import { SHRINK_CLUSTER_STAGE } from './config/stages/shrinkCluster/shrinkClusterStage';
 import { STAGE_CORE_MODULE } from './config/stages/core/stage.core.module';
 import { TRAVIS_STAGE_MODULE } from './config/stages/travis/travisStage.module';
 import { UNMATCHED_STAGE_TYPE_STAGE } from './config/stages/unmatchedStageTypeStage/unmatchedStageTypeStage';
@@ -39,7 +41,7 @@ module.exports = angular.module('spinnaker.core.pipeline', [
   DESTROY_ASG_STAGE,
   DISABLE_ASG_STAGE_MODULE,
   require('./config/stages/disableCluster/disableClusterStage.module').name,
-  ENABLE_ASG_STAGE_MODULE,
+  ENABLE_ASG_STAGE,
   require('./config/stages/executionWindows/executionWindowsStage.module').name,
   FIND_AMI_STAGE,
   require('./config/stages/findImageFromTags/findImageFromTagsStage.module').name,
@@ -49,9 +51,9 @@ module.exports = angular.module('spinnaker.core.pipeline', [
   require('./config/stages/pipeline/pipelineStage.module').name,
   RESIZE_ASG_STAGE,
   require('./config/stages/runJob/runJobStage.module').name,
-  require('./config/stages/scaleDownCluster/scaleDownClusterStage.module').name,
-  require('./config/stages/script/scriptStage.module').name,
-  SHRINK_CLUSTER_STAGE_MODULE,
+  SCALE_DOWN_CLUSTER_STAGE,
+  SCRIPT_STAGE_MODULE,
+  SHRINK_CLUSTER_STAGE,
   WAIT_STAGE_MODULE,
   require('./config/stages/waitForParentTasks/waitForParentTasks').name,
   CREATE_LOAD_BALANCER_STAGE,

diff --git a/app/scripts/modules/google/src/pipeline/stages/resizeAsg/gceResizeAsgStage.js b/app/scripts/modules/google/src/pipeline/stages/resizeAsg/gceResizeAsgStage.js
@@ -12,7 +12,6 @@ module.exports = angular.module('spinnaker.gce.pipeline.stage..resizeAsgStage',
       provides: 'resizeServerGroup',
       cloudProvider: 'gce',
       templateUrl: require('./resizeAsgStage.html'),
-      executionConfigSections: ['resizeServerGroupConfig', 'taskStatus'],
       executionStepLabelUrl: require('./resizeAsgStepLabel.html'),
       accountExtractor: (stage) => [stage.context.credentials],
       configAccountExtractor: (stage) => [stage.credentials],

diff --git a/app/scripts/modules/google/src/pipeline/stages/scaleDownCluster/gceScaleDownClusterStage.js b/app/scripts/modules/google/src/pipeline/stages/scaleDownCluster/gceScaleDownClusterStage.js
@@ -12,7 +12,6 @@ module.exports = angular.module('spinnaker.gce.pipeline.stage..scaleDownClusterS
       provides: 'scaleDownCluster',
       cloudProvider: 'gce',
       templateUrl: require('./scaleDownClusterStage.html'),
-      executionConfigSections: ['scaleDownClusterConfig', 'taskStatus'],
       accountExtractor: (stage) => [stage.context.credentials],
       configAccountExtractor: (stage) => [stage.credentials],
       validators: [

diff --git a/app/scripts/modules/kubernetes/pipeline/stages/resizeAsg/resizeStage.js b/app/scripts/modules/kubernetes/pipeline/stages/resizeAsg/resizeStage.js
@@ -15,7 +15,6 @@ module.exports = angular.module('spinnaker.kubernetes.pipeline.stage.resizeStage
       cloudProvider: 'kubernetes',
       templateUrl: require('./resizeStage.html'),
       executionDetailsUrl: require('./resizeExecutionDetails.html'),
-      executionConfigSections: ['resizeServerGroupConfig', 'taskStatus'],
       executionStepLabelUrl: require('./resizeStepLabel.html'),
       validators: [
         {

diff --git a/app/scripts/modules/kubernetes/pipeline/stages/scaleDownCluster/scaleDownClusterStage.js b/app/scripts/modules/kubernetes/pipeline/stages/scaleDownCluster/scaleDownClusterStage.js
@@ -13,7 +13,6 @@ module.exports = angular.module('spinnaker.kubernetes.pipeline.stage.scaleDownCl
       cloudProvider: 'kubernetes',
       templateUrl: require('./scaleDownClusterStage.html'),
       executionDetailsUrl: require('./scaleDownClusterExecutionDetails.html'),
-      executionConfigSections: ['scaleDownClusterConfig', 'taskStatus'],
       validators: [
         { type: 'requiredField', fieldName: 'cluster' },
         { type: 'requiredField', fieldName: 'remainingFullSizeServerGroups', fieldLabel: 'Keep [X] full size Server Groups'},