From c072761b18e4690c352ed0348651725b9e9c2269 Mon Sep 17 00:00:00 2001 From: chrisb Date: Sat, 30 Jan 2016 11:46:41 -0800 Subject: [PATCH 001/151] get provider, vpcId from configured security group --- .../securityGroup/details/securityGroupDetail.controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/scripts/modules/amazon/securityGroup/details/securityGroupDetail.controller.js b/app/scripts/modules/amazon/securityGroup/details/securityGroupDetail.controller.js index 40dec6cda7e..33f37fd9b54 100644 --- a/app/scripts/modules/amazon/securityGroup/details/securityGroupDetail.controller.js +++ b/app/scripts/modules/amazon/securityGroup/details/securityGroupDetail.controller.js @@ -102,8 +102,8 @@ module.exports = angular.module('spinnaker.securityGroup.aws.details.controller' var submitMethod = function () { return securityGroupWriter.deleteSecurityGroup(securityGroup, application, { - cloudProvider: $scope.securityGroup.type, - vpcId: $scope.securityGroup.vpcId, + cloudProvider: securityGroup.provider, + vpcId: securityGroup.vpcId, }); }; From 38997b267192222e5dd40a758609871a3a620561 Mon Sep 17 00:00:00 2001 From: duftler Date: Mon, 1 Feb 2016 14:17:51 -0500 Subject: [PATCH 002/151] Rename rebakeControlEnabled to roscoMode, as it now guards more than just the single Rebake control. Add support to Bake Stage for optional Template File Name field (it is only rendered if roscoMode is enabled). --- app/scripts/modules/core/help/helpContents.js | 1 + .../core/pipeline/config/stages/bake/aws/awsBakeStage.js | 2 +- .../stages/bake/aws/bakeExecutionDetails.controller.js | 2 +- .../config/stages/bake/aws/bakeExecutionDetails.html | 6 ++++-- .../core/pipeline/config/stages/bake/aws/bakeStage.html | 9 +++++++-- .../stages/bake/gce/bakeExecutionDetails.controller.js | 2 +- .../config/stages/bake/gce/bakeExecutionDetails.html | 6 ++++-- .../core/pipeline/config/stages/bake/gce/bakeStage.html | 9 +++++++-- .../core/pipeline/config/stages/bake/gce/gceBakeStage.js | 2 +- settings.js | 2 +- 10 files changed, 28 insertions(+), 13 deletions(-) diff --git a/app/scripts/modules/core/help/helpContents.js b/app/scripts/modules/core/help/helpContents.js index 1b9013482f3..495c6c23887 100644 --- a/app/scripts/modules/core/help/helpContents.js +++ b/app/scripts/modules/core/help/helpContents.js @@ -157,6 +157,7 @@ module.exports = angular.module('spinnaker.core.help.contents', []) 'pipeline.config.bake.amiSuffix': '

(Optional) String of date in format YYYYMMDDHHmm, default is calculated from timestamp,

', 'pipeline.config.bake.enhancedNetworking': '

(Optional) Enable enhanced networking (sr-iov) support for image (requires hvm and trusty base_os).

', 'pipeline.config.bake.amiName': '

(Optional) Default = $package-$arch-$ami_suffix-$store_type

', + 'pipeline.config.bake.templateFileName': '

(Optional) The explicit packer template to use, instead of resolving one from rosco\'s configuration.

', 'pipeline.config.gce.bake.baseImage': '

(Optional) A GCE image name. For example: ubuntu-1204-precise-v20150910.

', 'pipeline.config.manualJudgment.instructions': '

(Optional) Instructions are shown to the user when making a manual judgment.

May contain HTML.

', 'pipeline.config.manualJudgment.failPipeline': '' + diff --git a/app/scripts/modules/core/pipeline/config/stages/bake/aws/awsBakeStage.js b/app/scripts/modules/core/pipeline/config/stages/bake/aws/awsBakeStage.js index 9bffd8a48be..bfa2291afb9 100644 --- a/app/scripts/modules/core/pipeline/config/stages/bake/aws/awsBakeStage.js +++ b/app/scripts/modules/core/pipeline/config/stages/bake/aws/awsBakeStage.js @@ -80,7 +80,7 @@ module.exports = angular.module('spinnaker.core.pipeline.stage.aws.bakeStage', [ if (!$scope.stage.baseLabel && $scope.baseLabelOptions && $scope.baseLabelOptions.length) { $scope.stage.baseLabel = $scope.baseLabelOptions[0]; } - $scope.viewState.rebakeControlEnabled = settings.feature.rebakeControlEnabled; + $scope.viewState.roscoMode = settings.feature.roscoMode; $scope.viewState.loading = false; }); } diff --git a/app/scripts/modules/core/pipeline/config/stages/bake/aws/bakeExecutionDetails.controller.js b/app/scripts/modules/core/pipeline/config/stages/bake/aws/bakeExecutionDetails.controller.js index 9fe57e92766..6fa31b572fc 100644 --- a/app/scripts/modules/core/pipeline/config/stages/bake/aws/bakeExecutionDetails.controller.js +++ b/app/scripts/modules/core/pipeline/config/stages/bake/aws/bakeExecutionDetails.controller.js @@ -22,7 +22,7 @@ module.exports = angular.module('spinnaker.core.pipeline.stage.bake.aws.executio $scope.provider = $scope.stage.context.cloudProviderType || 'aws'; }); - $scope.rebakeControlEnabled = settings.feature.rebakeControlEnabled; + $scope.roscoMode = settings.feature.roscoMode; $scope.bakeryDetailUrl = $interpolate(settings.bakeryDetailUrl); } diff --git a/app/scripts/modules/core/pipeline/config/stages/bake/aws/bakeExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/bake/aws/bakeExecutionDetails.html index 99317af6b15..6188f919096 100644 --- a/app/scripts/modules/core/pipeline/config/stages/bake/aws/bakeExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/bake/aws/bakeExecutionDetails.html @@ -24,8 +24,10 @@
{{stage.context.storeType | uppercase}}
Label
{{stage.context.baseLabel}}
-
Rebake
-
{{stage.context.rebake || false}}
+
Rebake
+
{{stage.context.rebake || false}}
+
Template
+
{{stage.context.templateFileName}}
diff --git a/app/scripts/modules/core/pipeline/config/stages/bake/aws/bakeStage.html b/app/scripts/modules/core/pipeline/config/stages/bake/aws/bakeStage.html index bdfcd6546bf..d5e177e69da 100644 --- a/app/scripts/modules/core/pipeline/config/stages/bake/aws/bakeStage.html +++ b/app/scripts/modules/core/pipeline/config/stages/bake/aws/bakeStage.html @@ -44,8 +44,8 @@

{{baseLabel}} - - + +
+ + + diff --git a/app/scripts/modules/core/pipeline/config/stages/bake/gce/bakeExecutionDetails.controller.js b/app/scripts/modules/core/pipeline/config/stages/bake/gce/bakeExecutionDetails.controller.js index de193575365..9c8fe93f740 100644 --- a/app/scripts/modules/core/pipeline/config/stages/bake/gce/bakeExecutionDetails.controller.js +++ b/app/scripts/modules/core/pipeline/config/stages/bake/gce/bakeExecutionDetails.controller.js @@ -22,7 +22,7 @@ module.exports = angular.module('spinnaker.core.pipeline.stage.bake.gce.executio $scope.provider = $scope.stage.context.cloudProviderType || 'gce'; }); - $scope.rebakeControlEnabled = settings.feature.rebakeControlEnabled; + $scope.roscoMode = settings.feature.roscoMode; $scope.bakeryDetailUrl = $interpolate(settings.bakeryDetailUrl); } diff --git a/app/scripts/modules/core/pipeline/config/stages/bake/gce/bakeExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/bake/gce/bakeExecutionDetails.html index 53376636f28..9728f5451f3 100644 --- a/app/scripts/modules/core/pipeline/config/stages/bake/gce/bakeExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/bake/gce/bakeExecutionDetails.html @@ -20,8 +20,10 @@
{{stage.context.baseOs}}
Label
{{stage.context.baseLabel}}
-
Rebake
-
{{stage.context.rebake || false}}
+
Rebake
+
{{stage.context.rebake || false}}
+
Template
+
{{stage.context.templateFileName}}
diff --git a/app/scripts/modules/core/pipeline/config/stages/bake/gce/bakeStage.html b/app/scripts/modules/core/pipeline/config/stages/bake/gce/bakeStage.html index 5ed6873a4af..e0c3673be4b 100644 --- a/app/scripts/modules/core/pipeline/config/stages/bake/gce/bakeStage.html +++ b/app/scripts/modules/core/pipeline/config/stages/bake/gce/bakeStage.html @@ -21,8 +21,8 @@ - - + +
+ + + diff --git a/app/scripts/modules/core/pipeline/config/stages/bake/gce/gceBakeStage.js b/app/scripts/modules/core/pipeline/config/stages/bake/gce/gceBakeStage.js index f689c0fdc92..72daf4683f0 100644 --- a/app/scripts/modules/core/pipeline/config/stages/bake/gce/gceBakeStage.js +++ b/app/scripts/modules/core/pipeline/config/stages/bake/gce/gceBakeStage.js @@ -53,7 +53,7 @@ module.exports = angular.module('spinnaker.core.pipeline.stage.gce.bakeStage', [ if (!$scope.stage.baseLabel && $scope.baseLabelOptions && $scope.baseLabelOptions.length) { $scope.stage.baseLabel = $scope.baseLabelOptions[0]; } - $scope.viewState.rebakeControlEnabled = settings.feature.rebakeControlEnabled; + $scope.viewState.roscoMode = settings.feature.roscoMode; $scope.viewState.loading = false; }); } diff --git a/settings.js b/settings.js index d7c2e084237..020670ff577 100644 --- a/settings.js +++ b/settings.js @@ -58,7 +58,7 @@ window.spinnakerSettings = { fastProperty: true, vpcMigrator: true, clusterDiff: true, - rebakeControlEnabled: false, + roscoMode: false, netflixMode: false, }, }; From 1984b34d7895ae2e88d23a176150504e38e26539 Mon Sep 17 00:00:00 2001 From: bfarrell Date: Mon, 1 Feb 2016 19:48:56 -0800 Subject: [PATCH 003/151] Update manual jdgment state to allow inputs to be set and utilized at execution time. --- app/scripts/modules/core/help/helpContents.js | 3 +- .../manualJudgment/manualJudgment.service.js | 5 ++- ...nualJudgmentExecutionDetails.controller.js | 7 ++-- .../manualJudgmentExecutionDetails.html | 13 +++++++- .../manualJudgment/manualJudgmentStage.html | 33 +++++++++++++++++++ .../manualJudgment/manualJudgmentStage.js | 12 +++++++ 6 files changed, 65 insertions(+), 8 deletions(-) diff --git a/app/scripts/modules/core/help/helpContents.js b/app/scripts/modules/core/help/helpContents.js index 495c6c23887..c82745eb9f4 100644 --- a/app/scripts/modules/core/help/helpContents.js +++ b/app/scripts/modules/core/help/helpContents.js @@ -157,12 +157,13 @@ module.exports = angular.module('spinnaker.core.help.contents', []) 'pipeline.config.bake.amiSuffix': '

(Optional) String of date in format YYYYMMDDHHmm, default is calculated from timestamp,

', 'pipeline.config.bake.enhancedNetworking': '

(Optional) Enable enhanced networking (sr-iov) support for image (requires hvm and trusty base_os).

', 'pipeline.config.bake.amiName': '

(Optional) Default = $package-$arch-$ami_suffix-$store_type

', - 'pipeline.config.bake.templateFileName': '

(Optional) The explicit packer template to use, instead of resolving one from rosco\'s configuration.

', 'pipeline.config.gce.bake.baseImage': '

(Optional) A GCE image name. For example: ubuntu-1204-precise-v20150910.

', 'pipeline.config.manualJudgment.instructions': '

(Optional) Instructions are shown to the user when making a manual judgment.

May contain HTML.

', 'pipeline.config.manualJudgment.failPipeline': '' + '

Checked - the overall pipeline will fail whenever the manual judgment is negative.

' + '

Unchecked - the overall pipeline will continue executing but this particular branch will stop.

', + 'pipeline.config.manualJudgment.judgmentInputs': '

(Optional) Entries populate input dropdown when making manual judgment.

' + + '

Selected value can be used in precondition to determine branching. e.g. execution.stages[n].context.judgmentInput==value

', 'pipeline.config.failPipeline': '' + '

Checked - the overall pipeline will fail whenever the stage fails.

' + '

Unchecked - the overall pipeline will continue executing but this particular branch will stop.

', diff --git a/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgment.service.js b/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgment.service.js index 0c25188fbad..83c9fb954dd 100644 --- a/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgment.service.js +++ b/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgment.service.js @@ -20,16 +20,15 @@ module.exports = angular }; }; - let provideJudgment = (execution, stage, judgment) => { + let provideJudgment = (execution, stage, judgment, input) => { var targetUrl = [settings.gateUrl, 'pipelines', execution.id, 'stages', stage.id].join('/'); var deferred = $q.defer(); var request = { method: 'PATCH', url: targetUrl, - data: {judgmentStatus: judgment}, + data: {judgmentStatus: judgment, judgmentInput: input}, timeout: settings.pollSchedule * 2 + 5000, // TODO: replace with apiHost call }; - $http(request) .success(() => { executionService.waitUntilExecutionMatches(execution.id, buildMatcher(stage, judgment, deferred)) diff --git a/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentExecutionDetails.controller.js b/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentExecutionDetails.controller.js index fad5ab9514b..6517b12b69c 100644 --- a/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentExecutionDetails.controller.js +++ b/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentExecutionDetails.controller.js @@ -16,6 +16,7 @@ module.exports = angular $scope.viewState = { submitting: false, judgmentDecision: null, + judgmentInput: null, error: false, }; @@ -38,12 +39,12 @@ module.exports = angular $scope.viewState.error = true; } - this.provideJudgment = (judgmentDecision) => { + this.provideJudgment = (judgmentDecision, judgmentInput) => { $scope.viewState.submitting = true; $scope.viewState.error = false; $scope.viewState.judgmentDecision = judgmentDecision; - return manualJudgmentService.provideJudgment($scope.execution, $scope.stage, judgmentDecision) + $scope.viewState.judgmentInput = judgmentInput; + return manualJudgmentService.provideJudgment($scope.execution, $scope.stage, judgmentDecision, judgmentInput) .then(judgmentMade, judgmentFailure); }; - }); diff --git a/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentExecutionDetails.html index a37df204fc1..4823da085d2 100644 --- a/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentExecutionDetails.html @@ -10,12 +10,23 @@

{{ stage.endTime | timestamp }}
+
Input
+
{{ stage.context.judgmentInput | robotToHuman}}
Instructions
- diff --git a/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentStage.html b/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentStage.html index d9e71beaee8..82ad24cef2e 100644 --- a/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentStage.html +++ b/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentStage.html @@ -13,6 +13,39 @@
+ + + + + + + + + + + + + + + + + + + +
Input ValueActions
+
+ +
+ 		+ Remove +
+ +
+ diff --git a/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentStage.js b/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentStage.js index 87df5f66782..ca8d9503377 100644 --- a/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentStage.js +++ b/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentStage.js @@ -19,6 +19,7 @@ module.exports = angular.module('spinnaker.core.pipeline.stage.manualJudgmentSta .controller('ManualJudgmentStageCtrl', function($scope, $uibModal) { $scope.stage.notifications = $scope.stage.notifications || []; + $scope.stage.judgmentInputs = $scope.stage.judgmentInputs || []; $scope.stage.failPipeline = ($scope.stage.failPipeline === undefined ? true : $scope.stage.failPipeline); this.addNotification = function() { @@ -40,4 +41,15 @@ module.exports = angular.module('spinnaker.core.pipeline.stage.manualJudgmentSta $scope.stage.notifications.splice(idx, 1); }; + this.addJudgmentInput = function() { + if (!$scope.stage.judgmentInputs) { + $scope.stage.judgmentInputs = []; + } + var judgmentInput = {}; + $scope.stage.judgmentInputs.push(judgmentInput); + }; + + this.removeJudgmentInput = function (idx) { + $scope.stage.judgmentInputs.splice(idx, 1); + }; }); From 703cd203bcd5af14366d82c0df0deb5e2db6bdcc Mon Sep 17 00:00:00 2001 From: Brendan Farrell Date: Mon, 1 Feb 2016 21:55:55 -0600 Subject: [PATCH 004/151] Readd deleted help message. --- app/scripts/modules/core/help/helpContents.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/scripts/modules/core/help/helpContents.js b/app/scripts/modules/core/help/helpContents.js index c82745eb9f4..c01b224a21d 100644 --- a/app/scripts/modules/core/help/helpContents.js +++ b/app/scripts/modules/core/help/helpContents.js @@ -157,6 +157,7 @@ module.exports = angular.module('spinnaker.core.help.contents', []) 'pipeline.config.bake.amiSuffix': '

(Optional) String of date in format YYYYMMDDHHmm, default is calculated from timestamp,

', 'pipeline.config.bake.enhancedNetworking': '

(Optional) Enable enhanced networking (sr-iov) support for image (requires hvm and trusty base_os).

', 'pipeline.config.bake.amiName': '

(Optional) Default = $package-$arch-$ami_suffix-$store_type

', + 'pipeline.config.bake.templateFileName': '

(Optional) The explicit packer template to use, instead of resolving one from rosco\'s configuration.

', 'pipeline.config.gce.bake.baseImage': '

(Optional) A GCE image name. For example: ubuntu-1204-precise-v20150910.

', 'pipeline.config.manualJudgment.instructions': '

(Optional) Instructions are shown to the user when making a manual judgment.

May contain HTML.

', 'pipeline.config.manualJudgment.failPipeline': '' + From 0f9e1ce75a8fc29d9c2c11984408b7a79c247ed6 Mon Sep 17 00:00:00 2001 From: chrisb Date: Mon, 1 Feb 2016 22:28:09 -0800 Subject: [PATCH 005/151] style tweaks to judgment inputs --- app/scripts/modules/core/help/helpContents.js | 8 ++++++-- app/scripts/modules/core/modal/modals.less | 4 ++++ .../manualJudgmentExecutionDetails.html | 4 ++-- .../manualJudgment/manualJudgmentStage.html | 19 ++++++++----------- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/app/scripts/modules/core/help/helpContents.js b/app/scripts/modules/core/help/helpContents.js index c01b224a21d..ec04d61fdf3 100644 --- a/app/scripts/modules/core/help/helpContents.js +++ b/app/scripts/modules/core/help/helpContents.js @@ -163,8 +163,12 @@ module.exports = angular.module('spinnaker.core.help.contents', []) 'pipeline.config.manualJudgment.failPipeline': '' + '

Checked - the overall pipeline will fail whenever the manual judgment is negative.

' + '

Unchecked - the overall pipeline will continue executing but this particular branch will stop.

', - 'pipeline.config.manualJudgment.judgmentInputs': '

(Optional) Entries populate input dropdown when making manual judgment.

' + - '

Selected value can be used in precondition to determine branching. e.g. execution.stages[n].context.judgmentInput==value

', + 'pipeline.config.manualJudgment.judgmentInputs': '

(Optional) Entries populate a dropdown displayed when ' + + 'performing a manual judgment.

' + + '

The selected value can be used in a subsequent Check Preconditions stage to determine branching.

' + + '

For example, if the user selects "rollback" from this list of options, that branch can be activated by using the ' + + 'expression: ' + + 'execution.stages[n].context.judgmentInput=="rollback"

', 'pipeline.config.failPipeline': '' + '

Checked - the overall pipeline will fail whenever the stage fails.

' + '

Unchecked - the overall pipeline will continue executing but this particular branch will stop.

', diff --git a/app/scripts/modules/core/modal/modals.less b/app/scripts/modules/core/modal/modals.less index 833d6b7fa68..fcb6b7f9498 100644 --- a/app/scripts/modules/core/modal/modals.less +++ b/app/scripts/modules/core/modal/modals.less @@ -237,6 +237,10 @@ select.select2 { background: #ffffff; } +abbr.select2-search-choice-close { + margin-top: 0; +} + .select2-container-multi { &.select2-container-active { .select2-choices { diff --git a/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentExecutionDetails.html index 4823da085d2..637129a8d7f 100644 --- a/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentExecutionDetails.html @@ -12,12 +12,12 @@
Input
{{ stage.context.judgmentInput | robotToHuman}}
-
Instructions
+
Instructions
-
+

Judgment Input

{{$select.selected.value}} diff --git a/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentStage.html b/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentStage.html index 82ad24cef2e..a5bfcf0705e 100644 --- a/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentStage.html +++ b/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentStage.html @@ -13,25 +13,22 @@
- +
- - + + - @@ -52,7 +49,7 @@ - + @@ -63,8 +60,8 @@ - From 86bb98ad8a90e586731cb7bc82a8b8a6b6a9d396 Mon Sep 17 00:00:00 2001 From: chrisb Date: Tue, 2 Feb 2016 07:51:45 -0800 Subject: [PATCH 006/151] fdescribe -> describe --- app/scripts/modules/netflix/migrator/migrator.service.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/modules/netflix/migrator/migrator.service.spec.js b/app/scripts/modules/netflix/migrator/migrator.service.spec.js index b9bf7e2027b..d7e2cbde4d9 100644 --- a/app/scripts/modules/netflix/migrator/migrator.service.spec.js +++ b/app/scripts/modules/netflix/migrator/migrator.service.spec.js @@ -1,6 +1,6 @@ 'use strict'; -fdescribe('Service: migrator', function () { +describe('Service: migrator', function () { var service, $q, $scope, taskExecutor; From cabf0a97aad02205cb9273b89eb4ec0f2bb4cf4f Mon Sep 17 00:00:00 2001 From: chrisb Date: Tue, 2 Feb 2016 09:20:43 -0800 Subject: [PATCH 007/151] show instance details view when single instance selected in multiselect mode --- .../cluster/filter/clusterFilter.model.js | 51 ++++++++++++++++--- .../filter/clusterFilter.model.spec.js | 45 +++++++++++++--- app/scripts/modules/core/cluster/rollups.less | 4 -- .../details/multipleInstances.controller.js | 15 +++--- .../instance/instanceListBody.directive.js | 20 +------- 5 files changed, 95 insertions(+), 40 deletions(-) diff --git a/app/scripts/modules/core/cluster/filter/clusterFilter.model.js b/app/scripts/modules/core/cluster/filter/clusterFilter.model.js index 2bd4edc87bd..4cff4ca2d1b 100644 --- a/app/scripts/modules/core/cluster/filter/clusterFilter.model.js +++ b/app/scripts/modules/core/cluster/filter/clusterFilter.model.js @@ -54,16 +54,39 @@ module.exports = angular }; this.syncNavigation = () => { - let instancesSelected = 0; - this.multiselectInstanceGroups.forEach((instanceGroup) => { - instancesSelected += instanceGroup.instanceIds.length; - }); + // this method gets called on page initialization, so if we're deep linked to an instance details view, leave it + if (!this.multiselectInstanceGroups.length && $state.params.instanceId) { + return; + } + + let instancesSelected = this.multiselectInstanceGroups.reduce((acc, group) => acc + group.instanceIds.length, 0); + + if (instancesSelected === 1) { + // if there's just one instance selected and we're not showing instance details, do so + if (!$state.includes('**.instanceDetails')) { + let [match] = this.multiselectInstanceGroups.filter((group) => group.instanceIds.length), + params = {provider: match.cloudProvider, instanceId: match.instanceIds[0]}; + if ($state.includes('**.clusters.*')) { + $state.go('^.instanceDetails', params); + } else { + $state.go('.instanceDetails', params); + } + } + return; + } + + // if the user just de-selected the one instance, close the details view + if (this.sortFilter.listInstances && $state.includes('**.instanceDetails') && instancesSelected === 0) { + $state.go('^'); + } if ($state.includes('**.multipleInstances') && !instancesSelected) { $state.go('^'); } - if (!$state.includes('**.multipleInstances') && instancesSelected) { + if (!$state.includes('**.multipleInstances') && instancesSelected > 1) { + // user selected multiple instances if ($state.includes('**.clusters.*')) { + // from a child state, e.g. instanceDetails $state.go('^.multipleInstances'); } else { $state.go('.multipleInstances'); @@ -71,6 +94,14 @@ module.exports = angular } }; + this.clearAllMultiselectGroups = () => { + this.multiselectInstanceGroups.forEach((instanceGroup) => { + instanceGroup.instanceIds.length = 0; + instanceGroup.selectAll = false; + }); + this.multiselectInstancesStream.onNext(); + }; + this.getOrCreateMultiselectInstanceGroup = (serverGroup) => { let serverGroupName = serverGroup.name, account = serverGroup.account, @@ -83,12 +114,17 @@ module.exports = angular instanceGroup.cloudProvider === cloudProvider; }); if (!result) { + // when creating a new group, include an instance ID if we're deep-linked into the details view + let params = $state.params; + let instanceIds = (serverGroup.instances || []) + .filter((instance) => instance.provider === params.provider && instance.id === params.instanceId) + .map((instance) => instance.id); result = { serverGroup: serverGroupName, account: account, region: region, cloudProvider: cloudProvider, - instanceIds: [], + instanceIds: instanceIds, instances: [], // populated by details controller selectAll: false, }; @@ -178,6 +214,9 @@ module.exports = angular if (movingFromClusterState(toState, fromState)) { this.saveState(fromState, fromParams, mostRecentParams); } + if ($state.includes('**.instanceDetails') && this.sortFilter.listInstances && isClusterState(toState.name)) { + this.clearAllMultiselectGroups(); + } }; $rootScope.$on('$stateChangeStart', this.handleStateChangeStart); diff --git a/app/scripts/modules/core/cluster/filter/clusterFilter.model.spec.js b/app/scripts/modules/core/cluster/filter/clusterFilter.model.spec.js index 5d91903c9ac..e99bddb2995 100644 --- a/app/scripts/modules/core/cluster/filter/clusterFilter.model.spec.js +++ b/app/scripts/modules/core/cluster/filter/clusterFilter.model.spec.js @@ -22,6 +22,7 @@ describe('Cluster Filter Model', function () { this.currentStates = []; spyOn($state, 'includes').and.callFake((substate) => this.currentStates.indexOf(substate) > -1); spyOn($state, 'go').and.callFake((newState) => this.result = newState); + $state.params = {}; }); describe('syncNavigation', function () { @@ -32,30 +33,54 @@ describe('Cluster Filter Model', function () { it('navigates to multipleInstances child view when not already there and instances are selected', function () { this.instanceGroup.instanceIds.push('i-123'); - this.currentStates = ['**.clusters.*']; + this.instanceGroup.instanceIds.push('i-124'); + this.currentStates = ['**.clusters']; ClusterFilterModel.syncNavigation(); - expect(this.result).toBe('^.multipleInstances'); + expect(this.result).toBe('.multipleInstances'); + }); + + it('navigates to instanceDetails child view when not already there and an instance is selected', function () { + this.instanceGroup.instanceIds.push('i-123'); + this.currentStates = ['**.clusters']; + ClusterFilterModel.syncNavigation(); + expect(this.result).toBe('.instanceDetails'); }); it('navigates to multipleInstances sibling view when not already there and instances are selected', function () { this.instanceGroup.instanceIds.push('i-123'); - this.currentStates = ['**.clusters.instanceDetails']; + this.instanceGroup.instanceIds.push('i-124'); + this.currentStates = ['**.clusters.*', '**.clusters.instanceDetails']; ClusterFilterModel.syncNavigation(); - expect(this.result).toBe('.multipleInstances'); + expect(this.result).toBe('^.multipleInstances'); + }); + + it('navigates to instanceDetails sibling view when not already there and instances are selected', function () { + this.instanceGroup.instanceIds.push('i-124'); + this.currentStates = ['**.clusters.*', '**.clusters.instanceDetails']; + ClusterFilterModel.syncNavigation(); + expect(this.result).toBe('^.instanceDetails'); }); it('does not navigate when already in multipleInstances view', function () { this.instanceGroup.instanceIds.push('i-123'); - this.currentStates = ['**.multipleInstances']; + this.instanceGroup.instanceIds.push('i-124'); + this.currentStates = ['**.clusters.*', '**.multipleInstances']; ClusterFilterModel.syncNavigation(); expect(this.result).toBe(null); }); it('navigates away from multipleInstances view when no instances are selected', function () { - this.currentStates = ['**.multipleInstances']; + this.currentStates = ['**.clusters.*', '**.multipleInstances']; ClusterFilterModel.syncNavigation(); expect(this.result).toBe('^'); }); + + it('navigates to instanceDetails view when just one instance remains selected', function () { + this.instanceGroup.instanceIds.push('i-123'); + this.currentStates = ['**.clusters.*', '**.multipleInstances']; + ClusterFilterModel.syncNavigation(); + expect(this.result).toBe('^.instanceDetails'); + }); }); describe('getOrCreateMultiselectInstanceGroup', function () { @@ -97,6 +122,14 @@ describe('Cluster Filter Model', function () { let test = ClusterFilterModel.getOrCreateMultiselectInstanceGroup(this.serverGroup); expect(test).not.toBe(this.original); }); + + it('includes instance id if present in state params', function () { + $state.params = { provider: 'aws', instanceId: 'i-123' }; + this.serverGroup.instances = [ { id: 'i-123', provider: 'aws' } ]; + this.serverGroup.name = 'asg-v002'; + let test = ClusterFilterModel.getOrCreateMultiselectInstanceGroup(this.serverGroup); + expect(test.instanceIds).toEqual(['i-123']); + }); }); describe('toggleMultiselectInstance', function () { diff --git a/app/scripts/modules/core/cluster/rollups.less b/app/scripts/modules/core/cluster/rollups.less index 820f3ce2b84..4b344beabb6 100644 --- a/app/scripts/modules/core/cluster/rollups.less +++ b/app/scripts/modules/core/cluster/rollups.less @@ -76,10 +76,6 @@ font-size: 200%; margin: 0; } - tr.instance-row:hover > td.no-hover { - background-color: #ffffff; - cursor: default; - } a.instance { margin: 0; display: inline-block; diff --git a/app/scripts/modules/core/instance/details/multipleInstances.controller.js b/app/scripts/modules/core/instance/details/multipleInstances.controller.js index 6b779c5d76a..79e6ea8f623 100644 --- a/app/scripts/modules/core/instance/details/multipleInstances.controller.js +++ b/app/scripts/modules/core/instance/details/multipleInstances.controller.js @@ -200,17 +200,15 @@ module.exports = angular.module('spinnaker.core.instance.details.multipleInstanc }; }; - + let countInstances = () => { + return ClusterFilterModel.multiselectInstanceGroups.reduce((acc, group) => acc + group.instanceIds.length, 0); + }; let retrieveInstances = () => { - this.instancesCount = 0; + this.instancesCount = countInstances(); this.selectedGroups = ClusterFilterModel.multiselectInstanceGroups .filter((group) => group.instanceIds.length) .map(makeServerGroupModel); - - this.selectedGroups.forEach((group) => { - this.instancesCount += group.instances.length; - }); }; let multiselectWatcher = ClusterFilterModel.multiselectInstancesStream.subscribe(retrieveInstances); @@ -219,6 +217,11 @@ module.exports = angular.module('spinnaker.core.instance.details.multipleInstanc retrieveInstances(); $scope.$on('$destroy', () => { + // if there's just one instance selected, this is being destroyed because we're moving to the instanceDetails + // view; otherwise, deselect any instances because the user is closing the panel explicitly + if (countInstances() !== 1) { + ClusterFilterModel.clearAllMultiselectGroups(); + } refreshWatcher.dispose(); multiselectWatcher.dispose(); }); diff --git a/app/scripts/modules/core/instance/instanceListBody.directive.js b/app/scripts/modules/core/instance/instanceListBody.directive.js index 94db4d364f2..d3e62072acc 100644 --- a/app/scripts/modules/core/instance/instanceListBody.directive.js +++ b/app/scripts/modules/core/instance/instanceListBody.directive.js @@ -23,8 +23,6 @@ module.exports = angular.module('spinnaker.core.instance.instanceListBody.direct instanceGroup = ClusterFilterModel.getOrCreateMultiselectInstanceGroup(scope.serverGroup), activeInstance = null; - var base = elem.parent().inheritedData('$uiView').state; - function toggleSelection(instanceId) { ClusterFilterModel.toggleMultiselectInstance(scope.serverGroup, instanceId); } @@ -35,7 +33,7 @@ module.exports = angular.module('spinnaker.core.instance.instanceListBody.direct function buildInstanceCheckboxCell(instance) { let isChecked = ClusterFilterModel.instanceIsMultiselected(scope.serverGroup, instance.id); - return ``; + return ``; } function buildInstanceIdCell(instance) { @@ -208,12 +206,6 @@ module.exports = angular.module('spinnaker.core.instance.instanceListBody.direct elem.click(function(event) { $timeout(function() { if (event.target) { - let $target = $(event.target); - if ($target.is(':checkbox')) { - toggleSelection(event.target.getAttribute('data-instance-id')); - event.preventDefault(); - return; - } // anything handled by ui-sref or actual links should be ignored if (event.isDefaultPrevented() || (event.originalEvent && (event.originalEvent.defaultPrevented || event.originalEvent.target.href))) { return; @@ -225,15 +217,7 @@ module.exports = angular.module('spinnaker.core.instance.instanceListBody.direct if (activeInstance) { $('tr[data-instance-id="' + activeInstance.instanceId + '"]', elem).removeClass('active'); } - var targetRow = $targetRow.get(0); - var params = { - instanceId: targetRow.getAttribute('data-instance-id'), - provider: targetRow.getAttribute('data-provider') - }; - activeInstance = params; - // also stolen from uiSref directive - $state.go('.instanceDetails', params, {relative: base, inherit: true}); - $targetRow.addClass('active'); + toggleSelection($targetRow.attr('data-instance-id')); event.preventDefault(); } }); From b8f256977bb074bc8619db32759947f887ba8fb4 Mon Sep 17 00:00:00 2001 From: Zan Thrash Date: Wed, 3 Feb 2016 11:51:21 -0800 Subject: [PATCH 008/151] SPIN-1453: Adding new ACA Config selector to FP ACA screen. This selector gets a list of all previous Canary Configs for a given app. When the user selects a previous confg it populates the Canary Config form with the values. This can eventually go into the ACA pipeline stage I just want to get it out there and get some feedback from users. --- .../netflix/canary/canary.read.service.js | 9 ++- .../canaryConfigSelector.directive.html | 19 +++++++ .../canary/canaryConfigSelector.directive.js | 57 +++++++++++++++++++ app/scripts/modules/netflix/canary/index.js | 3 +- .../fastPropertyAcaConfigForm.directive.html | 17 +++++- 5 files changed, 99 insertions(+), 6 deletions(-) create mode 100644 app/scripts/modules/netflix/canary/canaryConfigSelector.directive.html create mode 100644 app/scripts/modules/netflix/canary/canaryConfigSelector.directive.js diff --git a/app/scripts/modules/netflix/canary/canary.read.service.js b/app/scripts/modules/netflix/canary/canary.read.service.js index 05db2d49e31..1020686d2eb 100644 --- a/app/scripts/modules/netflix/canary/canary.read.service.js +++ b/app/scripts/modules/netflix/canary/canary.read.service.js @@ -9,12 +9,17 @@ module.exports = angular ]) .factory('canaryReadService', function(Restangular) { - function getCanaryById(canaryId) { + let getCanaryById = (canaryId) => { return Restangular.one('canaries').one(canaryId).get(); - } + }; + + let getCanaryConfigsByApplication = (applicationName) => { + return Restangular.one('canaryConfigs').one(applicationName).getList(); + }; return { getCanaryById: getCanaryById, + getCanaryConfigsByApplication: getCanaryConfigsByApplication }; }); diff --git a/app/scripts/modules/netflix/canary/canaryConfigSelector.directive.html b/app/scripts/modules/netflix/canary/canaryConfigSelector.directive.html new file mode 100644 index 00000000000..241246dd8a3 --- /dev/null +++ b/app/scripts/modules/netflix/canary/canaryConfigSelector.directive.html @@ -0,0 +1,19 @@ +
+
+ + + + {{$select.selected.name}} + + + + {{option.name}} + + + +
+
diff --git a/app/scripts/modules/netflix/canary/canaryConfigSelector.directive.js b/app/scripts/modules/netflix/canary/canaryConfigSelector.directive.js new file mode 100644 index 00000000000..777e50a032c --- /dev/null +++ b/app/scripts/modules/netflix/canary/canaryConfigSelector.directive.js @@ -0,0 +1,57 @@ +'use strict'; + +let angular = require('angular'); + +module.exports = angular + .module('spinnaker.netfilx.widgits.canaryConfigSelector.directive', [ + require('./canary.read.service'), + require('../../core/utils/lodash') + ]) + .directive('canaryConfigSelector', () => { + return { + scope: {}, + bindToController: { + model: '=' , + applicationName: '=' + }, + templateUrl: require('./canaryConfigSelector.directive.html'), + controllerAs: 'vm', + controller: function($scope, canaryReadService, _) { + let vm = this; + + vm.selectorChanged = (model) => { + if (model) { + vm.model = model; + vm.model.successfulScore = model.canarySuccessCriteria.canaryResultScore; + vm.model.unhealthyScore = model.canaryHealthCheckHandler.minimumCanaryResultScore; + vm.model.resultStrategy = model.combinedCanaryResultStrategy; + } + }; + + vm.isNameInConfigList = (selectedName) => { + return getSelected(vm.canaryConfigs, selectedName).length ? true : false; + }; + + let setOptions = (results) => { + vm.canaryConfigs = results; + return vm.canaryConfigs; + }; + + let getSelected = _.curry((canaryConfigs = [], canaryName) => { + return canaryConfigs.filter((config) => config.name === canaryName); + }); + + let findConfigAndSet = _.flowRight(vm.selectorChanged, _.first, getSelected); + + $scope.$watch('vm.model.name', function(newVal) { + if(newVal !== undefined) { + findConfigAndSet(vm.canaryConfigs, newVal); + } + }); + + canaryReadService.getCanaryConfigsByApplication(vm.applicationName) + .then(setOptions); + + } + }; + }); diff --git a/app/scripts/modules/netflix/canary/index.js b/app/scripts/modules/netflix/canary/index.js index 43852d89240..999f0820710 100644 --- a/app/scripts/modules/netflix/canary/index.js +++ b/app/scripts/modules/netflix/canary/index.js @@ -4,5 +4,6 @@ let angular = require('angular'); module.exports = angular .module('spinnaker.core.canary', [ - require('./canaryAnalysisNameSelector.directive.js') + require('./canaryAnalysisNameSelector.directive.js'), + require('./canaryConfigSelector.directive') ]); diff --git a/app/scripts/modules/netflix/fastProperties/modal/wizard/fastPropertyAcaConfigForm.directive.html b/app/scripts/modules/netflix/fastProperties/modal/wizard/fastPropertyAcaConfigForm.directive.html index 54858700f2c..0c028bd2e44 100644 --- a/app/scripts/modules/netflix/fastProperties/modal/wizard/fastPropertyAcaConfigForm.directive.html +++ b/app/scripts/modules/netflix/fastProperties/modal/wizard/fastPropertyAcaConfigForm.directive.html @@ -21,6 +21,18 @@

Canary Config

+
+
+ Configs +
+
+ + +
+
+
Name @@ -65,8 +77,8 @@

Canary Config

class="form-control input-sm" ng-model="newFP.property.canary.resultStrategy" > - - + +
@@ -198,5 +210,4 @@
Analysis Config
- {{newFP.startScope}} From 7fcc842e7af3d6cce4178a1d5e49d9eaeabf2fdd Mon Sep 17 00:00:00 2001 From: chrisb Date: Thu, 4 Feb 2016 07:59:06 -0800 Subject: [PATCH 009/151] update security group submit button should say "Update" --- .../amazon/securityGroup/configure/EditSecurityGroupCtrl.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/scripts/modules/amazon/securityGroup/configure/EditSecurityGroupCtrl.js b/app/scripts/modules/amazon/securityGroup/configure/EditSecurityGroupCtrl.js index 6d1c5d2653a..8e1bf724e63 100644 --- a/app/scripts/modules/amazon/securityGroup/configure/EditSecurityGroupCtrl.js +++ b/app/scripts/modules/amazon/securityGroup/configure/EditSecurityGroupCtrl.js @@ -32,6 +32,8 @@ module.exports = angular.module('spinnaker.securityGroup.aws.edit.controller', [ securityGroup: securityGroup, })); + $scope.isNew = false; + $scope.taskMonitor = taskMonitorService.buildTaskMonitor({ application: application, title: 'Updating your security group', From 77d846eae3c7efc56579f1347c31c08d240d6897 Mon Sep 17 00:00:00 2001 From: Zan Thrash Date: Thu, 4 Feb 2016 14:32:58 -0800 Subject: [PATCH 010/151] SPIN-1415: Evict Local Storage if there is an exception on setItem Our current strategy to only clear out the infrastructureCaches if there is an exception thrown on insert. As the app has grown we have added more and more to Local Storage resulting in the possibility of exhausting the 5MB of space given in most browsers. This change simply evicts the entire local storage (restricted to the namespace of the url), when there is an insert exception. This change also reduces the TTL of the 'collapsible section cache' from 30 days to 7 days. --- .../core/cache/collapsibleSectionStateCache.js | 2 +- app/scripts/modules/core/cache/deckCacheFactory.js | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/app/scripts/modules/core/cache/collapsibleSectionStateCache.js b/app/scripts/modules/core/cache/collapsibleSectionStateCache.js index 806832468a8..546601b70e7 100644 --- a/app/scripts/modules/core/cache/collapsibleSectionStateCache.js +++ b/app/scripts/modules/core/cache/collapsibleSectionStateCache.js @@ -12,7 +12,7 @@ module.exports = angular.module('spinnaker.core.cache.collapsibleSectionState', try { CacheFactory.createCache(cacheId, { - maxAge: 30 * 24 * 60 * 60 * 1000, // 30 days + maxAge: 7 * 24 * 60 * 60 * 1000, // 7 days deleteOnExpire: 'aggressive', storageMode: 'localStorage', }); diff --git a/app/scripts/modules/core/cache/deckCacheFactory.js b/app/scripts/modules/core/cache/deckCacheFactory.js index 2e892441102..c4bf808d9a0 100644 --- a/app/scripts/modules/core/cache/deckCacheFactory.js +++ b/app/scripts/modules/core/cache/deckCacheFactory.js @@ -60,16 +60,7 @@ module.exports = angular.module('spinnaker.core.cache.deckCacheFactory', [ window.localStorage.setItem(k, v); } catch (e) { $log.warn('Local Storage Error! Clearing caches and trying again.\nException:', e); - for (var key in window.localStorage) { - // invalidate keystore for any angular caches - if (key.match(/angular-cache\.caches\.infrastructure:.*.\.keys/)) { - window.localStorage.setItem(key, '[]'); - } - // clear the data itself - if (key.match(/angular-cache\.caches\.infrastructure:.*.\.data\./)) { - window.localStorage.removeItem(key); - } - } + window.localStorage.clear(); window.localStorage.setItem(k, v); } }, From ebc036c1dde47772d5e69a9875cfa4d0086ebcec Mon Sep 17 00:00:00 2001 From: Zan Thrash Date: Sat, 6 Feb 2016 12:57:58 -0800 Subject: [PATCH 011/151] Angular got bumped to 1.5.0 causing issues with ui-select. I'm pinning Angular to the latest 1.4 release (1.4.9). --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 955cfdef380..250ca750c8f 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "Select2": "git://github.com/select2/select2.git#3.4.8", - "angular": "^1.4.1", + "angular": "~1.4.1", "angular-animate": "^1.4.1", "angular-cache": "^4.2.2", "angular-debounce": "git://github.com/shahata/angular-debounce.git#0.1.7", From 2e2c763dca255ba071466b8c98e4f42210e4bbe2 Mon Sep 17 00:00:00 2001 From: chrisb Date: Mon, 1 Feb 2016 13:34:07 -0800 Subject: [PATCH 012/151] provide svg logo for cloud foundry --- app/scripts/modules/cloudfoundry/cf.module.js | 4 +++- app/scripts/modules/cloudfoundry/logo/cf.logo.less | 8 ++++++++ app/scripts/modules/cloudfoundry/logo/cf.logo.svg | 1 + .../modules/cloudfoundry/{ => logo}/logo_cf.png | Bin 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 app/scripts/modules/cloudfoundry/logo/cf.logo.less create mode 100644 app/scripts/modules/cloudfoundry/logo/cf.logo.svg rename app/scripts/modules/cloudfoundry/{ => logo}/logo_cf.png (100%) diff --git a/app/scripts/modules/cloudfoundry/cf.module.js b/app/scripts/modules/cloudfoundry/cf.module.js index 50f9663a06f..a50392a9577 100644 --- a/app/scripts/modules/cloudfoundry/cf.module.js +++ b/app/scripts/modules/cloudfoundry/cf.module.js @@ -2,6 +2,8 @@ let angular = require('angular'); +require('./logo/cf.logo.less'); + // load all templates into the $templateCache var templates = require.context('./', true, /\.html$/); templates.keys().forEach(function(key) { @@ -35,7 +37,7 @@ module.exports = angular.module('spinnaker.cf', [ cloudProviderRegistryProvider.registerProvider('cf', { name: 'Cloud Foundry', logo: { - path: require('./logo_cf.png'), + path: require('./logo/logo_cf.png'), }, cache: { configurer: 'cfCacheConfigurer', diff --git a/app/scripts/modules/cloudfoundry/logo/cf.logo.less b/app/scripts/modules/cloudfoundry/logo/cf.logo.less new file mode 100644 index 00000000000..b600630eef1 --- /dev/null +++ b/app/scripts/modules/cloudfoundry/logo/cf.logo.less @@ -0,0 +1,8 @@ +cloud-provider-logo { + .icon-cf { + mask: url('cf.logo.svg') no-repeat 50% 50%; + -webkit-mask: url('cf.logo.svg') no-repeat 50% 0%; + mask-size: cover; + -webkit-mask-size: cover; + } +} diff --git a/app/scripts/modules/cloudfoundry/logo/cf.logo.svg b/app/scripts/modules/cloudfoundry/logo/cf.logo.svg new file mode 100644 index 00000000000..97d5e36fc55 --- /dev/null +++ b/app/scripts/modules/cloudfoundry/logo/cf.logo.svg @@ -0,0 +1 @@ +cf-logo \ No newline at end of file diff --git a/app/scripts/modules/cloudfoundry/logo_cf.png b/app/scripts/modules/cloudfoundry/logo/logo_cf.png similarity index 100% rename from app/scripts/modules/cloudfoundry/logo_cf.png rename to app/scripts/modules/cloudfoundry/logo/logo_cf.png From da307abdd4eee07e3269549c8e09e4297d904591 Mon Sep 17 00:00:00 2001 From: chrisb Date: Thu, 4 Feb 2016 00:00:11 -0800 Subject: [PATCH 013/151] v2 modal wizard (aws only) --- app/scripts/modules/amazon/aws.module.js | 1 + .../instance/awsInstanceType.service.js | 61 ------- .../configure/advancedSettings.html | 42 +++++ .../createLoadBalancer.controller.js | 11 +- .../configure/createLoadBalancer.html | 30 ++- .../createLoadBalancerProperties.html | 12 -- .../configure/editLoadBalancer.html | 26 ++- .../loadBalancer/configure/healthCheck.html | 124 +++---------- .../loadBalancer/configure/listeners.html | 17 -- ...cerAvailabilityZoneSelector.directive.html | 4 +- .../configure/securityGroups.html | 18 +- .../details/loadBalancerDetail.controller.js | 2 + .../clone/cloneSecurityGroup.html | 8 +- .../configure/createSecurityGroup.html | 20 +- .../configure/createSecurityGroupIngress.html | 11 -- .../createSecurityGroupProperties.html | 12 -- .../configure/editSecurityGroup.html | 17 +- .../details/securityGroupDetail.controller.js | 2 + .../serverGroup.configure.aws.module.js | 22 ++- .../serverGroupCommandBuilder.service.js | 3 + .../serverGroupConfiguration.service.js | 3 + .../serverGroupConfiguration.service.spec.js | 29 +-- .../wizard/CloneServerGroup.aws.controller.js | 62 +++---- .../CloneServerGroup.aws.controller.spec.js | 23 ++- .../ServerGroupAdvancedSettings.controller.js | 20 -- ...ServerGroupInstanceArchetype.controller.js | 29 --- .../ServerGroupInstanceType.controller.js | 11 -- .../configure/wizard/advancedSettings.html | 141 -------------- .../advancedSettings/advancedSettings.html | 128 +++++++++++++ .../ServerGroupCapacity.controller.js | 26 --- .../configure/wizard/capacity/capacity.html | 26 +-- .../capacity/capacityFooter.directive.html | 15 -- .../capacity/capacityFooter.directive.js | 26 --- .../configure/wizard/capacity/zones.html | 4 + .../configure/wizard/instanceArchetype.html | 20 -- .../configure/wizard/instanceType.html | 20 -- .../wizard/instanceType/instanceType.html | 8 + .../configure/wizard/loadBalancers.html | 60 ------ .../ServerGroupLoadBalancers.controller.js | 9 +- .../loadBalancerSelector.directive.html | 44 +++++ .../loadBalancerSelector.directive.js | 32 ++++ .../wizard/loadBalancers/loadBalancers.html | 3 + .../ServerGroupBasicSettings.controller.js | 17 +- .../wizard/{ => location}/basicSettings.html | 13 -- .../ServerGroupSecurityGroups.controller.js | 17 -- .../wizard/securityGroups/securityGroups.html | 20 +- .../securityGroupsFooter.directive.html | 14 -- .../securityGroupsFooter.directive.js | 25 --- .../configure/wizard/serverGroupWizard.html | 43 +++-- .../deployInitializer.controller.js | 6 +- .../deployInitializerCtrl.spec.js | 0 .../templateSelection.html | 4 +- .../availabilityZoneSelector.directive.html | 0 .../availabilityZoneSelector.directive.js | 0 .../azRebalanceSelector.directive.html | 0 .../azRebalanceSelector.directive.js | 0 .../serverGroupDetails.aws.controller.js | 1 + .../configure/wizard/templateSelection.html | 2 +- .../configure/wizard/templateSelection.html | 2 +- .../modal/editApplication.controller.modal.js | 15 +- .../application/modal/editApplication.html | 10 +- .../core/cluster/allClusters.controller.js | 1 + app/scripts/modules/core/cluster/rollups.less | 1 + .../executionGroup.directive.html | 2 +- .../executionGroup/executionGroup.less | 4 + .../executions/executions.controller.js | 2 +- .../core/instance/instanceSelection.less | 4 +- .../core/loadBalancer/AllLoadBalancersCtrl.js | 1 + .../modules/core/modal/modal.module.js | 3 + .../core/modal/modalOverlay.directive.js | 6 +- app/scripts/modules/core/modal/modals.less | 172 +++++++++--------- .../core/modal/wizard/modalWizard.less | 99 ++++++++++ .../modal/wizard/v2modalWizard.directive.html | 33 ++++ .../modal/wizard/v2modalWizard.directive.js | 32 ++++ .../modal/wizard/v2modalWizard.service.js | 86 +++++++++ .../modal/wizard/v2wizardPage.directive.html | 11 ++ .../modal/wizard/v2wizardPage.directive.js | 44 +++++ .../config/stages/deploy/deployStage.js | 2 + .../modules/core/presentation/main.less | 9 + .../configureProject.modal.controller.js | 6 + .../configure/configureProject.modal.html | 26 ++- .../configure/projectApplications.modal.html | 14 -- .../configure/projectClusters.modal.html | 14 -- .../configure/projectConfig.modal.html | 11 -- .../configure/projectPipelines.modal.html | 10 - .../infrastructure.controller.js | 1 + .../securityGroup/AllSecurityGroupsCtrl.js | 1 + .../v2InstanceTypeSelector.directive.js | 70 +++++++ .../common/v2instanceArchetype.directive.html | 36 ++++ .../v2instanceArchetypeSelector.directive.js | 120 ++++++++++++ .../core/task/monitor/taskMonitor.html | 2 +- .../core/utils/scrollTo/scrollTo.service.js | 4 +- .../stickyHeader/stickyHeader.directive.js | 16 +- .../core/utils/waypoints/waypoint.service.js | 26 ++- .../application/editApplication.modal.html | 12 +- .../modal/wizard/fastPropertyWizard.html | 2 +- app/scripts/modules/netflix/netflix.module.js | 2 +- .../report/reservationReport.directive.js | 29 +-- .../awsServerGroupSecurityGroups.html | 17 -- .../capacity/awsServerGroupCapacity.html | 31 ---- .../capacity/awsServerGroupCapacity.html | 21 +++ .../awsServerGroupSecurityGroups.html | 5 + .../serverGroupCommandConfigurer.service.js | 20 +- .../templateOverrides.module.js | 4 +- .../configure/wizard/templateSelection.html | 2 +- 105 files changed, 1278 insertions(+), 1107 deletions(-) create mode 100644 app/scripts/modules/amazon/loadBalancer/configure/advancedSettings.html delete mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/ServerGroupAdvancedSettings.controller.js delete mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/ServerGroupInstanceArchetype.controller.js delete mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/ServerGroupInstanceType.controller.js delete mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/advancedSettings.html create mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/advancedSettings/advancedSettings.html delete mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/ServerGroupCapacity.controller.js delete mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacityFooter.directive.html delete mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacityFooter.directive.js create mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/zones.html delete mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/instanceArchetype.html delete mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/instanceType.html create mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/instanceType/instanceType.html delete mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers.html rename app/scripts/modules/amazon/serverGroup/configure/wizard/{ => loadBalancers}/ServerGroupLoadBalancers.controller.js (69%) create mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.html create mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.js create mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/loadBalancers.html rename app/scripts/modules/amazon/serverGroup/configure/wizard/{ => location}/ServerGroupBasicSettings.controller.js (78%) rename app/scripts/modules/amazon/serverGroup/configure/wizard/{ => location}/basicSettings.html (91%) delete mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/ServerGroupSecurityGroups.controller.js delete mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroupsFooter.directive.html delete mode 100644 app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroupsFooter.directive.js rename app/scripts/modules/amazon/serverGroup/configure/wizard/{ => templateSelection}/deployInitializer.controller.js (94%) rename app/scripts/modules/amazon/serverGroup/configure/wizard/{ => templateSelection}/deployInitializerCtrl.spec.js (100%) rename app/scripts/modules/amazon/serverGroup/configure/wizard/{ => templateSelection}/templateSelection.html (96%) rename app/scripts/modules/amazon/serverGroup/configure/wizard/{ => zones}/availabilityZoneSelector.directive.html (100%) rename app/scripts/modules/amazon/serverGroup/configure/wizard/{ => zones}/availabilityZoneSelector.directive.js (100%) rename app/scripts/modules/amazon/serverGroup/configure/wizard/{capacity => zones}/azRebalanceSelector.directive.html (100%) rename app/scripts/modules/amazon/serverGroup/configure/wizard/{capacity => zones}/azRebalanceSelector.directive.js (100%) create mode 100644 app/scripts/modules/core/modal/wizard/modalWizard.less create mode 100644 app/scripts/modules/core/modal/wizard/v2modalWizard.directive.html create mode 100644 app/scripts/modules/core/modal/wizard/v2modalWizard.directive.js create mode 100644 app/scripts/modules/core/modal/wizard/v2modalWizard.service.js create mode 100644 app/scripts/modules/core/modal/wizard/v2wizardPage.directive.html create mode 100644 app/scripts/modules/core/modal/wizard/v2wizardPage.directive.js create mode 100644 app/scripts/modules/core/serverGroup/configure/common/v2InstanceTypeSelector.directive.js create mode 100644 app/scripts/modules/core/serverGroup/configure/common/v2instanceArchetype.directive.html create mode 100644 app/scripts/modules/core/serverGroup/configure/common/v2instanceArchetypeSelector.directive.js delete mode 100644 app/scripts/modules/netflix/serverGroup/awsServerGroupSecurityGroups.html delete mode 100644 app/scripts/modules/netflix/serverGroup/capacity/awsServerGroupCapacity.html create mode 100644 app/scripts/modules/netflix/serverGroup/wizard/capacity/awsServerGroupCapacity.html create mode 100644 app/scripts/modules/netflix/serverGroup/wizard/securityGroups/awsServerGroupSecurityGroups.html rename app/scripts/modules/netflix/serverGroup/{ => wizard}/serverGroupCommandConfigurer.service.js (77%) diff --git a/app/scripts/modules/amazon/aws.module.js b/app/scripts/modules/amazon/aws.module.js index 09d49cda3c5..5c1c48345c1 100644 --- a/app/scripts/modules/amazon/aws.module.js +++ b/app/scripts/modules/amazon/aws.module.js @@ -46,6 +46,7 @@ module.exports = angular.module('spinnaker.aws', [ ]) .config(function(cloudProviderRegistryProvider) { cloudProviderRegistryProvider.registerProvider('aws', { + v2wizard: true, name: 'Amazon', logo: { path: require('./logo/amazon.logo.svg'), diff --git a/app/scripts/modules/amazon/instance/awsInstanceType.service.js b/app/scripts/modules/amazon/instance/awsInstanceType.service.js index 65c899f7199..f06a176ae9e 100644 --- a/app/scripts/modules/amazon/instance/awsInstanceType.service.js +++ b/app/scripts/modules/amazon/instance/awsInstanceType.service.js @@ -167,91 +167,30 @@ module.exports = angular.module('spinnaker.aws.instanceType.service', [ { type: 'general', label: 'General Purpose', - description: 'Instances that provide a balance of compute, memory, and network resources', families: [ m3 ], icon: 'hdd' }, { type: 'memory', label: 'High Memory', - description: 'Instances that are optimized for memory-intensive applications', families: [ r3 ], icon: 'hdd' }, { type: 'micro', label: 'Micro Utility', - description: 'Instances that provide relatively small amounts of memory and CPU power', families: [t2, m3micro], icon: 'hdd' }, { type: 'custom', label: 'Custom Type', - description: 'Select the instance type below.', families: [], icon: 'asterisk' } ]; - function calculateStorage(type) { - if (!type || !type.storage) { - return 0; - } - return type.storage.count * type.storage.size; - } - - function buildStats(category) { - var stats = { - cpu: { - min: Number.MAX_VALUE, - max: -Number.MAX_VALUE - }, - memory: { - min: Number.MAX_VALUE, - max: -Number.MAX_VALUE - }, - storage: { - min: Number.MAX_VALUE, - max: -Number.MAX_VALUE - }, - costFactor: { - min: Number.MAX_VALUE, - max: -Number.MAX_VALUE - }, - families: [] - }; - - if (category.families && category.families.length) { - category.families.forEach(function(family) { - stats.families.push(family.type); - var cpuMin = _.min(family.instanceTypes, 'cpu').cpu || Number.MAX_VALUE, - cpuMax = _.max(family.instanceTypes, 'cpu').cpu || -Number.MAX_VALUE, - memoryMin = _.min(family.instanceTypes, 'memory').memory || Number.MAX_VALUE, - memoryMax = _.max(family.instanceTypes, 'memory').memory || -Number.MAX_VALUE, - storageMin = calculateStorage(_.min(family.instanceTypes, calculateStorage)) || Number.MAX_VALUE, - storageMax = calculateStorage(_.max(family.instanceTypes, calculateStorage)) || -Number.MAX_VALUE, - costFactorMin = _.min(family.instanceTypes, 'costFactor').costFactor || Number.MAX_VALUE, - costFactorMax = _.max(family.instanceTypes, 'costFactor').costFactor || -Number.MAX_VALUE; - - stats.cpu.min = Math.min(stats.cpu.min, cpuMin); - stats.cpu.max = Math.max(stats.cpu.max, cpuMax); - stats.memory.min = Math.min(stats.memory.min, memoryMin); - stats.memory.max = Math.max(stats.memory.max, memoryMax); - stats.storage.min = Math.min(stats.storage.min, storageMin); - stats.storage.max = Math.max(stats.storage.max, storageMax); - stats.costFactor.min = Math.min(stats.costFactor.min, costFactorMin); - stats.costFactor.max = Math.max(stats.costFactor.max, costFactorMax); - }); - } - - return stats; - } - function getCategories() { - categories.map(function(category) { - category.stats = buildStats(category); - }); return $q.when(categories); } diff --git a/app/scripts/modules/amazon/loadBalancer/configure/advancedSettings.html b/app/scripts/modules/amazon/loadBalancer/configure/advancedSettings.html new file mode 100644 index 00000000000..987ac80da82 --- /dev/null +++ b/app/scripts/modules/amazon/loadBalancer/configure/advancedSettings.html @@ -0,0 +1,42 @@ +
+
+ +
+
+ Timeout +
+
+ +
+
+ +
+
+ Interval +
+
+ +
+
+ +
+
+ Healthy Threshold +
+
+ +
+
+ +
+
+ Unhealthy Threshold +
+
+ +
+
+ + +
+
\ No newline at end of file diff --git a/app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancer.controller.js b/app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancer.controller.js index d5b624e4a56..494adff1121 100644 --- a/app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancer.controller.js +++ b/app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancer.controller.js @@ -9,7 +9,7 @@ module.exports = angular.module('spinnaker.loadBalancer.aws.create.controller', require('../../../core/account/account.service.js'), require('../loadBalancer.transformer.js'), require('../../../core/securityGroup/securityGroup.read.service.js'), - require('../../../core/modal/wizard/modalWizard.service.js'), + require('../../../core/modal/wizard/v2modalWizard.service.js'), require('../../../core/task/monitor/taskMonitorService.js'), require('../../subnet/subnet.read.service.js'), require('../../../core/cache/cacheInitializer.js'), @@ -24,7 +24,7 @@ module.exports = angular.module('spinnaker.loadBalancer.aws.create.controller', .controller('awsCreateLoadBalancerCtrl', function($scope, $modalInstance, $state, _, accountService, awsLoadBalancerTransformer, securityGroupReader, cacheInitializer, infrastructureCaches, loadBalancerReader, - modalWizardService, loadBalancerWriter, taskMonitorService, + v2modalWizardService, loadBalancerWriter, taskMonitorService, subnetReader, namingService, settings, application, loadBalancer, isNew) { @@ -35,6 +35,7 @@ module.exports = angular.module('spinnaker.loadBalancer.aws.create.controller', securityGroups: require('./securityGroups.html'), listeners: require('./listeners.html'), healthCheck: require('./healthCheck.html'), + advancedSettings: require('./advancedSettings.html'), }; $scope.isNew = isNew; @@ -180,7 +181,7 @@ module.exports = angular.module('spinnaker.loadBalancer.aws.create.controller', }); $scope.loadBalancer.securityGroups = _.unique(existingNames); if ($scope.state.removedSecurityGroups.length) { - modalWizardService.getWizard().markDirty('Security Groups'); + v2modalWizardService.markDirty('Security Groups'); } } else { clearSecurityGroups(); @@ -337,10 +338,10 @@ module.exports = angular.module('spinnaker.loadBalancer.aws.create.controller', updateAvailableSecurityGroups(availableVpcIds); if (subnetPurpose) { $scope.loadBalancer.vpcId = availableVpcIds.length ? availableVpcIds[0] : null; - modalWizardService.getWizard().includePage('Security Groups'); + v2modalWizardService.includePage('Security Groups'); } else { $scope.loadBalancer.vpcId = null; - modalWizardService.getWizard().excludePage('Security Groups'); + v2modalWizardService.excludePage('Security Groups'); } }; diff --git a/app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancer.html b/app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancer.html index 8bea8983983..107e1b552cb 100644 --- a/app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancer.html +++ b/app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancer.html @@ -1,14 +1,24 @@ - - + + - - + + - - + + - - + + - - + + + + + +
+ + +
\ No newline at end of file diff --git a/app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancerProperties.html b/app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancerProperties.html index 1f1bbf51332..86b26fe1fa3 100644 --- a/app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancerProperties.html +++ b/app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancerProperties.html @@ -70,16 +70,4 @@

-
- - - -
diff --git a/app/scripts/modules/amazon/loadBalancer/configure/editLoadBalancer.html b/app/scripts/modules/amazon/loadBalancer/configure/editLoadBalancer.html index 91ac2548e26..63d97e653d7 100644 --- a/app/scripts/modules/amazon/loadBalancer/configure/editLoadBalancer.html +++ b/app/scripts/modules/amazon/loadBalancer/configure/editLoadBalancer.html @@ -1,11 +1,21 @@ - - + + - - + + - - + + - - + + + + + +
+ + +
\ No newline at end of file diff --git a/app/scripts/modules/amazon/loadBalancer/configure/healthCheck.html b/app/scripts/modules/amazon/loadBalancer/configure/healthCheck.html index 3bd52b3df1c..3e96a6e6f7f 100644 --- a/app/scripts/modules/amazon/loadBalancer/configure/healthCheck.html +++ b/app/scripts/modules/amazon/loadBalancer/configure/healthCheck.html @@ -1,101 +1,29 @@
-
-
-
-

Health Check

-
-
-
Ping
-
Input ValueActionsOptionActions
-
-
- Remove + + Remove
Type DetailsActionsActions
{{notification.address}} - + Remove
- - - - - - - - - - - - - - - -
ProtocolPortPath
-
- - - - -
-
-

Advanced Settings

-
- -
- -
-
- Timeout -
-
- -
-
- -
-
- Interval -
-
- -
-
- -
-
- Healthy Threshold -
-
- -
-
- -
-
- Unhealthy Threshold -
-
- -
-
- - -
-
- - - - - - -
- - - +
Ping
+ + + + + + + + + + + + + + + + +
ProtocolPortPath
+
diff --git a/app/scripts/modules/amazon/loadBalancer/configure/listeners.html b/app/scripts/modules/amazon/loadBalancer/configure/listeners.html index ae2738c1066..a6e246bca51 100644 --- a/app/scripts/modules/amazon/loadBalancer/configure/listeners.html +++ b/app/scripts/modules/amazon/loadBalancer/configure/listeners.html @@ -1,5 +1,4 @@
-
@@ -48,20 +47,4 @@ -
- - - - -
diff --git a/app/scripts/modules/amazon/loadBalancer/configure/loadBalancerAvailabilityZoneSelector.directive.html b/app/scripts/modules/amazon/loadBalancer/configure/loadBalancerAvailabilityZoneSelector.directive.html index 46e3c3d3129..cac54d8f137 100644 --- a/app/scripts/modules/amazon/loadBalancer/configure/loadBalancerAvailabilityZoneSelector.directive.html +++ b/app/scripts/modules/amazon/loadBalancer/configure/loadBalancerAvailabilityZoneSelector.directive.html @@ -1,6 +1,6 @@
-
Availability Zones
+
Availability Zones
(Select a region)

Automatic Availability Zone Balancing:

@@ -12,7 +12,7 @@
-

+

Server group will be available in:

    diff --git a/app/scripts/modules/amazon/loadBalancer/configure/securityGroups.html b/app/scripts/modules/amazon/loadBalancer/configure/securityGroups.html index ca179f4a529..63030e2e13d 100644 --- a/app/scripts/modules/amazon/loadBalancer/configure/securityGroups.html +++ b/app/scripts/modules/amazon/loadBalancer/configure/securityGroups.html @@ -2,7 +2,7 @@

    -
    +
    @@ -46,20 +46,4 @@

    -
    - - - - - -
    diff --git a/app/scripts/modules/amazon/loadBalancer/details/loadBalancerDetail.controller.js b/app/scripts/modules/amazon/loadBalancer/details/loadBalancerDetail.controller.js index 09df6b82f4c..cef4ab74eca 100644 --- a/app/scripts/modules/amazon/loadBalancer/details/loadBalancerDetail.controller.js +++ b/app/scripts/modules/amazon/loadBalancer/details/loadBalancerDetail.controller.js @@ -87,6 +87,7 @@ module.exports = angular.module('spinnaker.loadBalancer.aws.details.controller', $uibModal.open({ templateUrl: require('../configure/editLoadBalancer.html'), controller: 'awsCreateLoadBalancerCtrl as ctrl', + size: 'lg', resolve: { application: function() { return app; }, loadBalancer: function() { return angular.copy($scope.loadBalancer); }, @@ -99,6 +100,7 @@ module.exports = angular.module('spinnaker.loadBalancer.aws.details.controller', $uibModal.open({ templateUrl: require('../configure/createLoadBalancer.html'), controller: 'awsCreateLoadBalancerCtrl as ctrl', + size: 'lg', resolve: { application: function() { return app; }, loadBalancer: function() { return angular.copy($scope.loadBalancer); }, diff --git a/app/scripts/modules/amazon/securityGroup/clone/cloneSecurityGroup.html b/app/scripts/modules/amazon/securityGroup/clone/cloneSecurityGroup.html index d3ee785be0d..ad6062ed7b1 100644 --- a/app/scripts/modules/amazon/securityGroup/clone/cloneSecurityGroup.html +++ b/app/scripts/modules/amazon/securityGroup/clone/cloneSecurityGroup.html @@ -1,4 +1,3 @@ - @@ -7,3 +6,10 @@ +
    + + +
    diff --git a/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroup.html b/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroup.html index 469c152a54f..9f3638c75ae 100644 --- a/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroup.html +++ b/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroup.html @@ -1,9 +1,15 @@ - - - + + - - + + - - + + +
    + + +
    diff --git a/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupIngress.html b/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupIngress.html index 6d11b13e9fa..3d91cec6509 100644 --- a/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupIngress.html +++ b/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupIngress.html @@ -86,15 +86,4 @@
    -
    - - - -
    diff --git a/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupProperties.html b/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupProperties.html index 17e87dfbba7..a5eafb63e09 100644 --- a/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupProperties.html +++ b/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupProperties.html @@ -60,16 +60,4 @@
-
- - - -
diff --git a/app/scripts/modules/amazon/securityGroup/configure/editSecurityGroup.html b/app/scripts/modules/amazon/securityGroup/configure/editSecurityGroup.html index d4ac8c7bb7a..29fbf6dea1c 100644 --- a/app/scripts/modules/amazon/securityGroup/configure/editSecurityGroup.html +++ b/app/scripts/modules/amazon/securityGroup/configure/editSecurityGroup.html @@ -1,6 +1,13 @@ - - - + + - - + + +
+ + +
+ diff --git a/app/scripts/modules/amazon/securityGroup/details/securityGroupDetail.controller.js b/app/scripts/modules/amazon/securityGroup/details/securityGroupDetail.controller.js index 33f37fd9b54..2b426745196 100644 --- a/app/scripts/modules/amazon/securityGroup/details/securityGroupDetail.controller.js +++ b/app/scripts/modules/amazon/securityGroup/details/securityGroupDetail.controller.js @@ -65,6 +65,7 @@ module.exports = angular.module('spinnaker.securityGroup.aws.details.controller' $uibModal.open({ templateUrl: require('../configure/editSecurityGroup.html'), controller: 'awsEditSecurityGroupCtrl as ctrl', + size: 'lg', resolve: { securityGroup: function() { return angular.copy($scope.securityGroup.plain()); @@ -79,6 +80,7 @@ module.exports = angular.module('spinnaker.securityGroup.aws.details.controller' $uibModal.open({ templateUrl: require('../clone/cloneSecurityGroup.html'), controller: 'awsCloneSecurityGroupController as ctrl', + size: 'lg', resolve: { securityGroup: function() { var securityGroup = angular.copy($scope.securityGroup.plain()); diff --git a/app/scripts/modules/amazon/serverGroup/configure/serverGroup.configure.aws.module.js b/app/scripts/modules/amazon/serverGroup/configure/serverGroup.configure.aws.module.js index 3662629ef4b..32228ca5839 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/serverGroup.configure.aws.module.js +++ b/app/scripts/modules/amazon/serverGroup/configure/serverGroup.configure.aws.module.js @@ -4,16 +4,18 @@ let angular = require('angular'); module.exports = angular.module('spinnaker.serverGroup.configure.aws', [ require('../../../core/account/account.module.js'), - require('./wizard/deployInitializer.controller.js'), require('../../../core/cache/infrastructureCaches.js'), - require('./wizard/ServerGroupBasicSettings.controller.js'), - require('./wizard/ServerGroupLoadBalancers.controller.js'), - require('./wizard/capacity/ServerGroupCapacity.controller.js'), - require('./wizard/ServerGroupInstanceArchetype.controller.js'), - require('./wizard/ServerGroupInstanceType.controller.js'), - require('./wizard/securityGroups/ServerGroupSecurityGroups.controller.js'), - require('./wizard/ServerGroupAdvancedSettings.controller.js'), + require('../../../core/serverGroup/configure/common/v2instanceArchetypeSelector.directive.js'), + require('../../../core/serverGroup/configure/common/v2InstanceTypeSelector.directive.js'), require('../serverGroup.transformer.js'), - require('../../../core/serverGroup/configure/common/instanceArchetypeSelector.js'), - require('../../../core/serverGroup/configure/common/instanceTypeSelector.js') + require('./wizard/templateSelection/deployInitializer.controller.js'), + require('./wizard/location/ServerGroupBasicSettings.controller.js'), + require('./wizard/loadBalancers/ServerGroupLoadBalancers.controller.js'), + require('./wizard/securityGroups/securityGroupSelector.directive.js'), + require('./wizard/securityGroups/securityGroupsRemoved.directive.js'), + require('./wizard/loadBalancers/loadBalancerSelector.directive.js'), + require('./wizard/capacity/capacitySelector.directive.js'), + require('./wizard/capacity/targetHealthyPercentageSelector.directive.js'), + require('./wizard/zones/azRebalanceSelector.directive.js'), + require('./wizard/zones/availabilityZoneSelector.directive.js'), ]); diff --git a/app/scripts/modules/amazon/serverGroup/configure/serverGroupCommandBuilder.service.js b/app/scripts/modules/amazon/serverGroup/configure/serverGroupCommandBuilder.service.js index cfe95d68ddc..0783cea71b1 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/serverGroupCommandBuilder.service.js +++ b/app/scripts/modules/amazon/serverGroup/configure/serverGroupCommandBuilder.service.js @@ -66,6 +66,7 @@ module.exports = angular.module('spinnaker.aws.serverGroupCommandBuilder.service usePreferredZones: true, mode: defaults.mode || 'create', disableStrategySelection: true, + dirty: {}, }, }; @@ -98,6 +99,7 @@ module.exports = angular.module('spinnaker.aws.serverGroupCommandBuilder.service mode: 'editPipeline', submitButtonLabel: 'Done', templatingEnabled: true, + dirty: {}, }; var viewOverrides = { @@ -202,6 +204,7 @@ module.exports = angular.module('spinnaker.aws.serverGroupCommandBuilder.service usePreferredZones: usePreferredZones, mode: mode, isNew: false, + dirty: {}, }, }; diff --git a/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js b/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js index a9bac518884..a459bbbe55d 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js +++ b/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js @@ -74,6 +74,9 @@ module.exports = angular.module('spinnaker.aws.serverGroup.configure.service', [ backingData.scalingProcesses = autoScalingProcessService.listProcesses(); command.backingData = backingData; configureVpcId(command); + if (command.viewState.disableImageSelection) { + configureInstanceTypes(command); + } if (command.loadBalancers && command.loadBalancers.length) { // verify all load balancers are accounted for; otherwise, try refreshing load balancers cache diff --git a/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.spec.js b/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.spec.js index 8de4c83d380..58cdbfe41d8 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.spec.js +++ b/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.spec.js @@ -1,19 +1,3 @@ -/* - * Copyright 2014 Netflix, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - 'use strict'; describe('Service: awsServerGroupConfiguration', function () { @@ -105,12 +89,12 @@ describe('Service: awsServerGroupConfiguration', function () { vpcId: null, viewState: { disableImageSelection: true, + dirty: {}, } }; service.configureCommand({}, command); $scope.$digest(); - $scope.$digest(); expect(cacheInitializer.refreshCache).toHaveBeenCalledWith('loadBalancers'); expect(cacheInitializer.refreshCache.calls.count()).toBe(1); @@ -136,6 +120,7 @@ describe('Service: awsServerGroupConfiguration', function () { vpcId: null, viewState: { disableImageSelection: true, + dirty: {}, } }; @@ -150,14 +135,18 @@ describe('Service: awsServerGroupConfiguration', function () { }); - it ('attempts to reload instance types if previous selection is not found on initialization, but does not set dirty flag', function () { + it ('attempts to reload instance types if already selected on initialization, but does not set dirty flag', function () { spyOn(accountService, 'getRegionsKeyedByAccount').and.returnValue($q.when([])); spyOn(securityGroupReader, 'getAllSecurityGroups').and.returnValue($q.when([])); spyOn(loadBalancerReader, 'listLoadBalancers').and.returnValue($q.when([])); spyOn(subnetReader, 'listSubnets').and.returnValue($q.when([])); spyOn(accountService, 'getPreferredZonesByAccount').and.returnValue($q.when([])); spyOn(keyPairsReader, 'listKeyPairs').and.returnValue($q.when([])); - spyOn(awsInstanceTypeService, 'getAllTypesByRegion').and.returnValue($q.when([])); + spyOn(awsInstanceTypeService, 'getAllTypesByRegion').and.returnValue($q.when( + { 'us-east-1': [ + {name: 'm4.tiny'} + ] } + )); spyOn(cacheInitializer, 'refreshCache').and.returnValue($q.when(null)); var command = { @@ -168,12 +157,12 @@ describe('Service: awsServerGroupConfiguration', function () { vpcId: null, viewState: { disableImageSelection: true, + dirty: {}, } }; service.configureCommand({}, command); $scope.$digest(); - $scope.$digest(); expect(cacheInitializer.refreshCache).toHaveBeenCalledWith('instanceTypes'); expect(cacheInitializer.refreshCache.calls.count()).toBe(1); 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 index 0677a8b9afa..8cc8afff43c 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/CloneServerGroup.aws.controller.js +++ b/app/scripts/modules/amazon/serverGroup/configure/wizard/CloneServerGroup.aws.controller.js @@ -9,25 +9,25 @@ module.exports = angular.module('spinnaker.aws.cloneServerGroup.controller', [ require('../serverGroupConfiguration.service.js'), require('../../../../core/serverGroup/serverGroup.write.service.js'), require('../../../../core/task/monitor/taskMonitorService.js'), - require('../../../../core/modal/wizard/modalWizard.service.js'), + require('../../../../core/modal/wizard/v2modalWizard.service.js'), require('../../../../core/overrideRegistry/override.registry.js'), require('../../../../core/serverGroup/configure/common/serverGroupCommand.registry.js'), require('../../../../core/task/modal/reason.directive.js'), ]) .controller('awsCloneServerGroupCtrl', function($scope, $modalInstance, _, $q, $state, - serverGroupWriter, modalWizardService, taskMonitorService, + serverGroupWriter, v2modalWizardService, taskMonitorService, overrideRegistry, awsServerGroupConfigurationService, serverGroupCommandRegistry, serverGroupCommand, application, title) { $scope.pages = { - 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')), + templateSelection: overrideRegistry.getTemplate('aws.serverGroup.templateSelection', require('./templateSelection/templateSelection.html')), + basicSettings: overrideRegistry.getTemplate('aws.serverGroup.basicSettings', require('./location/basicSettings.html')), + loadBalancers: overrideRegistry.getTemplate('aws.serverGroup.loadBalancers', require('./loadBalancers/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')), + instanceType: overrideRegistry.getTemplate('aws.serverGroup.instanceType', require('./instanceType/instanceType.html')), capacity: overrideRegistry.getTemplate('aws.serverGroup.capacity', require('./capacity/capacity.html')), - advancedSettings: overrideRegistry.getTemplate('aws.serverGroup.advancedSettings', require('./advancedSettings.html')), + zones: overrideRegistry.getTemplate('aws.serverGroup.zones', require('./capacity/zones.html')), + advancedSettings: overrideRegistry.getTemplate('aws.serverGroup.advancedSettings', require('./advancedSettings/advancedSettings.html')), }; $scope.title = title; @@ -102,18 +102,17 @@ module.exports = angular.module('spinnaker.aws.cloneServerGroup.controller', [ function initializeWizardState() { if (serverGroupCommand.viewState.instanceProfile && serverGroupCommand.viewState.instanceProfile !== 'custom') { - modalWizardService.getWizard().includePage('instance-type'); - modalWizardService.getWizard().markComplete('instance-type'); + v2modalWizardService.markComplete('instance-type'); } var mode = serverGroupCommand.viewState.mode; if (mode === 'clone' || mode === 'editPipeline') { - modalWizardService.getWizard().markComplete('location'); - modalWizardService.getWizard().markComplete('load-balancers'); - modalWizardService.getWizard().markComplete('security-groups'); - modalWizardService.getWizard().markComplete('instance-profile'); - modalWizardService.getWizard().markComplete('instance-type'); - modalWizardService.getWizard().markComplete('capacity'); - modalWizardService.getWizard().markComplete('advanced'); + v2modalWizardService.markComplete('location'); + v2modalWizardService.markComplete('instance-type'); + v2modalWizardService.markComplete('load-balancers'); + v2modalWizardService.markComplete('security-groups'); + v2modalWizardService.markComplete('capacity'); + v2modalWizardService.markComplete('zones'); + v2modalWizardService.markComplete('advanced'); } } @@ -151,20 +150,17 @@ module.exports = angular.module('spinnaker.aws.cloneServerGroup.controller', [ function processCommandUpdateResult(result) { if (result.dirty.loadBalancers) { - modalWizardService.getWizard().markDirty('load-balancers'); + v2modalWizardService.markDirty('load-balancers'); } if (result.dirty.securityGroups) { - modalWizardService.getWizard().markDirty('security-groups'); + v2modalWizardService.markDirty('security-groups'); } if (result.dirty.availabilityZones) { - modalWizardService.getWizard().markDirty('capacity'); + v2modalWizardService.markDirty('capacity'); } if (result.dirty.instanceType) { - if ($scope.command.viewState.instanceProfile === 'custom') { - modalWizardService.getWizard().markDirty('instance-profile'); - } else { - modalWizardService.getWizard().markDirty('instance-type'); - } + v2modalWizardService.markIncomplete('instance-type'); + v2modalWizardService.markDirty('instance-type'); } } @@ -181,17 +177,17 @@ module.exports = angular.module('spinnaker.aws.cloneServerGroup.controller', [ this.isValid = function () { return $scope.command && - ($scope.command.amiName !== null) && - ($scope.command.application !== null) && - ($scope.command.credentials !== null) && ($scope.command.instanceType !== null) && - ($scope.command.region !== null) && ($scope.command.availabilityZones !== null) && - ($scope.command.capacity.min !== null) && ($scope.command.capacity.max !== null) && - ($scope.command.capacity.desired !== null) && - modalWizardService.getWizard().isComplete(); + ($scope.command.viewState.disableImageSelection || $scope.command.amiName) && + ($scope.command.application) && + ($scope.command.credentials) && ($scope.command.instanceType) && + ($scope.command.region) && ($scope.command.availabilityZones) && + ($scope.command.capacity.min >= 0) && ($scope.command.capacity.max >= 0) && + ($scope.command.capacity.desired >= 0) && + v2modalWizardService.isComplete(); }; this.showSubmitButton = function () { - return modalWizardService.getWizard().allPagesVisited(); + return v2modalWizardService.allPagesVisited(); }; this.submit = function () { diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/CloneServerGroup.aws.controller.spec.js b/app/scripts/modules/amazon/serverGroup/configure/wizard/CloneServerGroup.aws.controller.spec.js index 591cba3dcb3..9ce75f1082d 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/CloneServerGroup.aws.controller.spec.js +++ b/app/scripts/modules/amazon/serverGroup/configure/wizard/CloneServerGroup.aws.controller.spec.js @@ -17,7 +17,7 @@ describe('Controller: awsCloneServerGroup', function () { beforeEach(function() { window.inject(function ($controller, $rootScope, accountService, serverGroupWriter, awsImageReader, settings, - searchService, awsInstanceTypeService, modalWizardService, securityGroupReader, taskMonitorService, + searchService, awsInstanceTypeService, v2modalWizardService, securityGroupReader, taskMonitorService, awsServerGroupConfigurationService, $q, subnetReader, keyPairsReader, loadBalancerReader) { this.$scope = $rootScope.$new(); @@ -26,7 +26,7 @@ describe('Controller: awsCloneServerGroup', function () { this.awsImageReader = awsImageReader; this.searchService = searchService; this.awsInstanceTypeService = awsInstanceTypeService; - this.modalWizardService = modalWizardService; + this.v2modalWizardService = v2modalWizardService; this.securityGroupReader = securityGroupReader; this.awsServerGroupConfigurationService = awsServerGroupConfigurationService; this.taskMonitorService = taskMonitorService; @@ -99,7 +99,7 @@ describe('Controller: awsCloneServerGroup', function () { awsImageReader: this.awsImageReader, searchService: this.searchService, awsInstanceTypeService: this.awsInstanceTypeService, - modalWizardService: this.modalWizardService, + v2modalWizardService: this.v2modalWizardService, securityGroupReader: this.securityGroupReader, awsServerGroupConfigurationService: this.awsServerGroupConfigurationService, taskMonitorService: this.taskMonitorService, @@ -113,7 +113,6 @@ describe('Controller: awsCloneServerGroup', function () { function setupMocks() { var resolve = this.resolve; - this.wizard = jasmine.createSpyObj('wizard', ['markDirty', 'markComplete', 'includePage']); spyOn(this.accountService, 'getPreferredZonesByAccount').and.callFake(resolve(AccountServiceFixture.preferredZonesByAccount)); spyOn(this.accountService, 'getRegionsKeyedByAccount').and.callFake(resolve(AccountServiceFixture.regionsKeyedByAccount)); spyOn(this.subnetReader, 'listSubnets').and.callFake(resolve([])); @@ -123,7 +122,8 @@ describe('Controller: awsCloneServerGroup', function () { spyOn(this.awsImageReader, 'findImages').and.callFake(resolve([{attributes: {virtualizationType: 'hvm'}, amis: {'us-east-1': []}}])); spyOn(this.searchService, 'search').and.callFake(resolve({results: []})); - spyOn(this.modalWizardService, 'getWizard').and.returnValue(this.wizard); + spyOn(this.v2modalWizardService, 'markComplete').and.stub(); + spyOn(this.v2modalWizardService, 'markDirty').and.stub(); spyOn(this.awsInstanceTypeService, 'getAllTypesByRegion').and.callFake(resolve([])); spyOn(this.awsInstanceTypeService, 'getAvailableTypesForRegions').and.returnValue([]); } @@ -156,7 +156,7 @@ describe('Controller: awsCloneServerGroup', function () { expect($scope.command.viewState.usePreferredZones).toBe(true); expect($scope.command.availabilityZones).toEqual(['c', 'd']); - expect(this.wizard.markDirty.calls.count()).toBe(0); + expect(this.v2modalWizardService.markDirty.calls.count()).toBe(0); }); it('clears availability zones when region changed and not using preferred values', function() { @@ -175,7 +175,7 @@ describe('Controller: awsCloneServerGroup', function () { expect($scope.command.viewState.usePreferredZones).toBe(false); expect($scope.command.availabilityZones).toEqual(['b', 'c']); - expect(this.wizard.markDirty.calls.count()).toBe(1); + expect(this.v2modalWizardService.markDirty.calls.count()).toBe(1); }); it('sets/clears availability zones to preferred zones when toggled on/off', function() { @@ -215,7 +215,7 @@ describe('Controller: awsCloneServerGroup', function () { accountService: this.accountService, serverGroupWriter: this.serverGroupWriter, awsInstanceTypeService: this.awsInstanceTypeService, - modalWizardService: this.modalWizardService, + v2modalWizardService: this.v2modalWizardService, taskMonitorService: this.taskMonitorService, serverGroupCommand: serverGroupCommand, application: {name: 'x'}, @@ -236,7 +236,7 @@ describe('Controller: awsCloneServerGroup', function () { spyOn(this.loadBalancerReader, 'listLoadBalancers').and.callFake(resolve([])); spyOn(this.searchService, 'search').and.callFake(resolve({results: []})); - spyOn(this.modalWizardService, 'getWizard').and.returnValue(this.wizard); + spyOn(this.v2modalWizardService, 'markComplete').and.stub(); spyOn(this.awsInstanceTypeService, 'getAllTypesByRegion').and.callFake(resolve([])); spyOn(this.awsInstanceTypeService, 'getAvailableTypesForRegions').and.returnValue([]); } @@ -370,7 +370,7 @@ describe('Controller: awsCloneServerGroup', function () { accountService: this.accountService, serverGroupWriter: this.serverGroupWriter, awsInstanceTypeService: this.awsInstanceTypeService, - modalWizardService: this.modalWizardService, + v2modalWizardService: this.v2modalWizardService, taskMonitorService: this.taskMonitorService, serverGroupCommand: serverGroup, application: {name: 'x'}, @@ -383,7 +383,6 @@ describe('Controller: awsCloneServerGroup', function () { var resolve = this.resolve, spec = this; - this.wizard = jasmine.createSpyObj('wizard', ['markDirty', 'markComplete', 'includePage']); spyOn(this.accountService, 'getPreferredZonesByAccount').and.callFake(resolve(AccountServiceFixture.preferredZonesByAccount)); spyOn(this.accountService, 'getRegionsKeyedByAccount').and.callFake(resolve(AccountServiceFixture.regionsKeyedByAccount)); spyOn(this.subnetReader, 'listSubnets').and.callFake(resolve([])); @@ -392,7 +391,7 @@ describe('Controller: awsCloneServerGroup', function () { spyOn(this.loadBalancerReader, 'listLoadBalancers').and.callFake(resolve([])); spyOn(this.searchService, 'search').and.callFake(resolve({results: []})); - spyOn(this.modalWizardService, 'getWizard').and.returnValue(this.wizard); + spyOn(this.v2modalWizardService, 'markComplete').and.stub(); spyOn(this.awsInstanceTypeService, 'getAllTypesByRegion').and.callFake(resolve([])); spyOn(this.awsInstanceTypeService, 'getAvailableTypesForRegions').and.returnValue([]); spyOn(this.awsImageReader, 'findImages').and.callFake(this.resolve([])); diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/ServerGroupAdvancedSettings.controller.js b/app/scripts/modules/amazon/serverGroup/configure/wizard/ServerGroupAdvancedSettings.controller.js deleted file mode 100644 index da3a56b01a9..00000000000 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/ServerGroupAdvancedSettings.controller.js +++ /dev/null @@ -1,20 +0,0 @@ -'use strict'; - -let angular = require('angular'); - -module.exports = angular.module('spinnaker.serverGroup.configure.aws.advancedSetting.controller', [ - require('../../../../core/modal/wizard/modalWizard.service.js'), -]) - .controller('awsServerGroupAdvancedSettingsCtrl', function($scope, modalWizardService) { - - modalWizardService.getWizard().markComplete('advanced'); - - $scope.$watch('form.$valid', function(newVal) { - if (newVal) { - modalWizardService.getWizard().markClean('advanced'); - } else { - modalWizardService.getWizard().markDirty('advanced'); - } - }); - - }); diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/ServerGroupInstanceArchetype.controller.js b/app/scripts/modules/amazon/serverGroup/configure/wizard/ServerGroupInstanceArchetype.controller.js deleted file mode 100644 index 2080008f0bd..00000000000 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/ServerGroupInstanceArchetype.controller.js +++ /dev/null @@ -1,29 +0,0 @@ -'use strict'; - -let angular = require('angular'); - -module.exports = angular.module('spinnaker.serverGroup.configure.aws.instanceArchetype.controller', [ - -]) - .controller('awsInstanceArchetypeCtrl', function($scope, instanceTypeService, modalWizardService) { - - var wizard = modalWizardService.getWizard(); - - $scope.$watch('command.viewState.instanceProfile', function() { - if (!$scope.command.viewState.instanceProfile || $scope.command.viewState.instanceProfile === 'custom') { - wizard.excludePage('instance-type'); - } else { - wizard.includePage('instance-type'); - wizard.markClean('instance-profile'); - wizard.markComplete('instance-profile'); - } - }); - - $scope.$watch('command.instanceType', function(newVal) { - if (newVal) { - wizard.markClean('instance-profile'); - wizard.markComplete('instance-profile'); - } - }); - - }); diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/ServerGroupInstanceType.controller.js b/app/scripts/modules/amazon/serverGroup/configure/wizard/ServerGroupInstanceType.controller.js deleted file mode 100644 index f7089bf048f..00000000000 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/ServerGroupInstanceType.controller.js +++ /dev/null @@ -1,11 +0,0 @@ -'use strict'; - -let angular = require('angular'); - -module.exports = angular.module('spinnaker.serverGroup.configure.aws.instanceType.controller', []) - .controller('awsInstanceTypeCtrl', function($scope, modalWizardService) { - - modalWizardService.getWizard().markComplete('instance-type'); - modalWizardService.getWizard().markClean('instance-type'); - - }); diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/advancedSettings.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/advancedSettings.html deleted file mode 100644 index 0172f1db362..00000000000 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/advancedSettings.html +++ /dev/null @@ -1,141 +0,0 @@ - -
- -
-
Cooldown
-
 seconds -
-
-
Health Check Type
-
- - - {{$select.selected}} - - - - - -
-
-
-
Health Check Grace Period
-
 seconds -
-
-
Termination Policies
-
- - - {{$item}} - - - - - -
-
- -
-
Key Name
-
- - {{$select.selected}} - - - - -
-
-
-
Ramdisk Id (optional)
-
-
-
-
IAM Instance Profile (optional)
-
-
-
-
- UserData (optional) - -
-
-
-
-
Instance Monitoring
-
- -
-
-
-
EBS Optimized
-
- -
-
-
-
Associate Public IP Address
-
- -
-
- -
-
- -
-
-
-
Scaling Processes
-
-
- -
-
-
-
-
Task Completion
-
- - -
-
-
- -
- - - -
- diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/advancedSettings/advancedSettings.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/advancedSettings/advancedSettings.html new file mode 100644 index 00000000000..68446d2b453 --- /dev/null +++ b/app/scripts/modules/amazon/serverGroup/configure/wizard/advancedSettings/advancedSettings.html @@ -0,0 +1,128 @@ + +
+
Cooldown
+
 seconds +
+
+
Health Check Type
+
+ + + {{$select.selected}} + + + + + +
+
+
+
Health Check Grace Period
+
 seconds +
+
+
Termination Policies
+
+ + + {{$item}} + + + + + +
+
+ +
+
Key Name
+
+ + {{$select.selected}} + + + + +
+
+
+
Ramdisk Id (optional)
+
+
+
+
IAM Instance Profile (optional)
+
+
+
+
+ UserData (optional) + +
+
+
+
+
Instance Monitoring
+
+ +
+
+
+
EBS Optimized
+
+ +
+
+
+
Associate Public IP Address
+
+ +
+
+ +
+
+ +
+
+
+
Scaling Processes
+
+
+ +
+
+
+
+
Task Completion
+
+ + +
+
+ diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/ServerGroupCapacity.controller.js b/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/ServerGroupCapacity.controller.js deleted file mode 100644 index 780ebba872f..00000000000 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/ServerGroupCapacity.controller.js +++ /dev/null @@ -1,26 +0,0 @@ -'use strict'; - -let angular = require('angular'); - -module.exports = angular.module('spinnaker.serverGroup.configure.aws.serverGroupCapacityCtrl', [ - require('../../../../../core/modal/wizard/modalWizard.service.js'), - require('./capacitySelector.directive.js'), - require('./capacityFooter.directive.js'), - require('./targetHealthyPercentageSelector.directive.js'), - require('./azRebalanceSelector.directive.js'), - require('../availabilityZoneSelector.directive.js'), -]) - .controller('awsServerGroupCapacityCtrl', function($scope, modalWizardService) { - - modalWizardService.getWizard().markComplete('capacity'); - modalWizardService.getWizard().markClean('capacity'); - - $scope.$watch('form.$valid', function(newVal) { - if (newVal) { - modalWizardService.getWizard().markClean('capacity'); - } else { - modalWizardService.getWizard().markDirty('capacity'); - } - }); - - }); diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacity.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacity.html index 4c0b292208f..6f43cd4ef57 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacity.html +++ b/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacity.html @@ -1,22 +1,12 @@ - -
-
+
+
+
+
+
+
+
-
- -
- - - +
diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacityFooter.directive.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacityFooter.directive.html deleted file mode 100644 index 0a58f0c7f7c..00000000000 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacityFooter.directive.html +++ /dev/null @@ -1,15 +0,0 @@ -
- - - - -
diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacityFooter.directive.js b/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacityFooter.directive.js deleted file mode 100644 index 18556eb5465..00000000000 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacityFooter.directive.js +++ /dev/null @@ -1,26 +0,0 @@ -'use strict'; - -let angular = require('angular'); - -module.exports = angular - .module('spinnaker.amazon.serverGroup.configure.wizard.capacity.footer.directive', [ - ]) - .directive('awsServerGroupCapacityFooter', function () { - return { - restrict: 'E', - templateUrl: require('./capacityFooter.directive.html'), - scope: {}, - bindToController: { - command: '=', - wizard: '=', - form: '=', - taskMonitor: '=', - cancel: '&', - isValid: '&', - showSubmitButton: '&', - submit: '&' - }, - controllerAs: 'vm', - controller: angular.noop, - }; - }); diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/zones.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/zones.html new file mode 100644 index 00000000000..0ff7a7ac332 --- /dev/null +++ b/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/zones.html @@ -0,0 +1,4 @@ +
+ + + \ No newline at end of file diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/instanceArchetype.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/instanceArchetype.html deleted file mode 100644 index 5f0cb314731..00000000000 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/instanceArchetype.html +++ /dev/null @@ -1,20 +0,0 @@ -
-
- -
-
- - - - -
- diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/instanceType.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/instanceType.html deleted file mode 100644 index 5b988c7cde1..00000000000 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/instanceType.html +++ /dev/null @@ -1,20 +0,0 @@ -
-
- -
-
- - - - -
- diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/instanceType/instanceType.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/instanceType/instanceType.html new file mode 100644 index 00000000000..20256e3e740 --- /dev/null +++ b/app/scripts/modules/amazon/serverGroup/configure/wizard/instanceType/instanceType.html @@ -0,0 +1,8 @@ +
+ +
+ +
+
+
Please select an image.
diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers.html deleted file mode 100644 index 06bcb9a28f9..00000000000 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers.html +++ /dev/null @@ -1,60 +0,0 @@ -
-
- -
-
-

- The following load balancers could not be found in the selected account/region/VPC and were removed: -

-
    -
  • {{loadBalancer}}
    • -
-

- Okay -

-
-
- -
-
Load Balancers
-
- - {{$item}} - - - - -
-
- -
-
-

- - Load balancers - last refreshed {{ getLoadBalancerRefreshTime() | timestamp }} - refreshing... -

-

If you're not finding a load balancer that was recently added, - click here to refresh the list. -

-
-
- -
-
- - - - -
- diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/ServerGroupLoadBalancers.controller.js b/app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/ServerGroupLoadBalancers.controller.js similarity index 69% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/ServerGroupLoadBalancers.controller.js rename to app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/ServerGroupLoadBalancers.controller.js index 4fad3b602d4..f34148175ca 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/ServerGroupLoadBalancers.controller.js +++ b/app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/ServerGroupLoadBalancers.controller.js @@ -3,16 +3,13 @@ let angular = require('angular'); module.exports = angular.module('spinnaker.serverGroup.configure.aws.loadBalancer.controller', [ - require('../../../../core/modal/wizard/modalWizard.service.js'), - require('../../../../core/cache/infrastructureCaches.js'), - require('../serverGroupConfiguration.service.js'), + require('../../../../../core/modal/wizard/modalWizard.service.js'), + require('../../../../../core/cache/infrastructureCaches.js'), + require('../../serverGroupConfiguration.service.js'), ]) .controller('awsServerGroupLoadBalancersCtrl', function($scope, modalWizardService, infrastructureCaches, awsServerGroupConfigurationService) { - modalWizardService.getWizard().markClean('load-balancers'); - modalWizardService.getWizard().markComplete('load-balancers'); - $scope.getLoadBalancerRefreshTime = function() { return infrastructureCaches.loadBalancers.getStats().ageMax; }; diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.html new file mode 100644 index 00000000000..b515bb08205 --- /dev/null +++ b/app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.html @@ -0,0 +1,44 @@ +
+
+
+

+ The following load balancers could not be found in the selected account/region/VPC and were removed: +

+
    +
  • {{loadBalancer}}
    • +
+

+ Okay +

+
+
+ +
+
Load Balancers
+
+ + {{$item}} + + + + +
+
+ +
+
+

+ + Load balancers + last refreshed {{ vm.getLoadBalancerRefreshTime() | timestamp }} + refreshing... +

+

If you're not finding a load balancer that was recently added, + click here to refresh the list. +

+
+
+
\ No newline at end of file diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.js b/app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.js new file mode 100644 index 00000000000..5affc84d616 --- /dev/null +++ b/app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.js @@ -0,0 +1,32 @@ +'use strict'; + +let angular = require('angular'); + +module.exports = angular + .module('spinnaker.amazon.serverGroup.configure.wizard.loadBalancers.selector.directive', [ + require('../../../../../core/cache/infrastructureCaches.js'), + require('../../serverGroupConfiguration.service.js'), + ]) + .directive('awsServerGroupLoadBalancerSelector', function () { + return { + restrict: 'E', + templateUrl: require('./loadBalancerSelector.directive.html'), + scope: {}, + bindToController: { + command: '=', + }, + controllerAs: 'vm', + controller: 'awsServerGroupLoadBalancerSelectorCtrl', + }; + }).controller('awsServerGroupLoadBalancerSelectorCtrl', function (awsServerGroupConfigurationService, infrastructureCaches) { + this.getLoadBalancerRefreshTime = () => { + return infrastructureCaches.loadBalancers.getStats().ageMax; + }; + + this.refreshLoadBalancers = () => { + this.refreshing = true; + awsServerGroupConfigurationService.refreshLoadBalancers(this.command).then(() => { + this.refreshing = false; + }); + }; + }); diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/loadBalancers.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/loadBalancers.html new file mode 100644 index 00000000000..2610edaa62d --- /dev/null +++ b/app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/loadBalancers.html @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/ServerGroupBasicSettings.controller.js b/app/scripts/modules/amazon/serverGroup/configure/wizard/location/ServerGroupBasicSettings.controller.js similarity index 78% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/ServerGroupBasicSettings.controller.js rename to app/scripts/modules/amazon/serverGroup/configure/wizard/location/ServerGroupBasicSettings.controller.js index 2eec01c9191..fd64d655527 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/ServerGroupBasicSettings.controller.js +++ b/app/scripts/modules/amazon/serverGroup/configure/wizard/location/ServerGroupBasicSettings.controller.js @@ -5,14 +5,14 @@ let angular = require('angular'); module.exports = angular.module('spinnaker.serverGroup.configure.aws.basicSettings', [ require('angular-ui-router'), require('angular-ui-bootstrap'), - require('../../../../core/serverGroup/configure/common/basicSettingsMixin.controller.js'), - require('../../../../core/modal/wizard/modalWizard.service.js'), - require('../../../../core/utils/rx.js'), - require('../../../../core/image/image.reader.js'), - require('../../../../core/naming/naming.service.js'), + require('../../../../../core/serverGroup/configure/common/basicSettingsMixin.controller.js'), + require('../../../../../core/modal/wizard/v2modalWizard.service.js'), + require('../../../../../core/utils/rx.js'), + require('../../../../../core/image/image.reader.js'), + require('../../../../../core/naming/naming.service.js'), ]) .controller('awsServerGroupBasicSettingsCtrl', function($scope, $controller, $uibModalStack, $state, - modalWizardService, rx, imageReader, namingService) { + v2modalWizardService, rx, imageReader, namingService) { function searchImages(q) { $scope.command.backingData.filtered.images = [ @@ -71,9 +71,10 @@ module.exports = angular.module('spinnaker.serverGroup.configure.aws.basicSettin $scope.$watch('form.$valid', function(newVal) { if (newVal) { - modalWizardService.getWizard().markClean('location'); + v2modalWizardService.markClean('location'); + v2modalWizardService.markComplete('location'); } else { - modalWizardService.getWizard().markDirty('location'); + v2modalWizardService.markIncomplete('location'); } }); diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/basicSettings.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/location/basicSettings.html similarity index 91% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/basicSettings.html rename to app/scripts/modules/amazon/serverGroup/configure/wizard/location/basicSettings.html index 093db527476..2bb2a00469d 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/basicSettings.html +++ b/app/scripts/modules/amazon/serverGroup/configure/wizard/location/basicSettings.html @@ -1,6 +1,4 @@
-
-
@@ -127,15 +125,4 @@
- -
-
- - - -
diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/ServerGroupSecurityGroups.controller.js b/app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/ServerGroupSecurityGroups.controller.js deleted file mode 100644 index a7ed5222a17..00000000000 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/ServerGroupSecurityGroups.controller.js +++ /dev/null @@ -1,17 +0,0 @@ -'use strict'; - -let angular = require('angular'); - -module.exports = angular - .module('spinnaker.serverGroup.configure.aws.securityGroups.controller', [ - require('../../../../../core/modal/wizard/modalWizard.service.js'), - require('./securityGroupsRemoved.directive.js'), - require('./securityGroupSelector.directive.js'), - require('./securityGroupsFooter.directive.js'), - - ]) - .controller('awsServerGroupSecurityGroupsCtrl', function($scope, modalWizardService) { - - modalWizardService.getWizard().markClean('security-groups'); - modalWizardService.getWizard().markComplete('security-groups'); - }); diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroups.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroups.html index b00aa5d6148..ec53e7da2d4 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroups.html +++ b/app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroups.html @@ -1,16 +1,4 @@ -
-
- - -
- - - +
+ + +
diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroupsFooter.directive.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroupsFooter.directive.html deleted file mode 100644 index a85a023eed0..00000000000 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroupsFooter.directive.html +++ /dev/null @@ -1,14 +0,0 @@ -
- - - - -
diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroupsFooter.directive.js b/app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroupsFooter.directive.js deleted file mode 100644 index 01361cc61d5..00000000000 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroupsFooter.directive.js +++ /dev/null @@ -1,25 +0,0 @@ -'use strict'; - -let angular = require('angular'); - -module.exports = angular - .module('spinnaker.amazon.serverGroup.configure.wizard.securityGroups.footer.directive', [ - ]) - .directive('awsServerGroupSecurityGroupsFooter', function () { - return { - restrict: 'E', - templateUrl: require('./securityGroupsFooter.directive.html'), - scope: {}, - bindToController: { - command: '=', - wizard: '=', - taskMonitor: '=', - cancel: '&', - isValid: '&', - showSubmitButton: '&', - submit: '&', - }, - controllerAs: 'vm', - controller: angular.noop, - }; - }); diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/serverGroupWizard.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/serverGroupWizard.html index 5e5dad5e718..df216c0bae4 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/serverGroupWizard.html +++ b/app/scripts/modules/amazon/serverGroup/configure/wizard/serverGroupWizard.html @@ -5,28 +5,35 @@

- - +
+ + - - + + - - + + - - - - - + + - - + + - - + + + + + - - - + + +
+
+
+ +
diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/deployInitializer.controller.js b/app/scripts/modules/amazon/serverGroup/configure/wizard/templateSelection/deployInitializer.controller.js similarity index 94% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/deployInitializer.controller.js rename to app/scripts/modules/amazon/serverGroup/configure/wizard/templateSelection/deployInitializer.controller.js index 8899a807ec2..c98df39f931 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/deployInitializer.controller.js +++ b/app/scripts/modules/amazon/serverGroup/configure/wizard/templateSelection/deployInitializer.controller.js @@ -3,9 +3,9 @@ let angular = require('angular'); module.exports = angular.module('spinnaker.serverGroup.configure.aws.deployInitialization.controller', [ - require('../../../../core/serverGroup/serverGroup.read.service.js'), - require('../../../../core/utils/lodash.js'), - require('../serverGroupCommandBuilder.service.js'), + require('../../../../../core/serverGroup/serverGroup.read.service.js'), + require('../../../../../core/utils/lodash.js'), + require('../../serverGroupCommandBuilder.service.js'), ]) .controller('awsDeployInitializerCtrl', function($scope, awsServerGroupCommandBuilder, serverGroupReader, _) { var controller = this; diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/deployInitializerCtrl.spec.js b/app/scripts/modules/amazon/serverGroup/configure/wizard/templateSelection/deployInitializerCtrl.spec.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/deployInitializerCtrl.spec.js rename to app/scripts/modules/amazon/serverGroup/configure/wizard/templateSelection/deployInitializerCtrl.spec.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/templateSelection.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/templateSelection/templateSelection.html similarity index 96% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/templateSelection.html rename to app/scripts/modules/amazon/serverGroup/configure/wizard/templateSelection/templateSelection.html index 2c8c246bea7..a8da65e37da 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/templateSelection.html +++ b/app/scripts/modules/amazon/serverGroup/configure/wizard/templateSelection/templateSelection.html @@ -7,12 +7,12 @@

Template Selection

-
+
Copy configuration from
-
+
diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/availabilityZoneSelector.directive.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/zones/availabilityZoneSelector.directive.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/availabilityZoneSelector.directive.html rename to app/scripts/modules/amazon/serverGroup/configure/wizard/zones/availabilityZoneSelector.directive.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/availabilityZoneSelector.directive.js b/app/scripts/modules/amazon/serverGroup/configure/wizard/zones/availabilityZoneSelector.directive.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/availabilityZoneSelector.directive.js rename to app/scripts/modules/amazon/serverGroup/configure/wizard/zones/availabilityZoneSelector.directive.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/azRebalanceSelector.directive.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/zones/azRebalanceSelector.directive.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/azRebalanceSelector.directive.html rename to app/scripts/modules/amazon/serverGroup/configure/wizard/zones/azRebalanceSelector.directive.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/azRebalanceSelector.directive.js b/app/scripts/modules/amazon/serverGroup/configure/wizard/zones/azRebalanceSelector.directive.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/azRebalanceSelector.directive.js rename to app/scripts/modules/amazon/serverGroup/configure/wizard/zones/azRebalanceSelector.directive.js diff --git a/app/scripts/modules/amazon/serverGroup/details/serverGroupDetails.aws.controller.js b/app/scripts/modules/amazon/serverGroup/details/serverGroupDetails.aws.controller.js index 8fb2d5fb2ed..6fdbab16e4d 100644 --- a/app/scripts/modules/amazon/serverGroup/details/serverGroupDetails.aws.controller.js +++ b/app/scripts/modules/amazon/serverGroup/details/serverGroupDetails.aws.controller.js @@ -295,6 +295,7 @@ module.exports = angular.module('spinnaker.serverGroup.details.aws.controller', $uibModal.open({ templateUrl: require('../configure/wizard/serverGroupWizard.html'), controller: 'awsCloneServerGroupCtrl as ctrl', + size: 'lg', resolve: { title: () => 'Clone ' + serverGroup.name, application: () => app, diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/templateSelection.html b/app/scripts/modules/azure/serverGroup/configure/wizard/templateSelection.html index adcedc241b9..e99f5da4dce 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/templateSelection.html +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/templateSelection.html @@ -7,7 +7,7 @@

Template Selection

-
+
Copy configuration from
diff --git a/app/scripts/modules/cloudfoundry/serverGroup/configure/wizard/templateSelection.html b/app/scripts/modules/cloudfoundry/serverGroup/configure/wizard/templateSelection.html index c7d5a4663bc..76aadab94c5 100644 --- a/app/scripts/modules/cloudfoundry/serverGroup/configure/wizard/templateSelection.html +++ b/app/scripts/modules/cloudfoundry/serverGroup/configure/wizard/templateSelection.html @@ -10,7 +10,7 @@

Template Selection

-
+
Copy configuration from
diff --git a/app/scripts/modules/core/application/modal/editApplication.controller.modal.js b/app/scripts/modules/core/application/modal/editApplication.controller.modal.js index 7491858f86b..cee49faf940 100644 --- a/app/scripts/modules/core/application/modal/editApplication.controller.modal.js +++ b/app/scripts/modules/core/application/modal/editApplication.controller.modal.js @@ -12,7 +12,10 @@ module.exports = angular .controller('EditApplicationController', function ($window, $state, $modalInstance, application, applicationWriter, _, accountService, taskReader) { var vm = this; - vm.submitting = false; + this.data = {}; + this.state = { + submitting: false, + }; vm.errorMsgs = []; vm.application = application; vm.applicationAttributes = _.cloneDeep(application.attributes); @@ -20,10 +23,10 @@ module.exports = angular application.attributes.cloudProviders.split(',') : []; - accountService.listProviders().then((providers) => vm.cloudProviders = providers); + accountService.listProviders().then((providers) => vm.data.cloudProviders = providers); function closeModal() { - vm.cloudProviders = null; // wha? prevents a fight with the ui-select directive trying to invalidate the selections + vm.data.cloudProviders = null; // wha? prevents a fight with the ui-select directive trying to invalidate the selections vm.applicationAttributes.cloudProviders = vm.applicationAttributes.cloudProviders.join(','); $modalInstance.close(vm.applicationAttributes); } @@ -51,15 +54,15 @@ module.exports = angular } function goIdle() { - vm.submitting = false; + vm.state.submitting = false; } function submitting() { - vm.submitting = true; + vm.state.submitting = true; } vm.clearEmailMsg = function() { - vm.emailErrorMsg = ''; + vm.state.emailErrorMsg = ''; }; vm.submit = function () { diff --git a/app/scripts/modules/core/application/modal/editApplication.html b/app/scripts/modules/core/application/modal/editApplication.html index c30163542d9..449e9f50119 100644 --- a/app/scripts/modules/core/application/modal/editApplication.html +++ b/app/scripts/modules/core/application/modal/editApplication.html @@ -97,14 +97,14 @@

Edit Application

-
+
Cloud Provider
{{$item}} - + {{provider}} @@ -153,10 +153,10 @@

Edit Application

diff --git a/app/scripts/modules/core/cluster/allClusters.controller.js b/app/scripts/modules/core/cluster/allClusters.controller.js index 26b3a365500..5c6e241d479 100644 --- a/app/scripts/modules/core/cluster/allClusters.controller.js +++ b/app/scripts/modules/core/cluster/allClusters.controller.js @@ -72,6 +72,7 @@ module.exports = angular.module('spinnaker.core.cluster.allClusters.controller', $uibModal.open({ templateUrl: provider.cloneServerGroupTemplateUrl, controller: `${provider.cloneServerGroupController} as ctrl`, + size: cloudProviderRegistry.getValue(selectedProvider, 'v2wizard') ? 'lg' : 'md', resolve: { title: function() { return 'Create New Server Group'; }, application: function() { return app; }, diff --git a/app/scripts/modules/core/cluster/rollups.less b/app/scripts/modules/core/cluster/rollups.less index 4b344beabb6..99b0a6b9129 100644 --- a/app/scripts/modules/core/cluster/rollups.less +++ b/app/scripts/modules/core/cluster/rollups.less @@ -174,6 +174,7 @@ height: 39px; margin: 0; font-size: 110%; + font-weight: 300; } .account-tag { .small { diff --git a/app/scripts/modules/core/delivery/executionGroup/executionGroup.directive.html b/app/scripts/modules/core/delivery/executionGroup/executionGroup.directive.html index 5fc2f5d3208..ebcdba25da4 100644 --- a/app/scripts/modules/core/delivery/executionGroup/executionGroup.directive.html +++ b/app/scripts/modules/core/delivery/executionGroup/executionGroup.directive.html @@ -8,10 +8,10 @@

ng-class="{'glyphicon-chevron-up': !vm.viewState.open, 'glyphicon-chevron-down': vm.viewState.open}"> + {{ vm.group.heading }} {{vm.group.runningExecutions.length}} - {{ vm.group.heading }}

diff --git a/app/scripts/modules/core/delivery/executionGroup/executionGroup.less b/app/scripts/modules/core/delivery/executionGroup/executionGroup.less index d7dee374fc3..8a2db094431 100644 --- a/app/scripts/modules/core/delivery/executionGroup/executionGroup.less +++ b/app/scripts/modules/core/delivery/executionGroup/executionGroup.less @@ -15,6 +15,7 @@ font-weight: 300; } h4 { + font-weight: 300; font-size: 16px; display: inline-block; vertical-align: top; @@ -22,6 +23,9 @@ .disabled { color: @mid_lighter_grey; } + .badge { + margin-left: 5px; + } cursor: pointer; .glyphicon { font-size: 70%; diff --git a/app/scripts/modules/core/delivery/executions/executions.controller.js b/app/scripts/modules/core/delivery/executions/executions.controller.js index 179d5e94084..761140f8b40 100644 --- a/app/scripts/modules/core/delivery/executions/executions.controller.js +++ b/app/scripts/modules/core/delivery/executions/executions.controller.js @@ -21,7 +21,7 @@ module.exports = angular.module('spinnaker.core.delivery.executions.controller', ExecutionFilterModel.mostRecentApplication = $scope.application.name; } - let scrollIntoView = (delay = 200) => scrollToService.scrollTo('execution-' + $stateParams.executionId, '.all-execution-groups', 225, delay); + let scrollIntoView = (delay = 200) => scrollToService.scrollTo('#execution-' + $stateParams.executionId, '.all-execution-groups', 225, delay); let application = $scope.application; this.application = application; diff --git a/app/scripts/modules/core/instance/instanceSelection.less b/app/scripts/modules/core/instance/instanceSelection.less index a94628858f1..3fceacfc39f 100644 --- a/app/scripts/modules/core/instance/instanceSelection.less +++ b/app/scripts/modules/core/instance/instanceSelection.less @@ -21,7 +21,7 @@ border-bottom: 0; } -instance-archetype-selector { +instance-archetype-selector, v2-instance-archetype-selector { .archetype-columns { display: inline-block; button { @@ -82,7 +82,7 @@ instance-archetype-selector { h4 { margin-top: 0; text-align: center; - word-spacing: 600px; + word-spacing: 30px; } ul { diff --git a/app/scripts/modules/core/loadBalancer/AllLoadBalancersCtrl.js b/app/scripts/modules/core/loadBalancer/AllLoadBalancersCtrl.js index c094abcc8ce..906ac2763e1 100644 --- a/app/scripts/modules/core/loadBalancer/AllLoadBalancersCtrl.js +++ b/app/scripts/modules/core/loadBalancer/AllLoadBalancersCtrl.js @@ -61,6 +61,7 @@ module.exports = angular.module('spinnaker.core.loadBalancer.controller', [ $uibModal.open({ templateUrl: provider.createLoadBalancerTemplateUrl, controller: `${provider.createLoadBalancerController} as ctrl`, + size: cloudProviderRegistry.getValue(selectedProvider, 'v2wizard') ? 'lg' : 'md', resolve: { application: function() { return app; }, loadBalancer: function() { return null; }, diff --git a/app/scripts/modules/core/modal/modal.module.js b/app/scripts/modules/core/modal/modal.module.js index 598b0da0404..e353a4d6548 100644 --- a/app/scripts/modules/core/modal/modal.module.js +++ b/app/scripts/modules/core/modal/modal.module.js @@ -13,6 +13,9 @@ module.exports = angular require('./wizard/modalWizard.directive.js'), require('./wizard/modalWizard.service.js'), require('./wizard/wizardPage.directive.js'), + require('./wizard/v2modalWizard.directive.js'), + require('./wizard/v2modalWizard.service.js'), + require('./wizard/v2wizardPage.directive.js'), ]).run(function($rootScope, $uibModalStack) { $rootScope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams) { if (!fromParams.allowModalToStayOpen) { diff --git a/app/scripts/modules/core/modal/modalOverlay.directive.js b/app/scripts/modules/core/modal/modalOverlay.directive.js index 9b4b29cf38d..fa323fecb74 100644 --- a/app/scripts/modules/core/modal/modalOverlay.directive.js +++ b/app/scripts/modules/core/modal/modalOverlay.directive.js @@ -10,7 +10,7 @@ module.exports = angular.module('spinnaker.core.modal.modalOverlay.directive', [ link: function(scope, elem) { $timeout(function() { var $uibModal = elem.closest('.modal-content'), - modalHeight = $uibModal.height(); + modalHeight = $uibModal.outerHeight(); if (modalHeight < 450) { modalHeight = 450; @@ -19,6 +19,10 @@ module.exports = angular.module('spinnaker.core.modal.modalOverlay.directive', [ $uibModal.height(modalHeight); elem.show().height(modalHeight).css({opacity: 1}); + let headerHeight = elem.find('.modal-header').outerHeight(), + footerHeight = elem.find('.modal-footer').outerHeight(); + elem.find('.modal-body').css({height: `calc(100% - ${headerHeight + footerHeight}px)`}); + scope.$on('$destroy', function() { elem.hide(); elem.height(0).css({opacity: 0, scrollTop: 0}); diff --git a/app/scripts/modules/core/modal/modals.less b/app/scripts/modules/core/modal/modals.less index fcb6b7f9498..ffd5dc7bbb2 100644 --- a/app/scripts/modules/core/modal/modals.less +++ b/app/scripts/modules/core/modal/modals.less @@ -19,88 +19,110 @@ .modal-header { background-color: #f5f5f5; - padding: 25px; - - h2, h3 { - margin-top: 0; - margin-bottom: 0; - } +} - .steps-indicator { - @indicator-size: 18px; - @indicator-radius: @indicator-size/2; - position: relative; - height: 74px; - overflow-x: hidden; - padding-top: @indicator-size; +modal-wizard { + .modal-header { + padding: 25px; - &:before { - top: @indicator-size + 10; + h2, h3 { + margin-top: 0; + margin-bottom: 0; } - li { - margin-top: 10px; - font-size: 80%; - padding: @indicator-size - 5 3px 0; - transition: all 0.25s ease-in-out; + .steps-indicator { + @indicator-size: 18px; + @indicator-radius: @indicator-size/2; + position: relative; + height: 74px; + overflow-x: hidden; + padding-top: @indicator-size; - &.ng-enter { - transform: scale(2.0); - opacity: 0.6; - } - &.ng-enter.ng-enter-active { - transform: scale(1.0); - opacity: 1; - } - &.ng-leave { - transform: scale(1.0); - opacity: 1; - } - &.ng-leave.ng-leave-active { - transform: scale(0.0); - opacity: 0; + &:before { + top: @indicator-size + 10; } - a:before { - top: @indicator-radius * -1; - width: @indicator-size; - height: @indicator-size; - background-color: transparent; - font-size: 175%; - font-family: 'Glyphicons Halflings'; - left: ~'calc(50% - @{indicator-radius})'; - } + li { + margin-top: 10px; + font-size: 80%; + padding: @indicator-size - 5 3px 0; + transition: all 0.25s ease-in-out; + + &.ng-enter { + transform: scale(2.0); + opacity: 0.6; + } + &.ng-enter.ng-enter-active { + transform: scale(1.0); + opacity: 1; + } + &.ng-leave { + transform: scale(1.0); + opacity: 1; + } + &.ng-leave.ng-leave-active { + transform: scale(0.0); + opacity: 0; + } - &.done { a:before { - background-color: #339933; + top: @indicator-radius * -1; + width: @indicator-size; + height: @indicator-size; + background-color: transparent; + font-size: 175%; + font-family: 'Glyphicons Halflings'; + left: ~'calc(50% - @{indicator-radius})'; } - &.dirty { + + &.done { a:before { - .pulsing(); - color: @state-danger-text; - background-color: transparent; - content: "\e088"; - top: -7px; + background-color: #339933; + } + &.dirty { + a:before { + .pulsing(); + color: @state-danger-text; + background-color: transparent; + content: "\e088"; + top: -7px; + } } } - } - &.current { - a { - color: @text-color; - } - a:before { - background-color: @spinnaker-blue; - content: ''; + &.current { + a { + color: @text-color; + } + a:before { + background-color: @spinnaker-blue; + content: ''; + } } - } - &.default { - a:before { - background-color: #808080; + &.default { + a:before { + background-color: #808080; + } } } } } + .wizard-subheading { + padding: 15px 0 0 15px; + h4 { + margin-top: 0; + margin-bottom: 0; + } + } + .steps { + width: 1200px; + overflow-x: hidden; + .modal-page { + position: relative; + width: 600px; + float: left; + } + .clearfix(); + } } .modal-body { @@ -109,25 +131,6 @@ } } -.wizard-subheading { - padding: 15px 0 0 15px; - h4 { - margin-top: 0; - margin-bottom: 0; - } -} - -.steps { - width: 1200px; - overflow-x: hidden; - .modal-page { - position: relative; - width: 600px; - float: left; - } - .clearfix(); -} - .forward { .modal-page { &.ng-leave, &.ng-enter { @@ -351,6 +354,9 @@ abbr.select2-search-choice-close { opacity: 0; overflow-y: auto; border-bottom: 2px solid @dark_blue_background; + background-color: #ffffff; + z-index: 5; + position: relative; .overlay-modal-status { padding: 0 30px; diff --git a/app/scripts/modules/core/modal/wizard/modalWizard.less b/app/scripts/modules/core/modal/wizard/modalWizard.less new file mode 100644 index 00000000000..46bc27c4c4c --- /dev/null +++ b/app/scripts/modules/core/modal/wizard/modalWizard.less @@ -0,0 +1,99 @@ +@import "../../presentation/less/imports/commonImports.less"; + +@indicator-size: 14px; +@indicator-radius: @indicator-size/2; + +v2-modal-wizard { + .modal-header { + /* Set to keep sticky section headings beneath modal header*/ + position: relative; + z-index: 3; + } + ul.wizard-navigation { + margin: 0; + padding: 0; + list-style-type: none; + .clearfix(); + li { + display: block; + width: 100%; + text-align: left; + padding: 0; + a { + display: block; + width: 100%; + font-weight: normal; + padding: 10px 5px 10px 32px; + } + a:before { + position: absolute; + left: 10px; + top: 10px; + width: @indicator-size; + height: @indicator-size; + border-radius: 100%; + background-color: #e6e6e6; + content: ''; + transition: 0.25s; + } + + a:before { + background-color: transparent; + font-size: 135%; + font-family: 'Glyphicons Halflings'; + } + + &.done { + a:before { + background-color: @healthy_green_icon; + } + } + &.default { + pointer-events: auto; + a:before { + background-color: #808080; + } + } + &.current, &:hover, &:active { + transition: 0.25s; + background-color: @lighter_grey; + a { + color: @text-color; + font-weight: 600; + } + a:before { + background-color: @spinnaker-blue; + content: ''; + } + } + &.dirty { + a:before { + color: @state-danger-text; + background-color: transparent; + content: "\e088"; + top: 11px; + } + } + } + } + + .steps { + overflow: auto; + clear: both; + max-height: calc(~"100vh - 250px"); + .wizard-subheading { + padding: 0; + h4 { + padding: 10px; + margin-bottom: 0; + color: @lightest_grey; + background-color: @dark_blue_background; + font-weight: 300; + } + margin-bottom: 10px; + } + .wizard-page-body { + padding: 10px 0 20px; + } + } +} \ No newline at end of file diff --git a/app/scripts/modules/core/modal/wizard/v2modalWizard.directive.html b/app/scripts/modules/core/modal/wizard/v2modalWizard.directive.html new file mode 100644 index 00000000000..91e552978f4 --- /dev/null +++ b/app/scripts/modules/core/modal/wizard/v2modalWizard.directive.html @@ -0,0 +1,33 @@ +
+ + +
+

{{wizard.heading}}

+
+
+
+
+ +
+
+
+
+
+
+
diff --git a/app/scripts/modules/core/modal/wizard/v2modalWizard.directive.js b/app/scripts/modules/core/modal/wizard/v2modalWizard.directive.js new file mode 100644 index 00000000000..c080f054389 --- /dev/null +++ b/app/scripts/modules/core/modal/wizard/v2modalWizard.directive.js @@ -0,0 +1,32 @@ +'use strict'; + +let angular = require('angular'); + +require('./modalWizard.less'); + +module.exports = angular.module('spinnaker.core.modalWizard.wizard.v2', [ + require('./v2modalWizard.service.js'), + require('./v2wizardPage.directive.js'), +]) + .directive('v2ModalWizard', function (v2modalWizardService) { + return { + restrict: 'E', + transclude: true, + scope: true, + templateUrl: require('./v2modalWizard.directive.html'), + controller: 'v2ModalWizardCtrl as wizardCtrl', + link: function(scope, elem, attrs) { + v2modalWizardService.setHeading(attrs.heading); + } + }; + } +).controller('v2ModalWizardCtrl', function($scope, v2modalWizardService) { + $scope.wizard = v2modalWizardService; + $scope.$on('waypoints-changed', (event, snapshot) => { + let ids = snapshot.lastWindow.map((entry) => entry.elem); + ids.reverse().forEach((id) => v2modalWizardService.setCurrentPage($scope.wizard.getPage(id), true)); + }); + + $scope.$on('$destroy', v2modalWizardService.resetWizard); + } +); diff --git a/app/scripts/modules/core/modal/wizard/v2modalWizard.service.js b/app/scripts/modules/core/modal/wizard/v2modalWizard.service.js new file mode 100644 index 00000000000..96f19b70dde --- /dev/null +++ b/app/scripts/modules/core/modal/wizard/v2modalWizard.service.js @@ -0,0 +1,86 @@ +'use strict'; + + +let angular = require('angular'); + +module.exports = angular + .module('spinnaker.core.modalWizard.service.v2', [ + require('../../utils/lodash.js'), + require('../../utils/scrollTo/scrollTo.service.js'), + ]) + .factory('v2modalWizardService', function(_, scrollToService) { + + this.renderedPages = []; + this.pageRegistry = []; + this.currentPage = null; + this.heading = null; + + this.setHeading = (heading) => this.heading = heading; + + this.getPage = (pageKey) => { + return _.find(this.pageRegistry, {key: pageKey}); + }; + + this.markDirty = (pageKey) => this.getPage(pageKey).state.dirty = true; + + this.markClean = (pageKey) => this.getPage(pageKey).state.dirty = false; + + this.markComplete = (pageKey) => this.getPage(pageKey).state.done = true; + + this.markIncomplete = (pageKey) => this.getPage(pageKey).state.done = false; + + this.setCurrentPage = (page, skipScroll) => { + this.pageRegistry.forEach((test) => test.state.current = (test === page)); + this.currentPage = page; + this.markClean(page.key); + + if (page.state.markCompleteOnView) { + this.markComplete(page.key); + } + if (!skipScroll) { + scrollToService.scrollTo(`[waypoint="${page.key}"]`, '[waypoint-container]', 115); + } + }; + + this.registerPage = (pageKey, label, state) => { + state = state || { done: false, blocked: true, rendered: true, current: false }; + this.pageRegistry.push({key: pageKey, label: label, state: state}); + this.renderPages(); + }; + + this.renderPages = () => { + var renderedPages = this.pageRegistry.filter((page) => page.state.rendered); + this.renderedPages = renderedPages; + if (renderedPages.length === 1) { + this.setCurrentPage(renderedPages[0]); + } + }; + + this.isComplete = () => _(this.renderedPages) + .collect('state') + .filter({rendered: true, required: true}) + .every({done: true, dirty: false}); + + this.allPagesVisited = () => _(this.renderedPages) + .collect('state') + .filter({rendered: true, required: true}) + .every({done: true}); + + this.setRendered = (pageKey, rendered) => { + this.pageRegistry.filter((page) => page.key === pageKey) + .forEach((page) => page.state.rendered = rendered); + this.renderPages(); + }; + + this.includePage = (pageKey) => this.setRendered(pageKey, true); + this.excludePage = (pageKey) => this.setRendered(pageKey, false); + + this.resetWizard = () => { + this.renderedPages.length = 0; + this.pageRegistry.length = 0; + this.currentPage = null; + this.heading = null; + }; + + return this; + }); diff --git a/app/scripts/modules/core/modal/wizard/v2wizardPage.directive.html b/app/scripts/modules/core/modal/wizard/v2wizardPage.directive.html new file mode 100644 index 00000000000..c74bd76748c --- /dev/null +++ b/app/scripts/modules/core/modal/wizard/v2wizardPage.directive.html @@ -0,0 +1,11 @@ +
+
+

{{label}}

+
+
+
diff --git a/app/scripts/modules/core/modal/wizard/v2wizardPage.directive.js b/app/scripts/modules/core/modal/wizard/v2wizardPage.directive.js new file mode 100644 index 00000000000..9508689dcf3 --- /dev/null +++ b/app/scripts/modules/core/modal/wizard/v2wizardPage.directive.js @@ -0,0 +1,44 @@ +'use strict'; + +/** + * Wizard page directive + * possible attributes: + * - key (required): Any string value, unique within the wizard; it becomes the the hook to access the page state + * through the wizard, e.g. wizard.getPage('page-1').markComplete() + * - label (required): Any string value; it becomes label in the wizard flow + * - done (optional, default: false): when set to true, the page will be marked complete when rendered + * - mandatory (optional, default: true): when set to false, the wizard will not consider this page when isComplete + * is called + * - render (optional, default: true): when set to false, registers the page with the wizard, but does not participate + * in the wizard flow. To add the page to the flow, call wizard.includePage(key) + * - markCompleteOnView (optional, default: true): when set to false, the page will not be marked complete when + * scrolled into view + */ +let angular = require('angular'); + +module.exports = angular + .module('spinnaker.core.modal.wizard.wizardPage.directive.v2', [ + require('./v2modalWizard.service.js'), + ]) + .directive('v2WizardPage', function (v2modalWizardService) { + return { + restrict: 'E', + transclude: true, + scope: true, + templateUrl: require('./v2wizardPage.directive.html'), + link: function($scope, elem, attrs) { + var state = { + rendered: !attrs.render || $scope.$eval(attrs.render), + done: attrs.done === 'true', + dirty: false, + required: attrs.mandatory !== 'false', + markCompleteOnView: attrs.markCompleteOnView !== 'false', + }; + $scope.key = attrs.key; + $scope.label = attrs.label; + $scope.state = state; + v2modalWizardService.registerPage($scope.key, $scope.label, state); + }, + }; + }); + diff --git a/app/scripts/modules/core/pipeline/config/stages/deploy/deployStage.js b/app/scripts/modules/core/pipeline/config/stages/deploy/deployStage.js index 78294be8907..9d6dd258648 100644 --- a/app/scripts/modules/core/pipeline/config/stages/deploy/deployStage.js +++ b/app/scripts/modules/core/pipeline/config/stages/deploy/deployStage.js @@ -65,6 +65,7 @@ module.exports = angular.module('spinnaker.core.pipeline.stage.deployStage', [ $uibModal.open({ templateUrl: config.cloneServerGroupTemplateUrl, controller: `${config.cloneServerGroupController} as ctrl`, + size: cloudProviderRegistry.getValue(selectedProvider, 'v2wizard') ? 'lg' : 'md', resolve: { title: function () { return 'Configure Deployment Cluster'; @@ -92,6 +93,7 @@ module.exports = angular.module('spinnaker.core.pipeline.stage.deployStage', [ return $uibModal.open({ templateUrl: providerConfig.serverGroup.cloneServerGroupTemplateUrl, controller: `${providerConfig.serverGroup.cloneServerGroupController} as ctrl`, + size: 'lg', resolve: { title: function () { return 'Configure Deployment Cluster'; diff --git a/app/scripts/modules/core/presentation/main.less b/app/scripts/modules/core/presentation/main.less index 7e700780bfa..60813437532 100644 --- a/app/scripts/modules/core/presentation/main.less +++ b/app/scripts/modules/core/presentation/main.less @@ -537,6 +537,9 @@ body > .container { } .sm-label-right { text-align: right; + @media(max-width: 992px) { + text-align: left; + } } .form-inline { @@ -557,6 +560,7 @@ body > .container { .modal-content { overflow-x: hidden; overflow-y: hidden; + border-radius: 3px; } .modal-pages { @@ -1089,6 +1093,11 @@ ul.select2-results { } .select2.select2-container { + &.ng-invalid-required { + a.select2-default { + border: 1px solid @unhealthy_red_border; + } + } .select2-choice { .select2-chosen { padding-left: 0; diff --git a/app/scripts/modules/core/projects/configure/configureProject.modal.controller.js b/app/scripts/modules/core/projects/configure/configureProject.modal.controller.js index 6e656401567..78aed5a7b38 100644 --- a/app/scripts/modules/core/projects/configure/configureProject.modal.controller.js +++ b/app/scripts/modules/core/projects/configure/configureProject.modal.controller.js @@ -61,6 +61,12 @@ module.exports = angular.module('spinnaker.core.projects.configure.modal.control $scope.command.config.pipelineConfigs = $scope.command.config.pipelineConfigs.filter( pipeline => pipeline.application !== null && pipeline.pipelineConfigId !== null ); + $scope.command.config.clusters + .filter((cluster) => !cluster.useAllApplications) + .forEach((cluster) => { + cluster.applications = cluster.applications + .filter((app) => $scope.command.config.applications.indexOf(app) > -1); + }); }; this.removeCluster = (index) => { diff --git a/app/scripts/modules/core/projects/configure/configureProject.modal.html b/app/scripts/modules/core/projects/configure/configureProject.modal.html index bac9154c313..8c5c260079a 100644 --- a/app/scripts/modules/core/projects/configure/configureProject.modal.html +++ b/app/scripts/modules/core/projects/configure/configureProject.modal.html @@ -1,14 +1,20 @@ - - + + - - + + - - + + - - + + - - + + +
+ + +
diff --git a/app/scripts/modules/core/projects/configure/projectApplications.modal.html b/app/scripts/modules/core/projects/configure/projectApplications.modal.html index f840031d3ca..bf2aef4d685 100644 --- a/app/scripts/modules/core/projects/configure/projectApplications.modal.html +++ b/app/scripts/modules/core/projects/configure/projectApplications.modal.html @@ -18,18 +18,4 @@
-
- - - - -
diff --git a/app/scripts/modules/core/projects/configure/projectClusters.modal.html b/app/scripts/modules/core/projects/configure/projectClusters.modal.html index d502b5c1dee..bc4a502b2e3 100644 --- a/app/scripts/modules/core/projects/configure/projectClusters.modal.html +++ b/app/scripts/modules/core/projects/configure/projectClusters.modal.html @@ -61,18 +61,4 @@
-
- - - - -
\ No newline at end of file diff --git a/app/scripts/modules/core/projects/configure/projectConfig.modal.html b/app/scripts/modules/core/projects/configure/projectConfig.modal.html index 13ac8a782cb..2f235c2f999 100644 --- a/app/scripts/modules/core/projects/configure/projectConfig.modal.html +++ b/app/scripts/modules/core/projects/configure/projectConfig.modal.html @@ -76,15 +76,4 @@
-
- - - -
diff --git a/app/scripts/modules/core/projects/configure/projectPipelines.modal.html b/app/scripts/modules/core/projects/configure/projectPipelines.modal.html index 497d2a2068a..6d4ba12ea66 100644 --- a/app/scripts/modules/core/projects/configure/projectPipelines.modal.html +++ b/app/scripts/modules/core/projects/configure/projectPipelines.modal.html @@ -38,14 +38,4 @@ -
- - - -
\ No newline at end of file diff --git a/app/scripts/modules/core/search/infrastructure/infrastructure.controller.js b/app/scripts/modules/core/search/infrastructure/infrastructure.controller.js index 8cd02c79327..cc4855ef077 100644 --- a/app/scripts/modules/core/search/infrastructure/infrastructure.controller.js +++ b/app/scripts/modules/core/search/infrastructure/infrastructure.controller.js @@ -96,6 +96,7 @@ module.exports = angular.module('spinnaker.search.infrastructure.controller', [ templateUrl: require('../../projects/configure/configureProject.modal.html'), controller: 'ConfigureProjectModalCtrl', controllerAs: 'ctrl', + size: 'lg', resolve: { projectConfig: () => { return {}; }, } diff --git a/app/scripts/modules/core/securityGroup/AllSecurityGroupsCtrl.js b/app/scripts/modules/core/securityGroup/AllSecurityGroupsCtrl.js index ad1a75e2344..768c7917353 100644 --- a/app/scripts/modules/core/securityGroup/AllSecurityGroupsCtrl.js +++ b/app/scripts/modules/core/securityGroup/AllSecurityGroupsCtrl.js @@ -63,6 +63,7 @@ module.exports = angular.module('spinnaker.core.securityGroup.all.controller', [ $uibModal.open({ templateUrl: provider.createSecurityGroupTemplateUrl, controller: `${provider.createSecurityGroupController} as ctrl`, + size: cloudProviderRegistry.getValue(selectedProvider, 'v2wizard') ? 'lg' : 'md', resolve: { securityGroup: function () { return { diff --git a/app/scripts/modules/core/serverGroup/configure/common/v2InstanceTypeSelector.directive.js b/app/scripts/modules/core/serverGroup/configure/common/v2InstanceTypeSelector.directive.js new file mode 100644 index 00000000000..dd03cb85dca --- /dev/null +++ b/app/scripts/modules/core/serverGroup/configure/common/v2InstanceTypeSelector.directive.js @@ -0,0 +1,70 @@ +'use strict'; + +let angular = require('angular'); + +require('./instanceTypeSelector.directive.less'); + +module.exports = angular.module('spinnaker.core.serverGroup.configure.common.v2instanceTypeSelector', []) + .directive('v2InstanceTypeSelector', function() { + return { + restrict: 'E', + scope: { + command: '=', + }, + templateUrl: require('./instanceTypeDirective.html'), + controller: 'v2InstanceTypeSelectorCtrl as instanceTypeCtrl', + }; + }) + .controller('v2InstanceTypeSelectorCtrl', function($scope, instanceTypeService) { + function updateFamilies() { + let command = $scope.command; + let availableTypes = []; + if (command.backingData && command.backingData.filtered) { + availableTypes = command.backingData.filtered.instanceTypes || []; + } + instanceTypeService.getCategories(command.selectedProvider).then(function(categories) { + categories.forEach(function(profile) { + if (profile.type === command.viewState.instanceProfile) { + if (!command.viewState.disableImageSelection) { + profile.families.forEach((family) => { + family.instanceTypes.forEach((instanceType) => { + instanceType.unavailable = availableTypes.every((available) => available !== instanceType.name); + }); + }); + } + $scope.selectedInstanceProfile = profile; + } + }); + }); + } + + $scope.$watch('command.viewState.instanceProfile', updateFamilies); + $scope.$watch('command.virtualizationType', updateFamilies); + + this.selectInstanceType = function(type) { + if (type.unavailable) { + return; + } + $scope.command.instanceType = type.name; + if ($scope.command.viewState.dirty && $scope.command.viewState.dirty.instanceType) { + delete $scope.command.viewState.dirty.instanceType; + } + + instanceTypeService.getInstanceTypeDetails($scope.command.selectedProvider, type.name).then(function(instanceTypeDetails) { + $scope.command.viewState.instanceTypeDetails = instanceTypeDetails; + }); + }; + + this.getStorageDescription = function(instanceType) { + if ($scope.command.instanceType === instanceType.name && $scope.command.viewState.overriddenStorageDescription) { + return $scope.command.viewState.overriddenStorageDescription; + } else { + return instanceType.storage.count + 'x' + instanceType.storage.size; + } + }; + + this.getStorageDescriptionHelpKey = function(instanceType) { + return $scope.command.instanceType === instanceType.name && $scope.command.viewState.overriddenStorageDescription ? 'instanceType.storageOverridden' : null; + }; + + }); diff --git a/app/scripts/modules/core/serverGroup/configure/common/v2instanceArchetype.directive.html b/app/scripts/modules/core/serverGroup/configure/common/v2instanceArchetype.directive.html new file mode 100644 index 00000000000..95acabaf07a --- /dev/null +++ b/app/scripts/modules/core/serverGroup/configure/common/v2instanceArchetype.directive.html @@ -0,0 +1,36 @@ +

This application is:

+
+ +
+
+
+ +
+
+
+

+ + Instance types + last refreshed {{ instanceArchetypeCtrl.getInstanceTypeRefreshTime() | timestamp }} + refreshing... +

+

If you're not seeing an instance type you expect, + click here to refresh the list. +

+
+
+
diff --git a/app/scripts/modules/core/serverGroup/configure/common/v2instanceArchetypeSelector.directive.js b/app/scripts/modules/core/serverGroup/configure/common/v2instanceArchetypeSelector.directive.js new file mode 100644 index 00000000000..38c319467bb --- /dev/null +++ b/app/scripts/modules/core/serverGroup/configure/common/v2instanceArchetypeSelector.directive.js @@ -0,0 +1,120 @@ +'use strict'; + +let angular = require('angular'); + +module.exports = angular.module('spinnaker.core.serverGroup.configure.common.v2instanceArchetypeSelector', [ + require('./costFactor.js'), + require('../../../presentation/isVisible/isVisible.directive.js'), + require('../../../modal/wizard/modalWizard.service.js'), + require('../../../modal/wizard/v2modalWizard.service.js'), +]) + .directive('v2InstanceArchetypeSelector', function() { + return { + restrict: 'E', + scope: { + command: '=', + }, + templateUrl: require('./v2instanceArchetype.directive.html'), + controller: 'v2InstanceArchetypeSelectorCtrl', + controllerAs: 'instanceArchetypeCtrl' + }; + }) + .controller('v2InstanceArchetypeSelectorCtrl', function($scope, instanceTypeService, infrastructureCaches, + serverGroupConfigurationService, modalWizardService, + v2modalWizardService, $log) { + var controller = this; + instanceTypeService.getCategories($scope.command.selectedProvider).then(function(categories) { + $scope.instanceProfiles = categories; + if ($scope.instanceProfiles.length % 3 === 0) { + $scope.columns = 3; + } + if ($scope.instanceProfiles.length % 4 === 0) { + $scope.columns = 4; + } + if ($scope.instanceProfiles.length % 5 === 0 || $scope.instanceProfiles.length === 7) { + $scope.columns = 5; + } + controller.selectInstanceType($scope.command.viewState.instanceProfile); + }); + + this.selectInstanceType = function (type) { + if ($scope.selectedInstanceProfile && $scope.selectedInstanceProfile.type === type) { + type = null; + $scope.selectedInstanceProfile = null; + } + $scope.command.viewState.instanceProfile = type; + $scope.instanceProfiles.forEach(function(profile) { + if (profile.type === type) { + $scope.selectedInstanceProfile = profile; + let current = $scope.command.instanceType; + if (current && profile.type !== 'custom') { + let found = profile.families + .some((family) => family.instanceTypes. + some((instanceType) => instanceType.name === current && !instanceType.unavailable) + ); + if (!found) { + $scope.command.instanceType = null; + try { + v2modalWizardService.markIncomplete('instance-type'); + } catch (e) { + $log.warn('DEV NOTE: Using deprecated wizard service; consider upgrading to v2 modal wizard'); + modalWizardService.getWizard().markIncomplete('instance-type'); + } + } + } + } + }); + }; + + this.updateInstanceType = () => { + if ($scope.command.instanceType) { + try { + v2modalWizardService.markComplete('instance-type'); + } catch (e) { + $log.warn('DEV NOTE: Using deprecated wizard service; consider upgrading to v2 modal wizard'); + modalWizardService.getWizard().markComplete('instance-type'); + } + } + }; + + if ($scope.command.region && $scope.command.instanceType && !$scope.command.viewState.instanceProfile) { + this.selectInstanceType('custom'); + } + + this.getInstanceTypeRefreshTime = function() { + return infrastructureCaches.instanceTypes.getStats().ageMax; + }; + + this.refreshInstanceTypes = function() { + controller.refreshing = true; + serverGroupConfigurationService.refreshInstanceTypes($scope.command.selectedProvider, $scope.command).then(function() { + controller.refreshing = false; + }); + }; + + // if there are no instance types in the cache, try to reload them + instanceTypeService.getAllTypesByRegion($scope.command.selectedProvider).then(function(results) { + if (!results || !Object.keys(results).length) { + controller.refreshInstanceTypes(); + } + }); + + this.getInstanceTypeRefreshTime = function() { + return infrastructureCaches.instanceTypes.getStats().ageMax; + }; + + this.refreshInstanceTypes = function() { + controller.refreshing = true; + serverGroupConfigurationService.refreshInstanceTypes($scope.command.selectedProvider, $scope.command).then(function() { + controller.refreshing = false; + }); + }; + + // if there are no instance types in the cache, try to reload them + instanceTypeService.getAllTypesByRegion($scope.command.selectedProvider).then(function(results) { + if (!results || !Object.keys(results).length) { + controller.refreshInstanceTypes(); + } + }); + + }); diff --git a/app/scripts/modules/core/task/monitor/taskMonitor.html b/app/scripts/modules/core/task/monitor/taskMonitor.html index 40e41c26a4e..38b5f9efa42 100644 --- a/app/scripts/modules/core/task/monitor/taskMonitor.html +++ b/app/scripts/modules/core/task/monitor/taskMonitor.html @@ -4,7 +4,7 @@

{{taskMonitor.title}}

-
+
  • diff --git a/app/scripts/modules/core/utils/scrollTo/scrollTo.service.js b/app/scripts/modules/core/utils/scrollTo/scrollTo.service.js index 2806c4c21bf..5046d0a5b93 100644 --- a/app/scripts/modules/core/utils/scrollTo/scrollTo.service.js +++ b/app/scripts/modules/core/utils/scrollTo/scrollTo.service.js @@ -21,9 +21,9 @@ let angular = require('angular'); module.exports = angular.module('spinnaker.core.utils.scrollTo', ['spinnaker.core.utils.jQuery']) .factory('scrollToService', function($timeout, $) { - function scrollTo(elementId, scrollableContainer, offset, delay = 0) { + function scrollTo(selector, scrollableContainer, offset = 0, delay = 0) { $timeout(function() { - var elem = $('#' + elementId); + var elem = $(selector); if (elem.length) { var content = scrollableContainer ? elem.closest(scrollableContainer) : $('body'); if (content.length) { diff --git a/app/scripts/modules/core/utils/stickyHeader/stickyHeader.directive.js b/app/scripts/modules/core/utils/stickyHeader/stickyHeader.directive.js index 0f95d93a6ed..d8bab47d639 100644 --- a/app/scripts/modules/core/utils/stickyHeader/stickyHeader.directive.js +++ b/app/scripts/modules/core/utils/stickyHeader/stickyHeader.directive.js @@ -34,33 +34,33 @@ module.exports = angular.module('spinnaker.core.utils.stickyHeader', [ var positionHeader = _.throttle(function () { var sectionRect = $section.get(0).getBoundingClientRect(), - sectionTop = sectionRect.bottom - sectionRect.height, + sectionTop = sectionRect.top, windowHeight = $window.innerHeight, bottom = sectionRect.bottom; - if (sectionRect.bottom < 0 || sectionTop > windowHeight) { + if (bottom < 0 || sectionTop > windowHeight) { clearStickiness($section); return; } var containerTop = $scrollableContainer.offset().top, - top = sectionTop - containerTop - addedOffsetHeight; + top = sectionTop - containerTop; if (top < 0 && bottom > containerTop + addedOffsetHeight) { var headingRect = $heading.get(0).getBoundingClientRect(), headingWidth = headingRect.width, - headingHeight = headingRect.height; - var topBase = containerTop, + headingHeight = $heading.outerHeight(true); + var topBase = containerTop + addedOffsetHeight, zIndex = 3; - if (containerTop + headingHeight + addedOffsetHeight > bottom) { - topBase = bottom - headingHeight - addedOffsetHeight; + if (containerTop + headingHeight > bottom) { + topBase = bottom - headingHeight + addedOffsetHeight; zIndex = 2; } $section.css({ paddingTop: headingHeight, }); $heading.addClass('heading-sticky').css({ - top: topBase + addedOffsetHeight, + top: topBase, width: headingWidth, zIndex: zIndex }); diff --git a/app/scripts/modules/core/utils/waypoints/waypoint.service.js b/app/scripts/modules/core/utils/waypoints/waypoint.service.js index cb0b1229831..975a8417500 100644 --- a/app/scripts/modules/core/utils/waypoints/waypoint.service.js +++ b/app/scripts/modules/core/utils/waypoints/waypoint.service.js @@ -6,7 +6,7 @@ module.exports = angular.module('spinnaker.core.utils.waypoints.service', [ require('../jQuery.js'), require('../lodash.js'), ]) - .factory('waypointService', function($timeout, $, _, $log) { + .factory('waypointService', function($timeout, $, _, $log, $rootScope) { var waypointRegistry = Object.create(null); @@ -25,28 +25,38 @@ module.exports = angular.module('spinnaker.core.utils.waypoints.service', [ if (!registryEntry.scrollEnabled) { // because they do not affect rendering directly, we can debounce this pretty liberally // but delay in case the scroll triggers a render of other elements and the top changes - element.bind('scroll.waypointEvents resize.waypointEvents', _.debounce(function() { + element.bind('scroll.waypointEvents resize.waypointEvents', _.throttle(function() { $timeout(function() { var containerRect = element.get(0).getBoundingClientRect(), - topThreshold = containerRect.top + registryEntry.offset, - waypoints = element.find('[waypoint]'), - inView = []; + topThreshold = containerRect.top + registryEntry.offset, + waypoints = element.find('[waypoint]'), + lastTop = waypointRegistry[key].top, + newTop = element.get(0).scrollTop, + inView = []; waypoints.each(function(idx, waypoint) { var waypointRect = waypoint.getBoundingClientRect(); if (waypointRect.bottom >= topThreshold && waypointRect.top <= containerRect.bottom) { inView.push({ top: waypointRect.top, elem: waypoint.getAttribute('waypoint') }); } }); - waypointRegistry[key].lastWindow = _.sortBy(inView, 'top'); + waypointRegistry[key] = { + lastWindow: _.sortBy(inView, 'top'), + top: newTop, + direction: lastTop > newTop ? 'up' : 'down' + }; + if (waypointRegistry[key].lastWindow.length) { + $rootScope.$broadcast('waypoint-set', waypointRegistry[key].lastWindow[0].elem); + $rootScope.$broadcast('waypoints-changed', waypointRegistry[key]); + } }); - }, 300)); + }, 200)); registryEntry.scrollEnabled = true; } } function disableWaypointEvent(key) { var registry = waypointRegistry[key]; - if (registry) { + if (registry && registry.container) { registry.container.unbind('scroll.waypointEvents resize.waypointEvents'); registry.scrollEnabled = false; registry.container = null; diff --git a/app/scripts/modules/netflix/application/editApplication.modal.html b/app/scripts/modules/netflix/application/editApplication.modal.html index b89eab0d02f..c0fbb92b05e 100644 --- a/app/scripts/modules/netflix/application/editApplication.modal.html +++ b/app/scripts/modules/netflix/application/editApplication.modal.html @@ -108,14 +108,14 @@

    Edit Application

-
+
Cloud Provider
{{$item}} - + {{provider}} @@ -180,12 +180,10 @@

Edit Application

diff --git a/app/scripts/modules/netflix/fastProperties/modal/wizard/fastPropertyWizard.html b/app/scripts/modules/netflix/fastProperties/modal/wizard/fastPropertyWizard.html index 1b24bc248bc..34cf72b42b5 100644 --- a/app/scripts/modules/netflix/fastProperties/modal/wizard/fastPropertyWizard.html +++ b/app/scripts/modules/netflix/fastProperties/modal/wizard/fastPropertyWizard.html @@ -1,4 +1,4 @@ - + diff --git a/app/scripts/modules/netflix/netflix.module.js b/app/scripts/modules/netflix/netflix.module.js index 73c42220ea6..79abb38610f 100644 --- a/app/scripts/modules/netflix/netflix.module.js +++ b/app/scripts/modules/netflix/netflix.module.js @@ -23,7 +23,7 @@ module.exports = angular require('./canary'), require('./templateOverride/templateOverrides.module.js'), require('./migrator/pipeline/pipeline.migrator.directive.js'), - require('./serverGroup/serverGroupCommandConfigurer.service.js'), + require('./serverGroup/wizard/serverGroupCommandConfigurer.service.js'), require('./serverGroup/diff/securityGroupDiff.directive.js'), require('./serverGroup/networking/networking.module.js'), require('./report/reservationReport.directive.js'), diff --git a/app/scripts/modules/netflix/report/reservationReport.directive.js b/app/scripts/modules/netflix/report/reservationReport.directive.js index 94bffe24c41..8453fe2ff09 100644 --- a/app/scripts/modules/netflix/report/reservationReport.directive.js +++ b/app/scripts/modules/netflix/report/reservationReport.directive.js @@ -23,21 +23,28 @@ module.exports = angular controllerAs: 'vm', }; }) - .controller('ReservationReportCtrl', function (reservationReportReader) { + .controller('ReservationReportCtrl', function ($scope, reservationReportReader) { this.viewState = { loading: true, error: false, }; - reservationReportReader.getReservationsFor(this.account, this.region, this.instanceType) - .then( - (report) => { - this.report = report.filter((row) => this.zones.indexOf(row.availabilityZone) > -1); - this.viewState.loading = false; - }, - () => { - this.viewState.loading = false; - this.viewState.error = true; + let initialize = () => { + if (!this.instanceType) { + return; } - ); + reservationReportReader.getReservationsFor(this.account, this.region, this.instanceType) + .then( + (report) => { + this.report = report.filter((row) => this.zones.indexOf(row.availabilityZone) > -1); + this.viewState.loading = false; + }, + () => { + this.viewState.loading = false; + this.viewState.error = true; + } + ); + }; + + $scope.$watch(() => this.instanceType, initialize); }); diff --git a/app/scripts/modules/netflix/serverGroup/awsServerGroupSecurityGroups.html b/app/scripts/modules/netflix/serverGroup/awsServerGroupSecurityGroups.html deleted file mode 100644 index fa5db092a28..00000000000 --- a/app/scripts/modules/netflix/serverGroup/awsServerGroupSecurityGroups.html +++ /dev/null @@ -1,17 +0,0 @@ -
-
- - - -
- - - diff --git a/app/scripts/modules/netflix/serverGroup/capacity/awsServerGroupCapacity.html b/app/scripts/modules/netflix/serverGroup/capacity/awsServerGroupCapacity.html deleted file mode 100644 index 676ffd2cefb..00000000000 --- a/app/scripts/modules/netflix/serverGroup/capacity/awsServerGroupCapacity.html +++ /dev/null @@ -1,31 +0,0 @@ -
-
-
-
-
- -
-
- - -
-
- - -
- - - - diff --git a/app/scripts/modules/netflix/serverGroup/wizard/capacity/awsServerGroupCapacity.html b/app/scripts/modules/netflix/serverGroup/wizard/capacity/awsServerGroupCapacity.html new file mode 100644 index 00000000000..8eab1088ef7 --- /dev/null +++ b/app/scripts/modules/netflix/serverGroup/wizard/capacity/awsServerGroupCapacity.html @@ -0,0 +1,21 @@ +
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
diff --git a/app/scripts/modules/netflix/serverGroup/wizard/securityGroups/awsServerGroupSecurityGroups.html b/app/scripts/modules/netflix/serverGroup/wizard/securityGroups/awsServerGroupSecurityGroups.html new file mode 100644 index 00000000000..1f6b5a5e26b --- /dev/null +++ b/app/scripts/modules/netflix/serverGroup/wizard/securityGroups/awsServerGroupSecurityGroups.html @@ -0,0 +1,5 @@ +
+ + + +
diff --git a/app/scripts/modules/netflix/serverGroup/serverGroupCommandConfigurer.service.js b/app/scripts/modules/netflix/serverGroup/wizard/serverGroupCommandConfigurer.service.js similarity index 77% rename from app/scripts/modules/netflix/serverGroup/serverGroupCommandConfigurer.service.js rename to app/scripts/modules/netflix/serverGroup/wizard/serverGroupCommandConfigurer.service.js index 19bc6ef45b4..f8961025026 100644 --- a/app/scripts/modules/netflix/serverGroup/serverGroupCommandConfigurer.service.js +++ b/app/scripts/modules/netflix/serverGroup/wizard/serverGroupCommandConfigurer.service.js @@ -4,12 +4,14 @@ const angular = require('angular'); module.exports = angular .module('spinnaker.netflix.serverGroup.configurer.service', [ - require('../../core/utils/lodash.js'), - require('./diff/diff.service.js'), - require('../../core/naming/naming.service.js'), - require('../../core/serverGroup/configure/common/serverGroupCommand.registry.js'), + require('../../../core/utils/lodash.js'), + require('./../diff/diff.service.js'), + require('../../../core/naming/naming.service.js'), + require('../../../core/config/settings.js'), + require('../../../core/serverGroup/configure/common/serverGroupCommand.registry.js'), + require('../../../core/modal/wizard/v2modalWizard.service.js'), ]) - .factory('netflixServerGroupCommandConfigurer', function(diffService, namingService, _, modalWizardService) { + .factory('netflixServerGroupCommandConfigurer', function(diffService, namingService, _, v2modalWizardService) { function configureSecurityGroupDiffs(command) { var currentOptions = command.backingData.filtered.securityGroups, currentSecurityGroups = command.securityGroups || []; @@ -53,7 +55,7 @@ module.exports = angular property: 'command.viewState.securityGroupDiffs', method: function(newVal) { if (newVal && newVal.length) { - modalWizardService.getWizard().markDirty('security-groups'); + v2modalWizardService.markDirty('security-groups'); } } }, @@ -70,6 +72,8 @@ module.exports = angular }; }) - .run(function(serverGroupCommandRegistry, netflixServerGroupCommandConfigurer) { - serverGroupCommandRegistry.register('aws', netflixServerGroupCommandConfigurer); + .run(function(serverGroupCommandRegistry, netflixServerGroupCommandConfigurer, settings) { + if (settings.feature && settings.feature.netflixMode) { + serverGroupCommandRegistry.register('aws', netflixServerGroupCommandConfigurer); + } }); diff --git a/app/scripts/modules/netflix/templateOverride/templateOverrides.module.js b/app/scripts/modules/netflix/templateOverride/templateOverrides.module.js index 8952668f6fe..d6495c70436 100644 --- a/app/scripts/modules/netflix/templateOverride/templateOverrides.module.js +++ b/app/scripts/modules/netflix/templateOverride/templateOverrides.module.js @@ -17,8 +17,8 @@ module.exports = angular { key: 'applicationNavHeader', value: require('../application/applicationNav.html') }, { key: 'pipelineConfigActions', value: require('./pipelineConfigActions.html') }, { key: 'spinnakerHeader', value: require('./spinnakerHeader.html') }, - { key: 'aws.serverGroup.securityGroups', value: require('../serverGroup/awsServerGroupSecurityGroups.html') }, - { key: 'aws.serverGroup.capacity', value: require('../serverGroup/capacity/awsServerGroupCapacity.html') }, + { key: 'aws.serverGroup.securityGroups', value: require('../serverGroup/wizard/securityGroups/awsServerGroupSecurityGroups.html') }, + { key: 'aws.serverGroup.capacity', value: require('../serverGroup/wizard/capacity/awsServerGroupCapacity.html') }, { key: 'aws.resize.modal', value: require('../serverGroup/resize/awsResizeServerGroup.html') }, ]; templates.forEach((template) => overrideRegistry.overrideTemplate(template.key, template.value)); diff --git a/app/scripts/modules/titan/serverGroup/configure/wizard/templateSelection.html b/app/scripts/modules/titan/serverGroup/configure/wizard/templateSelection.html index f79306db359..265d6670950 100644 --- a/app/scripts/modules/titan/serverGroup/configure/wizard/templateSelection.html +++ b/app/scripts/modules/titan/serverGroup/configure/wizard/templateSelection.html @@ -10,7 +10,7 @@

Template Selection

-
+
Copy configuration from
From 42989326d89de2965265bc8fd3800fc2cd37669b Mon Sep 17 00:00:00 2001 From: chrisb Date: Sun, 7 Feb 2016 22:35:17 -0800 Subject: [PATCH 014/151] improve usability in v2 modal wizards on small screens --- app/scripts/modules/core/modal/modals.less | 8 ++++ .../core/modal/wizard/modalWizard.less | 42 +++++++++++++++---- .../modal/wizard/v2modalWizard.directive.html | 4 +- .../modal/wizard/v2wizardPage.directive.html | 2 +- 4 files changed, 46 insertions(+), 10 deletions(-) diff --git a/app/scripts/modules/core/modal/modals.less b/app/scripts/modules/core/modal/modals.less index ffd5dc7bbb2..eded71164f8 100644 --- a/app/scripts/modules/core/modal/modals.less +++ b/app/scripts/modules/core/modal/modals.less @@ -15,10 +15,18 @@ h2, h3, h4, h5 { font-weight: 600; } + modal-close { + display: block; + position: relative; + z-index: 6; + } } .modal-header { background-color: #f5f5f5; + h3 { + margin: 0; + } } modal-wizard { diff --git a/app/scripts/modules/core/modal/wizard/modalWizard.less b/app/scripts/modules/core/modal/wizard/modalWizard.less index 46bc27c4c4c..f935b22b262 100644 --- a/app/scripts/modules/core/modal/wizard/modalWizard.less +++ b/app/scripts/modules/core/modal/wizard/modalWizard.less @@ -13,6 +13,10 @@ v2-modal-wizard { margin: 0; padding: 0; list-style-type: none; + height: auto; + position: relative; + background-color: #ffffff; + z-index: 5; .clearfix(); li { display: block; @@ -32,13 +36,9 @@ v2-modal-wizard { width: @indicator-size; height: @indicator-size; border-radius: 100%; - background-color: #e6e6e6; + background-color: transparent; content: ''; transition: 0.25s; - } - - a:before { - background-color: transparent; font-size: 135%; font-family: 'Glyphicons Halflings'; } @@ -78,9 +78,10 @@ v2-modal-wizard { } .steps { - overflow: auto; + overflow-y: auto; + overflow-x: hidden; clear: both; - max-height: calc(~"100vh - 250px"); + max-height: calc(~"100vh - 215px"); .wizard-subheading { padding: 0; h4 { @@ -89,6 +90,33 @@ v2-modal-wizard { color: @lightest_grey; background-color: @dark_blue_background; font-weight: 300; + @media(max-width: 992px) { + padding-left: 0; + &:before { + display: inline-block; + margin: 0 10px; + width: @indicator-size; + height: @indicator-size; + border-radius: 100%; + background-color: #808080; + content: ''; + transition: 0.25s; + } + &.done { + &:before { + background-color: @healthy_green_icon; + } + } + &.dirty { + &:before { + color: @state-danger-text; + background-color: transparent; + content: "\e088"; + top: 11px; + } + } + + } } margin-bottom: 10px; } diff --git a/app/scripts/modules/core/modal/wizard/v2modalWizard.directive.html b/app/scripts/modules/core/modal/wizard/v2modalWizard.directive.html index 91e552978f4..39b2085ee26 100644 --- a/app/scripts/modules/core/modal/wizard/v2modalWizard.directive.html +++ b/app/scripts/modules/core/modal/wizard/v2modalWizard.directive.html @@ -6,7 +6,7 @@

{{wizard.heading}}

-
+ -
+
-

{{label}}

+

{{label}}

From a1a251408d3b2413500dab536c71a300d792209c Mon Sep 17 00:00:00 2001 From: tomaslin Date: Fri, 5 Feb 2016 15:44:30 -0800 Subject: [PATCH 015/151] UI for defining git triggers --- .../config/triggers/git/gitPopoverLabel.html | 4 ++ .../config/triggers/git/gitTrigger.html | 46 +++++++++++++++++++ .../config/triggers/git/gitTrigger.module.js | 32 +++++++++++++ .../config/triggers/trigger.module.js | 1 + settings.js | 1 + 5 files changed, 84 insertions(+) create mode 100644 app/scripts/modules/core/pipeline/config/triggers/git/gitPopoverLabel.html create mode 100644 app/scripts/modules/core/pipeline/config/triggers/git/gitTrigger.html create mode 100644 app/scripts/modules/core/pipeline/config/triggers/git/gitTrigger.module.js diff --git a/app/scripts/modules/core/pipeline/config/triggers/git/gitPopoverLabel.html b/app/scripts/modules/core/pipeline/config/triggers/git/gitPopoverLabel.html new file mode 100644 index 00000000000..82b1c096973 --- /dev/null +++ b/app/scripts/modules/core/pipeline/config/triggers/git/gitPopoverLabel.html @@ -0,0 +1,4 @@ +
+ Repository: {{trigger.repository}} + Branch: {{trigger.branch}} +
diff --git a/app/scripts/modules/core/pipeline/config/triggers/git/gitTrigger.html b/app/scripts/modules/core/pipeline/config/triggers/git/gitTrigger.html new file mode 100644 index 00000000000..66a64ba4d8d --- /dev/null +++ b/app/scripts/modules/core/pipeline/config/triggers/git/gitTrigger.html @@ -0,0 +1,46 @@ + +
+ +
+ +
+
+
+ + +
+ +
+
+
+ +
+ +
+
+ diff --git a/app/scripts/modules/core/pipeline/config/triggers/git/gitTrigger.module.js b/app/scripts/modules/core/pipeline/config/triggers/git/gitTrigger.module.js new file mode 100644 index 00000000000..f24b6f0979f --- /dev/null +++ b/app/scripts/modules/core/pipeline/config/triggers/git/gitTrigger.module.js @@ -0,0 +1,32 @@ +'use strict'; + +let angular = require('angular'); + +module.exports = angular.module('spinnaker.core.pipeline.trigger.git', [ + require('../../../../../core/config/settings.js'), + ]) + .config(function (pipelineConfigProvider) { + pipelineConfigProvider.registerTrigger({ + label: 'Git', + description: 'Executes the pipeline on a git push', + key: 'git', + controller: 'GitTriggerCtrl', + controllerAs: 'vm', + templateUrl: require('./gitTrigger.html'), + popoverLabelUrl: require('./gitPopoverLabel.html'), + }); + }) + .controller('GitTriggerCtrl', function (trigger, $scope, settings) { + this.trigger = trigger; + + $scope.gitTriggerTypes = ['stash', 'github']; + + if (settings && settings.gitSources) { + $scope.gitTriggerTypes = settings.gitSources; + } + + if ($scope.gitTriggerTypes.length == 1) { + trigger.source = $scope.gitTriggerTypes[0]; + } + + }); diff --git a/app/scripts/modules/core/pipeline/config/triggers/trigger.module.js b/app/scripts/modules/core/pipeline/config/triggers/trigger.module.js index 91a25581c8c..11127af115c 100644 --- a/app/scripts/modules/core/pipeline/config/triggers/trigger.module.js +++ b/app/scripts/modules/core/pipeline/config/triggers/trigger.module.js @@ -8,5 +8,6 @@ module.exports = angular.module('spinnaker.core.pipeline.config.trigger', [ require('./jenkins/jenkinsTrigger.module.js'), require('./pipeline/pipelineTrigger.module.js'), require('./cron/cronTrigger.module.js'), + require('./git/gitTrigger.module.js'), require('../stages/stage.module.js'), ]); diff --git a/settings.js b/settings.js index 020670ff577..bc3fc1b6575 100644 --- a/settings.js +++ b/settings.js @@ -52,6 +52,7 @@ window.spinnakerSettings = { fileName: 'news.md', }, authEnabled: process.env.AUTH === 'enabled', + gitSources: ['stash', 'github'], feature: { pipelines: true, notifications: false, From 345c23f477a3c5faa8654181f11bd8263e7e4132 Mon Sep 17 00:00:00 2001 From: chrisb Date: Mon, 8 Feb 2016 11:24:44 -0800 Subject: [PATCH 016/151] fix form scoping on security group modals --- .../CreateSecurityGroup.controller.spec.js | 6 ++-- .../configSecurityGroup.mixin.controller.js | 15 +++++---- .../configure/createSecurityGroup.html | 32 ++++++++++--------- .../configure/createSecurityGroupIngress.html | 4 +-- .../createSecurityGroupProperties.html | 4 +-- 5 files changed, 32 insertions(+), 29 deletions(-) diff --git a/app/scripts/modules/amazon/securityGroup/configure/CreateSecurityGroup.controller.spec.js b/app/scripts/modules/amazon/securityGroup/configure/CreateSecurityGroup.controller.spec.js index f5789998ea2..91f8f747ead 100644 --- a/app/scripts/modules/amazon/securityGroup/configure/CreateSecurityGroup.controller.spec.js +++ b/app/scripts/modules/amazon/securityGroup/configure/CreateSecurityGroup.controller.spec.js @@ -13,14 +13,14 @@ describe('Controller: CreateSecurityGroup', function () { describe('filtering', function() { // Initialize the controller and a mock scope - beforeEach(window.inject(function ($controller, $rootScope, $q, accountService, securityGroupReader, modalWizardService, + beforeEach(window.inject(function ($controller, $rootScope, $q, accountService, securityGroupReader, v2modalWizardService, taskMonitorService, securityGroupWriter, vpcReader) { this.$scope = $rootScope.$new(); this.$q = $q; this.accountService = accountService; this.securityGroupReader = securityGroupReader; - this.modalWizardService = modalWizardService; + this.v2modalWizardService = v2modalWizardService; this.taskMonitorService = taskMonitorService; this.securityGroupWriter = securityGroupWriter; this.vpcReader = vpcReader; @@ -85,7 +85,7 @@ describe('Controller: CreateSecurityGroup', function () { $modalInstance: { result: this.$q.when(null) }, accountService: this.accountService, securityGroupReader: this.securityGroupReader, - modalWizardService: this.modalWizardService, + v2modalWizardService: this.v2modalWizardService, taskMonitorService: this.taskMonitorService, securityGroupWriter: this.securityGroupWriter, vpcReader: this.vpcReader, diff --git a/app/scripts/modules/amazon/securityGroup/configure/configSecurityGroup.mixin.controller.js b/app/scripts/modules/amazon/securityGroup/configure/configSecurityGroup.mixin.controller.js index d75b6ac9a0b..528ae247bca 100644 --- a/app/scripts/modules/amazon/securityGroup/configure/configSecurityGroup.mixin.controller.js +++ b/app/scripts/modules/amazon/securityGroup/configure/configSecurityGroup.mixin.controller.js @@ -9,7 +9,7 @@ module.exports = angular require('../../../core/securityGroup/securityGroup.write.service.js'), require('../../../core/account/account.service.js'), require('../../vpc/vpc.read.service.js'), - require('../../../core/modal/wizard/modalWizard.service.js'), + require('../../../core/modal/wizard/v2modalWizard.service.js'), require('../../../core/utils/lodash.js'), ]) .controller('awsConfigSecurityGroupMixin', function ($scope, @@ -21,7 +21,7 @@ module.exports = angular securityGroupReader, securityGroupWriter, accountService, - modalWizardService, + v2modalWizardService, cacheInitializer, vpcReader, _ ) { @@ -42,6 +42,8 @@ module.exports = angular }, }; + $scope.wizard = v2modalWizardService; + ctrl.addMoreItems = function() { $scope.state.infiniteScroll.currentItems += $scope.state.infiniteScroll.numToAdd; }; @@ -206,7 +208,7 @@ module.exports = angular return true; }); if (removed.length) { - modalWizardService.getWizard().markDirty('Ingress'); + v2modalWizardService.markDirty('Ingress'); } } @@ -277,14 +279,13 @@ module.exports = angular }; ctrl.dismissRemovedRules = function() { - $scope.state.removedRules = []; - modalWizardService.getWizard().markClean('Ingress'); - modalWizardService.getWizard().markComplete('Ingress'); + $scope.state.removedRules = []; + v2modalWizardService.markClean('Ingress'); + v2modalWizardService.markComplete('Ingress'); }; var classicPattern = /^[\x00-\x7F]+$/; var vpcPattern = /^[a-zA-Z0-9\s._\-:\/()#,@[\]+=&;{}!$*]+$/; - }); diff --git a/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroup.html b/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroup.html index 9f3638c75ae..59e3d4764c2 100644 --- a/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroup.html +++ b/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroup.html @@ -1,15 +1,17 @@ - - - - - - - - -
- - -
+ + + + + + + + + +
+ + +
+ diff --git a/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupIngress.html b/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupIngress.html index 3d91cec6509..7b8f1697fe4 100644 --- a/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupIngress.html +++ b/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupIngress.html @@ -1,4 +1,4 @@ -
+
@@ -86,4 +86,4 @@
- +
diff --git a/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupProperties.html b/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupProperties.html index a5eafb63e09..ab5fd64f529 100644 --- a/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupProperties.html +++ b/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupProperties.html @@ -1,4 +1,4 @@ -
+
@@ -60,4 +60,4 @@
- +
From bd14eb35a9158e5ee94a19aa146d9af1c45c84b9 Mon Sep 17 00:00:00 2001 From: Richard Guthrie Date: Wed, 27 Jan 2016 16:16:56 -0800 Subject: [PATCH 017/151] Azure Create ServerGroup and Create SecurityGroup basics --- app/scripts/modules/azure/azure.module.js | 1 - .../azure/cache/cacheConfigurer.service.js | 8 +- .../details/instance.details.controller.js | 1 - .../details/loadBalancerDetail.html | 2 +- .../loadBalancer/loadBalancer.transformer.js | 69 +---- .../clone/cloneSecurityGroup.controller.js | 7 +- .../CreateSecurityGroup.controller.spec.js | 17 +- .../configure/CreateSecurityGroupCtrl.js | 185 +++++++++++-- .../configure/EditSecurityGroupCtrl.js | 4 +- .../configSecurityGroup.mixin.controller.js | 33 --- .../configure/createSecurityGroup.html | 2 +- .../configure/createSecurityGroupIngress.html | 114 +++----- .../createSecurityGroupProperties.html | 39 +-- .../details/securityGroupDetail.controller.js | 2 +- .../details/securityGroupDetail.html | 62 ++--- .../securityGroup/securityGroup.reader.js | 5 +- .../securityGroup.transformer.js | 15 +- .../securityGroup.write.service.js | 56 ++++ .../serverGroupCommandBuilder.service.js | 256 ++---------------- .../serverGroupCommandBuilder.spec.js | 84 ++---- .../CloneServerGroup.azure.controller.js | 13 +- .../configure/wizard/basicSettings.html | 6 +- .../serverGroupDetails.azure.controller.js | 1 - .../serverGroup/serverGroup.transformer.js | 76 +++--- .../serverGroup.transformer.spec.js | 79 ++---- app/scripts/modules/azure/vpc/vpc.module.js | 8 - .../modules/azure/vpc/vpc.read.service.js | 44 --- .../azure/vpc/vpc.read.service.spec.js | 71 ----- .../modules/azure/vpc/vpcTag.directive.js | 33 --- .../azure/vpc/vpcTag.directive.spec.js | 65 ----- app/scripts/modules/core/help/helpContents.js | 16 +- settings.js | 2 +- 32 files changed, 453 insertions(+), 923 deletions(-) create mode 100644 app/scripts/modules/azure/securityGroup/securityGroup.write.service.js delete mode 100644 app/scripts/modules/azure/vpc/vpc.module.js delete mode 100644 app/scripts/modules/azure/vpc/vpc.read.service.js delete mode 100644 app/scripts/modules/azure/vpc/vpc.read.service.spec.js delete mode 100644 app/scripts/modules/azure/vpc/vpcTag.directive.js delete mode 100644 app/scripts/modules/azure/vpc/vpcTag.directive.spec.js diff --git a/app/scripts/modules/azure/azure.module.js b/app/scripts/modules/azure/azure.module.js index 004a0504893..296e88a3435 100644 --- a/app/scripts/modules/azure/azure.module.js +++ b/app/scripts/modules/azure/azure.module.js @@ -29,7 +29,6 @@ module.exports = angular.module('spinnaker.azure', [ require('./securityGroup/securityGroup.transformer.js'), require('./securityGroup/securityGroup.reader.js'), require('./subnet/subnet.module.js'), - require('./vpc/vpc.module.js'), require('./image/image.reader.js'), require('./cache/cacheConfigurer.service.js'), ]) diff --git a/app/scripts/modules/azure/cache/cacheConfigurer.service.js b/app/scripts/modules/azure/cache/cacheConfigurer.service.js index caee3f60ce3..7a329a344f5 100644 --- a/app/scripts/modules/azure/cache/cacheConfigurer.service.js +++ b/app/scripts/modules/azure/cache/cacheConfigurer.service.js @@ -8,12 +8,11 @@ module.exports = angular.module('spinnaker.azure.cache.initializer', [ require('../../core/instance/instanceTypeService.js'), require('../../core/securityGroup/securityGroup.read.service.js'), require('../subnet/subnet.read.service.js'), - require('../vpc/vpc.read.service.js'), require('../keyPairs/keyPairs.read.service.js'), ]) .factory('azureCacheConfigurer', function ($q, accountService, instanceTypeService, securityGroupReader, - subnetReader, vpcReader, keyPairsReader, loadBalancerReader) { + subnetReader, keyPairsReader, loadBalancerReader) { let config = Object.create(null); @@ -34,11 +33,6 @@ module.exports = angular.module('spinnaker.azure.cache.initializer', [ initializers: [subnetReader.listSubnets], }; - config.vpcs = { - version: 2, - initializers: [vpcReader.listVpcs], - }; - config.keyPairs = { initializers: [keyPairsReader.listKeyPairs] }; 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 79aa93936d7..b5e3834bb75 100644 --- a/app/scripts/modules/azure/instance/details/instance.details.controller.js +++ b/app/scripts/modules/azure/instance/details/instance.details.controller.js @@ -8,7 +8,6 @@ module.exports = angular.module('spinnaker.azure.instance.detail.controller', [ require('../../../core/utils/lodash.js'), require('../../../core/instance/instance.write.service.js'), require('../../../core/instance/instance.read.service.js'), - require('../../vpc/vpcTag.directive.js'), require('../../../core/confirmationModal/confirmationModal.service.js'), require('../../../core/insight/insightFilterState.model.js'), require('../../../core/history/recentHistory.service.js'), diff --git a/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.html b/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.html index eb0f869a8d0..e21bd3871b9 100644 --- a/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.html +++ b/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.html @@ -66,7 +66,7 @@

-
DNS Name
+
DNS Name:
{{loadBalancer.elb.dnsName}} + diff --git a/app/scripts/modules/azure/securityGroup/configure/createSecurityGroupIngress.html b/app/scripts/modules/azure/securityGroup/configure/createSecurityGroupIngress.html index 921d4752821..35e53fbc9e2 100644 --- a/app/scripts/modules/azure/securityGroup/configure/createSecurityGroupIngress.html +++ b/app/scripts/modules/azure/securityGroup/configure/createSecurityGroupIngress.html @@ -1,84 +1,58 @@
-
-
-
-

- The following security groups could not be found in the selected account/region/VPC and were removed: -

-
    -
  • {{securityGroup}}
    • -
-

- Okay -

-
-
-

- IP range rules can only be edited through the Azure Console. + Source/Destination address prefixes can only be edited through the Azure Portal.

-
-

- - - - - - - - - - - - - - - - - - - - - - - -
Security GroupProtocolStart PortEnd Port
- - {{$select.selected}} - - - - -
- -
- -
-
+
+
+ + + + + + + + + + + + + + + + + + +
ProtocolStart PortEnd PortActions
+ + + + + + +
+
+
-

- - Security groups - last refreshed {{ ctrl.getSecurityGroupRefreshTime() | timestamp }} - refreshing... -

-

If you're not finding a security group that was recently added, - click here to refresh the list. -

+
diff --git a/app/scripts/modules/azure/securityGroup/configure/createSecurityGroupProperties.html b/app/scripts/modules/azure/securityGroup/configure/createSecurityGroupProperties.html index 56cbda3e27a..e9b0c10f950 100644 --- a/app/scripts/modules/azure/securityGroup/configure/createSecurityGroupProperties.html +++ b/app/scripts/modules/azure/securityGroup/configure/createSecurityGroupProperties.html @@ -4,7 +4,7 @@
Your security group will be named: - - + -->
-
Detail (optional)
-
+
Detail (optional)
+
-
Description
-
+
Description
+
-
Account
-
+
Account
+
-
Regions
-
- - -

(Select an account)

+
+
-
-
VPC
-
- -

(Select an account)

-

(Select at least one region)

-
-
-
-
@@ -39,41 +39,37 @@

Region
{{securityGroup.region}}
-
VPC
-
-
Description
+ +
Description:
{{securityGroup.description}}
- -
None
- + +
None
-
IP Range
-
{{ipRangeRule.range.ip}}{{ipRangeRule.range.cidr}}
-
Port Ranges
-
- {{ipRangeRule.protocol}}: {{portRange.startPort}} → {{portRange.endPort}} -
-
- - -
None
- -
-
Security Group
-
- - {{rule.securityGroup.name}} ({{rule.securityGroup.id}}) - -
-
Port Ranges
-
- {{rule.protocol}}: {{portRange.startPort}} → {{portRange.endPort}} -
+ ng-repeat="rule in securityGroup.securityRules | orderBy: 'rule.priority'"> +
Name
+
{{rule.name}}
+
Priority
+
{{rule.priority}}
+
Direction
+
{{rule.direction}}
+
Access
+
{{rule.access}}
+
Protocol
+
{{rule.protocol}}
+
Src Addr Prefix
+
{{rule.sourceAddressPrefix}}
+
Src Port Range
+
{{rule.sourcePortRange}}
+
Dest Addr Prefix
+
{{rule.destinationAddressPrefix}}
+
Dest Port Range
+
{{rule.destinationPortRange}}
+
+

diff --git a/app/scripts/modules/azure/securityGroup/securityGroup.reader.js b/app/scripts/modules/azure/securityGroup/securityGroup.reader.js index c2c1c054da2..2b878ab9c73 100644 --- a/app/scripts/modules/azure/securityGroup/securityGroup.reader.js +++ b/app/scripts/modules/azure/securityGroup/securityGroup.reader.js @@ -7,7 +7,10 @@ module.exports = angular.module('spinnaker.azure.securityGroup.reader', [ .factory('azureSecurityGroupReader', function () { function resolveIndexedSecurityGroup(indexedSecurityGroups, container, securityGroupId) { - return indexedSecurityGroups[container.account][container.region][securityGroupId]; + + //hack to get around securityGroupId not matching id in indexedSecurityGroups. + var temp = securityGroupId.split('/'); + return indexedSecurityGroups[container.account][container.region][temp[temp.length - 1]]; } return { diff --git a/app/scripts/modules/azure/securityGroup/securityGroup.transformer.js b/app/scripts/modules/azure/securityGroup/securityGroup.transformer.js index e4705ccbc0a..d10d166e5c4 100644 --- a/app/scripts/modules/azure/securityGroup/securityGroup.transformer.js +++ b/app/scripts/modules/azure/securityGroup/securityGroup.transformer.js @@ -3,21 +3,10 @@ let angular = require('angular'); module.exports = angular.module('spinnaker.azure.securityGroup.transformer', [ - require('../vpc/vpc.read.service.js'), ]) - .factory('azureSecurityGroupTransformer', function (vpcReader) { + .factory('azureSecurityGroupTransformer', function () { - function normalizeSecurityGroup(securityGroup) { - return vpcReader.listVpcs().then(addVpcNameToSecurityGroup(securityGroup)); - } - - function addVpcNameToSecurityGroup(securityGroup) { - return function(vpcs) { - var matches = vpcs.filter(function(test) { - return test.id === securityGroup.vpcId; - }); - securityGroup.vpcName = matches.length ? matches[0].name : ''; - }; + function normalizeSecurityGroup() { } return { diff --git a/app/scripts/modules/azure/securityGroup/securityGroup.write.service.js b/app/scripts/modules/azure/securityGroup/securityGroup.write.service.js new file mode 100644 index 00000000000..ba06d546690 --- /dev/null +++ b/app/scripts/modules/azure/securityGroup/securityGroup.write.service.js @@ -0,0 +1,56 @@ +'use strict'; + +let angular = require('angular'); + +module.exports = angular + .module('spinnaker.azure.securityGroup.write.service', [ + require('../../core/utils/lodash.js'), + require('../../core/task/taskExecutor.js'), + require('../../core/cache/infrastructureCaches.js'), + ]) + .factory('azureSecurityGroupWriter', function(_, infrastructureCaches, taskExecutor) { + + + function upsertSecurityGroup(securityGroup, application, descriptor, params = {}) { + + // We want to extend params with all attributes from securityGroup, but only if they don't already exist. + _.assign(params, securityGroup, function(value, other) { + return _.isUndefined(value) ? other : value; + }); + + var operation = taskExecutor.executeTask({ + job: [params], + application: application, + description: descriptor + ' Security Group: ' + name + }); + + infrastructureCaches.clearCache('securityGroup'); + + return operation; + } + + function deleteSecurityGroup(securityGroup, application, params = {}) { + params.type = 'deleteSecurityGroup'; + params.securityGroup = securityGroup.name; + params.regions = [securityGroup.region]; + params.credentials = securityGroup.accountId; + params.cloudProvider = securityGroup.providerType; + params.appName = application.name; + + var operation = taskExecutor.executeTask({ + job: [params], + application: application, + description: 'Delete security group: ' + securityGroup.name + ' in ' + securityGroup.accountId + ':' + securityGroup.region + }); + + infrastructureCaches.clearCache('securityGroup'); + + return operation; + } + + return { + deleteSecurityGroup: deleteSecurityGroup, + upsertSecurityGroup: upsertSecurityGroup + }; + + }); diff --git a/app/scripts/modules/azure/serverGroup/configure/serverGroupCommandBuilder.service.js b/app/scripts/modules/azure/serverGroup/configure/serverGroupCommandBuilder.service.js index cd43a163a0a..4c5dc046e08 100644 --- a/app/scripts/modules/azure/serverGroup/configure/serverGroupCommandBuilder.service.js +++ b/app/scripts/modules/azure/serverGroup/configure/serverGroupCommandBuilder.service.js @@ -3,255 +3,41 @@ let angular = require('angular'); module.exports = angular.module('spinnaker.azure.serverGroupCommandBuilder.service', [ - require('exports?"restangular"!imports?_=lodash!restangular'), - require('../../../core/account/account.service.js'), - require('../../../netflix/serverGroup/diff/diff.service.js'), - require('../../subnet/subnet.read.service.js'), - require('../../../core/instance/instanceTypeService.js'), - require('../../../core/naming/naming.service.js'), - require('./serverGroupConfiguration.service.js'), - require('../../../core/utils/lodash.js'), ]) - .factory('azureServerGroupCommandBuilder', function (settings, Restangular, $exceptionHandler, $q, diffService, - accountService, subnetReader, namingService, instanceTypeService, - azureServerGroupConfigurationService, _) { + .factory('azureServerGroupCommandBuilder', function (settings) { function buildNewServerGroupCommand (application, defaults) { defaults = defaults || {}; - var regionsKeyedByAccountLoader = accountService.getRegionsKeyedByAccount('azure'); var defaultCredentials = defaults.account || application.defaultCredentials || settings.providers.azure.defaults.account; var defaultRegion = defaults.region || application.defaultRegion || settings.providers.azure.defaults.region; - var preferredZonesLoader = accountService.getAvailabilityZonesForAccountAndRegion('azure', defaultCredentials, defaultRegion); - - var clusterDiffLoader = function() { return []; }; - if (application.name) { - clusterDiffLoader = diffService.getClusterDiffForAccount(defaultCredentials, application.name); - } - - return $q.all({ - preferredZones: preferredZonesLoader, - regionsKeyedByAccount: regionsKeyedByAccountLoader, - clusterDiff: clusterDiffLoader, - }) - .then(function (asyncData) { - var availabilityZones = asyncData.preferredZones; - - var regions = asyncData.regionsKeyedByAccount[defaultCredentials]; - var keyPair = regions ? regions.defaultKeyPair : null; - - return { - application: application.name, - credentials: defaultCredentials, - region: defaultRegion, - strategy: '', - capacity: { - min: 1, - max: 1, - desired: 1 - }, - targetHealthyDeployPercentage: 100, - cooldown: 10, - healthCheckType: 'EC2', - healthCheckGracePeriod: 600, - instanceMonitoring: false, - ebsOptimized: false, - selectedProvider: 'azure', - iamRole: 'BaseIAMRole', // TODO: should not be hard coded here - - terminationPolicies: ['Default'], - vpcId: null, - availabilityZones: availabilityZones, - keyPair: keyPair, - suspendedProcesses: [], - securityGroups: [], - viewState: { - instanceProfile: 'custom', - allImageSelection: null, - useAllImageSelection: false, - useSimpleCapacity: true, - usePreferredZones: true, - mode: defaults.mode || 'create', - disableStrategySelection: true, - clusterDiff: asyncData.clusterDiff, - }, - }; - }); - } - - function buildServerGroupCommandFromPipeline(application, originalCluster) { - - var pipelineCluster = _.cloneDeep(originalCluster); - var region = Object.keys(pipelineCluster.availabilityZones)[0]; - var instanceTypeCategoryLoader = instanceTypeService.getCategoryForInstanceType('azure', pipelineCluster.instanceType); - var commandOptions = { account: pipelineCluster.account, region: region }; - var asyncLoader = $q.all({command: buildNewServerGroupCommand(application, commandOptions), instanceProfile: instanceTypeCategoryLoader}); - - return asyncLoader.then(function(asyncData) { - var command = asyncData.command; - var zones = pipelineCluster.availabilityZones[region]; - var usePreferredZones = zones.join(',') === command.availabilityZones.join(','); - - var viewState = { - instanceProfile: asyncData.instanceProfile, - disableImageSelection: true, - useSimpleCapacity: pipelineCluster.capacity.min === pipelineCluster.capacity.max && pipelineCluster.useSourceCapacity !== true, - usePreferredZones: usePreferredZones, - mode: 'editPipeline', - submitButtonLabel: 'Done', - templatingEnabled: true, - }; - - var viewOverrides = { - region: region, - credentials: pipelineCluster.account, - availabilityZones: pipelineCluster.availabilityZones[region], - viewState: viewState, - }; - - pipelineCluster.strategy = pipelineCluster.strategy || ''; - - return angular.extend({}, command, pipelineCluster, viewOverrides); - }); - - } - - // Only used to prepare view requiring template selecting - function buildNewServerGroupCommandForPipeline() { - return $q.when({ + return { + application: application.name, + credentials: defaultCredentials, + region: defaultRegion, + strategy: '', + capacity: { + min: 1, + max: 1, + desired: 1 + }, + selectedProvider: 'azure', + securityGroups: [], viewState: { - requiresTemplateSelection: true, - } - }); - } - - function buildUpdateServerGroupCommand(serverGroup) { - var command = { - type: 'modifyAsg', - asgs: [ - { asgName: serverGroup.name, region: serverGroup.region } - ], - cooldown: serverGroup.asg.defaultCooldown, - healthCheckGracePeriod: serverGroup.asg.healthCheckGracePeriod, - healthCheckType: serverGroup.asg.healthCheckType, - terminationPolicies: angular.copy(serverGroup.asg.terminationPolicies), - credentials: serverGroup.account + instanceProfile: 'custom', + allImageSelection: null, + useAllImageSelection: false, + useSimpleCapacity: true, + usePreferredZones: true, + mode: defaults.mode || 'create', + disableStrategySelection: true, + }, }; - azureServerGroupConfigurationService.configureUpdateCommand(command); - return command; - } - - function buildServerGroupCommandFromExisting(application, serverGroup, mode) { - mode = mode || 'clone'; - - var preferredZonesLoader = accountService.getPreferredZonesByAccount(); - var subnetsLoader = subnetReader.listSubnets(); - - var serverGroupName = namingService.parseServerGroupName(serverGroup.asg.autoScalingGroupName); - var clusterName = namingService.getClusterName(application.name, serverGroupName.stack, serverGroupName.freeFormDetails); - var clusterDiffLoader = diffService.getClusterDiffForAccount(serverGroup.account, clusterName); - - var instanceType = serverGroup.launchConfig ? serverGroup.launchConfig.instanceType : null; - var instanceTypeCategoryLoader = instanceTypeService.getCategoryForInstanceType('azure', instanceType); - - var asyncLoader = $q.all({ - preferredZones: preferredZonesLoader, - subnets: subnetsLoader, - instanceProfile: instanceTypeCategoryLoader, - clusterDiff: clusterDiffLoader, - }); - - return asyncLoader.then(function(asyncData) { - var zones = serverGroup.asg.availabilityZones.sort(); - var usePreferredZones = false; - var preferredZonesForAccount = asyncData.preferredZones[serverGroup.account]; - if (preferredZonesForAccount) { - var preferredZones = preferredZonesForAccount[serverGroup.region].sort(); - usePreferredZones = zones.join(',') === preferredZones.join(','); - } - - var command = { - application: application.name, - strategy: '', - stack: serverGroupName.stack, - freeFormDetails: serverGroupName.freeFormDetails, - credentials: serverGroup.account, - cooldown: serverGroup.asg.defaultCooldown, - healthCheckGracePeriod: serverGroup.asg.healthCheckGracePeriod, - healthCheckType: serverGroup.asg.healthCheckType, - terminationPolicies: serverGroup.asg.terminationPolicies, - loadBalancers: serverGroup.asg.loadBalancerNames, - region: serverGroup.region, - useSourceCapacity: false, - capacity: { - 'min': serverGroup.asg.minSize, - 'max': serverGroup.asg.maxSize, - 'desired': serverGroup.asg.desiredCapacity - }, - targetHealthyDeployPercentage: 100, - availabilityZones: zones, - selectedProvider: 'azure', - source: { - account: serverGroup.account, - region: serverGroup.region, - asgName: serverGroup.asg.autoScalingGroupName, - }, - suspendedProcesses: (serverGroup.asg.suspendedProcesses || []).map((process) => process.processName), - viewState: { - instanceProfile: asyncData.instanceProfile, - allImageSelection: null, - useAllImageSelection: false, - useSimpleCapacity: serverGroup.asg.minSize === serverGroup.asg.maxSize, - usePreferredZones: usePreferredZones, - mode: mode, - isNew: false, - clusterDiff: asyncData.clusterDiff, - }, - }; - - if (mode === 'clone') { - command.useSourceCapacity = true; - command.viewState.useSimpleCapacity = false; - } - - var vpcZoneIdentifier = serverGroup.asg.vpczoneIdentifier; - if (vpcZoneIdentifier !== '') { - var subnetId = vpcZoneIdentifier.split(',')[0]; - var subnet = _(asyncData.subnets).find({'id': subnetId}); - command.subnetType = subnet.purpose; - command.vpcId = subnet.vpcId; - } else { - command.subnetType = ''; - command.vpcId = null; - } - - if (serverGroup.launchConfig) { - angular.extend(command, { - instanceType: serverGroup.launchConfig.instanceType, - iamRole: serverGroup.launchConfig.iamInstanceProfile, - keyPair: serverGroup.launchConfig.keyName, - associatePublicIpAddress: serverGroup.launchConfig.associatePublicIpAddress, - ramdiskId: serverGroup.launchConfig.ramdiskId, - instanceMonitoring: serverGroup.launchConfig.instanceMonitoring.enabled, - ebsOptimized: serverGroup.launchConfig.ebsOptimized, - }); - command.viewState.imageId = serverGroup.launchConfig.imageId; - } - - if (serverGroup.launchConfig && serverGroup.launchConfig.securityGroups.length) { - command.securityGroups = serverGroup.launchConfig.securityGroups; - } - return command; - }); } return { buildNewServerGroupCommand: buildNewServerGroupCommand, - buildServerGroupCommandFromExisting: buildServerGroupCommandFromExisting, - buildNewServerGroupCommandForPipeline: buildNewServerGroupCommandForPipeline, - buildServerGroupCommandFromPipeline: buildServerGroupCommandFromPipeline, - buildUpdateServerGroupCommand: buildUpdateServerGroupCommand, }; }); diff --git a/app/scripts/modules/azure/serverGroup/configure/serverGroupCommandBuilder.spec.js b/app/scripts/modules/azure/serverGroup/configure/serverGroupCommandBuilder.spec.js index bb762daaf72..104cbacdb28 100644 --- a/app/scripts/modules/azure/serverGroup/configure/serverGroupCommandBuilder.spec.js +++ b/app/scripts/modules/azure/serverGroup/configure/serverGroupCommandBuilder.spec.js @@ -27,78 +27,30 @@ describe('create server group commands', function() { - it('initializes to default values, setting usePreferredZone flag to true', function () { + it('initializes to default values.', function () { var command = null; - this.azureServerGroupCommandBuilder.buildNewServerGroupCommand({name: 'appo'}, 'azure').then(function(result) { + this.azureServerGroupCommandBuilder.buildNewServerGroupCommand({name: 'appo'}, {account: 'azure-cred1', region: 'westus'}).then(function(result) { command = result; }); this.$scope.$digest(); - expect(command.viewState.usePreferredZones).toBe(true); - expect(command.availabilityZones).toEqual(['a', 'b', 'c']); - }); - - it('sets usePreferredZones flag based on initial value', function() { - spyOn(this.instanceTypeService, 'getCategoryForInstanceType').and.returnValue(this.$q.when('custom')); - var baseServerGroup = { - account: 'prod', - region: 'us-west-1', - asg: { - availabilityZones: ['g', 'h', 'i'], - vpczoneIdentifier: '', - }, - }; - var command = null; - - this.azureServerGroupCommandBuilder.buildServerGroupCommandFromExisting({name: 'appo'}, baseServerGroup).then(function(result) { - command = result; - }); - - this.$scope.$digest(); - - expect(command.viewState.usePreferredZones).toBe(true); - expect(command.availabilityZones).toEqual(['g', 'h', 'i']); - - baseServerGroup.asg.availabilityZones = ['g']; - - this.azureServerGroupCommandBuilder.buildServerGroupCommandFromExisting({name: 'appo'}, baseServerGroup).then(function(result) { - command = result; - }); - - this.$scope.$digest(); - - expect(command.viewState.usePreferredZones).toBe(false); - expect(command.availabilityZones).toEqual(['g']); - - }); - - it('sets profile and instance type if available', function() { - spyOn(this.instanceTypeService, 'getCategoryForInstanceType').and.returnValue(this.$q.when('selectedProfile')); - - var baseServerGroup = { - account: 'prod', - region: 'us-west-1', - asg: { - availabilityZones: ['g', 'h', 'i'], - vpczoneIdentifier: '', - }, - launchConfig: { - instanceType: 'something-custom', - instanceMonitoring: {}, - securityGroups: [], - }, - }; - var command = null; - - this.azureServerGroupCommandBuilder.buildServerGroupCommandFromExisting({name: 'appo'}, baseServerGroup).then(function(result) { - command = result; - }); - - this.$scope.$digest(); - - expect(command.viewState.instanceProfile).toBe('selectedProfile'); - expect(command.instanceType).toBe('something-custom'); + expect(command.application).toEqual('appo'); + expect(command.credentials).toEqual('azure-cred1'); + expect(command.region).toEqual('westus'); + expect(command.strategy).toEqual(''); + expect(command.capacity.min).toEqual(1); + expect(command.capacity.max).toEqual(1); + expect(command.capacity.desired).toEqual(1); + expect(command.selectedProvider).toEqual('azure'); + expect(command.securityGroups).toEqual([]); + expect(command.viewState.instanceProfile).toEqual('custom'); + expect(command.viewState.allImageSelection).toBe(null); + expect(command.viewState.useAllImageSelection).toBe(false); + expect(command.viewState.useSimpleCapacity).toBe(true); + expect(command.viewState.usePrefereedZones).toBe(true); + expect(command.viewState.mode).toEqual('create'); + expect(command.viewState.disableStrategySelection).toBe(true); }); }); 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 5919daf9ced..1c5f7a7b0c6 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 @@ -16,7 +16,7 @@ module.exports = angular.module('spinnaker.azure.cloneServerGroup.controller', [ $scope.pages = { templateSelection: require('./templateSelection.html'), basicSettings: require('./basicSettings.html'), -/* loadBalancers: require('./loadBalancers.html'), +/* loadBalancers: require('./loadBalancers.html'), securityGroups: require('./securityGroups.html'), instanceArchetype: require('./instanceArchetype.html'), instanceType: require('./instanceType.html'), @@ -164,19 +164,16 @@ module.exports = angular.module('spinnaker.azure.cloneServerGroup.controller', [ } this.isValid = function () { - //TODO:larrygug - modify to fit Azure model. Need to change the command object completely. return $scope.command && - ($scope.command.viewState.useAllImageSelection ? $scope.command.viewState.allImageSelection !== null : $scope.command.amiName !== null) && ($scope.command.application !== null) && - ($scope.command.credentials !== null) && ($scope.command.instanceType !== null) && - ($scope.command.region !== null) && ($scope.command.availabilityZones !== null) && - ($scope.command.capacity.min !== null) && ($scope.command.capacity.max !== null) && - ($scope.command.capacity.desired !== null) && + ($scope.command.credentials !== null) && + ($scope.command.region !== null) && modalWizardService.getWizard().isComplete(); }; this.showSubmitButton = function () { - return modalWizardService.getWizard().allPagesVisited(); + //return modalWizardService.getWizard().allPagesVisited(); + return true; }; this.submit = function () { diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/basicSettings.html b/app/scripts/modules/azure/serverGroup/configure/wizard/basicSettings.html index 8b91bf8a686..3df21383126 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/basicSettings.html +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/basicSettings.html @@ -36,7 +36,7 @@ class="form-control input-sm" ng-pattern="basicSettingsCtrl.detailPattern" name="details" - ng-model="command.freeFormDetails"/> + ng-model="command.details"/>
@@ -121,8 +121,8 @@
-
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 b61a2d40c5e..0bbdb079e39 100644 --- a/app/scripts/modules/azure/serverGroup/details/serverGroupDetails.azure.controller.js +++ b/app/scripts/modules/azure/serverGroup/details/serverGroupDetails.azure.controller.js @@ -9,7 +9,6 @@ module.exports = angular.module('spinnaker.azure.serverGroup.details.controller' require('../../../core/confirmationModal/confirmationModal.service.js'), require('../../../core/serverGroup/serverGroup.write.service.js'), require('../../../core/utils/lodash.js'), - require('../../vpc/vpcTag.directive.js'), require('./scalingProcesses/autoScalingProcess.service.js'), require('../../../core/serverGroup/serverGroup.read.service.js'), require('../configure/serverGroupCommandBuilder.service.js'), diff --git a/app/scripts/modules/azure/serverGroup/serverGroup.transformer.js b/app/scripts/modules/azure/serverGroup/serverGroup.transformer.js index c4441c41544..6912583b368 100644 --- a/app/scripts/modules/azure/serverGroup/serverGroup.transformer.js +++ b/app/scripts/modules/azure/serverGroup/serverGroup.transformer.js @@ -3,57 +3,53 @@ let angular = require('angular'); module.exports = angular.module('spinnaker.azure.serverGroup.transformer', [ - require('../../core/utils/lodash.js'), - require('../vpc/vpc.read.service.js'), ]) - .factory('azureServerGroupTransformer', function (_, azureVpcReader) { + .factory('azureServerGroupTransformer', function () { - function normalizeServerGroup(serverGroup) { - serverGroup.instances.forEach((instance) => { instance.vpcId = serverGroup.vpcId; }); - return azureVpcReader.listVpcs().then(addVpcNameToServerGroup(serverGroup)); - } - - function addVpcNameToServerGroup(serverGroup) { - return function(vpcs) { - var matches = vpcs.filter(function(test) { - return test.id === serverGroup.vpcId; - }); - serverGroup.vpcName = matches.length ? matches[0].name : ''; - return serverGroup; + function convertServerGroupCommandToDeployConfiguration(base) { + var command = { + name: base.application, + cloudProvider: base.selectedProvider, + application: base.application, + stack: base.stack, + detail: base.details, + credentials: base.credentials, + region: base.region, + user: '[anonymous]', + upgradePolicy: 'Manual', + type: 'createServerGroup', + + image: { + publisher: 'Canonical', + offer: 'UbuntuServer', + sku: '15.10', + version: 'latest', + }, + + sku: { + name: 'Standard_A1', + tier: 'Standard', + capacity: 2, + }, + + osConfig: { + adminUserName: 'spinnakeruser', + adminPassword: '!Qnti**234', + }, }; - } - function convertServerGroupCommandToDeployConfiguration(base) { - // use _.defaults to avoid copying the backingData, which is huge and expensive to copy over - var command = _.defaults({backingData: [], viewState: []}, base); - if (base.viewState.mode !== 'clone') { - delete command.source; - } - if (base.viewState.useAllImageSelection) { - command.amiName = base.viewState.allImageSelection; + if (typeof base.stack != 'undefined') { + command.name = command.name + '-' + base.stack; } - command.availabilityZones = {}; - command.availabilityZones[command.region] = base.availabilityZones; - command.account = command.credentials; - if (!command.ramdiskId) { - delete command.ramdiskId; // TODO: clean up in kato? - should ignore if empty string - } - delete command.region; - delete command.viewState; - delete command.backingData; - delete command.selectedProvider; - delete command.instanceProfile; - delete command.vpcId; - - if (!command.subnetType) { - delete command.subnetType; + if(typeof base.details != 'undefined') { + command.name = command.name + '-' + base.details; } + return command; } return { convertServerGroupCommandToDeployConfiguration: convertServerGroupCommandToDeployConfiguration, - normalizeServerGroup: normalizeServerGroup, }; }); diff --git a/app/scripts/modules/azure/serverGroup/serverGroup.transformer.spec.js b/app/scripts/modules/azure/serverGroup/serverGroup.transformer.spec.js index dc072894836..be07b089333 100644 --- a/app/scripts/modules/azure/serverGroup/serverGroup.transformer.spec.js +++ b/app/scripts/modules/azure/serverGroup/serverGroup.transformer.spec.js @@ -2,7 +2,7 @@ describe('azureServerGroupTransformer', function () { - var transformer, azureVpcReader, $q, $scope; + var transformer, $q, $scope; beforeEach( window.module( @@ -11,80 +11,57 @@ describe('azureServerGroupTransformer', function () { ); beforeEach(function () { - window.inject(function (_azureServerGroupTransformer_, _azureVpcReader_, _$q_, $rootScope) { + window.inject(function (_azureServerGroupTransformer_, $rootScope) { transformer = _azureServerGroupTransformer_; - azureVpcReader = _azureVpcReader_; - $q = _$q_; $scope = $rootScope.$new(); }); }); - describe('normalize server group', function () { - beforeEach(function() { - spyOn(azureVpcReader, 'listVpcs').and.returnValue($q.when([ - {account: 'test', region: 'us-east-1', id: 'vpc-1', name: 'main'} - ])); - }); + describe('command transforms', function () { - it('adds vpc name to server group', function () { - var serverGroup = { - account: 'test', - region: 'us-east-1', - vpcId: 'vpc-1', - instances: [], + it('sets name correctly with no stack or detail', function () { + var base = { + application: 'myApp' }; - transformer.normalizeServerGroup(serverGroup); - $scope.$digest(); - expect(serverGroup.vpcName).toBe('main'); + + var transformed = transformer.convertServerGroupCommandToDeployConfiguration(base); + + expect(transformed.name).toBe('myApp'); + }); - it('adds empty vpc name when no vpcId found on server group', function () { - var serverGroup = { - account: 'test', - region: 'us-east-1', - instances: [], + it('it sets name correctly with only stack', function () { + var command = { + stack: 's1', + application: 'theApp' }; - transformer.normalizeServerGroup(serverGroup); - $scope.$digest(); - expect(serverGroup.vpcName).toBe(''); - }); - }); - describe('command transforms', function () { + var transformed = transformer.convertServerGroupCommandToDeployConfiguration(command); - it('sets amiName from allImageSelection', function () { + expect(transformed.name).toBe('theApp-s1'); + }); + + it('it sets name correctly with only detail', function () { var command = { - viewState: { - mode: 'create', - useAllImageSelection: true, - allImageSelection: 'something-packagebase', - }, - application: { name: 'theApp'} + details: 'd1', + application: 'theApp' }; var transformed = transformer.convertServerGroupCommandToDeployConfiguration(command); - expect(transformed.amiName).toBe('something-packagebase'); - + expect(transformed.name).toBe('theApp-d1'); }); - it('removes subnetType property when null', function () { + it('it sets name correctly with both stack and detail', function () { var command = { - viewState: { - mode: 'create', - useAllImageSelection: true, - allImageSelection: 'something-packagebase', - }, - subnetType: null, - application: { name: 'theApp'} + stack: 's1', + details: 'd1', + application: 'theApp' }; var transformed = transformer.convertServerGroupCommandToDeployConfiguration(command); - expect(transformed.subnetType).toBe(undefined); - command.subnetType = 'internal'; - transformed = transformer.convertServerGroupCommandToDeployConfiguration(command); - expect(transformed.subnetType).toBe('internal'); + expect(transformed.name).toBe('theApp-s1-d1'); }); }); diff --git a/app/scripts/modules/azure/vpc/vpc.module.js b/app/scripts/modules/azure/vpc/vpc.module.js deleted file mode 100644 index cd2ef791bd0..00000000000 --- a/app/scripts/modules/azure/vpc/vpc.module.js +++ /dev/null @@ -1,8 +0,0 @@ -'use strict'; - -let angular = require('angular'); - -module.exports = angular - .module('spinnaker.azure.vpc', [ - require('./vpc.read.service.js') - ]); diff --git a/app/scripts/modules/azure/vpc/vpc.read.service.js b/app/scripts/modules/azure/vpc/vpc.read.service.js deleted file mode 100644 index 844aace6382..00000000000 --- a/app/scripts/modules/azure/vpc/vpc.read.service.js +++ /dev/null @@ -1,44 +0,0 @@ -'use strict'; - - -let angular = require('angular'); - -module.exports = angular - .module('spinnaker.azure.vpc.read.service', [ - require('exports?"restangular"!imports?_=lodash!restangular'), - require('../../core/utils/lodash.js'), - require('../../core/cache/infrastructureCaches.js') - ]) - .factory('azureVpcReader', function ($q, Restangular, infrastructureCaches ) { - - function listVpcs() { - return Restangular.all('vpcs') - .withHttpConfig({cache: infrastructureCaches.vpcs}) - .getList() - .then(function(vpcs) { - return vpcs.map(function(vpc) { - vpc.label = vpc.name; - vpc.deprecated = !!vpc.deprecated; - if (vpc.deprecated) { - vpc.label += ' (deprecated)'; - } - return vpc.plain(); - }); - }); - } - - function getVpcName(id) { - return listVpcs().then(function(vpcs) { - var matches = vpcs.filter(function(test) { - return test.id === id; - }); - return matches.length ? matches[0].name : null; - }); - } - - return { - listVpcs: listVpcs, - getVpcName: getVpcName, - }; - - }); diff --git a/app/scripts/modules/azure/vpc/vpc.read.service.spec.js b/app/scripts/modules/azure/vpc/vpc.read.service.spec.js deleted file mode 100644 index 04ce399b69d..00000000000 --- a/app/scripts/modules/azure/vpc/vpc.read.service.spec.js +++ /dev/null @@ -1,71 +0,0 @@ -'use strict'; - -describe('vpcReader', function() { - - var service, $http, $scope; - - beforeEach( - window.module( - require('./vpc.read.service.js') - ) - ); - - beforeEach(window.inject(function ($httpBackend, $rootScope, _azureVpcReader_) { - service = _azureVpcReader_; - $http = $httpBackend; - $scope = $rootScope.$new(); - })); - - beforeEach(function() { - $http.whenGET('/vpcs').respond(200, [ - { name: 'vpc1', id: 'vpc-1', deprecated: true }, - { name: 'vpc2', id: 'vpc-2', deprecated: false }, - { name: 'vpc3', id: 'vpc-3' }, - ]); - }); - - - it('adds label to vpc, including (deprecated) if deprecated field is true', function () { - - var result = null; - - service.listVpcs().then(function(vpcs) { result = vpcs; }); - - $http.flush(); - $scope.$digest(); - - expect(result[0].label).toBe('vpc1 (deprecated)'); - expect(result[0].deprecated).toBe(true); - expect(result[1].label).toBe('vpc2'); - expect(result[1].deprecated).toBe(false); - expect(result[2].label).toBe('vpc3'); - expect(result[2].deprecated).toBe(false); - }); - - it('retrieves vpc name - not label - from id', function() { - - var result = null; - - service.getVpcName('vpc-1').then(function(name) { result = name; }); - - $http.flush(); - $scope.$digest(); - - expect(result).toBe('vpc1'); - - service.getVpcName('vpc-2').then(function(name) { result = name; }); - - $http.flush(); - $scope.$digest(); - - expect(result).toBe('vpc2'); - - service.getVpcName('vpc-4').then(function(name) { result = name; }); - - $http.flush(); - $scope.$digest(); - - expect(result).toBe(null); - }); - -}); diff --git a/app/scripts/modules/azure/vpc/vpcTag.directive.js b/app/scripts/modules/azure/vpc/vpcTag.directive.js deleted file mode 100644 index 9a4c57e8c5b..00000000000 --- a/app/scripts/modules/azure/vpc/vpcTag.directive.js +++ /dev/null @@ -1,33 +0,0 @@ -'use strict'; - -let angular = require('angular'); - -module.exports = angular.module('spinnaker.azure.vpc.tag.directive', [ - require('./vpc.read.service.js'), -]) - .directive('azureVpcTag', function(vpcReader) { - return { - restrict: 'E', - scope: { - vpcId: '=', - }, - template: '{{vpcLabel}}', - link: function(scope) { - function applyLabel() { - if (!scope.vpcId) { - scope.vpcLabel = 'None (EC2 Classic)'; - } else { - vpcReader.getVpcName(scope.vpcId).then(function (name) { - scope.vpcLabel = '(' + scope.vpcId + ')'; - - if (name) { - scope.vpcLabel = name + ' ' + scope.vpcLabel; - } - }); - } - } - - scope.$watch('vpcId', applyLabel, true); - } - }; - }); diff --git a/app/scripts/modules/azure/vpc/vpcTag.directive.spec.js b/app/scripts/modules/azure/vpc/vpcTag.directive.spec.js deleted file mode 100644 index c3a5fe9cfbc..00000000000 --- a/app/scripts/modules/azure/vpc/vpcTag.directive.spec.js +++ /dev/null @@ -1,65 +0,0 @@ - 'use strict'; - - xdescribe('Directives: azureVpcTag', function () { - - var $q, vpcReader; - - beforeEach( - window.module( - require('./vpcTag.directive.js'), - require('./vpc.read.service.js') - ) - ); - - beforeEach(window.inject(function ($rootScope, $compile, _$q_, _azureVpcReader_) { - this.scope = $rootScope.$new(); - this.compile = $compile; - $q = _$q_; - vpcReader = _azureVpcReader_; - })); - - describe('vpc tag rendering - no VPC provided', function () { - - it('displays default message when no vpcId supplied', function () { - var domNode = this.compile('')(this.scope); - this.scope.$digest(); - expect(domNode.find('span').text()).toBe('None (EC2 Classic)'); - }); - - it('displays default message when undefined vpcId supplied', function () { - var domNode = this.compile('')(this.scope); - this.scope.$digest(); - expect(domNode.find('span').text()).toBe('None (EC2 Classic)'); - }); - - it('displays default message when null vpcId supplied', function () { - this.scope.vpcId = null; - var domNode = this.compile('')(this.scope); - this.scope.$digest(); - expect(domNode.find('span').text()).toBe('None (EC2 Classic)'); - }); - }); - - describe('vpc tag rendering - VPC provided', function () { - - it('displays vpc name when found', function() { - spyOn(vpcReader, 'getVpcName').and.callFake(function() { - return $q.when('Main VPC'); - }); - this.scope.vpcId = 'vpc-1'; - var domNode = this.compile('')(this.scope); - this.scope.$digest(); - expect(domNode.find('span').text()).toBe('Main VPC (vpc-1)'); - }); - - it('displays vpc id when not found', function() { - spyOn(vpcReader, 'getVpcName').and.callFake(function() { - return $q.when(null); - }); - this.scope.vpcId = 'vpc-2'; - var domNode = this.compile('')(this.scope); - this.scope.$digest(); - expect(domNode.find('span').text()).toBe('(vpc-2)'); - }); - }); - }); diff --git a/app/scripts/modules/core/help/helpContents.js b/app/scripts/modules/core/help/helpContents.js index ec04d61fdf3..6c3cf404e34 100644 --- a/app/scripts/modules/core/help/helpContents.js +++ b/app/scripts/modules/core/help/helpContents.js @@ -112,7 +112,7 @@ module.exports = angular.module('spinnaker.core.help.contents', []) 'gce.serverGroup.customMetadata.startup-script': 'This script will run automatically on every boot.', 'gce.serverGroup.preemptibility': 'A preemptible VM costs much less, but lasts only 24 hours. It can be terminated sooner due to system demands.', 'gce.serverGroup.automaticRestart': 'Compute Engine can automatically restart VM instances if they are terminated for non-user-initiated reasons (maintenance event, hardware failure, software failure, etc.).', - 'gce.serverGroup.onHostMaintenance': 'When Compute Engine performs periodic infrastructure maintenance it can migrate your VM instances to other hardware without downtime.', + 'gce.serverGroup.onHostMaintenance': 'When Cosdfgdsfmpute Engine performs periodic infrastructure maintenance it can migrate your VM instances to other hardware without downtime.', 'gce.serverGroup.securityGroups.implicit': 'Firewall rules with no target tags defined will permit incoming connections that match the ingress rules to all instances in the network.', 'gce.serverGroup.autoscaling.targetCPUUsage': 'Autoscaling adds or removes VMs in the group to maintain this level of CPU usage on each VM.', 'gce.serverGroup.autoscaling.targetHTTPLoadBalancingUsage': 'Autoscaling adds or removes VMs in the group to maintain this usage of load-balancing capacity. This value is a percentage of the \'Maximum rate\' setting of the load balancer this group is used by.', @@ -154,7 +154,7 @@ module.exports = angular.module('spinnaker.core.help.contents', []) 'pipeline.config.bake.package': '

The name of the package you want installed (without any version identifiers).

' + '

If your build produces a deb file named "myapp_1.27-h343", you would want to enter "myapp" here.

', 'pipeline.config.bake.baseAmi': '

(Optional) ami-????????

', - 'pipeline.config.bake.amiSuffix': '

(Optional) String of date in format YYYYMMDDHHmm, default is calculated from timestamp,

', + 'pipeline.config.bake.amiSuffix': '

(Optionsdfgdsfal) String of date in format YYYYMMDDHHmm, default is calculated from timestamp,

', 'pipeline.config.bake.enhancedNetworking': '

(Optional) Enable enhanced networking (sr-iov) support for image (requires hvm and trusty base_os).

', 'pipeline.config.bake.amiName': '

(Optional) Default = $package-$arch-$ami_suffix-$store_type

', 'pipeline.config.bake.templateFileName': '

(Optional) The explicit packer template to use, instead of resolving one from rosco\'s configuration.

', @@ -199,8 +199,12 @@ module.exports = angular.module('spinnaker.core.help.contents', []) '

Note: values for "DayOfWeek" are 1-7, where Sunday is 1, Monday is 2, etc. You can also use MON,TUE,WED, etc.', 'cluster.description': '

A cluster is a collection of server groups with the same name (stack + detail) in the same account.

', +<<<<<<< HEAD 'pipeline.config.findAmi.cluster': 'The cluster to look at when selecting the image to use in this pipeline.', +======= + 'pipeline.config.findAmi.cluster': 'The cluster to look at when selecting the AMI to use in this pipeline.', +>>>>>>> fa75c9d... Fixes to security groups to work with cloud driver 'pipeline.config.dependsOn': 'Declares which stages must be run before this stage begins.', 'pipeline.config.parallel.execution': '

Enabling parallel stage execution allows you to run stages only after dependent ' + 'stages have completed.

By configuring a pipeline this way, you can reduce the time it takes to run.

', @@ -266,4 +270,12 @@ module.exports = angular.module('spinnaker.core.help.contents', []) 'user.verification': 'Typing into this verification field is annoying! But it serves as a reminder that you are ' + 'changing something in an account deemed important, and prevents you from accidentally changing something ' + 'when you meant to click on the "Cancel" button.', + 'azure.securityGroup.ingress.description': 'Friendly description of the rule you want to enable (limit 80 chars.)', + 'azure.securityGroup.ingress.priority': 'Rules are processed in priority order; the lower the number, the higher the priority. We recommend leaving gaps between rules - 100, 200, 300, etc. - so that it\'s easier to add new rules without having to edit existing rules. There are several default rules that can be overridden with priority (65000, 65001 and 65500). For more information visit http://portal.azure.com.' , + 'azure.securityGroup.ingress.source': 'The source filter can be Any, an IP address range or a default tag(\'Internet\', \'VirtualNetwork\', \AzureLoadBalancer\'). It specifies the incoming traffic from a specific source IP address range (CIDR format) that will be allowed or denied by this rule.', + 'azure.securityGroup.ingress.sourcePortRange': 'The source port range can be a single port, such as 80, or a port range, such as 1024-65535. This specifies from which ports incoming traffic will be allowed or denied by this rule. Provide an asterisk (*) to allow traffic from clients connecting from any port.', + 'azure.securityGroup.ingress.destination': 'The destination filter can be Any, an IP address range or a default tag(\'Internet\', \'VirtualNetwork\', \AzureLoadBalancer\'). It specifies the outgoing traffic from a specific destination IP address range (CIDR format) that will be allowed or denied by this rule.', + 'azure.securityGroup.ingress.destinationPortRange': 'The destination port range can be a single port, such as 80, or a port range, such as 1024-65535. This specifies from which destination ports traffic will be allowed or denied by this rule. Provide an asterisk (*) to allow traffic from clients connecting from any port.', + 'azure.securityGroup.ingress.direction': 'Specifies whether the rule is for inbound or outbound traffic.', + 'azure.securityGroup.ingress.actions': 'To adjust the priority of a rule, move it up or down in the list of rules. Rules at the top of the list have the highest priority.', }); diff --git a/settings.js b/settings.js index 020670ff577..c0ab4cb233c 100644 --- a/settings.js +++ b/settings.js @@ -17,7 +17,7 @@ window.spinnakerSettings = { azure: { defaults: { account: 'azure-test', - region: 'West US' + region: 'westus' }, }, aws: { From c5630323327cefe99d4c0e6f91d5ff34dfd0e6b8 Mon Sep 17 00:00:00 2001 From: Adam Jordens Date: Mon, 8 Feb 2016 12:27:01 -0800 Subject: [PATCH 018/151] ForceCacheRefresh tasks should not be hidden --- app/scripts/modules/core/task/displayableTasks.filter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/modules/core/task/displayableTasks.filter.js b/app/scripts/modules/core/task/displayableTasks.filter.js index 17c0733590b..8c0880089b3 100644 --- a/app/scripts/modules/core/task/displayableTasks.filter.js +++ b/app/scripts/modules/core/task/displayableTasks.filter.js @@ -5,7 +5,7 @@ let angular = require('angular'); module.exports = angular.module('spinnaker.pipelines.stages.core.displayableTasks.filter', []) .filter('displayableTasks', function() { var blacklist = [ - 'forceCacheRefresh', 'stageStart', 'stageEnd' + 'stageStart', 'stageEnd' ]; return function(input) { if (input) { From 35df504c9cb3d194a5590e1ab6ba99c02a7c5c0b Mon Sep 17 00:00:00 2001 From: chrisb Date: Mon, 1 Feb 2016 13:29:15 -0800 Subject: [PATCH 019/151] update pipeline migrator for classic -> vpc0 --- .../netflix/migrator/migrator.service.js | 2 +- .../netflix/migrator/migrator.service.spec.js | 21 +- .../pipeline/pipeline.migrator.directive.js | 195 +++++++++--------- .../pipeline/pipeline.migrator.modal.html | 64 +++--- 4 files changed, 148 insertions(+), 134 deletions(-) diff --git a/app/scripts/modules/netflix/migrator/migrator.service.js b/app/scripts/modules/netflix/migrator/migrator.service.js index 2b2b7449de5..f4c6692304d 100644 --- a/app/scripts/modules/netflix/migrator/migrator.service.js +++ b/app/scripts/modules/netflix/migrator/migrator.service.js @@ -49,7 +49,7 @@ module.exports = angular if (tideTask.taskComplete && tideTask.taskComplete.status === 'failure') { return tideTask.taskComplete.message; } - return null; + return task.failureMessage; } function getPreview(task) { diff --git a/app/scripts/modules/netflix/migrator/migrator.service.spec.js b/app/scripts/modules/netflix/migrator/migrator.service.spec.js index d7e2cbde4d9..ec2c48c4c4d 100644 --- a/app/scripts/modules/netflix/migrator/migrator.service.spec.js +++ b/app/scripts/modules/netflix/migrator/migrator.service.spec.js @@ -161,7 +161,7 @@ describe('Service: migrator', function () { it('only returns message if task finished and failed', function () { - expect(this.getException()).toBe(null); + expect(this.getException()).toBeUndefined(); this.tideTask = { taskComplete: { @@ -169,7 +169,7 @@ describe('Service: migrator', function () { } }; - expect(this.getException()).toBe(null); + expect(this.getException()).toBeUndefined(); this.tideTask = { taskComplete: { @@ -181,6 +181,23 @@ describe('Service: migrator', function () { expect(this.getException()).toEqual('the error'); }); + it('falls back to failure message from task if present', function () { + + this.tideTask = { + taskComplete: { + status: 'failure', + message: 'tide failed', + }, + }; + + this.task.failureMessage = 'task failed'; + expect(this.getException()).toBe('tide failed'); + + this.tideTask.taskComplete = {}; + expect(this.getException()).toBe('task failed'); + + }); + }); }); diff --git a/app/scripts/modules/netflix/migrator/pipeline/pipeline.migrator.directive.js b/app/scripts/modules/netflix/migrator/pipeline/pipeline.migrator.directive.js index 93053afa836..03e9f5aff80 100644 --- a/app/scripts/modules/netflix/migrator/pipeline/pipeline.migrator.directive.js +++ b/app/scripts/modules/netflix/migrator/pipeline/pipeline.migrator.directive.js @@ -8,14 +8,13 @@ module.exports = angular .module('spinnaker.migrator.pipeline.directive', [ require('angular-ui-bootstrap'), require('../../../amazon/vpc/vpc.read.service.js'), - require('../../../amazon/subnet/subnet.read.service.js'), require('../../../core/config/settings.js'), require('../migrator.service.js'), - require('../../../core/utils/lodash.js'), require('../../../core/presentation/autoScroll/autoScroll.directive.js'), require('../../../core/pipeline/config/services/pipelineConfigService.js'), require('../../../core/utils/scrollTo/scrollTo.service.js'), require('../../../core/cache/cacheInitializer.js'), + require('../../../core/task/task.read.service.js'), ]) .directive('pipelineMigrator', function () { return { @@ -30,63 +29,46 @@ module.exports = angular controllerAs: 'migratorActionCtrl', }; }) - .controller('PipelineMigratorActionCtrl', function ($scope, $uibModal, vpcReader, settings, subnetReader, _) { + .controller('PipelineMigratorActionCtrl', function ($scope, $uibModal, vpcReader, settings) { $scope.showAction = false; $scope.submittingTemplateUrl = require('../migrator.modal.submitting.html'); - var subnets, - actionableDeployStages = []; + var actionableDeployStages = []; function testCluster(stage) { return function(cluster) { - var region = cluster.availabilityZones ? Object.keys(cluster.availabilityZones)[0] : null; - var account = cluster.account; - var subnetType = cluster.subnetType; - if (subnetType) { - var subnetMatches = _(subnets) - .filter({account: account, region: region, purpose: subnetType}) - .reject({target: 'elb'}) - .valueOf(); - if (subnetMatches.length) { - return vpcReader.getVpcName(subnetMatches[0].vpcId).then(function (vpc) { - if (vpc === 'Main') { - $scope.showAction = true; - if (cluster.strategy === 'highlander' || cluster.strategy === 'redblack') { - actionableDeployStages.push({strategy: cluster.strategy, name: stage.name}); - } - } - }); + if (!cluster.subnetType && cluster.provider === 'aws') { + $scope.showAction = true; + if (cluster.strategy !== '') { + actionableDeployStages.push({strategy: cluster.strategy, name: stage.name}); } } }; } if (settings.feature.vpcMigrator) { - subnetReader.listSubnets().then(function (loadedSubnets) { - subnets = loadedSubnets; - var stages = $scope.pipeline.stages || []; - stages.forEach(function (stage) { - if (stage.type === 'deploy') { - var clusters = stage.clusters || []; - clusters.forEach(testCluster(stage)); - } - if (stage.type === 'canary') { - var clusterPairs = stage.clusterPairs || []; - clusterPairs.forEach(function (clusterPair) { - testCluster(stage)(clusterPair.baseline); - testCluster(stage)(clusterPair.canary); - }); - } - }); + var stages = $scope.pipeline.stages || []; + stages.forEach((stage) => { + if (stage.type === 'deploy') { + var clusters = stage.clusters || []; + clusters.forEach(testCluster(stage)); + } + if (stage.type === 'canary') { + var clusterPairs = stage.clusterPairs || []; + clusterPairs.forEach((clusterPair) => { + testCluster(stage)(clusterPair.baseline); + testCluster(stage)(clusterPair.canary); + }); + } }); } this.previewMigration = function () { $uibModal.open({ templateUrl: require('./pipeline.migrator.modal.html'), - controller: 'PipelineMigratorCtrl as ctrl', + controller: 'PipelineMigratorCtrl as vm', resolve: { pipeline: function () { return $scope.pipeline; @@ -94,9 +76,6 @@ module.exports = angular application: function () { return $scope.application; }, - type: function() { - return $scope.type; - }, actionableDeployStages: function() { return actionableDeployStages; }, @@ -104,87 +83,105 @@ module.exports = angular }); }; }) - .controller('PipelineMigratorCtrl', function ($scope, pipeline, application, type, actionableDeployStages, - $modalInstance, + .controller('PipelineMigratorCtrl', function ($scope, pipeline, application, actionableDeployStages, + $modalInstance, taskReader, $timeout, $state, migratorService, pipelineConfigService, scrollToService, cacheInitializer) { - $scope.application = application; - $scope.pipeline = pipeline; - $scope.actionableDeployStages = actionableDeployStages; + this.submittingTemplateUrl = require('../migrator.modal.submitting.html'); + + this.actionableDeployStages = actionableDeployStages; - $scope.viewState = { + this.viewState = { computing: true, + executing: false, + error: false, + migrationComplete: false, }; - var source = { pipelineId: pipeline.id, vpcName: 'Main', }, - target = { vpcName: 'vpc0', }; - - - var migrationConfig = { - application: application, - type: 'deepCopyPipeline', - name: pipeline.name, - source: source, - target: target, - dryRun: true, + // shared component used by "submitting" overlay to indicate what's being operated against + this.component = { + name: pipeline.name }; - var dryRun = migratorService.executeMigration(migrationConfig); + // Async handlers - dryRun.deferred.promise.then( - function () { - $scope.viewState.computing = false; - $scope.preview = dryRun.executionPlan; - }, - function (error) { - $scope.viewState.computing = false; - $scope.viewState.error = error; + let errorMode = (error) => { + this.viewState.computing = false; + this.viewState.executing = false; + this.viewState.error = error || 'An unknown error occurred. Please try again later.'; + if (!error && this.task && this.task.getTideException()) { + this.viewState.error = this.task.getTideException(); } - ); + }; - this.cancel = function () { - dryRun.deferred.promise.cancelled = true; - if ($scope.executor) { - $scope.executor.deferred.promise.cancelled = true; - } - $modalInstance.dismiss(); + let dryRunComplete = () => { + this.viewState.computing = false; + this.preview = this.task.getPreview(); }; - this.submit = function () { - $scope.viewState.executing = true; - migrationConfig.dryRun = false; - var executor = migratorService.executeMigration(migrationConfig); - executor.deferred.promise.then( - function () { - $scope.viewState.executing = false; - $scope.viewState.migrationComplete = true; - reinitialize(); - }, - function (error) { - $scope.viewState.executing = false; - $scope.viewState.error = error; - } - ); - $scope.executor = executor; + let dryRunStarted = (task) => { + this.task = task; + taskReader.waitUntilTaskCompletes(application.name, task).then(dryRunComplete, errorMode); }; - function reinitialize() { - pipelineConfigService.getPipelinesForApplication(application.name).then(function (pipelines) { + let reinitialize = () => { + pipelineConfigService.getPipelinesForApplication(application.name).then((pipelines) => { application.pipelines = pipelines; // TODO: pipeline ID is not yet populated in the task result from Tide, so build it out based on name - var newPipelines = pipelines.filter(function(test) { + var [newPipeline] = pipelines.filter(function(test) { return test.name.indexOf(pipeline.name + ' - vpc0') === 0; }); - if (newPipelines && newPipelines.length) { - scrollToService.scrollTo('pipeline-config-' + newPipelines[0].id, '.execution-groups', 180); + if (newPipeline) { + $state.go('^.pipelineConfig', {pipelineId: newPipeline.id}); } - if ($scope.preview.securityGroups && $scope.preview.securityGroups.length) { + if (this.preview.securityGroups && this.preview.securityGroups.length) { cacheInitializer.refreshCache('securityGroups'); } - if ($scope.preview.loadBalancers && $scope.preview.loadBalancers.length) { + if (this.preview.loadBalancers && this.preview.loadBalancers.length) { cacheInitializer.refreshCache('loadBalancers'); } }); - } + }; + + let migrationComplete = () => { + this.viewState.executing = false; + this.viewState.migrationComplete = true; + reinitialize(); + }; + + let migrationStarted = (task) => { + this.task = task; + taskReader.waitUntilTaskCompletes(application.name, task).then(migrationComplete, errorMode); + }; + + var source = { pipelineId: pipeline.id }, + target = { vpcName: 'vpc0', }; + + + var migrationConfig = { + application: application, + type: 'deepCopyPipeline', + name: pipeline.name, + source: source, + target: target, + dryRun: true, + }; + + // Generate preview + let executor = migratorService.executeMigration(migrationConfig); + + executor.then(dryRunStarted, errorMode); + + this.cancel = () => { + $timeout.cancel(this.task.poller); + $modalInstance.dismiss(); + }; + + this.submit = () => { + this.viewState.executing = true; + migrationConfig.dryRun = false; + let executor = migratorService.executeMigration(migrationConfig); + executor.then(migrationStarted, errorMode); + }; }); diff --git a/app/scripts/modules/netflix/migrator/pipeline/pipeline.migrator.modal.html b/app/scripts/modules/netflix/migrator/pipeline/pipeline.migrator.modal.html index 81714b7c875..23b4e20e67d 100644 --- a/app/scripts/modules/netflix/migrator/pipeline/pipeline.migrator.modal.html +++ b/app/scripts/modules/netflix/migrator/pipeline/pipeline.migrator.modal.html @@ -1,13 +1,13 @@
-
+
-

Migrate {{pipeline.name}} to VPC0

+

Migrate {{vm.component.name}} to VPC0

-
+

@@ -16,52 +16,52 @@

-
+
-
+

This will create new pipeline named - {{preview.pipelines[0].mutationDetails.pipelineToCreate.name}}. All triggers will be disabled.

-

+ {{vm.preview.pipelines[0].mutationDetails.pipelineToCreate.name}}. All triggers will be disabled.

+

All load balancers and security groups needed for server groups deployed in the pipeline have already been migrated to VPC0, so this will just create the new pipeline.

-

As part of this migration, the following - security groups - and - load balancers +

As part of this migration, the following + security groups + and + load balancers will be created in VPC0:

-
-

The following items have been created:

+
+

The following items have been created:

-
+

Security Groups

-
{{securityGroup.mutationDetails.awsReference.identity.groupName}}
+
{{securityGroup.mutationDetails.awsReference.identity.groupName}}
-
+

Load Balancers

-
{{loadBalancer.mutationDetails.awsReference.identity.loadBalancerName}}
+
{{loadBalancer.mutationDetails.awsReference.identity.loadBalancerName}}

Note: if Route53 or sticky session policies are configured for the current load balancer, you will need to set that up in the AWS console.

-
+

The new pipeline named - {{preview.pipelines[0].mutationDetails.pipelineToCreate.name}} is available for review.

+ {{vm.preview.pipelines[0].mutationDetails.pipelineToCreate.name}} is available for review.

-
+

Important

The following deployment stages use deployment strategies:

    -
  • +
  • {{stage.name}} (strategy: {{stage.strategy}})

Spinnaker's deployment strategies do not differentiate between VPCs when cleaning up previous server groups. - Running this pipeline will clean up (i.e. disable or remove) the current server groups in VPC Main. + Running this pipeline will clean up (i.e. disable or remove) the current server groups in EC2 Classic.

If this is undesirable, you should switch the deployment strategies to "None" before running the new pipeline.

@@ -69,23 +69,23 @@

Important

-
+
-

We could not calculate an execution plan for {{component.name}} at this time.

-

Reason: {{viewState.error}}

+

We could not calculate an execution plan for {{vm.component.name}} at this time.

+

Reason: {{vm.viewState.error}}

-
- +
+
-
- +
+
From 9f11a5efa6aaba25a1369787645e32c6d348772c Mon Sep 17 00:00:00 2001 From: JargoonPard Date: Mon, 8 Feb 2016 13:31:49 -0800 Subject: [PATCH 020/151] Fixing helpconent bugs and minor style issues --- .../modules/azure/serverGroup/serverGroup.transformer.js | 4 ++-- app/scripts/modules/core/help/helpContents.js | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app/scripts/modules/azure/serverGroup/serverGroup.transformer.js b/app/scripts/modules/azure/serverGroup/serverGroup.transformer.js index 6912583b368..58e945520a6 100644 --- a/app/scripts/modules/azure/serverGroup/serverGroup.transformer.js +++ b/app/scripts/modules/azure/serverGroup/serverGroup.transformer.js @@ -38,10 +38,10 @@ module.exports = angular.module('spinnaker.azure.serverGroup.transformer', [ }, }; - if (typeof base.stack != 'undefined') { + if (typeof base.stack !== 'undefined') { command.name = command.name + '-' + base.stack; } - if(typeof base.details != 'undefined') { + if (typeof base.details !== 'undefined') { command.name = command.name + '-' + base.details; } diff --git a/app/scripts/modules/core/help/helpContents.js b/app/scripts/modules/core/help/helpContents.js index 6c3cf404e34..a907cb3ba7c 100644 --- a/app/scripts/modules/core/help/helpContents.js +++ b/app/scripts/modules/core/help/helpContents.js @@ -112,7 +112,7 @@ module.exports = angular.module('spinnaker.core.help.contents', []) 'gce.serverGroup.customMetadata.startup-script': 'This script will run automatically on every boot.', 'gce.serverGroup.preemptibility': 'A preemptible VM costs much less, but lasts only 24 hours. It can be terminated sooner due to system demands.', 'gce.serverGroup.automaticRestart': 'Compute Engine can automatically restart VM instances if they are terminated for non-user-initiated reasons (maintenance event, hardware failure, software failure, etc.).', - 'gce.serverGroup.onHostMaintenance': 'When Cosdfgdsfmpute Engine performs periodic infrastructure maintenance it can migrate your VM instances to other hardware without downtime.', + 'gce.serverGroup.onHostMaintenance': 'When Compute Engine performs periodic infrastructure maintenance it can migrate your VM instances to other hardware without downtime.', 'gce.serverGroup.securityGroups.implicit': 'Firewall rules with no target tags defined will permit incoming connections that match the ingress rules to all instances in the network.', 'gce.serverGroup.autoscaling.targetCPUUsage': 'Autoscaling adds or removes VMs in the group to maintain this level of CPU usage on each VM.', 'gce.serverGroup.autoscaling.targetHTTPLoadBalancingUsage': 'Autoscaling adds or removes VMs in the group to maintain this usage of load-balancing capacity. This value is a percentage of the \'Maximum rate\' setting of the load balancer this group is used by.', @@ -154,7 +154,7 @@ module.exports = angular.module('spinnaker.core.help.contents', []) 'pipeline.config.bake.package': '

The name of the package you want installed (without any version identifiers).

' + '

If your build produces a deb file named "myapp_1.27-h343", you would want to enter "myapp" here.

', 'pipeline.config.bake.baseAmi': '

(Optional) ami-????????

', - 'pipeline.config.bake.amiSuffix': '

(Optionsdfgdsfal) String of date in format YYYYMMDDHHmm, default is calculated from timestamp,

', + 'pipeline.config.bake.amiSuffix': '

(Optional) String of date in format YYYYMMDDHHmm, default is calculated from timestamp,

', 'pipeline.config.bake.enhancedNetworking': '

(Optional) Enable enhanced networking (sr-iov) support for image (requires hvm and trusty base_os).

', 'pipeline.config.bake.amiName': '

(Optional) Default = $package-$arch-$ami_suffix-$store_type

', 'pipeline.config.bake.templateFileName': '

(Optional) The explicit packer template to use, instead of resolving one from rosco\'s configuration.

', @@ -199,12 +199,7 @@ module.exports = angular.module('spinnaker.core.help.contents', []) '

Note: values for "DayOfWeek" are 1-7, where Sunday is 1, Monday is 2, etc. You can also use MON,TUE,WED, etc.', 'cluster.description': '

A cluster is a collection of server groups with the same name (stack + detail) in the same account.

', -<<<<<<< HEAD - 'pipeline.config.findAmi.cluster': 'The cluster to look at when selecting the image to use in this pipeline.', -======= - 'pipeline.config.findAmi.cluster': 'The cluster to look at when selecting the AMI to use in this pipeline.', ->>>>>>> fa75c9d... Fixes to security groups to work with cloud driver 'pipeline.config.dependsOn': 'Declares which stages must be run before this stage begins.', 'pipeline.config.parallel.execution': '

Enabling parallel stage execution allows you to run stages only after dependent ' + 'stages have completed.

By configuring a pipeline this way, you can reduce the time it takes to run.

', From 535e9cbdb1301bd71f7d89fa4865367420dbc0ef Mon Sep 17 00:00:00 2001 From: chrisb Date: Mon, 8 Feb 2016 15:08:29 -0800 Subject: [PATCH 021/151] correctly dismiss security group warning --- .../netflix/serverGroup/diff/securityGroupDiff.directive.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/scripts/modules/netflix/serverGroup/diff/securityGroupDiff.directive.js b/app/scripts/modules/netflix/serverGroup/diff/securityGroupDiff.directive.js index 8480696f7e0..a60705d8734 100644 --- a/app/scripts/modules/netflix/serverGroup/diff/securityGroupDiff.directive.js +++ b/app/scripts/modules/netflix/serverGroup/diff/securityGroupDiff.directive.js @@ -4,7 +4,7 @@ let angular = require('angular'); module.exports = angular .module('spinnaker.netflix.serverGroup.diff.securityGroupDiff.directive', [ - require('../../../core/modal/wizard/modalWizard.service.js'), + require('../../../core/modal/wizard/v2modalWizard.service.js'), ]) .directive('netflixSecurityGroupDiff', function () { return { @@ -17,9 +17,9 @@ module.exports = angular controllerAs: 'vm', controller: 'netflixSecurityGroupDiffCtrl', }; - }).controller('netflixSecurityGroupDiffCtrl', function (modalWizardService) { + }).controller('netflixSecurityGroupDiffCtrl', function (v2modalWizardService) { this.acknowledgeSecurityGroupDiff = () => { this.command.viewState.securityGroupDiffs = []; - modalWizardService.getWizard().markClean('security-groups'); + v2modalWizardService.markClean('security-groups'); }; }); From 4c738add2f8c3f07a00eee73fd1f9541b9234b49 Mon Sep 17 00:00:00 2001 From: Lars Wander Date: Sat, 6 Feb 2016 10:50:53 -0500 Subject: [PATCH 022/151] provider/kubernetes: Render basic server group information on "cluster" screen --- .../modules/kubernetes/kubernetes.module.js | 3 + .../serverGroup/details/details.controller.js | 118 ++++++++++++ .../serverGroup/details/details.html | 172 ++++++++++++++++++ .../details/details.kubernetes.module.js | 8 + 4 files changed, 301 insertions(+) create mode 100644 app/scripts/modules/kubernetes/serverGroup/details/details.controller.js create mode 100644 app/scripts/modules/kubernetes/serverGroup/details/details.html create mode 100644 app/scripts/modules/kubernetes/serverGroup/details/details.kubernetes.module.js diff --git a/app/scripts/modules/kubernetes/kubernetes.module.js b/app/scripts/modules/kubernetes/kubernetes.module.js index af925b5b5d6..041b8e81492 100644 --- a/app/scripts/modules/kubernetes/kubernetes.module.js +++ b/app/scripts/modules/kubernetes/kubernetes.module.js @@ -11,6 +11,7 @@ templates.keys().forEach(function(key) { module.exports = angular.module('spinnaker.kubernetes', [ require('./serverGroup/configure/CommandBuilder.js'), require('./serverGroup/configure/configure.kubernetes.module.js'), + require('./serverGroup/details/details.kubernetes.module.js'), require('./serverGroup/transformer.js'), ]) .config(function(cloudProviderRegistryProvider) { @@ -21,6 +22,8 @@ module.exports = angular.module('spinnaker.kubernetes', [ }, serverGroup: { transformer: 'kubernetesServerGroupTransformer', + detailsTemplateUrl: require('./serverGroup/details/details.html'), + detailsController: 'kubernetesDetailsController', cloneServerGroupController: 'kubernetesCloneServerGroupController', cloneServerGroupTemplateUrl: require('./serverGroup/configure/wizard/wizard.html'), commandBuilder: 'kubernetesServerGroupCommandBuilder', diff --git a/app/scripts/modules/kubernetes/serverGroup/details/details.controller.js b/app/scripts/modules/kubernetes/serverGroup/details/details.controller.js new file mode 100644 index 00000000000..bd86a11d8e7 --- /dev/null +++ b/app/scripts/modules/kubernetes/serverGroup/details/details.controller.js @@ -0,0 +1,118 @@ +'use strict'; +/* jshint camelcase:false */ + +let angular = require('angular'); + +module.exports = angular.module('spinnaker.serverGroup.details.kubernetes.controller', [ + require('angular-ui-router'), + require('../../../core/serverGroup/serverGroup.read.service.js'), + require('../../../core/serverGroup/details/serverGroupWarningMessage.service.js'), + require('../../../core/serverGroup/serverGroup.write.service.js'), + require('../../../core/serverGroup/configure/common/runningExecutions.service.js'), + require('../../../core/utils/lodash.js'), + require('../../../core/insight/insightFilterState.model.js'), + require('../../../core/utils/selectOnDblClick.directive.js'), +]) + .controller('kubernetesDetailsController', function ($scope, $state, app, serverGroup, InsightFilterStateModel, + serverGroupReader, $uibModal, serverGroupWriter, + runningExecutionsService, serverGroupWarningMessageService) { + + let application = app; + + $scope.state = { + loading: true + }; + + $scope.InsightFilterStateModel = InsightFilterStateModel; + + function extractServerGroupSummary() { + var summary = _.find(application.serverGroups, function (toCheck) { + return toCheck.name === serverGroup.name && toCheck.account === serverGroup.accountId && toCheck.region === serverGroup.region; + }); + if (!summary) { + application.loadBalancers.some(function (loadBalancer) { + if (loadBalancer.account === serverGroup.accountId && loadBalancer.region === serverGroup.region) { + return loadBalancer.serverGroups.some(function (possibleServerGroup) { + if (possibleServerGroup.name === serverGroup.name) { + summary = possibleServerGroup; + return true; + } + }); + } + }); + } + return summary; + } + + function retrieveServerGroup() { + var summary = extractServerGroupSummary(); + return serverGroupReader.getServerGroup(application.name, serverGroup.accountId, serverGroup.region, serverGroup.name).then(function(details) { + cancelLoader(); + + var restangularlessDetails = details.plain(); + angular.extend(restangularlessDetails, summary); + + $scope.serverGroup = restangularlessDetails; + $scope.runningExecutions = function() { + return runningExecutionsService.filterRunningExecutions($scope.serverGroup.executions); + }; + }, + autoClose + ); + } + + function autoClose() { + if ($scope.$$destroyed) { + return; + } + $state.params.allowModalToStayOpen = true; + $state.go('^', null, {location: 'replace'}); + } + + function cancelLoader() { + $scope.state.loading = false; + } + + retrieveServerGroup().then(() => { + // If the user navigates away from the view before the initial retrieveServerGroup call completes, + // do not bother subscribing to the autoRefreshStream + if (!$scope.$$destroyed) { + let refreshWatcher = app.autoRefreshStream.subscribe(retrieveServerGroup); + $scope.$on('$destroy', () => refreshWatcher.dispose()); + } + }); + + this.destroyServerGroup = () => { + }; + + this.getBodyTemplate = (serverGroup, application) => { + if (this.isLastServerGroupInRegion(serverGroup, application)) { + return serverGroupWarningMessageService.getMessage(serverGroup); + } + }; + + this.isLastServerGroupInRegion = function (serverGroup, application ) { + try { + var cluster = _.find(application.clusters, {name: serverGroup.cluster, account:serverGroup.account}); + return _.filter(cluster.serverGroups, {region: serverGroup.region}).length === 1; + } catch (error) { + return false; + } + }; + + this.disableServerGroup = function disableServerGroup() { + }; + + this.enableServerGroup = function enableServerGroup() { + }; + + this.rollbackServerGroup = function rollbackServerGroup() { + }; + + this.resizeServerGroup = function resizeServerGroup() { + }; + + this.cloneServerGroup = function cloneServerGroup() { + }; + } +); diff --git a/app/scripts/modules/kubernetes/serverGroup/details/details.html b/app/scripts/modules/kubernetes/serverGroup/details/details.html new file mode 100644 index 00000000000..4d4777d407d --- /dev/null +++ b/app/scripts/modules/kubernetes/serverGroup/details/details.html @@ -0,0 +1,172 @@ +
+ +
+
+ + + +
+

+ +

+
+ + +
+
+ + + +
+
+ +

+ {{serverGroup.name}} +

+
+
+
+
+ + +
+
+ + +
+
+
+
+
+
+

[SERVER GROUP IS DISABLED]

+ +
+
+
+ + {{task.name}} + +
+
+
+
+ {{step.name | robotToHuman }} +
+
+ {{step.runningTimeInMs | duration }} +
+
+
+ +
+
+
+ + Pipeline: {{execution.name}} + +
+
+
+
+ {{stage.name | robotToHuman }} +
+
+ {{stage.runningTimeInMs | duration }} +
+
+
+ + + +
+
Created
+
{{serverGroup.createdTime | timestamp }}
+
In
+
+
Namespace
+
{{serverGroup.region}}
+
+ + +
+
Min/Max
+
{{serverGroup.capacity.desired}}
+
Current
+
{{serverGroup.instances.length}}
+
+ + +
+
Instances
+
+ +
+
+ + +
+
Name
+
{{container.name}}
+
Image
+
{{container.image}}
+
+
+
+
CPU Limit
+
{{container.resources.limits.cpu}}
+
+
+
Memory Limit
+
{{container.resources.limits.memory}}
+
+
+
+
+
CPU Request
+
{{container.resources.requests.cpu}}
+
+
+
Memory Request
+
{{container.resources.requests.memory}}
+
+
+
+
+ + +
No labels associated with this replication controller
+
+ {{key}}: {{value}} +
+ + + + +
+
diff --git a/app/scripts/modules/kubernetes/serverGroup/details/details.kubernetes.module.js b/app/scripts/modules/kubernetes/serverGroup/details/details.kubernetes.module.js new file mode 100644 index 00000000000..92a34dacb50 --- /dev/null +++ b/app/scripts/modules/kubernetes/serverGroup/details/details.kubernetes.module.js @@ -0,0 +1,8 @@ +'use strict'; + +let angular = require('angular'); + +module.exports = angular.module('spinnaker.serverGroup.details.kubernetes', [ + require('../../../core/account/account.module.js'), + require('./details.controller.js'), +]); From 9461053ed6b7d1be6a820f7fa255f2760971455d Mon Sep 17 00:00:00 2001 From: Lars Wander Date: Tue, 9 Feb 2016 13:31:05 -0500 Subject: [PATCH 023/151] provider/kubernetes: Clone server group. --- .../serverGroup/configure/CommandBuilder.js | 4 ++-- .../configure/configure.kubernetes.module.js | 1 + .../configure/wizard/Clone.controller.js | 5 ++--- .../serverGroup/details/details.controller.js | 16 ++++++++++++++-- .../kubernetes/serverGroup/details/details.html | 2 +- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/app/scripts/modules/kubernetes/serverGroup/configure/CommandBuilder.js b/app/scripts/modules/kubernetes/serverGroup/configure/CommandBuilder.js index 249c3dbb657..0df774fda37 100644 --- a/app/scripts/modules/kubernetes/serverGroup/configure/CommandBuilder.js +++ b/app/scripts/modules/kubernetes/serverGroup/configure/CommandBuilder.js @@ -68,9 +68,9 @@ module.exports = angular.module('spinnaker.kubernetes.serverGroupCommandBuilder. stack: serverGroupName.stack, freeFormDetails: serverGroupName.freeFormDetails, credentials: serverGroup.account, - loadBalancers: serverGroup.asg.loadBalancerNames, + loadBalancers: serverGroup.loadBalancers, securityGroups: serverGroup.securityGroups, - targetSize: serverGroup.asg.targetSize, + targetSize: serverGroup.replicas, cloudProvider: 'kubernetes', selectedProvider: 'kubernetes', containers: serverGroup.containers, diff --git a/app/scripts/modules/kubernetes/serverGroup/configure/configure.kubernetes.module.js b/app/scripts/modules/kubernetes/serverGroup/configure/configure.kubernetes.module.js index f250435e630..9eaeb9e1df3 100644 --- a/app/scripts/modules/kubernetes/serverGroup/configure/configure.kubernetes.module.js +++ b/app/scripts/modules/kubernetes/serverGroup/configure/configure.kubernetes.module.js @@ -5,6 +5,7 @@ let angular = require('angular'); module.exports = angular.module('spinnaker.serverGroup.configure.kubernetes', [ require('../../../core/account/account.module.js'), require('./configuration.service.js'), + require('./CommandBuilder.js'), require('./wizard/BasicSettings.controller.js'), require('./wizard/LoadBalancers.controller.js'), require('./wizard/SecurityGroups.controller.js'), diff --git a/app/scripts/modules/kubernetes/serverGroup/configure/wizard/Clone.controller.js b/app/scripts/modules/kubernetes/serverGroup/configure/wizard/Clone.controller.js index 321e1846549..f7f9eaaec68 100644 --- a/app/scripts/modules/kubernetes/serverGroup/configure/wizard/Clone.controller.js +++ b/app/scripts/modules/kubernetes/serverGroup/configure/wizard/Clone.controller.js @@ -56,12 +56,11 @@ module.exports = angular.module('spinnaker.serverGroup.configure.kubernetes.clon function initializeWizardState() { var mode = serverGroupCommand.viewState.mode; if (mode === 'clone' || mode === 'editPipeline') { - if ($scope.command.image || $scope.command.viewState.disableImageSelection) { - modalWizardService.getWizard().markComplete('location'); - } + modalWizardService.getWizard().markComplete('location'); modalWizardService.getWizard().markComplete('load-balancers'); modalWizardService.getWizard().markComplete('security-groups'); modalWizardService.getWizard().markComplete('containers'); + modalWizardService.getWizard().markComplete('capacity'); } } diff --git a/app/scripts/modules/kubernetes/serverGroup/details/details.controller.js b/app/scripts/modules/kubernetes/serverGroup/details/details.controller.js index bd86a11d8e7..ad34369d5ea 100644 --- a/app/scripts/modules/kubernetes/serverGroup/details/details.controller.js +++ b/app/scripts/modules/kubernetes/serverGroup/details/details.controller.js @@ -5,6 +5,7 @@ let angular = require('angular'); module.exports = angular.module('spinnaker.serverGroup.details.kubernetes.controller', [ require('angular-ui-router'), + require('../configure/configure.kubernetes.module.js'), require('../../../core/serverGroup/serverGroup.read.service.js'), require('../../../core/serverGroup/details/serverGroupWarningMessage.service.js'), require('../../../core/serverGroup/serverGroup.write.service.js'), @@ -15,7 +16,8 @@ module.exports = angular.module('spinnaker.serverGroup.details.kubernetes.contro ]) .controller('kubernetesDetailsController', function ($scope, $state, app, serverGroup, InsightFilterStateModel, serverGroupReader, $uibModal, serverGroupWriter, - runningExecutionsService, serverGroupWarningMessageService) { + runningExecutionsService, serverGroupWarningMessageService, + kubernetesServerGroupCommandBuilder) { let application = app; @@ -112,7 +114,17 @@ module.exports = angular.module('spinnaker.serverGroup.details.kubernetes.contro this.resizeServerGroup = function resizeServerGroup() { }; - this.cloneServerGroup = function cloneServerGroup() { + this.cloneServerGroup = function cloneServerGroup(serverGroup) { + $uibModal.open({ + templateUrl: require('../configure/wizard/wizard.html'), + controller: 'kubernetesCloneServerGroupController as ctrl', + resolve: { + title: function() { return 'Clone ' + serverGroup.name; }, + application: function() { return application; }, + serverGroup: function() { return serverGroup; }, + serverGroupCommand: function() { return kubernetesServerGroupCommandBuilder.buildServerGroupCommandFromExisting(application, serverGroup); }, + } + }); }; } ); diff --git a/app/scripts/modules/kubernetes/serverGroup/details/details.html b/app/scripts/modules/kubernetes/serverGroup/details/details.html index 4d4777d407d..5123391e4cf 100644 --- a/app/scripts/modules/kubernetes/serverGroup/details/details.html +++ b/app/scripts/modules/kubernetes/serverGroup/details/details.html @@ -34,7 +34,7 @@

Server Group Actions

From bc9414b9a553e93b5ddf57ef13b62f2c03d4bfa5 Mon Sep 17 00:00:00 2001 From: chrisb Date: Tue, 9 Feb 2016 11:42:12 -0800 Subject: [PATCH 024/151] consolidate extraction of failure message from orchestrated items --- .../details/executionDetails.controller.js | 13 - .../executionDetails.controller.spec.js | 92 ------ .../orchestratedItem.transformer.js | 53 ++++ .../orchestratedItem.transformer.spec.js | 291 ++++++++++++++++++ .../stages/bake/aws/bakeExecutionDetails.html | 4 +- .../bake/docker/bakeExecutionDetails.html | 4 +- .../stages/bake/gce/bakeExecutionDetails.html | 4 +- .../checkPreconditionsExecutionDetails.html | 2 +- .../deployExecutionDetails.controller.js | 1 - .../stages/deploy/deployExecutionDetails.html | 2 +- .../aws/destroyAsgExecutionDetails.html | 2 +- .../cf/destroyAsgExecutionDetails.html | 2 +- .../gce/destroyAsgExecutionDetails.html | 2 +- .../determineTargetReferenceDetails.html | 2 +- .../aws/disableAsgExecutionDetails.html | 2 +- .../cf/disableAsgExecutionDetails.html | 2 +- .../gce/disableAsgExecutionDetails.html | 2 +- .../aws/disableClusterExecutionDetails.html | 2 +- .../cf/disableClusterExecutionDetails.html | 2 +- .../gce/disableClusterExecutionDetails.html | 2 +- .../aws/enableAsgExecutionDetails.html | 2 +- .../cf/enableAsgExecutionDetails.html | 2 +- .../gce/enableAsgExecutionDetails.html | 2 +- .../findAmi/aws/findAmiExecutionDetails.html | 2 +- .../findAmi/gce/findAmiExecutionDetails.html | 2 +- .../jenkinsExecutionDetails.controller.js | 2 +- ...jenkinsExecutionDetails.controller.spec.js | 4 +- .../manualJudgmentExecutionDetails.html | 2 +- .../modifyScalingProcessExecutionDetails.html | 2 +- .../pipeline/pipelineExecutionDetails.html | 2 +- .../aws/resizeAsgExecutionDetails.html | 2 +- .../cf/resizeAsgExecutionDetails.html | 2 +- .../gce/resizeAsgExecutionDetails.html | 2 +- .../aws/scaleDownClusterExecutionDetails.html | 2 +- .../cf/scaleDownClusterExecutionDetails.html | 2 +- .../gce/scaleDownClusterExecutionDetails.html | 2 +- .../aws/shrinkClusterExecutionDetails.html | 2 +- .../cf/shrinkClusterExecutionDetails.html | 2 +- .../gce/shrinkClusterExecutionDetails.html | 2 +- .../stages/wait/waitExecutionDetails.html | 2 +- .../waitForParentTasksExecutionDetails.html | 2 +- .../modules/core/task/task.read.service.js | 49 +-- .../core/task/task.read.service.spec.js | 196 ------------ app/scripts/modules/core/task/tasks.html | 2 +- .../netflix/migrator/migrator.service.js | 9 - .../netflix/migrator/migrator.service.spec.js | 63 ---- .../pipeline/pipeline.migrator.directive.js | 7 +- .../serverGroup.migrator.directive.js | 2 +- .../stage/canary/canaryStage.transformer.js | 17 +- .../bulkQuickPatchStageExecutionDetails.html | 2 +- .../quickPatchAsgExecutionDetails.html | 2 +- 51 files changed, 396 insertions(+), 483 deletions(-) create mode 100644 app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.spec.js diff --git a/app/scripts/modules/core/delivery/details/executionDetails.controller.js b/app/scripts/modules/core/delivery/details/executionDetails.controller.js index 505c77f6f1d..f0880ce87de 100644 --- a/app/scripts/modules/core/delivery/details/executionDetails.controller.js +++ b/app/scripts/modules/core/delivery/details/executionDetails.controller.js @@ -43,19 +43,6 @@ module.exports = angular.module('spinnaker.executionDetails.controller', [ $state.go('.', { step: null }); }; - controller.getException = function(stage) { - if (stage.context) { - if (stage.context.exception && stage.context.exception.details.errors.length) { - return stage.context.exception.details.errors.join(', '); - } - if (stage.context['kato.tasks'] && stage.context['kato.tasks'].length) { - var lastTask = stage.context['kato.tasks'][stage.context['kato.tasks'].length - 1]; - return lastTask.exception ? lastTask.exception.message : null; - } - } - return null; - }; - controller.getDetailsSourceUrl = function() { if ($stateParams.step !== undefined) { let stages = $scope.execution.stageSummaries || []; diff --git a/app/scripts/modules/core/delivery/details/executionDetails.controller.spec.js b/app/scripts/modules/core/delivery/details/executionDetails.controller.spec.js index 6005097ae73..394be37bbef 100644 --- a/app/scripts/modules/core/delivery/details/executionDetails.controller.spec.js +++ b/app/scripts/modules/core/delivery/details/executionDetails.controller.spec.js @@ -47,96 +47,4 @@ describe('Controller: ExecutionDetails', function () { }); }); - describe('getException', function() { - beforeEach(function() { - this.$state = {}; - this.$stateParams = { - application: 'app' - }; - - this.controller = this.$controller('executionDetails', { - $scope: this.$scope, - $stateParams: this.$stateParams, - $state: this.$state, - pipelineConfig: this.pipelineConfig, - }); - }); - - it('returns null when no stage context', function() { - expect(this.controller.getException({})).toBe(null); - }); - - it('returns null when no kato.tasks field in stage context', function() { - expect(this.controller.getException({context: {}})).toBe(null); - }); - - it('returns null when kato.tasks field in stage context is empty or not an array', function() { - expect(this.controller.getException({context: { 'kato.tasks': 'not-array'}})).toBe(null); - expect(this.controller.getException({context: { 'kato.tasks': []}})).toBe(null); - }); - - it('returns null when last kato task has no exception', function() { - var stage = { - context: { - 'kato.tasks': [ - { - exception: { - message: 'failed!' - } - }, - { - - } - ] - } - }; - expect(this.controller.getException(stage)).toBe(null); - }); - - it('returns general exception if present', function() { - expect(this.controller.getException({context: { 'exception': { 'details' : { 'errors': ['E1', 'E2']}}}})).toBe('E1, E2'); - expect(this.controller.getException({context: { 'exception': { 'details' : { 'errors': []}}}})).toBe(null); - expect(this.controller.getException({context: { }})).toBe(null); - }); - - it('returns general exception even if a kato task is present', function() { - var stage = { - context: { - 'kato.tasks': [ - { - exception: { - message: 'failed!' - } - } - ], - exception: { - details: { - errors: ['E1', 'E2'] - } - } - } - }; - expect(this.controller.getException(stage)).toBe('E1, E2'); - }); - - it('returns exception when it is in the last kato task', function() { - var stage = { - context: { - 'kato.tasks': [ - { - message: 'this one is fine' - }, - { - exception: { - message: 'failed!' - } - } - ] - } - }; - expect(this.controller.getException(stage)).toBe('failed!'); - }); - - }); - }); diff --git a/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.js b/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.js index 137aad3a652..892df1b8fe5 100644 --- a/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.js +++ b/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.js @@ -6,6 +6,43 @@ module.exports = angular.module('spinnaker.core.orchestratedItem.transformer', [ require('../utils/moment.js') ]) .factory('orchestratedItemTransformer', function(momentService, $log) { + + function getOrchestrationException(task) { + var katoTasks = task.getValueFor('kato.tasks'); + if (katoTasks && katoTasks.length) { + var steps = katoTasks[katoTasks.length - 1].history; + var exception = katoTasks[katoTasks.length - 1].exception; + if (exception) { + return exception.message; + } + if (steps && steps.length) { + return steps[steps.length - 1].status; + } + } + return null; + } + + function getGeneralException(task) { + var generalException = task.getValueFor('exception'); + if (generalException) { + if (generalException.details && generalException.details.errors && generalException.details.errors.length) { + return generalException.details.errors.join(', '); + } + if (generalException.details && generalException.details.error) { + return generalException.details.error; + } + } + return null; + } + + function getMigrationException(task) { + let tideTask = task.getValueFor('tide.task'); + if (tideTask && tideTask.taskComplete && tideTask.taskComplete.status === 'failure') { + return tideTask.taskComplete.message; + } + return null; + } + function defineProperties(item) { if (!item || typeof item !== 'object') { return; @@ -15,8 +52,24 @@ module.exports = angular.module('spinnaker.core.orchestratedItem.transformer', [ return; } + item.getValueFor = function(key) { + if (item.context) { + return item.context[key]; + } + if (!item.variables) { + return null; + } + var [matching] = item.variables.filter((item) => item.key === key).map((variable) => variable.value); + return matching; + }; + item.originalStatus = item.status; Object.defineProperties(item, { + failureMessage: { + get: function() { + return getGeneralException(item) || getMigrationException(item) || getOrchestrationException(item) || null; + } + }, isCompleted: { get: function() { return item.status === 'COMPLETED'; diff --git a/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.spec.js b/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.spec.js new file mode 100644 index 00000000000..006ca3c5b7a --- /dev/null +++ b/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.spec.js @@ -0,0 +1,291 @@ +'use strict'; + +describe('orchestratedItem transformer', function () { + var transformer; + + beforeEach(window.module( + require('./orchestratedItem.transformer') + )); + + beforeEach(window.inject(function(orchestratedItemTransformer) { + transformer = orchestratedItemTransformer; + })); + + describe('failure message extraction', function () { + + let getMessage = (obj) => { + transformer.defineProperties(obj); + return obj.failureMessage; + }; + + + it('returns null when no stage context', function() { + expect(getMessage({})).toBe(null); + }); + + it('returns null when no kato.tasks field in stage context', function() { + expect(getMessage({context: {}})).toBe(null); + }); + + it('returns null when kato.tasks field in stage context is empty', function() { + expect(getMessage({context: { 'kato.tasks': []}})).toBe(null); + }); + + it('returns null when last kato task has no exception', function() { + var stage = { + context: { + 'kato.tasks': [ + { + exception: { + message: 'failed!' + } + }, + { + + } + ] + } + }; + expect(getMessage(stage)).toBe(null); + }); + + it('returns general exception if present', function() { + expect(getMessage({context: { 'exception': { 'details' : { 'errors': ['E1', 'E2']}}}})).toBe('E1, E2'); + expect(getMessage({context: { 'exception': { 'details' : { 'errors': []}}}})).toBe(null); + expect(getMessage({context: { }})).toBe(null); + }); + + it('returns general exception even if a kato task is present', function() { + var stage = { + context: { + 'kato.tasks': [ + { + exception: { + message: 'failed!' + } + } + ], + exception: { + details: { + errors: ['E1', 'E2'] + } + } + } + }; + expect(getMessage(stage)).toBe('E1, E2'); + }); + + it('returns exception when it is in the last kato task', function() { + var stage = { + context: { + 'kato.tasks': [ + { + message: 'this one is fine' + }, + { + exception: { + message: 'failed!' + } + } + ] + } + }; + expect(getMessage(stage)).toBe('failed!'); + }); + + it ('extracts exception object from variables', function () { + let task = { + variables: [ + { + key: 'exception', + value: { + details: { + error: 'From exception object' + } + } + } + ] + }; + + expect(getMessage(task)).toBe('From exception object'); + }); + + it('prefers "errors" to "error" and expects them to be an array in exception object', function () { + let task = { + variables: [ + { + key: 'exception', + value: { + details: { + errors: [ + 'error 1', + 'error 2' + ], + error: 'From error' + } + } + } + ] + }; + expect(getMessage(task)).toBe('error 1, error 2'); + }); + + it('returns null if an exception variable is present but has no details', function () { + let task = { + variables: [ + { + key: 'exception', + value: 'i should be an object' + } + ] + }; + expect(getMessage(task)).toBe(null); + }); + + it('falls back to extracting last orchestration message if no exception found in variables', function () { + let task = { + variables: [ + { + key: 'kato.tasks', + value: [ + { + history: [ + { status: 'i am fine' }, + { status: 'i am terrible' } + ], + } + ] + } + ] + }; + expect(getMessage(task)).toBe('i am terrible'); + }); + + it('prefers message from kato exception object if present', function () { + let task = { + variables: [ + { + key: 'kato.tasks', + value: [ + { + exception: { + message: 'I am the exception' + }, + history: [ + { status: 'i am terrible' } + ], + } + ] + } + ] + }; + expect(getMessage(task)).toBe('I am the exception'); + }); + + it('returns null if kato exception object does not have a message property', function () { + let task = { + variables: [ + { + key: 'kato.tasks', + value: [ + { + exception: 'I am the problem', + history: [ + { status: 'i am terrible' } + ], + } + ] + } + ] + }; + expect(getMessage(task)).toBe(null); + }); + + it('returns null if no kato exception and no history', function () { + let task = { + variables: [ + { + key: 'kato.tasks', + value: [ + { + history: [], + } + ] + } + ] + }; + expect(getMessage(task)).toBe(null); + }); + + it('gets orchestration message from last kato task', function () { + let task = { + variables: [ + { + key: 'kato.tasks', + value: [ + { + history: [ + { status: 'i am the first' }, + ], + }, + { + history: [ + { status: 'i am the second' }, + ], + } + ] + } + ] + }; + expect(getMessage(task)).toBe('i am the second'); + }); + + it('returns null if no failure message is present', function () { + expect(getMessage({ status: 'COMPLETED' })).toBe(null); + }); + + it('returns null if tide task succeeded', function () { + let task = { + variables: [ + { + key: 'tide.task', + value: { + taskComplete: { status: 'success', message: 'the message' } + } + } + ] + }; + expect(getMessage(task)).toBe(null); + task.variables[0].value.taskComplete.status = 'failure'; + + expect(getMessage(task)).toBe('the message'); + + }); + + it('prefers task exception over tide exception if present', function () { + let task = { + variables: [ + { + key: 'exception', + value: { + details: { + error: 'From exception object' + } + } + }, + { + key: 'tide.task', + value: { + taskComplete: { status: 'success', message: 'the message' } + } + } + ] + }; + expect(getMessage(task)).toBe('From exception object'); + }); + + + + + }); +}); diff --git a/app/scripts/modules/core/pipeline/config/stages/bake/aws/bakeExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/bake/aws/bakeExecutionDetails.html index 6188f919096..dc7794305cb 100644 --- a/app/scripts/modules/core/pipeline/config/stages/bake/aws/bakeExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/bake/aws/bakeExecutionDetails.html @@ -31,9 +31,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/bake/docker/bakeExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/bake/docker/bakeExecutionDetails.html index a2618411e08..01eb08c2819 100644 --- a/app/scripts/modules/core/pipeline/config/stages/bake/docker/bakeExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/bake/docker/bakeExecutionDetails.html @@ -23,9 +23,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/bake/gce/bakeExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/bake/gce/bakeExecutionDetails.html index 9728f5451f3..af00c02bfdf 100644 --- a/app/scripts/modules/core/pipeline/config/stages/bake/gce/bakeExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/bake/gce/bakeExecutionDetails.html @@ -27,9 +27,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/checkPreconditions/checkPreconditionsExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/checkPreconditions/checkPreconditionsExecutionDetails.html index 23ded3731e3..42e3457dab2 100644 --- a/app/scripts/modules/core/pipeline/config/stages/checkPreconditions/checkPreconditionsExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/checkPreconditions/checkPreconditionsExecutionDetails.html @@ -17,7 +17,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/deploy/deployExecutionDetails.controller.js b/app/scripts/modules/core/pipeline/config/stages/deploy/deployExecutionDetails.controller.js index 41147d6f8e5..7ac946a3507 100644 --- a/app/scripts/modules/core/pipeline/config/stages/deploy/deployExecutionDetails.controller.js +++ b/app/scripts/modules/core/pipeline/config/stages/deploy/deployExecutionDetails.controller.js @@ -57,7 +57,6 @@ module.exports = angular.module('spinnaker.core.pipeline.stage.deploy.details.co var resultObjects = context['kato.tasks'][0].resultObjects; if (resultObjects && resultObjects.length) { results = []; - addDeployedArtifacts('asgNameByRegion'); // TODO: Remove after 5/11/15 addDeployedArtifacts('serverGroupNameByRegion'); } } diff --git a/app/scripts/modules/core/pipeline/config/stages/deploy/deployExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/deploy/deployExecutionDetails.html index 4207d5b97fb..2032e765316 100644 --- a/app/scripts/modules/core/pipeline/config/stages/deploy/deployExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/deploy/deployExecutionDetails.html @@ -31,7 +31,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/destroyAsg/aws/destroyAsgExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/destroyAsg/aws/destroyAsgExecutionDetails.html index 66591eff992..59a15fba501 100644 --- a/app/scripts/modules/core/pipeline/config/stages/destroyAsg/aws/destroyAsgExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/destroyAsg/aws/destroyAsgExecutionDetails.html @@ -31,7 +31,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/destroyAsg/cf/destroyAsgExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/destroyAsg/cf/destroyAsgExecutionDetails.html index 00acb2ae8ef..5ddae17bfc5 100644 --- a/app/scripts/modules/core/pipeline/config/stages/destroyAsg/cf/destroyAsgExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/destroyAsg/cf/destroyAsgExecutionDetails.html @@ -15,7 +15,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/destroyAsg/gce/destroyAsgExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/destroyAsg/gce/destroyAsgExecutionDetails.html index d4cf40aa6e7..fe0af9a57a6 100644 --- a/app/scripts/modules/core/pipeline/config/stages/destroyAsg/gce/destroyAsgExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/destroyAsg/gce/destroyAsgExecutionDetails.html @@ -15,7 +15,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/determineTargetReference/determineTargetReferenceDetails.html b/app/scripts/modules/core/pipeline/config/stages/determineTargetReference/determineTargetReferenceDetails.html index 783b2dd6625..a23664b9496 100644 --- a/app/scripts/modules/core/pipeline/config/stages/determineTargetReference/determineTargetReferenceDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/determineTargetReference/determineTargetReferenceDetails.html @@ -21,6 +21,6 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/disableAsg/aws/disableAsgExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/disableAsg/aws/disableAsgExecutionDetails.html index 5cb4e70e09f..10ba0dd5a4c 100644 --- a/app/scripts/modules/core/pipeline/config/stages/disableAsg/aws/disableAsgExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/disableAsg/aws/disableAsgExecutionDetails.html @@ -15,7 +15,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/disableAsg/cf/disableAsgExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/disableAsg/cf/disableAsgExecutionDetails.html index dca5df464b2..69b9f22418a 100644 --- a/app/scripts/modules/core/pipeline/config/stages/disableAsg/cf/disableAsgExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/disableAsg/cf/disableAsgExecutionDetails.html @@ -15,7 +15,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/disableAsg/gce/disableAsgExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/disableAsg/gce/disableAsgExecutionDetails.html index 1f2e96c1c1b..aa913dfcb4a 100644 --- a/app/scripts/modules/core/pipeline/config/stages/disableAsg/gce/disableAsgExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/disableAsg/gce/disableAsgExecutionDetails.html @@ -15,7 +15,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/disableCluster/aws/disableClusterExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/disableCluster/aws/disableClusterExecutionDetails.html index 8d1bb387932..401bf4659fb 100644 --- a/app/scripts/modules/core/pipeline/config/stages/disableCluster/aws/disableClusterExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/disableCluster/aws/disableClusterExecutionDetails.html @@ -29,7 +29,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/disableCluster/cf/disableClusterExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/disableCluster/cf/disableClusterExecutionDetails.html index be838d4c76e..0f2ba9bd00c 100644 --- a/app/scripts/modules/core/pipeline/config/stages/disableCluster/cf/disableClusterExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/disableCluster/cf/disableClusterExecutionDetails.html @@ -29,7 +29,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/disableCluster/gce/disableClusterExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/disableCluster/gce/disableClusterExecutionDetails.html index 9b281a9b14c..0a8aa55a033 100644 --- a/app/scripts/modules/core/pipeline/config/stages/disableCluster/gce/disableClusterExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/disableCluster/gce/disableClusterExecutionDetails.html @@ -29,7 +29,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/enableAsg/aws/enableAsgExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/enableAsg/aws/enableAsgExecutionDetails.html index 66faf9c428a..2756d0e8897 100644 --- a/app/scripts/modules/core/pipeline/config/stages/enableAsg/aws/enableAsgExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/enableAsg/aws/enableAsgExecutionDetails.html @@ -15,7 +15,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/enableAsg/cf/enableAsgExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/enableAsg/cf/enableAsgExecutionDetails.html index 9fc051fd015..a717a8c0448 100644 --- a/app/scripts/modules/core/pipeline/config/stages/enableAsg/cf/enableAsgExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/enableAsg/cf/enableAsgExecutionDetails.html @@ -15,7 +15,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/enableAsg/gce/enableAsgExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/enableAsg/gce/enableAsgExecutionDetails.html index 9fc051fd015..a717a8c0448 100644 --- a/app/scripts/modules/core/pipeline/config/stages/enableAsg/gce/enableAsgExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/enableAsg/gce/enableAsgExecutionDetails.html @@ -15,7 +15,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/findAmi/aws/findAmiExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/findAmi/aws/findAmiExecutionDetails.html index 19281b304ee..f32ec769aff 100644 --- a/app/scripts/modules/core/pipeline/config/stages/findAmi/aws/findAmiExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/findAmi/aws/findAmiExecutionDetails.html @@ -15,7 +15,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/findAmi/gce/findAmiExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/findAmi/gce/findAmiExecutionDetails.html index 3f05f7767c8..9daae64001f 100644 --- a/app/scripts/modules/core/pipeline/config/stages/findAmi/gce/findAmiExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/findAmi/gce/findAmiExecutionDetails.html @@ -15,7 +15,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/jenkins/jenkinsExecutionDetails.controller.js b/app/scripts/modules/core/pipeline/config/stages/jenkins/jenkinsExecutionDetails.controller.js index f7b86d7aabe..68c17b77f8a 100644 --- a/app/scripts/modules/core/pipeline/config/stages/jenkins/jenkinsExecutionDetails.controller.js +++ b/app/scripts/modules/core/pipeline/config/stages/jenkins/jenkinsExecutionDetails.controller.js @@ -18,7 +18,7 @@ module.exports = angular.module('spinnaker.core.pipeline.stage.jenkins.execution } function getFailureMessage() { - var failureMessage = 'No reason provided.', + var failureMessage = $scope.stage.failureMessage, context = $scope.stage.context || {}, buildInfo = context.buildInfo || {}, testResults = buildInfo && buildInfo.testResults && buildInfo.testResults.length ? diff --git a/app/scripts/modules/core/pipeline/config/stages/jenkins/jenkinsExecutionDetails.controller.spec.js b/app/scripts/modules/core/pipeline/config/stages/jenkins/jenkinsExecutionDetails.controller.spec.js index 4d60d8ab086..b928c229cd9 100644 --- a/app/scripts/modules/core/pipeline/config/stages/jenkins/jenkinsExecutionDetails.controller.spec.js +++ b/app/scripts/modules/core/pipeline/config/stages/jenkins/jenkinsExecutionDetails.controller.spec.js @@ -71,9 +71,9 @@ describe('Jenkins Execution Details Controller:', function () { expect($scope.failureMessage).toBe('Build failed.'); }); - it ('should fall back to "no reason provided" message when not failing', function () { + it ('should set failureMessage to undefined when not failing', function () { this.initializeController({}); - expect($scope.failureMessage).toBe('No reason provided.'); + expect($scope.failureMessage).toBeUndefined(); }); }); diff --git a/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentExecutionDetails.html index 637129a8d7f..b4b8f3e3655 100644 --- a/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/manualJudgment/manualJudgmentExecutionDetails.html @@ -40,7 +40,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/modifyScalingProcess/modifyScalingProcessExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/modifyScalingProcess/modifyScalingProcessExecutionDetails.html index 8a6bfe73275..174e8f88dc4 100644 --- a/app/scripts/modules/core/pipeline/config/stages/modifyScalingProcess/modifyScalingProcessExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/modifyScalingProcess/modifyScalingProcessExecutionDetails.html @@ -17,7 +17,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/pipeline/pipelineExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/pipeline/pipelineExecutionDetails.html index 92e39262c57..29c8b374178 100644 --- a/app/scripts/modules/core/pipeline/config/stages/pipeline/pipelineExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/pipeline/pipelineExecutionDetails.html @@ -13,7 +13,7 @@
Pipeline Stage Configuration
{{stage.context.status}}
- +
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/resizeAsg/cf/resizeAsgExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/resizeAsg/cf/resizeAsgExecutionDetails.html index 551ba6b7013..5608bfb7bbc 100644 --- a/app/scripts/modules/core/pipeline/config/stages/resizeAsg/cf/resizeAsgExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/resizeAsg/cf/resizeAsgExecutionDetails.html @@ -15,7 +15,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/resizeAsg/gce/resizeAsgExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/resizeAsg/gce/resizeAsgExecutionDetails.html index 93ec48561e3..a1a699e5bc9 100644 --- a/app/scripts/modules/core/pipeline/config/stages/resizeAsg/gce/resizeAsgExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/resizeAsg/gce/resizeAsgExecutionDetails.html @@ -15,7 +15,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/scaleDownCluster/aws/scaleDownClusterExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/scaleDownCluster/aws/scaleDownClusterExecutionDetails.html index 80175ab9ee9..24fa0a3ad6c 100644 --- a/app/scripts/modules/core/pipeline/config/stages/scaleDownCluster/aws/scaleDownClusterExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/scaleDownCluster/aws/scaleDownClusterExecutionDetails.html @@ -31,7 +31,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/scaleDownCluster/cf/scaleDownClusterExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/scaleDownCluster/cf/scaleDownClusterExecutionDetails.html index b5f18772c39..1f3f36c8bd4 100644 --- a/app/scripts/modules/core/pipeline/config/stages/scaleDownCluster/cf/scaleDownClusterExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/scaleDownCluster/cf/scaleDownClusterExecutionDetails.html @@ -31,7 +31,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/scaleDownCluster/gce/scaleDownClusterExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/scaleDownCluster/gce/scaleDownClusterExecutionDetails.html index 63d96be39aa..944ea0a3f23 100644 --- a/app/scripts/modules/core/pipeline/config/stages/scaleDownCluster/gce/scaleDownClusterExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/scaleDownCluster/gce/scaleDownClusterExecutionDetails.html @@ -31,7 +31,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/shrinkCluster/aws/shrinkClusterExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/shrinkCluster/aws/shrinkClusterExecutionDetails.html index f579dcd7bee..c115d0e0256 100644 --- a/app/scripts/modules/core/pipeline/config/stages/shrinkCluster/aws/shrinkClusterExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/shrinkCluster/aws/shrinkClusterExecutionDetails.html @@ -31,7 +31,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/shrinkCluster/cf/shrinkClusterExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/shrinkCluster/cf/shrinkClusterExecutionDetails.html index f1f9bccfe3b..e8393f1f552 100644 --- a/app/scripts/modules/core/pipeline/config/stages/shrinkCluster/cf/shrinkClusterExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/shrinkCluster/cf/shrinkClusterExecutionDetails.html @@ -31,7 +31,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/shrinkCluster/gce/shrinkClusterExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/shrinkCluster/gce/shrinkClusterExecutionDetails.html index 9b60a978bf7..736a21e4ef7 100644 --- a/app/scripts/modules/core/pipeline/config/stages/shrinkCluster/gce/shrinkClusterExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/shrinkCluster/gce/shrinkClusterExecutionDetails.html @@ -31,7 +31,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/wait/waitExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/wait/waitExecutionDetails.html index 70fb42d3981..1a085c6ec31 100644 --- a/app/scripts/modules/core/pipeline/config/stages/wait/waitExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/wait/waitExecutionDetails.html @@ -10,7 +10,7 @@
- +
diff --git a/app/scripts/modules/core/pipeline/config/stages/waitForParentTasks/waitForParentTasksExecutionDetails.html b/app/scripts/modules/core/pipeline/config/stages/waitForParentTasks/waitForParentTasksExecutionDetails.html index 0630317e826..1cb8b7b8cf8 100644 --- a/app/scripts/modules/core/pipeline/config/stages/waitForParentTasks/waitForParentTasksExecutionDetails.html +++ b/app/scripts/modules/core/pipeline/config/stages/waitForParentTasks/waitForParentTasksExecutionDetails.html @@ -13,6 +13,6 @@
Parent Tasks
{{task.status}}
- +
diff --git a/app/scripts/modules/core/task/task.read.service.js b/app/scripts/modules/core/task/task.read.service.js index 6819b20284b..b12c6e37cbe 100644 --- a/app/scripts/modules/core/task/task.read.service.js +++ b/app/scripts/modules/core/task/task.read.service.js @@ -11,56 +11,11 @@ module.exports = angular const activeStatuses = ['RUNNING', 'SUSPENDED', 'NOT_STARTED']; - function getOrchestrationException(task) { - var katoTasks = task.getValueFor('kato.tasks'); - if (katoTasks) { - var steps = katoTasks[katoTasks.length - 1].history; - var exception = katoTasks[katoTasks.length - 1].exception; - if (exception) { - return exception.message || 'No reason provided'; - } - return steps && steps.length ? steps[steps.length - 1].status : 'No reason provided'; - } - return null; - } - - function getGeneralException(task) { - var generalException = task.getValueFor('exception'); - if (generalException) { - if (generalException.details && generalException.details.errors && generalException.details.errors.length) { - return generalException.details.errors.join(', '); - } - if (generalException.details && generalException.details.error) { - return generalException.details.error; - } - return 'No reason provided'; - } - return null; - } - function setTaskProperties(task) { orchestratedItemTransformer.defineProperties(task); if (task.steps && task.steps.length) { task.steps.forEach(orchestratedItemTransformer.defineProperties); } - - task.getValueFor = function(key) { - if (!task.variables) { - return null; - } - var matching = task.variables.filter(function(item) { - return item.key === key; - }); - return matching.length > 0 ? matching[0].value : null; - }; - - Object.defineProperties(task, { - failureMessage: { - get: function() { - return getGeneralException(task) || getOrchestrationException(task) || false; - } - }, - }); } function getRunningTasks(applicationName) { @@ -97,9 +52,9 @@ module.exports = angular if (!task) { deferred.reject(); } else if (closure(task)) { - deferred.resolve(); + deferred.resolve(task); } else if (failureClosure && failureClosure(task)) { - deferred.reject(); + deferred.reject(task); } else { task.poller = $timeout(() => { getTask(application, task.id).then((updated) => { diff --git a/app/scripts/modules/core/task/task.read.service.spec.js b/app/scripts/modules/core/task/task.read.service.spec.js index 3f4df7a7cef..24ae7ef97e9 100644 --- a/app/scripts/modules/core/task/task.read.service.spec.js +++ b/app/scripts/modules/core/task/task.read.service.spec.js @@ -167,202 +167,6 @@ describe('Service: taskReader', function () { }); }); - describe('failure message', function () { - it ('extracts exception object from variables', function () { - let response = { - variables: [ - { - key: 'exception', - value: { - details: { - error: 'From exception object' - } - } - } - ] - }; - $http.expectGET('/applications/deck/tasks/1').respond(200, response); - - service.getTask('deck', 1).then((result) => task = result); - $http.flush(); - - expect(task.failureMessage).toBe('From exception object'); - }); - - it('prefers "errors" to "error" and expects them to be an array in exception object', function () { - let response = { - variables: [ - { - key: 'exception', - value: { - details: { - errors: [ - 'error 1', - 'error 2' - ], - error: 'From error' - } - } - } - ] - }; - $http.expectGET('/applications/deck/tasks/1').respond(200, response); - - service.getTask('deck', 1).then((result) => task = result); - $http.flush(); - - expect(task.failureMessage).toBe('error 1, error 2'); - }); - - it('returns "No reason provided" if an exception variable is present but has no details', function () { - let response = { - variables: [ - { - key: 'exception', - value: 'i should be an object' - } - ] - }; - $http.expectGET('/applications/deck/tasks/1').respond(200, response); - - service.getTask('deck', 1).then((result) => task = result); - $http.flush(); - - expect(task.failureMessage).toBe('No reason provided'); - }); - - it('falls back to extracting last orchestration message if no exception found in variables', function () { - let response = { - variables: [ - { - key: 'kato.tasks', - value: [ - { - history: [ - { status: 'i am fine' }, - { status: 'i am terrible' } - ], - } - ] - } - ] - }; - $http.expectGET('/applications/deck/tasks/1').respond(200, response); - - service.getTask('deck', 1).then((result) => task = result); - $http.flush(); - - expect(task.failureMessage).toBe('i am terrible'); - }); - - it('prefers message from kato exception object if present', function () { - let response = { - variables: [ - { - key: 'kato.tasks', - value: [ - { - exception: { - message: 'I am the exception' - }, - history: [ - { status: 'i am terrible' } - ], - } - ] - } - ] - }; - $http.expectGET('/applications/deck/tasks/1').respond(200, response); - - service.getTask('deck', 1).then((result) => task = result); - $http.flush(); - - expect(task.failureMessage).toBe('I am the exception'); - }); - - it('returns "No reason provided" if kato exception object does not have a message property', function () { - let response = { - variables: [ - { - key: 'kato.tasks', - value: [ - { - exception: 'I am the problem', - history: [ - { status: 'i am terrible' } - ], - } - ] - } - ] - }; - $http.expectGET('/applications/deck/tasks/1').respond(200, response); - - service.getTask('deck', 1).then((result) => task = result); - $http.flush(); - - expect(task.failureMessage).toBe('No reason provided'); - }); - - it('returns "No reason provided" if no kato exception and no history', function () { - let response = { - variables: [ - { - key: 'kato.tasks', - value: [ - { - history: [], - } - ] - } - ] - }; - $http.expectGET('/applications/deck/tasks/1').respond(200, response); - - service.getTask('deck', 1).then((result) => task = result); - $http.flush(); - - expect(task.failureMessage).toBe('No reason provided'); - }); - - it('gets orchestration message from last kato task', function () { - let response = { - variables: [ - { - key: 'kato.tasks', - value: [ - { - history: [ - { status: 'i am the first' }, - ], - }, - { - history: [ - { status: 'i am the second' }, - ], - } - ] - } - ] - }; - $http.expectGET('/applications/deck/tasks/1').respond(200, response); - - service.getTask('deck', 1).then((result) => task = result); - $http.flush(); - - expect(task.failureMessage).toBe('i am the second'); - }); - - it('returns false if no failure message is present', function () { - $http.expectGET('/applications/deck/tasks/1').respond(200, { status: 'COMPLETED' }); - service.getTask('deck', 1).then((result) => task = result); - $http.flush(); - - expect(task.failureMessage).toBe(false); - }); - }); - describe('task running time', function () { function execute() { diff --git a/app/scripts/modules/core/task/tasks.html b/app/scripts/modules/core/task/tasks.html index 4af0eea458d..c26c68c55f7 100644 --- a/app/scripts/modules/core/task/tasks.html +++ b/app/scripts/modules/core/task/tasks.html @@ -146,7 +146,7 @@

- Exception: {{task.failureMessage}} + Exception: {{task.failureMessage || 'No reason provided'}} diff --git a/app/scripts/modules/netflix/migrator/migrator.service.js b/app/scripts/modules/netflix/migrator/migrator.service.js index f4c6692304d..5b8d942b47e 100644 --- a/app/scripts/modules/netflix/migrator/migrator.service.js +++ b/app/scripts/modules/netflix/migrator/migrator.service.js @@ -24,7 +24,6 @@ module.exports = angular return taskStarter.then((task) => { task.getEventLog = () => getEventLog(task); - task.getTideException = () => getTideException(task); task.getPreview = () => getPreview(task); return task; }); @@ -44,14 +43,6 @@ module.exports = angular .valueOf(); } - function getTideException(task) { - let tideTask = getTideTask(task); - if (tideTask.taskComplete && tideTask.taskComplete.status === 'failure') { - return tideTask.taskComplete.message; - } - return task.failureMessage; - } - function getPreview(task) { var tideTask = getTideTask(task) || {}; tideTask.mutations = tideTask.mutations || []; diff --git a/app/scripts/modules/netflix/migrator/migrator.service.spec.js b/app/scripts/modules/netflix/migrator/migrator.service.spec.js index ec2c48c4c4d..391d44ce6aa 100644 --- a/app/scripts/modules/netflix/migrator/migrator.service.spec.js +++ b/app/scripts/modules/netflix/migrator/migrator.service.spec.js @@ -137,67 +137,4 @@ describe('Service: migrator', function () { }); }); - describe('getTideException', function () { - beforeEach(function () { - this.task = { - getValueFor: (key) => { - if (key === 'tide.task') { - return this.tideTask; - } - return null; - } - }; - this.tideTask = null; - - spyOn(taskExecutor, 'executeTask').and.returnValue($q.when(this.task)); - - this.getException = function() { - let result = null; - service.executeMigration({}).then((taskResult) => result = taskResult); - $scope.$digest(); - return result.getTideException(); - }; - }); - - it('only returns message if task finished and failed', function () { - - expect(this.getException()).toBeUndefined(); - - this.tideTask = { - taskComplete: { - status: 'success' - } - }; - - expect(this.getException()).toBeUndefined(); - - this.tideTask = { - taskComplete: { - status: 'failure', - message: 'the error', - }, - }; - - expect(this.getException()).toEqual('the error'); - }); - - it('falls back to failure message from task if present', function () { - - this.tideTask = { - taskComplete: { - status: 'failure', - message: 'tide failed', - }, - }; - - this.task.failureMessage = 'task failed'; - expect(this.getException()).toBe('tide failed'); - - this.tideTask.taskComplete = {}; - expect(this.getException()).toBe('task failed'); - - }); - - }); - }); diff --git a/app/scripts/modules/netflix/migrator/pipeline/pipeline.migrator.directive.js b/app/scripts/modules/netflix/migrator/pipeline/pipeline.migrator.directive.js index 03e9f5aff80..4a0727fbe3e 100644 --- a/app/scripts/modules/netflix/migrator/pipeline/pipeline.migrator.directive.js +++ b/app/scripts/modules/netflix/migrator/pipeline/pipeline.migrator.directive.js @@ -109,9 +109,10 @@ module.exports = angular let errorMode = (error) => { this.viewState.computing = false; this.viewState.executing = false; - this.viewState.error = error || 'An unknown error occurred. Please try again later.'; - if (!error && this.task && this.task.getTideException()) { - this.viewState.error = this.task.getTideException(); + if (this.task && this.task.failureMessage) { + this.viewState.error = this.task.failureMessage; + } else { + this.viewState.error = error || 'An unknown error occurred. Please try again later.'; } }; diff --git a/app/scripts/modules/netflix/migrator/serverGroup/serverGroup.migrator.directive.js b/app/scripts/modules/netflix/migrator/serverGroup/serverGroup.migrator.directive.js index 6a2acce9155..bdbacf5c38a 100644 --- a/app/scripts/modules/netflix/migrator/serverGroup/serverGroup.migrator.directive.js +++ b/app/scripts/modules/netflix/migrator/serverGroup/serverGroup.migrator.directive.js @@ -72,7 +72,7 @@ module.exports = angular this.viewState.executing = false; this.viewState.error = error || 'An unknown error occurred. Please try again later.'; if (!error && this.task) { - this.viewState.error = this.task.getTideException(); + this.viewState.error = this.task.failureMessage; } }; diff --git a/app/scripts/modules/netflix/pipeline/stage/canary/canaryStage.transformer.js b/app/scripts/modules/netflix/pipeline/stage/canary/canaryStage.transformer.js index b62e7bb94fe..400397bbb6c 100644 --- a/app/scripts/modules/netflix/pipeline/stage/canary/canaryStage.transformer.js +++ b/app/scripts/modules/netflix/pipeline/stage/canary/canaryStage.transformer.js @@ -4,8 +4,9 @@ let angular = require('angular'); module.exports = angular.module('spinnaker.netflix.pipeline.stage.canary.transformer', [ require('../../../../core/utils/lodash.js'), + require('../../../../core/orchestratedItem/orchestratedItem.transformer.js'), ]) - .service('canaryStageTransformer', function($log, _) { + .service('canaryStageTransformer', function($log, _, orchestratedItemTransformer) { // adds "canary" or "baseline" to the deploy stage name when converting it to a task function getDeployTaskName(stage) { @@ -22,16 +23,8 @@ module.exports = angular.module('spinnaker.netflix.pipeline.stage.canary.transfo } function getException (stage) { - if (stage.context) { - if (stage.context.exception && stage.context.exception.details.errors.length) { - return stage.context.exception.details.errors.join(', '); - } - if (stage.context['kato.tasks'] && stage.context['kato.tasks'].length) { - var lastTask = stage.context['kato.tasks'][stage.context['kato.tasks'].length - 1]; - return lastTask.exception ? lastTask.exception.message : null; - } - } - return null; + orchestratedItemTransformer.defineProperties(stage); + return stage.isFailed ? stage.failureMessage : null; } function buildCanaryDeploymentsFromClusterPairs(stage) { @@ -114,7 +107,7 @@ module.exports = angular.module('spinnaker.netflix.pipeline.stage.canary.transfo var syntheticStagesToAdd = []; execution.stages.forEach(function(stage) { if (stage.type === 'canary') { - + orchestratedItemTransformer.defineProperties(stage); stage.exceptions = []; var deployParent = _.find(execution.stages, { diff --git a/app/scripts/modules/netflix/pipeline/stage/quickPatchAsg/bulkQuickPatchStage/bulkQuickPatchStageExecutionDetails.html b/app/scripts/modules/netflix/pipeline/stage/quickPatchAsg/bulkQuickPatchStage/bulkQuickPatchStageExecutionDetails.html index d7310620d7e..f4b51ead59f 100644 --- a/app/scripts/modules/netflix/pipeline/stage/quickPatchAsg/bulkQuickPatchStage/bulkQuickPatchStageExecutionDetails.html +++ b/app/scripts/modules/netflix/pipeline/stage/quickPatchAsg/bulkQuickPatchStage/bulkQuickPatchStageExecutionDetails.html @@ -29,7 +29,7 @@

- +
diff --git a/app/scripts/modules/netflix/pipeline/stage/quickPatchAsg/quickPatchAsgExecutionDetails.html b/app/scripts/modules/netflix/pipeline/stage/quickPatchAsg/quickPatchAsgExecutionDetails.html index d8b9c355871..1ea7dc988ce 100644 --- a/app/scripts/modules/netflix/pipeline/stage/quickPatchAsg/quickPatchAsgExecutionDetails.html +++ b/app/scripts/modules/netflix/pipeline/stage/quickPatchAsg/quickPatchAsgExecutionDetails.html @@ -23,7 +23,7 @@
- +
From 60df6273e42c023d3b2391641ed4712049b0176c Mon Sep 17 00:00:00 2001 From: chrisb Date: Tue, 9 Feb 2016 13:04:04 -0800 Subject: [PATCH 025/151] more dynamic rendering of provider buttons --- .../providerSelection/providerSelection.html | 8 ++--- .../providerSelection.modal.less | 30 +++++++++++++++++++ .../providerSelector.directive.js | 2 ++ 3 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 app/scripts/modules/core/cloudProvider/providerSelection/providerSelection.modal.less diff --git a/app/scripts/modules/core/cloudProvider/providerSelection/providerSelection.html b/app/scripts/modules/core/cloudProvider/providerSelection/providerSelection.html index 05230c60898..893d5530556 100644 --- a/app/scripts/modules/core/cloudProvider/providerSelection/providerSelection.html +++ b/app/scripts/modules/core/cloudProvider/providerSelection/providerSelection.html @@ -4,15 +4,15 @@

Pick your provider:

-
-
-
diff --git a/app/scripts/modules/core/cloudProvider/providerSelection/providerSelection.modal.less b/app/scripts/modules/core/cloudProvider/providerSelection/providerSelection.modal.less new file mode 100644 index 00000000000..1b94f492bd1 --- /dev/null +++ b/app/scripts/modules/core/cloudProvider/providerSelection/providerSelection.modal.less @@ -0,0 +1,30 @@ +.provider-options { + display: flex; + justify-content: space-between; + flex-wrap: wrap; + &.providers-2 { + justify-content: space-around; + .provider { + width: 200px; + margin: 20px; + } + } + .provider { + width: 166px; + margin: 10px; + .panel-heading { + padding: 10px 0; + } + } + .provider-selection-logo { + width: 100%; + h4 { + background-size: contain; + background-repeat: no-repeat; + background-position: 50% 50%; + min-height: 70px; + height: 100%; + width: 100%; + } + } +} diff --git a/app/scripts/modules/core/cloudProvider/providerSelection/providerSelector.directive.js b/app/scripts/modules/core/cloudProvider/providerSelection/providerSelector.directive.js index a010400105e..daab209b484 100644 --- a/app/scripts/modules/core/cloudProvider/providerSelection/providerSelector.directive.js +++ b/app/scripts/modules/core/cloudProvider/providerSelection/providerSelector.directive.js @@ -2,6 +2,8 @@ let angular = require('angular'); +require('./providerSelection.modal.less'); + module.exports = angular.module('spinnaker.providerSelection.directive', [ require('../../account/account.service.js'), ]) From 0504e9a706a014e3025ac83a558171174abea817 Mon Sep 17 00:00:00 2001 From: chrisb Date: Tue, 9 Feb 2016 15:09:00 -0800 Subject: [PATCH 026/151] set virtualizationType on aws command based on image match --- .../serverGroupConfiguration.service.js | 11 ++-- .../serverGroupConfiguration.service.spec.js | 59 +++++++++++++++++++ 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js b/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js index a459bbbe55d..371f7d85013 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js +++ b/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js @@ -196,15 +196,18 @@ module.exports = angular.module('spinnaker.aws.serverGroup.configure.service', [ ami: image.amis ? image.amis[command.region][0] : null }; }); - var regionalImageMatches = regionalImages.filter((image) => image.imageName === command.amiName); - if (command.amiName && !regionalImageMatches.length) { + var [match] = regionalImages.filter((image) => image.imageName === command.amiName); + if (command.amiName && !match) { result.dirty.amiName = true; command.amiName = null; } else { - command.virtualizationType = regionalImages.length ? regionalImages[0].virtualizationType : null; + command.virtualizationType = match ? match.virtualizationType : null; } } else { - command.amiName = null; + if (command.amiName) { + result.dirty.amiName = true; + command.amiName = null; + } } command.backingData.filtered.images = regionalImages; return result; diff --git a/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.spec.js b/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.spec.js index 58cdbfe41d8..62be356d8ff 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.spec.js +++ b/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.spec.js @@ -401,4 +401,63 @@ describe('Service: awsServerGroupConfiguration', function () { }); + describe('configureImages', function () { + beforeEach(function() { + this.command = { + viewState: {}, + backingData: { + filtered: {}, + regionsKeyedByAccount: { + test: { + defaultKeyPair: 'test-pair' + }, + prod: { + defaultKeyPair: 'prod-pair' + }, + }, + packageImages: [ + { amis: { 'us-east-1': [ {} ] }, attributes: { virtualizationType: 'hvm', }, imageName: 'ami-1234' }, + { amis: { 'us-east-1': [ {} ], 'eu-west-1': [ {} ] }, attributes: { virtualizationType: 'pv', }, imageName: 'ami-1235' }, + { amis: { 'us-west-1': [ {} ] }, attributes: { virtualizationType: 'hvm', }, imageName: 'ami-1236' }, + ], + }, + credentials: 'test', + region: 'us-west-1', + amiName: 'ami-1236' + }; + }); + + it('clears virtualization type if no ami present', function () { + this.command.virtualizationType = 'pv'; + this.command.amiName = null; + service.configureImages(this.command); + expect(this.command.virtualizationType).toBe(null); + }); + + it('clears amiName if region is absent and sets dirty flag', function () { + this.command.region = null; + let result = service.configureImages(this.command); + expect(this.command.amiName).toBe(null); + expect(result.dirty.amiName).toBe(true); + }); + + it('clears amiName and sets dirty flag if image is not found in region', function () { + this.command.region = 'us-east-1'; + let result = service.configureImages(this.command); + expect(this.command.amiName).toBe(null); + expect(result.dirty.amiName).toBe(true); + }); + + it('preserves amiName if image is found in region, and sets virtualizationType on command', function () { + this.command.region = 'us-east-1'; + this.command.amiName = 'ami-1235'; + let result = service.configureImages(this.command); + expect(this.command.amiName).toBe('ami-1235'); + expect(result.dirty.amiName).toBeUndefined(); + expect(this.command.virtualizationType).toBe('pv'); + }); + + + }); + }); From 534f8708c766e9be1a1dedf9cd6ccdf9ff4f422f Mon Sep 17 00:00:00 2001 From: Steven Kim Date: Wed, 10 Feb 2016 17:09:54 +0000 Subject: [PATCH 027/151] Adds Kubernetes provider logo. Does not include k8s SG icons. --- .../modules/kubernetes/kubernetes.module.js | 3 +++ .../modules/kubernetes/logo/kubernetes.logo.png | Bin 0 -> 9112 bytes 2 files changed, 3 insertions(+) create mode 100644 app/scripts/modules/kubernetes/logo/kubernetes.logo.png diff --git a/app/scripts/modules/kubernetes/kubernetes.module.js b/app/scripts/modules/kubernetes/kubernetes.module.js index 041b8e81492..fc1d3ed07e9 100644 --- a/app/scripts/modules/kubernetes/kubernetes.module.js +++ b/app/scripts/modules/kubernetes/kubernetes.module.js @@ -17,6 +17,9 @@ module.exports = angular.module('spinnaker.kubernetes', [ .config(function(cloudProviderRegistryProvider) { cloudProviderRegistryProvider.registerProvider('kubernetes', { name: 'Kubernetes', + logo: { + path: require('./logo/kubernetes.logo.png'), + }, image: { reader: 'kubernetesImageReader', }, diff --git a/app/scripts/modules/kubernetes/logo/kubernetes.logo.png b/app/scripts/modules/kubernetes/logo/kubernetes.logo.png new file mode 100644 index 0000000000000000000000000000000000000000..c8b1ebf917fb090564e391d6082a2cfb2c765510 GIT binary patch literal 9112 zcmaKSbyOVB*6rXP+zA=nVHhk-aF+ms3?aA;4ucHA-6g?2xC9Sw0fI|{d(b4fTY?08 zEfMB$pt7TxHCzjBX6fZJ3>O0c(70`N^pJXLFCi8PM_#kP zKD?fe&W~sSKuprp+04Qojs%*+t!Azm<#1qj3s6c*s+7Z4Q`5akAfLHr=TzbBXn^c*561Q7rM|9vn%Msu~af@sMp z{5#fTNu1FJiFAhW@p*W7@OlXFB3!Nc_(erU`9NSkFqr4jgU8Lw32ElZgf0%Z#SeC{D1TPe-gXtcsaxQwBT+CcUOzYfwN-z8_F3X>k2nRB3yM42#0@q5o&`# zBHU~c&OmtwxFg&N=?3I~%nhh!W?}2}_szeMYHAQ=CpV;-lLcH^PMqMEHDR69>GkObjD-jo~Rjy^x z6?FyY@^!ljxw&fAN?)U78$Jo!D@qoN$x2^?-$!~ii#rI{n7<1{*FtR3GK^kY+6%fx z<#rko7m16~v{Ji1HE7wLJ15;)o)({6b2Ph$qBc+KZy`&|^~ zcIxZDG`I*K&gVqcfe^w#4$wr6;<2g~ z4cH_Qjn*SFjz)p2fEYst()wB`XC)ftjSGp<#F%W9 zaYLRMNB63=u`SyEMn3b_r}SgE1R>VkAvPY4(Ec{yaCDZvy9yV_y(po3f*ix$l^xgJ zGH_*?C8%2BtD;04U;$-|dg{u=3a#QoOLi-(=!<;>8dr1Z&h)i|Y!!FOvW%J%n{x^# zG=YTM=H!9EZhA((*&2gfaR0z-w=I_uybO0*y~Yq4{!7!N{$)%oifX*6ZM@rG zPtnSOrr6|LrQuz8;dSYbHO`?szgT(O%If2)CFd1?PlXawSmq3f1zpq9>ItQ(!|yB5 zb*7<*-Anw(ua2VlUuMS4GG#K3%VvIZEx&VjPFO zawT>(0T!rJg2JbI;_+ycV3dh&kcm=TNSnv$r2F>OPJ=?VO%kG*QdAao40G;5)^7YZ zzM+st%6#NCecrhL*>vT{-eE zm`SI4qF{QV>Bg*#olPB5GHdM*pqhp^beL{vl<@%E<`SRl1Z+J74SJMHeQ0%f;RpE~ z>AyljQojY~8{Zd3fssS=%c{9%B)+PZ;cylU!!SS>^i$=6uFu(Y*n23w#Jc4O|4YxY>X6~#U85MOWcGZ(u4gdE6jy~q%MHqKS>z>Np>F5m=UWR)zwR6N4l z!}}^42_uiN#O|cQp2z+uD6U*w0Gy1`J`2;a+#6e-!kl|1yE|gtyDuyDWnJPzPlt>T zsvRGEjbADwyt*Xpj>9nv?3K>o;M^qN)A>Hn(FH{NPPVy#f;otq=+dnp`iVW`ntN&B zk3}iJTg9Ch#BuEz!$+5DVBhX=wn)N zO?a(G3sM&P{(SzBc+o{_eQl@GANIpVSD`Jo_0_^y;G&St>>QE%abh6THaNfmZNG1t z+WE?ViMqrvl|G8QHWpV}J~?4TYXA{Bg8s3>_eE(lc1+I2=rU4!8+~tTPWJ8ob58v5 zH@54<_&qYe5ifdr6f!?UhO|bA%Bg~M3Q;FmJx5HrtA}?>yN=8oTU=g+2H62GD@aoY z3>;0frAY9GDgp?j09Nv$dUK80zJlNR${M1V#Ba=apAOB3EfVKrIcZZ(a8%^P+9*zu!~RA*NPv7&y17vtw;6_p-TLnUXVZS$yOR+ z18V%zMV3~L7uvS1Zz;#Q@X`RJcAm$9NQpa?g44TFC{?D4_60{03&qSgyZ}{ejhEz! z7^_rsIJJ7Ws}|JA?f$4usjxgwRvPLeO-THQ$^6^1{UPfn=jjT+>D^X(Thx}YTiUt! zJM$ZDXY7T$|vp9;xfewjGG^+a?E*~*Xk5QMYJ+rEDYR4u~ecpEv6Mtrgjj! z_BoHBBx`)sYs16Ah^9cCN8D+em)t#G70V26;=a6HP94$0ZIQX#o z@mYZp78A=F(*^R*?Pm90q)vX>A)wj{1#|Lo!cJrnT4`BGU==X{?*80SJ5-24@&NqKTVf6`BkDSXNG?;rgXS+$?{Q?p^dO<;*0C@KLV6WJITd=1W53 zH0Ca$(=vz*C(?FZVkF+Up6BJUuMu#Lg25$kB(vs}_q+n#t3_i$_uF;8ip;{8Q9VF_ zi%Jf(gF^!5`9UGJi-SH~&DUgzup(>EW;B8ZbX*7f5#>b%0s5okpiy?#Jx^qSz0@y| zc|m9=c>1Zw)zN>ItZ19HH}72}uwpttxsnT2PS=#hTS=+T20+oJYE|Rc+NV+YVGHNe zn97USZ{KC-X!PS78-^6<9Bs8;9p(LO&e{`EE%$rW9!luT30-Wc(=s(NFp>|~Hh7~l zH3ygAIL*fzx(?wbZj0P%Mq>h`2qmFRO)?}@4uMdE%RFjNCBI+HxXvf-z{-e=EZzs9 zQJw6Z&sU-9(NpWz2Du00UvfJPE_$)c(7*DPlqoR&WX0Q-g#t|lU5g+uCMBPZ7jZ$Z zLj5pkvGfA{HtVSHjW=9}$1(aLEcJ`N7u7o6jT)GZ&x_mPL7SPY2h3e1(R~@ovA>l= z6`9@Zg4}(kV;s1P{?sED4oSpxm*mU0bfH0+t`#`jH8tLK5J7ymneTBkn@^uc|3sIYb=>fP@7mYQhp%zmHL79LvzlBg z{EmH&MQwb-g7$bYcdT2oqA4^C9BtiAop69@t6nS5rQ#NVGlBOo_Mv#cSFp{4COgrI z<~*`#EkKPVdvaMm*Vja@8L9TX@}n++(M$vj5#zSsM|EDxn;xfJhG$#2yY8pC9jKA< z-a{Swog8%Y1U+BFwp%mAU!~UR#X5Dj&!y@O#`$^%|JY;z?Zpbvl66lAt7XqrcGjcY znDF94Rf1(==CI0+7aS&YQ;3G>Zlo}cez6^!4d#32wu^?*ckma}l}e-=Nsap^bLs5N z`4Q{?GKhkZ<_%o`@;u-^0!(?{@tRrxKpks>{WxV2>lpoEd-$A)n1k&!-idvtsqB*_ zv9~}4b*UEBW|`QxeUI>+pa4q&qF_aL&6AgdzNw0QzNzD;uR=dyH%6qxqRfW!6o3>! z$thS24}5vM?NDfbtlYM%2k@!C$1Q=_qvz>Capj+4{ebl&&?cE}kAy(c3c7XP+Lc4? zU=6pKA0hF5hv?>dvL3zn8&}?rJ9mcb4TV=`7S3z-O)0!s-AouQH806DBq)yv@Rt3j z$7G}y9MSf#5}-IkBm}2SRRb=+(I5jRnz_gxM_L#4%DALV4F_DHCe}$xKVV zLH-uurhSiYQthW{$B!phP`9m;A>J!LM3JGybV5<8Q1}L)u$vXpJR}RnEXD<|i^4(Ldo#3(KREkV1RnHLeTfmD5+i+dI89Yha4RRJRpfCP(8*4uvcu3d zHnmqWq&@r%M0l2nNV+F!U$D_Nu^auYu8X+(z}@`)6R&bn$SvUZOI~SiwLWt(YmuHx zu>5zLTC}qs^(B4tF2(iN(zJTBsvuKxPnFUW)J766D-3e18=NUj*j4rJMq!hh3WD5A z^OS_5V$DY|Y3rVZOnB-wPu#5m)oSTH&|WxsqP0r=*DObW!wpm}5a&K$RjBY9{xo3+ zvRNWdTr0rNquGB~D7NYJ7{=bjoh)c_t(QB2^GPhK4mQ$wRLX9kT3joU77i(c%UZMK zV^33jxwLOM4^-d(wmzbyS!SSUqHKrfz~=ClPjyH}YL{t4p8<&boyBW5{dH+%lpp_s z{MXk;1uX{ZL1Q^4p%fnpqxaeIc>8v1z=6n3^$)FC%4Lpd6*RkKTLKJGpi_Fbl<8-g zGsp)YAG_hLh*CccL|m?CtrKPOLp8@14gs+am#_j5fw$Ct%T2%_O+?cb9{pvf>Va%x zaP5Xe{M&M9X7^p80$O1B$$;863#dl5n1Tc|!PN5`bp)1?$-P+a>U9aUXg?XY3%JX4 zWB}lqn1}RV3fGj!)kM`3i!t|Qy&pTHWh5(;cyqGBU>Hb7eE?R-A@hGF(l5<-%kx%U zWS?cCyvmH`?lpZeKUE%YLP{V}P@E6y^SxsFZ!ZE*bKmD-qtQ!Gg&g$%_~UO_!IY*_ z`kkEz9&*2X>58*7t1s*ty)ynPXOlFLvfO~*+_Nn_(ptW;#j*Vr-)wK`c8y%nt1VZZ z_jCIjioOTGQ2*R2ejefuBMbHp!fL$>R50NqNCxbW#gO#N@SE#{+6h`EL0u)MLe@8Z z_ucFa*T=tYF=iUGBdQ@4WZX6)UQWb^7P3!21rRZIC2Bk`fPVa%7&;R(MTv*XE!xXS z72~QB6M#1viogpy2Uw%S&@H?eTL{ZI1rDC;{+?pEMQaR3eU?eQWD~9u+HF8K;YFfm z8?3CD_!QUWAZgNV!GzE->t&|ZTrH|jttPo0L168aq&4}}b6uYyvK9Y4!H15Z<$O~7 zv~pf_IZe5udGcav!pL9a2IP5Uxvj;cn6PA=Vs+AI1J^{%c0F zV8wRPSBPgn?}py%!gRpP9HAi`x}Q`v8=(&mUl^D+b@Q;CYs9kFP}fV1E= zO@R@LTZtQ$f+D>9tc^E}z$4+PKInSwQGB^j{nMpCwokmP70W?w`N8E{!YG*DE=rV~ zJo?g@!ec`|)4NBiq-8=rK?^WamQWNcK0XQt^o8d&v+-kRN0q@O+bAR?3Xp@c+Q*%& zR?J|8Wrt?&R*bz)#q+6aZh6GfPf}t(@KeW~sY}3??0A zd4olZ)tXXziwV)Hm0#X#v5BwJO{wDFP0Jne%Xy#mBA$}SLlSxH2!yGpQcZS~q*oxB zz+l`y`kp_##W@>Jm`6+q>*>9<-k!M_ADJOTjzBWHOK7-fAW$#Eq)M3-HeE;SZ+-v5 z?dZ3|l4&;;Y5A*Sm0W4YA5I*qg@dbO`Hpp^G=TZOI+x#RJPftWA?A$Fu~=#MC|%f# zI(_T8p^0Sxa$5{?=2@oo`u>ZD^5AlIn@H!ub1lwZ4^w)B-mS8MIbi>d)2h|FuHW7r z-6<=Mrys0?6u?pu6!K>+l{5B@Juy*V)pC%@5z|l_JM6ZG zlf5a3VTZ>48wZ71H;t5khX%yR64Q$qzava^5OXeysWf~Ls)(}mecnj~rVcy81aaci zFkbE+DuPwZhv<0BygocrmHzc=mXg?%=JBJ+(}(l!P{r)kj}@^rO#;7DZ8hF@;mB() zba2G)m!t_!mIk_T2#U-zG=P(zQb}_j`yh#K(n7u)vrIRkLpERXuy4&*8M6)*a(k6n z_s{AchUruoFlhNL&5dwvrr`kgO$F5KYX5P4bj)exO3CqLQ=DmaEk9M|mGp^vYT$`3 zyF!qYtXTgFy%Z+

$*ZjO;^AE`UNT39aDYP@8{H( z8$xFD#tZvWCa|y>U5JEQb2>4O-;#Wklg8NjCgka4C!g)n-f+gXl`LYtHElmV+Q00% z?1L^Od$9S|hdqhc;W$4d=2j-9+a~-iISH{>eW0S?G)jUWfkimdYB!;$$@_yz$&hh+ z?ZPiz`FP#8(|Y616IgL@h4ZsDbN^7gs}~-2y%jzI!BrSOpT=j0krvjukwX2l*iwvV zPoP1a<{INXC@45#sPuZ?-4EHW`7{q2XQhnj3Eze1u~3>sxuU~DgPWsKoq{G3p6Pj} z>wTabpwB~}_0ZCvy`mJIP4$q`2;`4bruS7WFYOOJk%ITjd=Ekq6v;(Y;}t~Ho2$nQ z>N4;KXW^zO@!U!-er$YmGey9Vuo8IeWI7uecJ`$Q7@r!CjPuaQuRaXL!uHwo$F5xj zF*IW6rT27?2;>bY)O3W1C;^|cP?+&(hGO}1P`r4zb_>pZQpbNJ7QMF@57B$?AE2AR zz$zTzUh8=(1!om2;@q=av2YsatK1#%c5JAv3|--l9BB@-^FCXl3u@J)HE`D~A0p!5 zO1Eivu{gCjS1tcM)< zPV?mG9)M6Kw`KEE1Z~BMWJv3g)N*nMCS8Yr)VHY2y*z?-q3ZD7CuecsBHftE06AY~yltlXz22paQ4E=V9)O=}OF>O4hdG84UVh+uq7%OnS(C?z=@g zKKqq~qL*io@z8&e-ZY_+v_&zQbD*S5ytFPoIkmWO7rXdmXrAqy=i)M+y16b0rds;! zTxm$APGk=FNUQnkA9zCQZFT4&wuyMZ%nMZ z$vaTE#-Xl5Cd5E2qTYJk;>@Z=lG$w?)=)Yv zk#+O6DdK)3S#Ri*aj#g?$g3fGuI_#lm93x7Pkk0Nw4&fBq|7k)4HHF5XmlCHhFd+l z!gU(g5O=6>63YpgR^=3>qRoWdo*;F%(R5iqp;Zj+Ps%q;-S=J5zl+RY;4ywt_gBHY zuGhZEKi`gbSdSkBlz^V`;c-$n2OVy09SiHY@@}LFCTKYsWcXJeI!ow~D)?9mZn!K3 zgB|yhu5k?yFy%K>)s|T$6#_tn>M2@pUNoPlT|XJDDo!GopudZ)jXFUzfc=EGBx?jN z2kQ9XYo1>z%PGydJzST>8&|nDXa}t@xHTLsJ9X&kfpMdWd1x!c?KvanwjYvrF-Zf3 z1ORqC4^}wm*YGj4?;Y$ndTdM8-z{FH+RkTO8-Y!lo4&a^(q3P^#ChJ(>xwJPQE7Rf zaBbbNx$g1GIWBE@|6LC4VNTRVKQdozT=47oz!!^smNob;U(B_tmr=X}?bW#)4szcM z@l*2ikiYX=)d|XH0mZ^-6@dt%S?>rHzEc7J!~%p;7a;#7(v8!|Lp5zsy?#Mg7bk-y z&Z6#Qs`z8;gK(-a)ysn_`_K<2P5oc_Bsbsi@EpBhCEW#F)3-MhY$KExqmtc>HFQNO)COJ)V9u;lfF@-*gWvvOFBV z6{QD$dlKgJ0odZFWoijpu(Xx4CBR%Gfaq&9xi*=?fxx^Q- zv=NLS^P2#Pe&1(=VCJ6QGmjyR+#%nR+boWy6@&{q`bmbQAM(vw_n;7AdZE*Y8Cx+ImW7MsRjr7Izc9H)>TWo zg`rg7;L|6viGnlf(gj$YbtivN6V7)(L4&rAw|td>D8@N%v!7^) z=nR6vGvwj2qdNF0ELAAGo-f~I(rCW^xp%lBrbAmZHT04nWpD6wRCmzFu=2QPg(GNl zeHgkitx94;o+9tSF3W&bdHEz|aK7Z#592~iq>g-3jZ(|UQeVhh+4Aw(v--wLSNX;` z_2&18^kh5uuFkbbPI97%3|M8g=Mp{YN{jnLv0MSZud$2G7f*2}TdkId_3=Tw?Wdsj z+5rz@dI?YKVFXs}OHEjzlXG9*=v-4y5L4#f6N|L+n0b}3g2ir8--abksuA2ykY#Tz zDqhaCw5@D6>+X<9n`F4<3!1ZJ97VbA1U9xw&8-`UGV{2UWbmCn8zM~JkLD~h8EpEF zT%~Mh0fHA_c)1fFE^+GFquLQQNP#gIkG-Jw?$TxZ=}rty@m?PGE3L+CX*ys5v&w02)UI=F zupG(Bp(1|oUc38}3VJR-W*weezW0t=Y5xMBrd9QPdzseDePq?5w$>Y@k#Nyt**RIk zeT1ALA5Ts!T`<4tW31RgFg{S2pR^pW6|1F;=JH7dHI=|15?{8Bp&TZJ}OePlBKKbf;ZqPKtP8 zztWWXO_{9hp8OUH!*4oGuFf==osqJkN3#%+eX-U=xhIIw@=?gvTeCQcnE%)im;I#U**dec2WlGb}vBPP$q zvpV(FmoAHL(|@ zecSYk#Rl~>$}gPCi^Z$+p_#aZszT~#Gy%yM*s&+H0FwL8cXSn{){!?}vfkBcLqz>x zTaz#z!b(_M&#FrquLs-scTG-P?|d`%B@R)u7?S8p5jtGD(AorIG@^2w;k`-%(PRD zP4-b9-l@A~c_)=Q-8vaKtQ8h=eq+@pMeE9q*wYG?3>Vn#+ zByJPTOq9YK(Q;?G`y-`89bm-}u%>$9(Tbm&T#Tc&>5*cVv`XIK6~`SWLs$6;X(Z5> zHBKV_Hn|7t?>v!2?7mZjW!V1(Jf8PsyXN%1RT?uS5OdFaL;n6jFzh|oN=W$SE2>QV zR4$>kbx1$d*o}}%BI@RkZdh|U#MA#R>yzH!B|Z~F4BWr}e3e0=&*=}WrV>cTUV*o~ z=S!m4E&dauU1>prpu^J`Cj_TcH{hdV;%b%g7aWNNLVY41e5JMuep85E3v8My6yvqG zH5cbcn=ERT=)s zvu(t>ZpR1WOP;^Va?sXv3}Y)cyN_ufFexUMP`pUvIxO}Fx7TR~TjmIE6*e(aY?&k{ zI@LFHfG*g{rsnNTFck6ep?!KIBsTBzZ6nBFl-8n$~b792D%rT<#5wbqnsc7T*k9oaXj@b-fd?2j0I>^Ycg)_2X0 z&haPYgMAmMvF-SqxU;9pWuRGzA({d+B=_lWnp}&E$qP85q^4|!cTe)CLxi?jl%oyQ zDwD>a8+?%AuDJPTsjF@`PM@n`n3Yyf_*+-qFlMUSf9&JV>tE$Z8w5{MJDqyK0RdnG W)tv3Ib~k_jl~I;gm#daB4gNod Date: Mon, 8 Feb 2016 16:28:49 -0800 Subject: [PATCH 028/151] Adding a decorator around ui-select-match and ui-select-choices directives to insesert the a class on the template with the direcives name. This is to get around the fact that ui-select is pretty much abandonware an that it doesnt seem to play nicely with Angular 1.5.0's lazy compliation and/or it's new multiple transclustion feature. --- .../modules/core/forms/uiSelect.decorator.js | 29 +++++++++++++++++++ ...AdvancedSettingsSelector.directive.spec.js | 3 +- ...oupLoadBalancersSelector.directive.spec.js | 1 + package.json | 4 +-- 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/app/scripts/modules/core/forms/uiSelect.decorator.js b/app/scripts/modules/core/forms/uiSelect.decorator.js index 6b72172da77..952199a91ed 100644 --- a/app/scripts/modules/core/forms/uiSelect.decorator.js +++ b/app/scripts/modules/core/forms/uiSelect.decorator.js @@ -3,6 +3,34 @@ let angular = require('angular'); module.exports = function($provide) { + + $provide.decorator('uiSelectChoicesDirective', function($delegate) { + var directive = $delegate[0]; + + var templateUrl = directive.templateUrl; + + directive.templateUrl = function(element) { + element.addClass('ui-select-choices'); + return templateUrl(element); + }; + + return $delegate; + + }); + + $provide.decorator('uiSelectMatchDirective', function($delegate) { + var directive = $delegate[0]; + + var templateUrl = directive.templateUrl; + + directive.templateUrl = function(element) { + element.addClass('ui-select-match'); + return templateUrl(element); + }; + + return $delegate; + }); + $provide.decorator('uiSelectDirective', function ($delegate, $parse, $timeout, $document, uiSelectMinErr, uisOffset, uiSelectConfig) { var uiSelect = $delegate[0]; @@ -298,4 +326,5 @@ module.exports = function($provide) { return $delegate; }); + }; diff --git a/app/scripts/modules/google/serverGroup/configure/serverGroupAdvancedSettingsSelector.directive.spec.js b/app/scripts/modules/google/serverGroup/configure/serverGroupAdvancedSettingsSelector.directive.spec.js index 77715c21d81..a54c01b81fc 100644 --- a/app/scripts/modules/google/serverGroup/configure/serverGroupAdvancedSettingsSelector.directive.spec.js +++ b/app/scripts/modules/google/serverGroup/configure/serverGroupAdvancedSettingsSelector.directive.spec.js @@ -7,7 +7,8 @@ describe('Directive: GCE Group Advanced Settings Selector', function() { beforeEach( window.module( - require('./serverGroupAdvancedSettingsSelector.directive.js') + require('./serverGroupAdvancedSettingsSelector.directive.js'), + require('../../../core/forms/uiSelect.decorator') ) ); diff --git a/app/scripts/modules/google/serverGroup/configure/serverGroupLoadBalancersSelector.directive.spec.js b/app/scripts/modules/google/serverGroup/configure/serverGroupLoadBalancersSelector.directive.spec.js index 59f94999291..41bed345d82 100644 --- a/app/scripts/modules/google/serverGroup/configure/serverGroupLoadBalancersSelector.directive.spec.js +++ b/app/scripts/modules/google/serverGroup/configure/serverGroupLoadBalancersSelector.directive.spec.js @@ -10,6 +10,7 @@ describe('Directive: GCE Load Balancers Selector', function() { require('./serverGroupLoadBalancersSelector.directive.js'), require('./serverGroupConfiguration.service.js'), require('exports?"ui.select"!ui-select'), + require('../../../core/forms/uiSelect.decorator'), require('../../../core/utils/timeFormatters.js'), require('../../../core/utils/moment.js') ) diff --git a/package.json b/package.json index 250ca750c8f..441be185a21 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ }, "dependencies": { "Select2": "git://github.com/select2/select2.git#3.4.8", - "angular": "~1.4.1", - "angular-animate": "^1.4.1", + "angular": "~1.5.0", + "angular-animate": "~1.5.0", "angular-cache": "^4.2.2", "angular-debounce": "git://github.com/shahata/angular-debounce.git#0.1.7", "angular-filter": "^0.5.4", From f09b8e8cb03c8d8a85a5a12ffde0422170433e46 Mon Sep 17 00:00:00 2001 From: Lars Wander Date: Wed, 10 Feb 2016 12:56:59 -0500 Subject: [PATCH 029/151] provider/kubernetes: Surface instance details in UI --- .../instance/details/details.controller.js | 171 ++++++++++++++ .../kubernetes/instance/details/details.html | 212 ++++++++++++++++++ .../details/details.kubernetes.module.js | 8 + .../modules/kubernetes/kubernetes.module.js | 7 +- .../serverGroup/details/details.controller.js | 8 +- 5 files changed, 401 insertions(+), 5 deletions(-) create mode 100644 app/scripts/modules/kubernetes/instance/details/details.controller.js create mode 100644 app/scripts/modules/kubernetes/instance/details/details.html create mode 100644 app/scripts/modules/kubernetes/instance/details/details.kubernetes.module.js diff --git a/app/scripts/modules/kubernetes/instance/details/details.controller.js b/app/scripts/modules/kubernetes/instance/details/details.controller.js new file mode 100644 index 00000000000..f9379f44a65 --- /dev/null +++ b/app/scripts/modules/kubernetes/instance/details/details.controller.js @@ -0,0 +1,171 @@ +'use strict'; + +let angular = require('angular'); + +module.exports = angular.module('spinnaker.instance.detail.kubernetes.controller', [ + require('angular-ui-router'), + require('angular-ui-bootstrap'), + require('../../../core/instance/instance.write.service.js'), + require('../../../core/instance/instance.read.service.js'), + require('../../../core/confirmationModal/confirmationModal.service.js'), + require('../../../core/utils/lodash.js'), + require('../../../core/insight/insightFilterState.model.js'), + require('../../../core/history/recentHistory.service.js'), + require('../../../core/utils/selectOnDblClick.directive.js'), + require('../../../core/cloudProvider/cloudProvider.registry.js'), +]) + .controller('kubernetesInstanceDetailsController', function ($scope, $state, $uibModal, InsightFilterStateModel, + instanceWriter, confirmationModalService, recentHistoryService, + cloudProviderRegistry, instanceReader, _, instance, app, $q) { + // needed for standalone instances + $scope.detailsTemplateUrl = cloudProviderRegistry.getValue('kubernetes', 'instance.detailsTemplateUrl'); + + $scope.state = { + loading: true, + standalone: app.isStandalone, + }; + + $scope.InsightFilterStateModel = InsightFilterStateModel; + + function extractHealthMetrics(instance, latest) { + // do not backfill on standalone instances + if (app.isStandalone) { + instance.health = latest.health; + } + + instance.health = instance.health || []; + var displayableMetrics = instance.health.filter( + function(metric) { + return metric.type !== 'Kubernetes' || metric.state !== 'Unknown'; + }); + + // backfill details where applicable + if (latest.health) { + displayableMetrics.forEach(function (metric) { + var detailsMatch = latest.health.filter(function (latestHealth) { + return latestHealth.type === metric.type; + }); + if (detailsMatch.length) { + _.defaults(metric, detailsMatch[0]); + } + }); + } + $scope.healthMetrics = displayableMetrics; + } + + function retrieveInstance() { + var extraData = {}; + var instanceSummary, loadBalancers, account, namespace; + app.serverGroups.some(function (serverGroup) { + return serverGroup.instances.some(function (possibleInstance) { + if (possibleInstance.id === instance.instanceId) { + instanceSummary = possibleInstance; + loadBalancers = serverGroup.loadBalancers; + account = serverGroup.account; + namespace = serverGroup.region; + extraData.serverGroup = serverGroup.name; + return true; + } + }); + }); + + if (instanceSummary && account && namespace) { + extraData.account = account; + extraData.namespace = namespace; + recentHistoryService.addExtraDataToLatest('instances', extraData); + return instanceReader.getInstanceDetails(account, namespace, instance.instanceId).then(function(details) { + details = details.plain(); + $scope.state.loading = false; + extractHealthMetrics(instanceSummary, details); + $scope.instance = _.defaults(details, instanceSummary); + $scope.instance.account = account; + $scope.instance.namespace = namespace; + $scope.instance.loadBalancers = loadBalancers; + var pod = $scope.instance.pod; + $scope.instance.dnsPolicy = pod.spec.dnsPolicy; + $scope.instance.apiVersion = pod.apiVersion; + $scope.instance.kind = pod.kind; + $scope.instance.nodeName = pod.spec.nodeName; + $scope.instance.restartPolicy = pod.spec.restartPolicy; + $scope.instance.terminationGracePeriodSeconds = pod.spec.terminationGracePeriodSeconds; + $scope.instance.hostIp = pod.status.hostIP; + $scope.instance.podIp = pod.status.podIP; + $scope.instance.phase = pod.status.phase; + $scope.instance.volumes = pod.spec.volumes; + $scope.instance.metadata = pod.metadata; + $scope.instance.imagePullSecrets = pod.spec.imagePullSecrets; + $scope.instance.containers = pod.spec.containers; + $scope.instance.containerStatuses = pod.status.containerStatuses; + }, + autoClose + ); + } + + if (!instanceSummary) { + autoClose(); + } + + return $q.when(null); + } + + function autoClose() { + if ($scope.$$destroyed) { + return; + } + $state.params.allowModalToStayOpen = true; + $state.go('^', null, {location: 'replace'}); + } + + this.canRegisterWithLoadBalancer = function() { + }; + + this.canDeregisterFromLoadBalancer = function() { + }; + + this.canRegisterWithDiscovery = function() { + }; + + this.terminateInstance = function terminateInstance() { + }; + + this.terminateInstanceAndShrinkServerGroup = function terminateInstanceAndShrinkServerGroup() { + }; + + this.rebootInstance = function rebootInstance() { + }; + + this.registerInstanceWithLoadBalancer = function registerInstanceWithLoadBalancer() { + }; + + this.deregisterInstanceFromLoadBalancer = function deregisterInstanceFromLoadBalancer() { + }; + + this.enableInstanceInDiscovery = function enableInstanceInDiscovery() { + }; + + this.disableInstanceInDiscovery = function disableInstanceInDiscovery() { + }; + + this.hasHealthState = function hasHealthState(healthProviderType, state) { + var instance = $scope.instance; + return (instance.health.some(function (health) { + return health.type === healthProviderType && health.state === state; + }) + ); + }; + + retrieveInstance().then(() => { + // Two things to look out for here: + // 1. If the retrieveInstance call completes *after* the user has navigated away from the view, there + // is no point in subscribing to the autoRefreshStream + // 2. If this is a standalone instance, there is no application that will refresh + if (!$scope.$$destroyed && !app.isStandalone) { + let refreshWatcher = app.autoRefreshStream.subscribe(retrieveInstance); + $scope.$on('$destroy', () => refreshWatcher.dispose()); + } + }); + + $scope.account = instance.account; + + } +); diff --git a/app/scripts/modules/kubernetes/instance/details/details.html b/app/scripts/modules/kubernetes/instance/details/details.html new file mode 100644 index 00000000000..a8af9515b24 --- /dev/null +++ b/app/scripts/modules/kubernetes/instance/details/details.html @@ -0,0 +1,212 @@ +

+
+
+ + + +
+

+ +

+
+ +
+
+ + + +
+
+ +

+ {{instance.instanceId}} +

+
+
+
+
+ + +
+
+ + +
+
+
+
+
+
+ +
+
Launched
+
{{instance.launchTime | timestamp}}
+
(Unknown)
+
In
+
+ +
+
Server Group
+
+ {{instance.serverGroup}} +
+
API Version
+
{{instance.apiVersion}}
+
Kind
+
{{instance.kind}}
+
+ + +

+ No health metrics found for this instance +

+

+ Starting +

+ +
+
{{metric.type | robotToHuman}}
+
+
+ + + {{metric.state | robotToHuman}} + + + Health Check + | + Status + +
+
+ +
+
+ {{instance.phase}} +
+ +
+
+

Could not find the instance. No other details provided.

+
+
+ +
+
DNS Policy
+
+ {{instance.dnsPolicy}} +
Host IP
+
+ {{instance.hostIp}} + + +
+
Pod IP
+
+ {{instance.podIp}} + + +
+
+ + +
+ {{key}}: {{value}} +
+ + +
No containers associated with this pod
+
+
Name
+
{{container.name}}
+
Image
+
{{container.image}}
+
+
+
+
CPU Limit
+
{{container.resources.limits.cpu}}
+
+
+
Memory Limit
+
{{container.resources.limits.memory}}
+
+
+
+
+
CPU Request
+
{{container.resources.requests.cpu}}
+
+
+
Memory Request
+
{{container.resources.requests.memory}}
+
+
+
+
Image Pull Policy
+
{{container.imagePullPolicy}}
+
Termination Message Path
+
{{container.terminationMessagePath}} + + +
+
+
+
Ready
+
{{instance.containerStatuses[$index].ready}}
+
Restart Count
+
{{instance.containerStatuses[$index].restartCount}}
+
+
Running
+
+ Started At: {{instance.containerStatuses[$index].state.running.startedAt}} +
+
+
+
Waiting
+
+ Reason: {{instance.containerStatuses[$index].state.waiting.reason}} + Message: {{instance.containerStatuses[$index].state.waiting.message}} +
+
+
+
Terminated
+
+ Started At: {{instance.containerStatuses[$index].state.terminated.finishedAt}} + Finished At: {{instance.containerStatuses[$index].state.terminated.startedAt}} + Message: {{instance.containerStatuses[$index].state.terminated.message}} + Reason: {{instance.containerStatuses[$index].state.terminated.reason}} + Exit Code: {{instance.containerStatuses[$index].state.terminated.exitCode}} + Signal: {{instance.containerStatuses[$index].state.terminated.signal}} +
+
+
+ + + +
+
diff --git a/app/scripts/modules/kubernetes/instance/details/details.kubernetes.module.js b/app/scripts/modules/kubernetes/instance/details/details.kubernetes.module.js new file mode 100644 index 00000000000..abed13be969 --- /dev/null +++ b/app/scripts/modules/kubernetes/instance/details/details.kubernetes.module.js @@ -0,0 +1,8 @@ +'use strict'; + +let angular = require('angular'); + +module.exports = angular.module('spinnaker.instance.details.kubernetes', [ + require('../../../core/account/account.module.js'), + require('./details.controller.js'), +]); diff --git a/app/scripts/modules/kubernetes/kubernetes.module.js b/app/scripts/modules/kubernetes/kubernetes.module.js index fc1d3ed07e9..6494fddcce2 100644 --- a/app/scripts/modules/kubernetes/kubernetes.module.js +++ b/app/scripts/modules/kubernetes/kubernetes.module.js @@ -13,6 +13,7 @@ module.exports = angular.module('spinnaker.kubernetes', [ require('./serverGroup/configure/configure.kubernetes.module.js'), require('./serverGroup/details/details.kubernetes.module.js'), require('./serverGroup/transformer.js'), + require('./instance/details/details.kubernetes.module.js'), ]) .config(function(cloudProviderRegistryProvider) { cloudProviderRegistryProvider.registerProvider('kubernetes', { @@ -23,10 +24,14 @@ module.exports = angular.module('spinnaker.kubernetes', [ image: { reader: 'kubernetesImageReader', }, + instance: { + detailsTemplateUrl: require('./instance/details/details.html'), + detailsController: 'kubernetesInstanceDetailsController', + }, serverGroup: { transformer: 'kubernetesServerGroupTransformer', detailsTemplateUrl: require('./serverGroup/details/details.html'), - detailsController: 'kubernetesDetailsController', + detailsController: 'kubernetesServerGroupDetailsController', cloneServerGroupController: 'kubernetesCloneServerGroupController', cloneServerGroupTemplateUrl: require('./serverGroup/configure/wizard/wizard.html'), commandBuilder: 'kubernetesServerGroupCommandBuilder', diff --git a/app/scripts/modules/kubernetes/serverGroup/details/details.controller.js b/app/scripts/modules/kubernetes/serverGroup/details/details.controller.js index ad34369d5ea..923aef4ef1f 100644 --- a/app/scripts/modules/kubernetes/serverGroup/details/details.controller.js +++ b/app/scripts/modules/kubernetes/serverGroup/details/details.controller.js @@ -14,10 +14,10 @@ module.exports = angular.module('spinnaker.serverGroup.details.kubernetes.contro require('../../../core/insight/insightFilterState.model.js'), require('../../../core/utils/selectOnDblClick.directive.js'), ]) - .controller('kubernetesDetailsController', function ($scope, $state, app, serverGroup, InsightFilterStateModel, - serverGroupReader, $uibModal, serverGroupWriter, - runningExecutionsService, serverGroupWarningMessageService, - kubernetesServerGroupCommandBuilder) { + .controller('kubernetesServerGroupDetailsController', function ($scope, $state, app, serverGroup, InsightFilterStateModel, + serverGroupReader, $uibModal, serverGroupWriter, + runningExecutionsService, serverGroupWarningMessageService, + kubernetesServerGroupCommandBuilder) { let application = app; From 7278c9a60012a09fd913da48408dd728077e1be8 Mon Sep 17 00:00:00 2001 From: Steven Kim Date: Wed, 10 Feb 2016 19:51:37 +0000 Subject: [PATCH 030/151] Kubernetes icon for Server Groups --- app/scripts/modules/kubernetes/kubernetes.module.js | 2 ++ .../modules/kubernetes/logo/kubernetes.icon.svg | 10 ++++++++++ .../modules/kubernetes/logo/kubernetes.logo.less | 8 ++++++++ 3 files changed, 20 insertions(+) create mode 100644 app/scripts/modules/kubernetes/logo/kubernetes.icon.svg create mode 100644 app/scripts/modules/kubernetes/logo/kubernetes.logo.less diff --git a/app/scripts/modules/kubernetes/kubernetes.module.js b/app/scripts/modules/kubernetes/kubernetes.module.js index 6494fddcce2..68e171af655 100644 --- a/app/scripts/modules/kubernetes/kubernetes.module.js +++ b/app/scripts/modules/kubernetes/kubernetes.module.js @@ -2,6 +2,8 @@ let angular = require('angular'); +require('./logo/kubernetes.logo.less'); + // load all templates into the $templateCache var templates = require.context('./', true, /\.html$/); templates.keys().forEach(function(key) { diff --git a/app/scripts/modules/kubernetes/logo/kubernetes.icon.svg b/app/scripts/modules/kubernetes/logo/kubernetes.icon.svg new file mode 100644 index 00000000000..456416e5fa2 --- /dev/null +++ b/app/scripts/modules/kubernetes/logo/kubernetes.icon.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/app/scripts/modules/kubernetes/logo/kubernetes.logo.less b/app/scripts/modules/kubernetes/logo/kubernetes.logo.less new file mode 100644 index 00000000000..96dd29d39c5 --- /dev/null +++ b/app/scripts/modules/kubernetes/logo/kubernetes.logo.less @@ -0,0 +1,8 @@ +cloud-provider-logo { + .icon-kubernetes { + mask: url('kubernetes.icon.svg') no-repeat 50% 50%; + -webkit-mask: url('kubernetes.icon.svg') no-repeat 50% 0%; + mask-size: cover; + -webkit-mask-size: cover; + } +} From edced0179ee3c81ba2cd3fc7ddc62e49da3aae1b Mon Sep 17 00:00:00 2001 From: chrisb Date: Wed, 10 Feb 2016 14:51:15 -0800 Subject: [PATCH 031/151] mark instance type page complete when instance type selected --- .../wizard/CloneServerGroup.aws.controller.js | 5 ----- .../common/v2instanceArchetype.directive.html | 1 - .../v2instanceArchetypeSelector.directive.js | 15 +++++++++------ 3 files changed, 9 insertions(+), 12 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 index 8cc8afff43c..fce49e85970 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/CloneServerGroup.aws.controller.js +++ b/app/scripts/modules/amazon/serverGroup/configure/wizard/CloneServerGroup.aws.controller.js @@ -101,13 +101,9 @@ module.exports = angular.module('spinnaker.aws.cloneServerGroup.controller', [ } function initializeWizardState() { - if (serverGroupCommand.viewState.instanceProfile && serverGroupCommand.viewState.instanceProfile !== 'custom') { - v2modalWizardService.markComplete('instance-type'); - } var mode = serverGroupCommand.viewState.mode; if (mode === 'clone' || mode === 'editPipeline') { v2modalWizardService.markComplete('location'); - v2modalWizardService.markComplete('instance-type'); v2modalWizardService.markComplete('load-balancers'); v2modalWizardService.markComplete('security-groups'); v2modalWizardService.markComplete('capacity'); @@ -159,7 +155,6 @@ module.exports = angular.module('spinnaker.aws.cloneServerGroup.controller', [ v2modalWizardService.markDirty('capacity'); } if (result.dirty.instanceType) { - v2modalWizardService.markIncomplete('instance-type'); v2modalWizardService.markDirty('instance-type'); } } diff --git a/app/scripts/modules/core/serverGroup/configure/common/v2instanceArchetype.directive.html b/app/scripts/modules/core/serverGroup/configure/common/v2instanceArchetype.directive.html index 95acabaf07a..47e743784e1 100644 --- a/app/scripts/modules/core/serverGroup/configure/common/v2instanceArchetype.directive.html +++ b/app/scripts/modules/core/serverGroup/configure/common/v2instanceArchetype.directive.html @@ -15,7 +15,6 @@


{{in diff --git a/app/scripts/modules/core/serverGroup/configure/common/v2instanceArchetypeSelector.directive.js b/app/scripts/modules/core/serverGroup/configure/common/v2instanceArchetypeSelector.directive.js index 38c319467bb..e56a5b1ce6f 100644 --- a/app/scripts/modules/core/serverGroup/configure/common/v2instanceArchetypeSelector.directive.js +++ b/app/scripts/modules/core/serverGroup/configure/common/v2instanceArchetypeSelector.directive.js @@ -54,12 +54,6 @@ module.exports = angular.module('spinnaker.core.serverGroup.configure.common.v2i ); if (!found) { $scope.command.instanceType = null; - try { - v2modalWizardService.markIncomplete('instance-type'); - } catch (e) { - $log.warn('DEV NOTE: Using deprecated wizard service; consider upgrading to v2 modal wizard'); - modalWizardService.getWizard().markIncomplete('instance-type'); - } } } } @@ -74,9 +68,18 @@ module.exports = angular.module('spinnaker.core.serverGroup.configure.common.v2i $log.warn('DEV NOTE: Using deprecated wizard service; consider upgrading to v2 modal wizard'); modalWizardService.getWizard().markComplete('instance-type'); } + } else { + try { + v2modalWizardService.markIncomplete('instance-type'); + } catch (e) { + $log.warn('DEV NOTE: Using deprecated wizard service; consider upgrading to v2 modal wizard'); + modalWizardService.getWizard().markIncomplete('instance-type'); + } } }; + $scope.$watch('command.instanceType', this.updateInstanceType); + if ($scope.command.region && $scope.command.instanceType && !$scope.command.viewState.instanceProfile) { this.selectInstanceType('custom'); } From 1b1c08d97393ffc66d53fcee57df7bb85846bb00 Mon Sep 17 00:00:00 2001 From: chrisb Date: Wed, 10 Feb 2016 09:56:28 -0800 Subject: [PATCH 032/151] allow rendering of up to 50 executions per pipeline --- .../service/applications.read.service.spec.js | 8 ++--- .../core/cluster/cluster.service.spec.js | 2 +- .../executions/executions.controller.js | 17 +++++---- .../core/delivery/executions/executions.html | 4 ++- .../core/delivery/executions/executions.less | 8 ++--- .../filter/executionFilter.controller.js | 10 ++++-- .../core/delivery/filter/filterNav.html | 16 ++++----- .../delivery/service/execution.service.js | 12 ++++--- .../service/execution.service.spec.js | 11 +++--- .../executions.transformer.service.spec.js | 36 +++++++++---------- .../orchestratedItem.transformer.js | 6 ++-- .../orchestratedItem.transformer.spec.js | 2 +- .../pipeline/config/graph/pipelineGraph.less | 2 +- .../pipelineTriggerOptions.directive.js | 2 +- .../modules/core/pipeline/pipelines.less | 2 +- .../presentation/less/imports/colors.less | 2 +- .../modules/core/presentation/main.less | 5 +-- .../task/monitor/taskMonitorService.spec.js | 2 +- .../core/task/task.read.service.spec.js | 14 ++++---- .../core/task/tasks.controller.spec.js | 8 ++--- .../modules/core/task/tasks.fixture.js | 8 ++--- app/scripts/modules/core/task/tasks.html | 4 +-- .../stage/canary/canaryStage.transformer.js | 2 +- .../stage/canary/canaryStatus.directive.js | 2 +- 24 files changed, 101 insertions(+), 84 deletions(-) diff --git a/app/scripts/modules/core/application/service/applications.read.service.spec.js b/app/scripts/modules/core/application/service/applications.read.service.spec.js index b0efbcd837b..e70cbfcc14a 100644 --- a/app/scripts/modules/core/application/service/applications.read.service.spec.js +++ b/app/scripts/modules/core/application/service/applications.read.service.spec.js @@ -56,7 +56,7 @@ describe('Service: applicationReader', function () { describe('loading executions', function () { it('loads executions and sets appropriate flags', function () { - spyOn(executionService, 'getRunningExecutions').and.returnValue($q.when([{status: 'COMPLETED', stages: []}])); + spyOn(executionService, 'getRunningExecutions').and.returnValue($q.when([{status: 'SUCCEEDED', stages: []}])); var result = null; loadApplication([], [], [], {executions: true}).then((app) => { result = app; @@ -84,7 +84,7 @@ describe('Service: applicationReader', function () { describe('reload executions', function () { it('reloads executions and sets appropriate flags', function () { - spyOn(executionService, 'getRunningExecutions').and.returnValue($q.when([{status: 'COMPLETED', stages: []}])); + spyOn(executionService, 'getRunningExecutions').and.returnValue($q.when([{status: 'SUCCEEDED', stages: []}])); var result = null, nextCalls = 0; loadApplication([], [], [], {executions: true}).then((app) => { @@ -138,7 +138,7 @@ describe('Service: applicationReader', function () { describe('loading tasks', function () { it('loads tasks and sets appropriate flags', function () { - spyOn(taskReader, 'getRunningTasks').and.returnValue($q.when([{status: 'COMPLETED'}])); + spyOn(taskReader, 'getRunningTasks').and.returnValue($q.when([{status: 'SUCCEEDED'}])); var result = null; loadApplication([], [], [], {tasks: true}).then((app) => { result = app; @@ -166,7 +166,7 @@ describe('Service: applicationReader', function () { describe('reload tasks', function () { it('reloads tasks and sets appropriate flags', function () { - spyOn(taskReader, 'getRunningTasks').and.returnValue($q.when([{status: 'COMPLETED'}])); + spyOn(taskReader, 'getRunningTasks').and.returnValue($q.when([{status: 'SUCCEEDED'}])); var result = null, nextCalls = 0; loadApplication([], [], [], {tasks: true}).then((app) => { diff --git a/app/scripts/modules/core/cluster/cluster.service.spec.js b/app/scripts/modules/core/cluster/cluster.service.spec.js index 62a7baf4579..6fb9a82a41d 100644 --- a/app/scripts/modules/core/cluster/cluster.service.spec.js +++ b/app/scripts/modules/core/cluster/cluster.service.spec.js @@ -253,7 +253,7 @@ describe('Service: InstanceType', function () { it('ignores non-running tasks', function() { var app = this.application; this.buildCommonTask('resizeasg'); - app.tasks[0].status = 'COMPLETED'; + app.tasks[0].status = 'SUCCEEDED'; clusterService.addTasksToServerGroups(app); app.serverGroups.forEach(function(serverGroup) { expect(serverGroup.runningTasks.length).toBe(0); diff --git a/app/scripts/modules/core/delivery/executions/executions.controller.js b/app/scripts/modules/core/delivery/executions/executions.controller.js index 761140f8b40..41c72c145a6 100644 --- a/app/scripts/modules/core/delivery/executions/executions.controller.js +++ b/app/scripts/modules/core/delivery/executions/executions.controller.js @@ -41,13 +41,18 @@ module.exports = angular.module('spinnaker.core.delivery.executions.controller', this.updateExecutionGroups(); }; - this.updateExecutionGroups = () => { + this.updateExecutionGroups = (reload) => { normalizeExecutionNames(); ExecutionFilterModel.applyParamsToUrl(); - executionFilterService.updateExecutionGroups(this.application); - this.tags = ExecutionFilterModel.tags; - // updateExecutionGroups is debounced by 25ms, so we need to delay setting the loading flag a bit - $timeout(() => { this.viewState.loading = false; }, 50); + if (reload) { + this.application.reloadingExecutionsForFilters = true; + this.application.reloadExecutions(); + } else { + executionFilterService.updateExecutionGroups(this.application); + this.tags = ExecutionFilterModel.tags; + // updateExecutionGroups is debounced by 25ms, so we need to delay setting the loading flag a bit + $timeout(() => { this.viewState.loading = false; }, 50); + } }; this.viewState = { @@ -72,7 +77,7 @@ module.exports = angular.module('spinnaker.core.delivery.executions.controller', } }); - $scope.filterCountOptions = [1, 2, 5, 10, 20]; + $scope.filterCountOptions = [1, 2, 5, 10, 20, 30, 40, 50]; let dataInitializationFailure = () => { this.viewState.loading = false; diff --git a/app/scripts/modules/core/delivery/executions/executions.html b/app/scripts/modules/core/delivery/executions/executions.html index 0271fa06c0c..3a09a386c44 100644 --- a/app/scripts/modules/core/delivery/executions/executions.html +++ b/app/scripts/modules/core/delivery/executions/executions.html @@ -37,7 +37,7 @@

- executions per pipeline @@ -67,6 +67,8 @@

+
+

No pipelines configured for this application.

diff --git a/app/scripts/modules/core/delivery/executions/executions.less b/app/scripts/modules/core/delivery/executions/executions.less index cd0da0fe0f0..be18d4e3258 100644 --- a/app/scripts/modules/core/delivery/executions/executions.less +++ b/app/scripts/modules/core/delivery/executions/executions.less @@ -52,7 +52,7 @@ executions { .execution-status-failed { color: @unhealthy_red; } -.execution-status-completed { +.execution-status-succeeded { color: @healthy_green_border; } @@ -63,9 +63,9 @@ executions { fill: @stage-failed; background-color: @stage-failed; } - &.execution-marker-completed { - fill: @stage-completed; - background-color: @stage-completed; + &.execution-marker-succeeded { + fill: @stage-succeeded; + background-color: @stage-succeeded; } &.execution-marker-running { fill: @stage-running; diff --git a/app/scripts/modules/core/delivery/filter/executionFilter.controller.js b/app/scripts/modules/core/delivery/filter/executionFilter.controller.js index 0b4187ae799..6de09ba5f9b 100644 --- a/app/scripts/modules/core/delivery/filter/executionFilter.controller.js +++ b/app/scripts/modules/core/delivery/filter/executionFilter.controller.js @@ -26,9 +26,14 @@ module.exports = angular.module('spinnaker.core.delivery.filter.executionFilter. this.pipelineSortOptions.disabled = true; }; - this.updateExecutionGroups = () => { + this.updateExecutionGroups = (reload) => { ExecutionFilterModel.applyParamsToUrl(); - executionFilterService.updateExecutionGroups(this.application); + if (reload) { + this.application.reloadingExecutionsForFilters = true; + this.application.reloadExecutions(); + } else { + executionFilterService.updateExecutionGroups(this.application); + } }; this.clearFilters = () => { @@ -46,6 +51,7 @@ module.exports = angular.module('spinnaker.core.delivery.filter.executionFilter. .map((option) => option.name); this.pipelineNames = _.uniq(allOptions); this.updateExecutionGroups(); + this.application.reloadingExecutionsForFilters = false; }; var executionWatcher = this.application.executionRefreshStream.subscribe(this.initialize); diff --git a/app/scripts/modules/core/delivery/filter/filterNav.html b/app/scripts/modules/core/delivery/filter/filterNav.html index 6041d61411d..2da1b3a1598 100644 --- a/app/scripts/modules/core/delivery/filter/filterNav.html +++ b/app/scripts/modules/core/delivery/filter/filterNav.html @@ -53,7 +53,7 @@

@@ -61,23 +61,23 @@

@@ -85,7 +85,7 @@

@@ -93,7 +93,7 @@

diff --git a/app/scripts/modules/core/delivery/service/execution.service.js b/app/scripts/modules/core/delivery/service/execution.service.js index 2ea1213e86c..8076ede130d 100644 --- a/app/scripts/modules/core/delivery/service/execution.service.js +++ b/app/scripts/modules/core/delivery/service/execution.service.js @@ -5,21 +5,23 @@ module.exports = angular.module('spinnaker.core.delivery.executions.service', [ require('../../cache/deckCacheFactory.js'), require('../../utils/appendTransform.js'), require('../../config/settings.js'), + require('../filter/executionFilter.model.js'), require('./executions.transformer.service.js') ]) - .factory('executionService', function($http, $timeout, $q, $log, + .factory('executionService', function($http, $timeout, $q, $log, ExecutionFilterModel, settings, appendTransform, executionsTransformer) { const activeStatuses = ['RUNNING', 'SUSPENDED', 'PAUSED', 'NOT_STARTED']; + const runningLimit = 30; function getRunningExecutions(applicationName) { - return getExecutions(applicationName, activeStatuses); + return getExecutions(applicationName, {statuses: activeStatuses, limit: runningLimit}); } - function getExecutions(applicationName, statuses = []) { - let url = [ settings.gateUrl, 'applications', applicationName, 'pipelines'].join('/'); + function getExecutions(applicationName, {statuses = Object.keys(ExecutionFilterModel.sortFilter.status), limit = ExecutionFilterModel.sortFilter.count} = {}) { + let url = [ settings.gateUrl, 'applications', applicationName, `pipelines?limit=${limit}`].join('/'); if (statuses.length) { - url += '?statuses=' + statuses.map((status) => status.toUpperCase()).join(','); + url += '&statuses=' + statuses.map((status) => status.toUpperCase()).join(','); } return $http({ method: 'GET', diff --git a/app/scripts/modules/core/delivery/service/execution.service.spec.js b/app/scripts/modules/core/delivery/service/execution.service.spec.js index 1c2c9027b10..e2eb4fc4dc2 100644 --- a/app/scripts/modules/core/delivery/service/execution.service.spec.js +++ b/app/scripts/modules/core/delivery/service/execution.service.spec.js @@ -15,12 +15,13 @@ describe('Service: executionService', function () { ); beforeEach( - window.inject(function (_executionService_, _$httpBackend_, _settings_, _$timeout_, _$q_) { + window.inject(function (_executionService_, _$httpBackend_, _settings_, _$timeout_, _$q_, ExecutionFilterModel) { executionService = _executionService_; $httpBackend = _$httpBackend_; settings = _settings_; timeout = _$timeout_; $q = _$q_; + ExecutionFilterModel.sortFilter.count = 3; }) ); @@ -35,7 +36,7 @@ describe('Service: executionService', function () { let executionId = 'abc'; let cancelUrl = [ settings.gateUrl, 'applications', 'deck', 'pipelines', executionId, 'cancel' ].join('/'); let checkUrl = [ settings.gateUrl, 'applications', 'deck', 'pipelines' ].join('/') - .concat('?statuses=RUNNING,SUSPENDED,PAUSED,NOT_STARTED'); + .concat('?limit=30&statuses=RUNNING,SUSPENDED,PAUSED,NOT_STARTED'); let application = { name: 'deck', reloadExecutions: () => $q.when(null) }; $httpBackend.expectPUT(cancelUrl).respond(200, []); @@ -70,7 +71,7 @@ describe('Service: executionService', function () { let completed = false; let executionId = 'abc'; let deleteUrl = [ settings.gateUrl, 'pipelines', executionId ].join('/'); - let checkUrl = [ settings.gateUrl, 'applications', 'deck', 'pipelines' ].join('/'); + let checkUrl = [ settings.gateUrl, 'applications', 'deck', 'pipelines?limit=3' ].join('/'); let application = { name: 'deck', reloadExecutions: () => $q.when(null) }; $httpBackend.expectDELETE(deleteUrl).respond(200, []); @@ -153,7 +154,7 @@ describe('Service: executionService', function () { settings.gateUrl, 'applications', 'deck', - 'pipelines', + 'pipelines?limit=3', ].join('/'); $httpBackend.expectGET(url).respond(200, []); @@ -177,7 +178,7 @@ describe('Service: executionService', function () { settings.gateUrl, 'applications', 'deck', - 'pipelines', + 'pipelines?limit=3', ].join('/'); $httpBackend.expectGET(url).respond(429, []); diff --git a/app/scripts/modules/core/delivery/service/executions.transformer.service.spec.js b/app/scripts/modules/core/delivery/service/executions.transformer.service.spec.js index cdf2f65cd41..768d7c4e317 100644 --- a/app/scripts/modules/core/delivery/service/executions.transformer.service.spec.js +++ b/app/scripts/modules/core/delivery/service/executions.transformer.service.spec.js @@ -108,11 +108,11 @@ describe('executionTransformerService', function() { it('should set summary status and start/end times based on child stages', function() { var execution = { stages: [ - { id: '1', name: 'bake', status: 'COMPLETED', startTime: 7, endTime: 8 }, + { id: '1', name: 'bake', status: 'SUCCEEDED', startTime: 7, endTime: 8 }, { id: '2', name: 'deploy', status: 'RUNNING', startTime: 7 }, { id: '3', name: 'wait', status: 'NOT_STARTED' }, - { id: '4', parentStageId: '2', syntheticStageOwner: 'STAGE_BEFORE', status: 'COMPLETED', startTime: 4, endTime: 6}, - { id: '5', parentStageId: '1', syntheticStageOwner: 'STAGE_BEFORE', status: 'COMPLETED', startTime: 5, endTime: 6}, + { id: '4', parentStageId: '2', syntheticStageOwner: 'STAGE_BEFORE', status: 'SUCCEEDED', startTime: 4, endTime: 6}, + { id: '5', parentStageId: '1', syntheticStageOwner: 'STAGE_BEFORE', status: 'SUCCEEDED', startTime: 5, endTime: 6}, { id: '6', parentStageId: '2', syntheticStageOwner: 'STAGE_BEFORE', status: 'NOT_STARTED' }, { id: '7', parentStageId: '3', syntheticStageOwner: 'STAGE_BEFORE', status: 'NOT_STARTED' }, { id: '8', parentStageId: '3', syntheticStageOwner: 'STAGE_AFTER', status: 'NOT_STARTED' }, @@ -120,7 +120,7 @@ describe('executionTransformerService', function() { }; this.transformer.transformExecution({}, execution); - expect(execution.stageSummaries[0].status).toBe('COMPLETED'); + expect(execution.stageSummaries[0].status).toBe('SUCCEEDED'); expect(execution.stageSummaries[0].startTime).toBe(5); expect(execution.stageSummaries[0].endTime).toBe(8); @@ -136,8 +136,8 @@ describe('executionTransformerService', function() { it('should remove stage summary end time if current stage is still running', function () { var execution = { stages: [ - { id: '2', name: 'deploy', status: 'COMPLETED', startTime: 7, endTime: 8 }, - { id: '4', parentStageId: '2', syntheticStageOwner: 'STAGE_BEFORE', status: 'COMPLETED', startTime: 4, endTime: 6}, + { id: '2', name: 'deploy', status: 'SUCCEEDED', startTime: 7, endTime: 8 }, + { id: '4', parentStageId: '2', syntheticStageOwner: 'STAGE_BEFORE', status: 'SUCCEEDED', startTime: 4, endTime: 6}, { id: '6', parentStageId: '2', syntheticStageOwner: 'STAGE_BEFORE', status: 'RUNNING', startTime: 6 }, ] }; @@ -148,10 +148,10 @@ describe('executionTransformerService', function() { it('should set stage summary end time to the maximum value of all stage end times', function () { var execution = { stages: [ - { id: '2', name: 'deploy', status: 'COMPLETED', startTime: 7, endTime: 8 }, - { id: '4', parentStageId: '2', syntheticStageOwner: 'STAGE_BEFORE', status: 'COMPLETED', startTime: 4, endTime: 6}, - { id: '5', parentStageId: '2', syntheticStageOwner: 'STAGE_BEFORE', status: 'COMPLETED', startTime: 4, endTime: 9}, - { id: '6', parentStageId: '2', syntheticStageOwner: 'STAGE_AFTER', status: 'COMPLETED', startTime: 6, endTime: 11 }, + { id: '2', name: 'deploy', status: 'SUCCEEDED', startTime: 7, endTime: 8 }, + { id: '4', parentStageId: '2', syntheticStageOwner: 'STAGE_BEFORE', status: 'SUCCEEDED', startTime: 4, endTime: 6}, + { id: '5', parentStageId: '2', syntheticStageOwner: 'STAGE_BEFORE', status: 'SUCCEEDED', startTime: 4, endTime: 9}, + { id: '6', parentStageId: '2', syntheticStageOwner: 'STAGE_AFTER', status: 'SUCCEEDED', startTime: 6, endTime: 11 }, ] }; this.transformer.transformExecution({}, execution); @@ -161,9 +161,9 @@ describe('executionTransformerService', function() { it('should not set stage status, start/end times based on child stages on non-summary stages', function() { var execution = { stages: [ - { id: '1', name: 'bake', status: 'COMPLETED', startTime: 7, endTime: 8 }, - { id: '2', parentStageId: '1', syntheticStageOwner: 'STAGE_AFTER', status: 'COMPLETED', startTime: 8, endTime: 9}, - { id: '3', parentStageId: '2', syntheticStageOwner: 'STAGE_BEFORE', status: 'COMPLETED', startTime: 7, endTime: 8}, + { id: '1', name: 'bake', status: 'SUCCEEDED', startTime: 7, endTime: 8 }, + { id: '2', parentStageId: '1', syntheticStageOwner: 'STAGE_AFTER', status: 'SUCCEEDED', startTime: 8, endTime: 9}, + { id: '3', parentStageId: '2', syntheticStageOwner: 'STAGE_BEFORE', status: 'SUCCEEDED', startTime: 7, endTime: 8}, { id: '4', parentStageId: '2', syntheticStageOwner: 'STAGE_AFTER', status: 'RUNNING', startTime: 11 }, { id: '5', parentStageId: '2', syntheticStageOwner: 'STAGE_AFTER', status: 'NOT_STARTED' }, ] @@ -184,7 +184,7 @@ describe('executionTransformerService', function() { expect(_.pluck(summary.stages, 'id')).toEqual(['1', '3', '2', '4', '5']); expect(nested.id).toBe('2'); - expect(nested.status).toBe('COMPLETED'); + expect(nested.status).toBe('SUCCEEDED'); expect(nested.startTime).toBe(8); expect(nested.endTime).toBe(9); }); @@ -192,10 +192,10 @@ describe('executionTransformerService', function() { it('should add startTime to stage summary based on min of child stage start times if first stage has no start time', function () { var execution = { stages: [ - { id: '2', name: 'deploy', status: 'COMPLETED', startTime: null, endTime: 8 }, - { id: '4', parentStageId: '2', syntheticStageOwner: 'STAGE_BEFORE', status: 'COMPLETED', startTime: null, endTime: 6}, - { id: '5', parentStageId: '2', syntheticStageOwner: 'STAGE_BEFORE', status: 'COMPLETED', startTime: 11, endTime: 9}, - { id: '6', parentStageId: '2', syntheticStageOwner: 'STAGE_AFTER', status: 'COMPLETED', startTime: 4, endTime: 11 }, + { id: '2', name: 'deploy', status: 'SUCCEEDED', startTime: null, endTime: 8 }, + { id: '4', parentStageId: '2', syntheticStageOwner: 'STAGE_BEFORE', status: 'SUCCEEDED', startTime: null, endTime: 6}, + { id: '5', parentStageId: '2', syntheticStageOwner: 'STAGE_BEFORE', status: 'SUCCEEDED', startTime: 11, endTime: 9}, + { id: '6', parentStageId: '2', syntheticStageOwner: 'STAGE_AFTER', status: 'SUCCEEDED', startTime: 4, endTime: 11 }, ] }; this.transformer.transformExecution({}, execution); diff --git a/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.js b/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.js index 892df1b8fe5..f1830b96644 100644 --- a/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.js +++ b/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.js @@ -72,7 +72,7 @@ module.exports = angular.module('spinnaker.core.orchestratedItem.transformer', [ }, isCompleted: { get: function() { - return item.status === 'COMPLETED'; + return item.status === 'SUCCEEDED'; }, }, isRunning: { @@ -111,7 +111,7 @@ module.exports = angular.module('spinnaker.core.orchestratedItem.transformer', [ } }, status: { - // Returns either COMPLETED, RUNNING, FAILED, CANCELED, or NOT_STARTED + // Returns either SUCCEEDED, RUNNING, FAILED, CANCELED, or NOT_STARTED get: function() { return normalizeStatus(item); }, set: function(status) { item.originalStatus = status; @@ -138,7 +138,7 @@ module.exports = angular.module('spinnaker.core.orchestratedItem.transformer', [ switch(item.originalStatus) { case 'COMPLETED': case 'SUCCEEDED': - return 'COMPLETED'; + return 'SUCCEEDED'; case 'STARTED': case 'EXECUTING': case 'RUNNING': diff --git a/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.spec.js b/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.spec.js index 006ca3c5b7a..28b4ff26525 100644 --- a/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.spec.js +++ b/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.spec.js @@ -241,7 +241,7 @@ describe('orchestratedItem transformer', function () { }); it('returns null if no failure message is present', function () { - expect(getMessage({ status: 'COMPLETED' })).toBe(null); + expect(getMessage({ status: 'SUCCEEDED' })).toBe(null); }); it('returns null if tide task succeeded', function () { diff --git a/app/scripts/modules/core/pipeline/config/graph/pipelineGraph.less b/app/scripts/modules/core/pipeline/config/graph/pipelineGraph.less index 48a228d4004..7dc5513229f 100644 --- a/app/scripts/modules/core/pipeline/config/graph/pipelineGraph.less +++ b/app/scripts/modules/core/pipeline/config/graph/pipelineGraph.less @@ -44,7 +44,7 @@ pipeline-graph { stroke: @unhealthy_red; } &.completed { - stroke: @stage-completed; + stroke: @stage-succeeded; } &.not_started, &.suspended, &.canceled, &.unknown { stroke: @mid_light_grey; diff --git a/app/scripts/modules/core/pipeline/config/triggers/pipeline/pipelineTriggerOptions.directive.js b/app/scripts/modules/core/pipeline/config/triggers/pipeline/pipelineTriggerOptions.directive.js index 58428dccc2a..577261195db 100644 --- a/app/scripts/modules/core/pipeline/config/triggers/pipeline/pipelineTriggerOptions.directive.js +++ b/app/scripts/modules/core/pipeline/config/triggers/pipeline/pipelineTriggerOptions.directive.js @@ -51,7 +51,7 @@ module.exports = angular return; } this.viewState.executionsLoading = true; - executionService.getExecutions(command.trigger.application) + executionService.getExecutions(command.trigger.application, {statuses: []}) .then(executionLoadSuccess, executionLoadFailure); }; diff --git a/app/scripts/modules/core/pipeline/pipelines.less b/app/scripts/modules/core/pipeline/pipelines.less index 62657810117..739f4bc8909 100644 --- a/app/scripts/modules/core/pipeline/pipelines.less +++ b/app/scripts/modules/core/pipeline/pipelines.less @@ -71,7 +71,7 @@ } } - .label-completed { + .label-succeeded { background-color: @healthy_green_border; } .label-failed, .label-terminated { diff --git a/app/scripts/modules/core/presentation/less/imports/colors.less b/app/scripts/modules/core/presentation/less/imports/colors.less index 30ba1ce2c8f..6f69b9405f1 100644 --- a/app/scripts/modules/core/presentation/less/imports/colors.less +++ b/app/scripts/modules/core/presentation/less/imports/colors.less @@ -57,7 +57,7 @@ @bootstrap_info: #d9edf7; -@stage-completed: #769D3E; +@stage-succeeded: #769D3E; @stage-failed: #b82525; @stage-running: #2275b8; @stage-default: #cccccc; diff --git a/app/scripts/modules/core/presentation/main.less b/app/scripts/modules/core/presentation/main.less index 60813437532..02da4b5721a 100644 --- a/app/scripts/modules/core/presentation/main.less +++ b/app/scripts/modules/core/presentation/main.less @@ -773,7 +773,7 @@ tfoot .add-new { position:fixed; top: 58px; width:100%; - height:100% + height:100%; } .transition-overlay { @@ -782,7 +782,8 @@ tfoot .add-new { opacity:.7; position:fixed; width:100%; - height:100% + height:100%; + transition: opacity 0.2s; } .panel { diff --git a/app/scripts/modules/core/task/monitor/taskMonitorService.spec.js b/app/scripts/modules/core/task/monitor/taskMonitorService.spec.js index a2b73b6eddf..db2874b5696 100644 --- a/app/scripts/modules/core/task/monitor/taskMonitorService.spec.js +++ b/app/scripts/modules/core/task/monitor/taskMonitorService.spec.js @@ -49,7 +49,7 @@ describe('Service: taskMonitorService', function () { $http.flush(); expect(monitor.task.isCompleted).toBe(false); - $http.expectGET(['/applications', 'deck', 'tasks', 'a'].join('/')).respond(200, { status: 'COMPLETED' }); + $http.expectGET(['/applications', 'deck', 'tasks', 'a'].join('/')).respond(200, { status: 'SUCCEEDED' }); $timeout.flush(); // complete second time $http.flush(); diff --git a/app/scripts/modules/core/task/task.read.service.spec.js b/app/scripts/modules/core/task/task.read.service.spec.js index 24ae7ef97e9..19efc6d5a7b 100644 --- a/app/scripts/modules/core/task/task.read.service.spec.js +++ b/app/scripts/modules/core/task/task.read.service.spec.js @@ -39,7 +39,7 @@ describe('Service: taskReader', function () { $http.whenGET('/applications/deck/tasks/1').respond(200, { id: 1, foo: 3, - status: 'COMPLETED' + status: 'SUCCEEDED' }); var completed = false; @@ -58,7 +58,7 @@ describe('Service: taskReader', function () { $http.whenGET('/applications/deck/tasks/1').respond(200, { id: 1, foo: 3, - status: 'COMPLETED' + status: 'SUCCEEDED' }); var completed = false, @@ -105,7 +105,7 @@ describe('Service: taskReader', function () { expect(failed).toBe(false); // succeeds - $http.expectGET('/applications/deck/tasks/1').respond(200, { id: 1, status: 'COMPLETED' }); + $http.expectGET('/applications/deck/tasks/1').respond(200, { id: 1, status: 'SUCCEEDED' }); cycle(); expect(completed).toBe(true); expect(failed).toBe(false); @@ -179,7 +179,7 @@ describe('Service: taskReader', function () { it('uses start time to calculate running time if endTime is zero', function () { $http.whenGET('/applications/deck/tasks/1').respond(200, { id: 2, - status: 'COMPLETED', + status: 'SUCCEEDED', startTime: new Date(), endTime: 0 }); @@ -192,7 +192,7 @@ describe('Service: taskReader', function () { it('uses start time to calculate running time if endTime is not present', function () { $http.whenGET('/applications/deck/tasks/1').respond(200, { id: 2, - status: 'COMPLETED', + status: 'SUCCEEDED', startTime: new Date() }); @@ -206,7 +206,7 @@ describe('Service: taskReader', function () { end = start + 120 * 1000; $http.whenGET('/applications/deck/tasks/1').respond(200, { id: 2, - status: 'COMPLETED', + status: 'SUCCEEDED', startTime: start, endTime: end }); @@ -221,7 +221,7 @@ describe('Service: taskReader', function () { offset = 200000; $http.whenGET('/applications/deck/tasks/1').respond(200, { id: 2, - status: 'COMPLETED', + status: 'SUCCEEDED', startTime: now + offset }); diff --git a/app/scripts/modules/core/task/tasks.controller.spec.js b/app/scripts/modules/core/task/tasks.controller.spec.js index 558ab030b0f..0d6aec11387 100644 --- a/app/scripts/modules/core/task/tasks.controller.spec.js +++ b/app/scripts/modules/core/task/tasks.controller.spec.js @@ -125,7 +125,7 @@ describe('Controller: tasks', function () { describe('Filtering Task list with one running task', function () { var application = { tasks: [ - {status: 'COMPLETED', name: 'a'}, + {status: 'SUCCEEDED', name: 'a'}, {status: 'RUNNING', name: 'a'}, ] }; @@ -161,8 +161,8 @@ describe('Controller: tasks', function () { describe('Filtering Task list with zero running task', function () { var application = { tasks: [ - {status: 'COMPLETED', startTime: 22, name: 'a'}, - {status: 'COMPLETED', startTime: 100, name: 'a'}, + {status: 'SUCCEEDED', startTime: 22, name: 'a'}, + {status: 'SUCCEEDED', startTime: 100, name: 'a'}, ] }; @@ -173,7 +173,7 @@ describe('Controller: tasks', function () { expect(sortedList.length).toBe(2); expect(sortedList[0].startTime).toBe(100); sortedList.forEach(function(task) { - expect(task.status).toEqual('COMPLETED'); + expect(task.status).toEqual('SUCCEEDED'); }); }); }); diff --git a/app/scripts/modules/core/task/tasks.fixture.js b/app/scripts/modules/core/task/tasks.fixture.js index d7d97ec40c9..2ac270cebb0 100644 --- a/app/scripts/modules/core/task/tasks.fixture.js +++ b/app/scripts/modules/core/task/tasks.fixture.js @@ -17,7 +17,7 @@ TasksFixture.initialSnapshot = [ }, { id: 2, - status: 'COMPLETED', + status: 'SUCCEEDED', variables: [ { key: 'description', @@ -50,7 +50,7 @@ TasksFixture.initialSnapshot = [ TasksFixture.secondSnapshot = [ { id: 1, - status: 'COMPLETED', + status: 'SUCCEEDED', variables: [ { key: 'description', @@ -65,7 +65,7 @@ TasksFixture.secondSnapshot = [ }, { id: 2, - status: 'COMPLETED', + status: 'SUCCEEDED', variables: [ { key: 'description', @@ -110,7 +110,7 @@ TasksFixture.secondSnapshot = [ }, { id: 5, - status: 'COMPLETED', + status: 'SUCCEEDED', variables: [ { key: 'description', diff --git a/app/scripts/modules/core/task/tasks.html b/app/scripts/modules/core/task/tasks.html index c26c68c55f7..6cf2f6c5bae 100644 --- a/app/scripts/modules/core/task/tasks.html +++ b/app/scripts/modules/core/task/tasks.html @@ -21,8 +21,8 @@

Task History

-

- - - - - -
- - - -
+ + + diff --git a/app/scripts/modules/google/serverGroup/configure/wizard/capacity.html b/app/scripts/modules/google/serverGroup/configure/wizard/capacity.html index 2495ac57fa0..337d3680d4a 100644 --- a/app/scripts/modules/google/serverGroup/configure/wizard/capacity.html +++ b/app/scripts/modules/google/serverGroup/configure/wizard/capacity.html @@ -1,20 +1,3 @@
-
- -
- - - - -
-
+
diff --git a/app/scripts/modules/google/serverGroup/configure/wizard/instanceArchetype.html b/app/scripts/modules/google/serverGroup/configure/wizard/instanceArchetype.html deleted file mode 100644 index 38c1ccd4d74..00000000000 --- a/app/scripts/modules/google/serverGroup/configure/wizard/instanceArchetype.html +++ /dev/null @@ -1,20 +0,0 @@ -
-
- -
-
- - - - -
-
diff --git a/app/scripts/modules/google/serverGroup/configure/wizard/instanceType.html b/app/scripts/modules/google/serverGroup/configure/wizard/instanceType.html index 1ae13d2b1eb..efe9a763be8 100644 --- a/app/scripts/modules/google/serverGroup/configure/wizard/instanceType.html +++ b/app/scripts/modules/google/serverGroup/configure/wizard/instanceType.html @@ -1,20 +1,8 @@ -
-
- +
+ +
+
-
- - - - -
- +
+
Please select an image.
diff --git a/app/scripts/modules/google/serverGroup/configure/wizard/loadBalancers.html b/app/scripts/modules/google/serverGroup/configure/wizard/loadBalancers.html index a4479b019c7..d3aa48881f5 100644 --- a/app/scripts/modules/google/serverGroup/configure/wizard/loadBalancers.html +++ b/app/scripts/modules/google/serverGroup/configure/wizard/loadBalancers.html @@ -1,20 +1,3 @@ -
-
- -
-
- - - - -
+ +
diff --git a/app/scripts/modules/google/serverGroup/configure/wizard/securityGroups.html b/app/scripts/modules/google/serverGroup/configure/wizard/securityGroups.html index df2dfc45a99..d21527a57c0 100644 --- a/app/scripts/modules/google/serverGroup/configure/wizard/securityGroups.html +++ b/app/scripts/modules/google/serverGroup/configure/wizard/securityGroups.html @@ -1,20 +1,3 @@ -
-
- -
-
- - - - -
+ +
diff --git a/app/scripts/modules/google/serverGroup/configure/wizard/serverGroupWizard.html b/app/scripts/modules/google/serverGroup/configure/wizard/serverGroupWizard.html index 3e5f1005e20..75fd993dc8a 100644 --- a/app/scripts/modules/google/serverGroup/configure/wizard/serverGroupWizard.html +++ b/app/scripts/modules/google/serverGroup/configure/wizard/serverGroupWizard.html @@ -5,27 +5,32 @@

- - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + +
+ + +
+
diff --git a/app/scripts/modules/google/serverGroup/configure/wizard/templateSelection.html b/app/scripts/modules/google/serverGroup/configure/wizard/templateSelection.html index 240f6fc4fca..e1b4bf02868 100644 --- a/app/scripts/modules/google/serverGroup/configure/wizard/templateSelection.html +++ b/app/scripts/modules/google/serverGroup/configure/wizard/templateSelection.html @@ -6,16 +6,13 @@

Template Selection

- - -
-
+
Copy configuration from
-
+
diff --git a/app/scripts/modules/google/serverGroup/details/serverGroupDetails.gce.controller.js b/app/scripts/modules/google/serverGroup/details/serverGroupDetails.gce.controller.js index 4c4e1f350cd..e08e987dce2 100644 --- a/app/scripts/modules/google/serverGroup/details/serverGroupDetails.gce.controller.js +++ b/app/scripts/modules/google/serverGroup/details/serverGroupDetails.gce.controller.js @@ -360,6 +360,7 @@ module.exports = angular.module('spinnaker.serverGroup.details.gce.controller', $uibModal.open({ templateUrl: require('../configure/wizard/serverGroupWizard.html'), controller: 'gceCloneServerGroupCtrl as ctrl', + size: 'lg', resolve: { title: function() { return 'Clone ' + serverGroup.name; }, application: function() { return application; }, diff --git a/app/scripts/modules/kubernetes/serverGroup/details/details.controller.js b/app/scripts/modules/kubernetes/serverGroup/details/details.controller.js index 923aef4ef1f..6f3957658ba 100644 --- a/app/scripts/modules/kubernetes/serverGroup/details/details.controller.js +++ b/app/scripts/modules/kubernetes/serverGroup/details/details.controller.js @@ -118,6 +118,7 @@ module.exports = angular.module('spinnaker.serverGroup.details.kubernetes.contro $uibModal.open({ templateUrl: require('../configure/wizard/wizard.html'), controller: 'kubernetesCloneServerGroupController as ctrl', + size: 'lg', resolve: { title: function() { return 'Clone ' + serverGroup.name; }, application: function() { return application; }, From 9abce7cb61515afeba01983b5145d2f2afded4ab Mon Sep 17 00:00:00 2001 From: chrisb Date: Fri, 12 Feb 2016 10:52:54 -0800 Subject: [PATCH 038/151] fix canary CSS, Failed->Terminal, fix sub-stage ordering --- .../delivery/details/executionDetails.less | 58 ------------------ .../executions/executions.controller.js | 2 +- .../core/delivery/executions/executions.html | 2 +- .../core/delivery/executions/executions.less | 8 +-- .../core/delivery/filter/filterNav.html | 4 +- .../service/executions.transformer.service.js | 32 +++++----- .../executions.transformer.service.spec.js | 20 +------ .../orchestratedItem.transformer.js | 4 +- .../modules/core/pipeline/pipelines.less | 2 +- .../presentation/less/imports/colors.less | 2 +- .../core/task/task.read.service.spec.js | 2 +- app/scripts/modules/core/task/tasks.html | 4 +- .../modules/netflix/canary/canary.less | 59 +++++++++++++++++-- 13 files changed, 86 insertions(+), 113 deletions(-) diff --git a/app/scripts/modules/core/delivery/details/executionDetails.less b/app/scripts/modules/core/delivery/details/executionDetails.less index 2b5aa02e9bb..c9f1354310b 100644 --- a/app/scripts/modules/core/delivery/details/executionDetails.less +++ b/app/scripts/modules/core/delivery/details/executionDetails.less @@ -54,64 +54,6 @@ execution { } } - .canary-summary { - .canary-deployment-row { - td:first-child { - padding-left: 20px; - font-weight: 600; - } - } - } - - .canary-details { - .section-title { - border-bottom: 1px solid @mid_lighter_grey; - margin-bottom: 20px; - h4 { - border-bottom: 0; - } - } - h4 { - margin-bottom: 10px; - border-bottom: 1px solid @mid_lighter_grey; - } - .canary-config-section { - margin-bottom: 20px; - } - - .canary-summary { - margin-bottom: 5px; - padding-bottom: 5px; - align-items: center; - display: flex; - - & > div { - display: flex; - flex: 4 0 20px; - margin-right: 15px; - &.canary-summary-section { - display: block; - } - &.score-large { - flex: 0 0 auto; - height: 48px; - .score { - line-height: 38px; - height: 48px; - padding-left: 10px; - padding-right: 10px; - font-size: 175%; - } - margin-right: 10px; - } - } - } - - h5 { - margin: 0; - } - } - tbody { tr.stage-summary { font-weight: 600; diff --git a/app/scripts/modules/core/delivery/executions/executions.controller.js b/app/scripts/modules/core/delivery/executions/executions.controller.js index 41c72c145a6..c3f8cae28aa 100644 --- a/app/scripts/modules/core/delivery/executions/executions.controller.js +++ b/app/scripts/modules/core/delivery/executions/executions.controller.js @@ -38,7 +38,7 @@ module.exports = angular.module('spinnaker.core.delivery.executions.controller', this.clearFilters = () => { executionFilterService.clearFilters(); - this.updateExecutionGroups(); + this.updateExecutionGroups(true); }; this.updateExecutionGroups = (reload) => { diff --git a/app/scripts/modules/core/delivery/executions/executions.html b/app/scripts/modules/core/delivery/executions/executions.html index 3a09a386c44..a7bbb46bf4b 100644 --- a/app/scripts/modules/core/delivery/executions/executions.html +++ b/app/scripts/modules/core/delivery/executions/executions.html @@ -62,7 +62,7 @@

- +

diff --git a/app/scripts/modules/core/delivery/executions/executions.less b/app/scripts/modules/core/delivery/executions/executions.less index be18d4e3258..840263d95e5 100644 --- a/app/scripts/modules/core/delivery/executions/executions.less +++ b/app/scripts/modules/core/delivery/executions/executions.less @@ -49,7 +49,7 @@ executions { .execution-status-executing, .execution-status-running { color: @spinnaker-blue; } -.execution-status-failed { +.execution-status-terminal { color: @unhealthy_red; } .execution-status-succeeded { @@ -59,9 +59,9 @@ executions { .execution-marker { fill: @stage-default; background-color: @stage-default; - &.execution-marker-failed { - fill: @stage-failed; - background-color: @stage-failed; + &.execution-marker-terminal { + fill: @stage-terminal; + background-color: @stage-terminal; } &.execution-marker-succeeded { fill: @stage-succeeded; diff --git a/app/scripts/modules/core/delivery/filter/filterNav.html b/app/scripts/modules/core/delivery/filter/filterNav.html index 2da1b3a1598..ea5dc2f9552 100644 --- a/app/scripts/modules/core/delivery/filter/filterNav.html +++ b/app/scripts/modules/core/delivery/filter/filterNav.html @@ -60,9 +60,9 @@

diff --git a/app/scripts/modules/core/delivery/service/executions.transformer.service.js b/app/scripts/modules/core/delivery/service/executions.transformer.service.js index 77185bcbadb..6a57292f3d5 100644 --- a/app/scripts/modules/core/delivery/service/executions.transformer.service.js +++ b/app/scripts/modules/core/delivery/service/executions.transformer.service.js @@ -79,8 +79,22 @@ module.exports = angular.module('spinnaker.core.delivery.executionTransformer.se addBuildInfo(execution); } + function siblingStageSorter(a, b) { + if (!a.startTime && !b.startTime) { + return 0; + } + if (!a.startTime) { + return 1; + } + if (!b.startTime) { + return -1; + } + return a.startTime - b.startTime; + } + function flattenStages(stages, stage) { if (stage.before && stage.before.length) { + stage.before.sort(siblingStageSorter); stage.before.forEach(function(beforeStage) { flattenStages(stages, beforeStage); }); @@ -91,6 +105,7 @@ module.exports = angular.module('spinnaker.core.delivery.executionTransformer.se stages.push(stage); } if (stage.after && stage.after.length) { + stage.after.sort(siblingStageSorter); stage.after.forEach(function(afterStage) { flattenStages(stages, afterStage); }); @@ -102,23 +117,6 @@ module.exports = angular.module('spinnaker.core.delivery.executionTransformer.se return flattenStages([], stage) .filter(function(stage) { return stage.type !== 'initialization' && stage.initializationStage !== true; - }) - .sort(function(a, b) { - if (a.syntheticStageOwner === 'STAGE_BEFORE' && - b.syntheticStageOwner === 'STAGE_BEFORE' && - a.parentStageId === b.parentStageId) { - if (!a.startTime && !b.startTime) { - return 0; - } - if (!a.startTime) { - return 1; - } - if (!b.startTime) { - return -1; - } - return a.startTime - b.startTime; - } - return 0; }); } diff --git a/app/scripts/modules/core/delivery/service/executions.transformer.service.spec.js b/app/scripts/modules/core/delivery/service/executions.transformer.service.spec.js index 768d7c4e317..ff36900e719 100644 --- a/app/scripts/modules/core/delivery/service/executions.transformer.service.spec.js +++ b/app/scripts/modules/core/delivery/service/executions.transformer.service.spec.js @@ -49,25 +49,7 @@ describe('executionTransformerService', function() { }; this.transformer.transformExecution({}, execution); - expect(_.pluck(execution.stageSummaries[0].stages, 'id')).toEqual(['f', 'e', 'c', 'b', 'a', 'g', 'd', 'h']); - }); - - it('should sort sibling before stages by start time if available', function() { - var execution = { - stages: [ - { id: 'a', name: 'a' }, - { id: 'b', name: 'b', parentStageId: 'a', syntheticStageOwner: 'STAGE_BEFORE', startTime: 2 }, - { id: 'c', name: 'c', parentStageId: 'a', syntheticStageOwner: 'STAGE_BEFORE', startTime: 1 }, - { id: 'd', name: 'd', parentStageId: 'a', syntheticStageOwner: 'STAGE_AFTER' }, - { id: 'e', name: 'e', parentStageId: 'b', syntheticStageOwner: 'STAGE_BEFORE' }, - { id: 'f', name: 'f', parentStageId: 'b', syntheticStageOwner: 'STAGE_BEFORE', startTime: 1 }, - { id: 'g', name: 'g', parentStageId: 'd', syntheticStageOwner: 'STAGE_BEFORE' }, - { id: 'h', name: 'h', parentStageId: 'd', syntheticStageOwner: 'STAGE_AFTER' }, - ] - }; - - this.transformer.transformExecution({}, execution); - expect(_.pluck(execution.stageSummaries[0].stages, 'id')).toEqual(['f', 'e', 'c', 'b', 'a', 'g', 'd', 'h']); + expect(_.pluck(execution.stageSummaries[0].stages, 'id')).toEqual(['c', 'f', 'e', 'b', 'a', 'g', 'd', 'h']); }); it('should group stages into summaries when no synthetic stages added', function() { diff --git a/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.js b/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.js index f1830b96644..90a54673ce0 100644 --- a/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.js +++ b/app/scripts/modules/core/orchestratedItem/orchestratedItem.transformer.js @@ -82,7 +82,7 @@ module.exports = angular.module('spinnaker.core.orchestratedItem.transformer', [ }, isFailed: { get: function() { - return item.status === 'FAILED'; + return item.status === 'TERMINAL'; }, }, isActive: { @@ -145,7 +145,7 @@ module.exports = angular.module('spinnaker.core.orchestratedItem.transformer', [ return 'RUNNING'; case 'FAILED': case 'TERMINAL': - return 'FAILED'; + return 'TERMINAL'; case 'STOPPED': return 'STOPPED'; case 'SUSPENDED': diff --git a/app/scripts/modules/core/pipeline/pipelines.less b/app/scripts/modules/core/pipeline/pipelines.less index 739f4bc8909..4b53f21dfa7 100644 --- a/app/scripts/modules/core/pipeline/pipelines.less +++ b/app/scripts/modules/core/pipeline/pipelines.less @@ -74,7 +74,7 @@ .label-succeeded { background-color: @healthy_green_border; } - .label-failed, .label-terminated { + .label-terminal, .label-terminated { background-color: @unhealthy_red; } .label-running, .label-launched { diff --git a/app/scripts/modules/core/presentation/less/imports/colors.less b/app/scripts/modules/core/presentation/less/imports/colors.less index 6f69b9405f1..f3fac09902d 100644 --- a/app/scripts/modules/core/presentation/less/imports/colors.less +++ b/app/scripts/modules/core/presentation/less/imports/colors.less @@ -58,7 +58,7 @@ @bootstrap_info: #d9edf7; @stage-succeeded: #769D3E; -@stage-failed: #b82525; +@stage-terminal: #b82525; @stage-running: #2275b8; @stage-default: #cccccc; @stage-stopped: #777777; diff --git a/app/scripts/modules/core/task/task.read.service.spec.js b/app/scripts/modules/core/task/task.read.service.spec.js index 19efc6d5a7b..8c2541364f8 100644 --- a/app/scripts/modules/core/task/task.read.service.spec.js +++ b/app/scripts/modules/core/task/task.read.service.spec.js @@ -139,7 +139,7 @@ describe('Service: taskReader', function () { expect(failed).toBe(false); // succeeds - $http.expectGET('/applications/deck/tasks/1').respond(200, { id: 1, status: 'FAILED' }); + $http.expectGET('/applications/deck/tasks/1').respond(200, { id: 1, status: 'TERMINAL' }); cycle(); expect(completed).toBe(false); expect(failed).toBe(true); diff --git a/app/scripts/modules/core/task/tasks.html b/app/scripts/modules/core/task/tasks.html index 6cf2f6c5bae..7ddf828a305 100644 --- a/app/scripts/modules/core/task/tasks.html +++ b/app/scripts/modules/core/task/tasks.html @@ -24,8 +24,8 @@

Task History

-
-
+

Having a problem or looking for something that's not in Spinnaker? Let us know.

@@ -38,10 +38,15 @@

Talk to Us

All fields are required.

-
-
-

Creating your issue

+
+

Something went horribly wrong.

+

+ Really sorry - you can try to submit this again, or send us an email at: +
delivery-engineering@netflix.com
+ and we'll try to get this straightened out as soon as possible. +

+
@@ -51,24 +56,14 @@

Thanks for your feedback!

-
-

Something went horribly wrong.

-

- Really sorry - you can send us an email at delivery-engineering@netflix.com and we'll try to - get this straightened out as soon as possible. -

-
-
- +
From c75e84d9da46720be7e9b73121feaf1730b11e07 Mon Sep 17 00:00:00 2001 From: chrisb Date: Wed, 10 Feb 2016 15:43:56 -0800 Subject: [PATCH 040/151] edit project works with v2 modals --- .../configure/configureProject.modal.controller.js | 8 +++----- app/scripts/modules/core/projects/project.controller.js | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/scripts/modules/core/projects/configure/configureProject.modal.controller.js b/app/scripts/modules/core/projects/configure/configureProject.modal.controller.js index 78aed5a7b38..e9a9a58da41 100644 --- a/app/scripts/modules/core/projects/configure/configureProject.modal.controller.js +++ b/app/scripts/modules/core/projects/configure/configureProject.modal.controller.js @@ -11,7 +11,7 @@ module.exports = angular.module('spinnaker.core.projects.configure.modal.control .controller('ConfigureProjectModalCtrl', function ($scope, projectConfig, $modalInstance, $q, pipelineConfigService, applicationReader, projectWriter, projectReader, accountService, taskMonitorService, - modalWizardService, $timeout) { + v2modalWizardService, $timeout) { if (!projectConfig.name) { projectConfig.name = ''; @@ -38,9 +38,7 @@ module.exports = angular.module('spinnaker.core.projects.configure.modal.control }; $timeout(() => { - if (projectConfig.name) { - Object.keys(this.pages).forEach(modalWizardService.getWizard().markComplete); - } + Object.keys(this.pages).forEach(v2modalWizardService.markComplete); }); this.addApplication = (application) => { @@ -177,7 +175,7 @@ module.exports = angular.module('spinnaker.core.projects.configure.modal.control $scope.taskMonitor.submit(submitMethod); }; - this.showSubmitButton = () => modalWizardService.getWizard().allPagesVisited(); + this.showSubmitButton = () => v2modalWizardService.allPagesVisited(); this.cancel = $modalInstance.dismiss; diff --git a/app/scripts/modules/core/projects/project.controller.js b/app/scripts/modules/core/projects/project.controller.js index c7c909a764f..361c01c3fe5 100644 --- a/app/scripts/modules/core/projects/project.controller.js +++ b/app/scripts/modules/core/projects/project.controller.js @@ -81,6 +81,7 @@ module.exports = angular.module('spinnaker.core.projects.project.controller', [ templateUrl: require('./configure/configureProject.modal.html'), controller: 'ConfigureProjectModalCtrl', controllerAs: 'ctrl', + size: 'lg', resolve: { projectConfig: () => projectConfiguration, }, From b6023de372a2c52aa47ce80abe8d0995610a94bd Mon Sep 17 00:00:00 2001 From: Adam Jordens Date: Fri, 12 Feb 2016 12:49:41 -0800 Subject: [PATCH 041/151] Show a warning if a deprecated region is selected for deploy --- .../configure/serverGroupConfiguration.service.js | 5 +++++ .../serverGroup/configure/wizard/location/basicSettings.html | 5 +++++ .../modules/core/region/regionSelectField.directive.html | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js b/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js index 371f7d85013..0934c71a693 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js +++ b/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js @@ -54,6 +54,11 @@ module.exports = angular.module('spinnaker.aws.serverGroup.configure.service', [ return command.suspendedProcesses.indexOf(process) !== -1; }; + command.regionIsDeprecated = () => { + return command.backingData && + command.backingData.filtered.regions.filter((region) => region.name === command.region && region.deprecated).length; + }; + return $q.all({ regionsKeyedByAccount: accountService.getRegionsKeyedByAccount('aws'), securityGroups: securityGroupReader.getAllSecurityGroups(), diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/location/basicSettings.html b/app/scripts/modules/amazon/serverGroup/configure/wizard/location/basicSettings.html index 2bb2a00469d..5768eb4ea67 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/location/basicSettings.html +++ b/app/scripts/modules/amazon/serverGroup/configure/wizard/location/basicSettings.html @@ -1,5 +1,10 @@
+
+
+
You are deploying into a deprecated region within the {{ command.credentials }} account!
+
+
Account diff --git a/app/scripts/modules/core/region/regionSelectField.directive.html b/app/scripts/modules/core/region/regionSelectField.directive.html index 159fb44a09d..172ca1f1481 100644 --- a/app/scripts/modules/core/region/regionSelectField.directive.html +++ b/app/scripts/modules/core/region/regionSelectField.directive.html @@ -7,7 +7,7 @@ ng-model="component[field]" ng-change="onChange()" required> - +

{{component[field]}}

From aa7565e9535efeb3edbc164bcaf240c066e050af Mon Sep 17 00:00:00 2001 From: chrisb Date: Fri, 12 Feb 2016 16:36:03 -0800 Subject: [PATCH 042/151] guard against NPE when calculating deprecated region flag --- .../serverGroup/configure/serverGroupConfiguration.service.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js b/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js index 0934c71a693..25c22ad8de5 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js +++ b/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js @@ -55,8 +55,8 @@ module.exports = angular.module('spinnaker.aws.serverGroup.configure.service', [ }; command.regionIsDeprecated = () => { - return command.backingData && - command.backingData.filtered.regions.filter((region) => region.name === command.region && region.deprecated).length; + return _.has(command, 'backingData.filtered.regions') && + command.backingData.filtered.regions.some((region) => region.name === command.region && region.deprecated); }; return $q.all({ From 015e1ac4aebbc8f32b0b2a6ed633488097ed4d7f Mon Sep 17 00:00:00 2001 From: Greg Turnquist Date: Fri, 12 Feb 2016 16:51:40 -0600 Subject: [PATCH 043/151] Add rollback support to CF --- .../rollbackServerGroup.controller.js | 63 +++++++++++++++++++ .../details/rollback/rollbackServerGroup.html | 47 ++++++++++++++ .../serverGroupDetails.cf.controller.js | 16 +++++ .../details/serverGroupDetails.html | 2 + 4 files changed, 128 insertions(+) create mode 100644 app/scripts/modules/cloudfoundry/serverGroup/details/rollback/rollbackServerGroup.controller.js create mode 100644 app/scripts/modules/cloudfoundry/serverGroup/details/rollback/rollbackServerGroup.html diff --git a/app/scripts/modules/cloudfoundry/serverGroup/details/rollback/rollbackServerGroup.controller.js b/app/scripts/modules/cloudfoundry/serverGroup/details/rollback/rollbackServerGroup.controller.js new file mode 100644 index 00000000000..35c55a6564f --- /dev/null +++ b/app/scripts/modules/cloudfoundry/serverGroup/details/rollback/rollbackServerGroup.controller.js @@ -0,0 +1,63 @@ +'use strict'; + +let angular = require('angular'); + +module.exports = angular.module('spinnaker.cf.serverGroup.details.rollback.controller', [ + require('../../../../core/account/account.service.js'), + require('../../../../core/application/modal/platformHealthOverride.directive.js'), + require('../../../../core/task/modal/reason.directive.js'), + require('../../../../core/serverGroup/serverGroup.write.service.js'), + require('../../../../core/task/monitor/taskMonitorService.js'), + ]) + .controller('cfRollbackServerGroupCtrl', function ($scope, $modalInstance, serverGroupWriter, + taskMonitorService, + application, serverGroup, disabledServerGroups) { + $scope.serverGroup = serverGroup; + $scope.disabledServerGroups = disabledServerGroups.sort((a, b) => b.name.localeCompare(a.name)); + $scope.verification = {}; + + $scope.command = { + rollbackType: 'EXPLICIT', + rollbackContext: { + rollbackServerGroupName: serverGroup.name + }, + zone: serverGroup.zones[0], + }; + + if (application && application.attributes) { + $scope.command.platformHealthOnlyShowOverride = application.attributes.platformHealthOnlyShowOverride; + } + + this.isValid = function () { + var command = $scope.command; + if (!$scope.verification.verified) { + return false; + } + + return command.rollbackContext.restoreServerGroupName !== undefined; + }; + + this.rollback = function () { + if (!this.isValid()) { + return; + } + + var submitMethod = function () { + return serverGroupWriter.rollbackServerGroup(serverGroup, application, $scope.command); + }; + + var taskMonitorConfig = { + modalInstance: $modalInstance, + application: application, + title: 'Rollback ' + serverGroup.name, + }; + + $scope.taskMonitor = taskMonitorService.buildTaskMonitor(taskMonitorConfig); + + $scope.taskMonitor.submit(submitMethod); + }; + + this.cancel = function () { + $modalInstance.dismiss(); + }; + }); diff --git a/app/scripts/modules/cloudfoundry/serverGroup/details/rollback/rollbackServerGroup.html b/app/scripts/modules/cloudfoundry/serverGroup/details/rollback/rollbackServerGroup.html new file mode 100644 index 00000000000..5c1e8345a1c --- /dev/null +++ b/app/scripts/modules/cloudfoundry/serverGroup/details/rollback/rollbackServerGroup.html @@ -0,0 +1,47 @@ +
+ + + +
+

Rollback {{serverGroup.name}}

+
+
+
+
+ Restore to +
+
+ + {{$select.selected.name}} + + + + +
+
+ +
+
+ + +
+
+ + +
+
+ + + + +
+ +
diff --git a/app/scripts/modules/cloudfoundry/serverGroup/details/serverGroupDetails.cf.controller.js b/app/scripts/modules/cloudfoundry/serverGroup/details/serverGroupDetails.cf.controller.js index 1fb9a70fbec..c8b1302d656 100644 --- a/app/scripts/modules/cloudfoundry/serverGroup/details/serverGroupDetails.cf.controller.js +++ b/app/scripts/modules/cloudfoundry/serverGroup/details/serverGroupDetails.cf.controller.js @@ -14,6 +14,7 @@ module.exports = angular.module('spinnaker.serverGroup.details.cf.controller', [ require('../../../core/utils/lodash.js'), require('../../../core/insight/insightFilterState.model.js'), require('./resize/resizeServerGroup.controller'), + require('./rollback/rollbackServerGroup.controller'), require('../../../core/modal/closeable/closeable.modal.controller.js'), require('../../../core/utils/selectOnDblClick.directive.js'), ]) @@ -224,6 +225,21 @@ module.exports = angular.module('spinnaker.serverGroup.details.cf.controller', [ }; + this.rollbackServerGroup = function rollbackServerGroup() { + $uibModal.open({ + templateUrl: require('./rollback/rollbackServerGroup.html'), + controller: 'cfRollbackServerGroupCtrl as ctrl', + resolve: { + serverGroup: function() { return $scope.serverGroup; }, + disabledServerGroups: function() { + var cluster = _.find(app.clusters, {name: $scope.serverGroup.cluster, account: $scope.serverGroup.account}); + return _.filter(cluster.serverGroups, {isDisabled: true, region: $scope.serverGroup.region}); + }, + application: function() { return app; } + } + }); + }; + this.resizeServerGroup = function resizeServerGroup() { $uibModal.open({ templateUrl: require('./resize/resizeServerGroup.html'), diff --git a/app/scripts/modules/cloudfoundry/serverGroup/details/serverGroupDetails.html b/app/scripts/modules/cloudfoundry/serverGroup/details/serverGroupDetails.html index 6eb274dcb6a..3a2fb13f254 100644 --- a/app/scripts/modules/cloudfoundry/serverGroup/details/serverGroupDetails.html +++ b/app/scripts/modules/cloudfoundry/serverGroup/details/serverGroupDetails.html @@ -34,6 +34,8 @@

Server Group Actions