@spinnaker/azure 2026.2.2 → 2026.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/azure.module.d.ts +3 -1
- package/dist/image/image.reader.d.ts +4 -2
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/instance/azureInstanceType.service.d.ts +6 -2
- package/dist/instance/details/AzureInstanceDetails.d.ts +67 -0
- package/dist/loadBalancer/configure/AzureLoadBalancerChoiceModal.d.ts +10 -5
- package/dist/loadBalancer/configure/AzureLoadBalancerModal.d.ts +102 -0
- package/dist/loadBalancer/details/azureLoadBalancerDetails.d.ts +26 -0
- package/dist/loadBalancer/loadBalancer.transformer.d.ts +45 -2
- package/dist/pipeline/stages/AzureAccountRegionClusterSelector.d.ts +32 -0
- package/dist/pipeline/stages/bake/azureBakeStage.d.ts +46 -2
- package/dist/pipeline/stages/destroyAsg/azureDestroyAsgStage.d.ts +14 -2
- package/dist/pipeline/stages/disableAsg/azureDisableAsgStage.d.ts +4 -2
- package/dist/pipeline/stages/enableAsg/azureEnableAsgStage.d.ts +4 -2
- package/dist/securityGroup/configure/AzureSecurityGroupModal.d.ts +70 -0
- package/dist/securityGroup/details/AzureSecurityGroupDetails.d.ts +51 -0
- package/dist/securityGroup/securityGroup.reader.d.ts +3 -2
- package/dist/securityGroup/securityGroup.transformer.d.ts +3 -2
- package/dist/securityGroup/securityGroup.write.service.d.ts +9 -2
- package/dist/serverGroup/configure/serverGroupCommandBuilder.service.d.ts +88 -2
- package/dist/serverGroup/configure/serverGroupConfiguration.service.d.ts +30 -2
- package/dist/serverGroup/configure/wizard/AzureCloneServerGroupModal.d.ts +44 -0
- package/dist/serverGroup/configure/wizard/pages/ServerGroupAdvancedSettings.d.ts +8 -0
- package/dist/serverGroup/configure/wizard/pages/ServerGroupBasicSettings.d.ts +12 -0
- package/dist/serverGroup/configure/wizard/pages/ServerGroupCapacityAndZones.d.ts +11 -0
- package/dist/serverGroup/configure/wizard/pages/ServerGroupHealthSettings.d.ts +10 -0
- package/dist/serverGroup/configure/wizard/pages/ServerGroupImageSettings.d.ts +12 -0
- package/dist/serverGroup/configure/wizard/pages/ServerGroupInstanceType.d.ts +9 -0
- package/dist/serverGroup/configure/wizard/pages/ServerGroupLoadBalancers.d.ts +14 -0
- package/dist/serverGroup/configure/wizard/pages/ServerGroupNetworkSettings.d.ts +10 -0
- package/dist/serverGroup/configure/wizard/pages/ServerGroupSecurityGroups.d.ts +6 -0
- package/dist/serverGroup/configure/wizard/pages/ServerGroupTags.d.ts +9 -0
- package/dist/serverGroup/configure/wizard/pages/common.d.ts +14 -0
- package/dist/serverGroup/configure/wizard/pages/index.d.ts +10 -0
- package/dist/serverGroup/details/azureServerGroupDetails.d.ts +13 -0
- package/dist/serverGroup/details/rollback/RollbackServerGroupModal.d.ts +6 -4
- package/dist/serverGroup/serverGroup.transformer.d.ts +61 -2
- package/dist/validation/applicationName.validator.d.ts +6 -2
- package/package.json +5 -8
- package/src/azure.module.spec.ts +921 -0
- package/src/azure.module.ts +56 -68
- package/src/image/image.reader.js +4 -15
- package/src/image/image.reader.spec.js +4 -7
- package/src/instance/azureInstanceType.service.js +8 -16
- package/src/instance/azureInstanceType.service.spec.js +5 -13
- package/src/instance/details/AzureInstanceDetails.spec.tsx +364 -0
- package/src/instance/details/AzureInstanceDetails.tsx +533 -0
- package/src/loadBalancer/configure/AzureLoadBalancerChoiceModal.spec.tsx +125 -0
- package/src/loadBalancer/configure/AzureLoadBalancerChoiceModal.tsx +46 -26
- package/src/loadBalancer/configure/AzureLoadBalancerModal.spec.tsx +658 -0
- package/src/loadBalancer/configure/AzureLoadBalancerModal.tsx +960 -0
- package/src/loadBalancer/details/azureLoadBalancerDetails.spec.tsx +470 -0
- package/src/loadBalancer/details/azureLoadBalancerDetails.tsx +412 -0
- package/src/loadBalancer/loadBalancer.transformer.js +83 -93
- package/src/pipeline/stages/AzureAccountRegionClusterSelector.tsx +238 -0
- package/src/pipeline/stages/bake/azureBakeStage.tsx +723 -0
- package/src/pipeline/stages/destroyAsg/azureDestroyAsgStage.tsx +128 -0
- package/src/pipeline/stages/disableAsg/azureDisableAsgStage.tsx +92 -0
- package/src/pipeline/stages/enableAsg/azureEnableAsgStage.tsx +87 -0
- package/src/routerConsumers.spec.tsx +69 -0
- package/src/securityGroup/configure/AzureSecurityGroupModal.spec.tsx +558 -0
- package/src/securityGroup/configure/AzureSecurityGroupModal.tsx +782 -0
- package/src/securityGroup/details/AzureSecurityGroupDetails.spec.tsx +291 -0
- package/src/securityGroup/details/AzureSecurityGroupDetails.tsx +354 -0
- package/src/securityGroup/securityGroup.reader.js +3 -13
- package/src/securityGroup/securityGroup.transformer.js +3 -13
- package/src/securityGroup/securityGroup.write.service.spec.ts +105 -0
- package/src/securityGroup/securityGroup.write.service.ts +73 -0
- package/src/serverGroup/configure/serverGroupCommandBuilder.service.js +167 -166
- package/src/serverGroup/configure/serverGroupCommandBuilder.service.spec.js +63 -0
- package/src/serverGroup/configure/serverGroupConfiguration.service.js +325 -309
- package/src/serverGroup/configure/serverGroupConfiguration.service.spec.js +57 -53
- package/src/serverGroup/configure/wizard/AzureCloneServerGroupModal.spec.tsx +758 -0
- package/src/serverGroup/configure/wizard/AzureCloneServerGroupModal.tsx +349 -0
- package/src/serverGroup/configure/wizard/pages/ServerGroupAdvancedSettings.tsx +208 -0
- package/src/serverGroup/configure/wizard/pages/ServerGroupBasicSettings.tsx +122 -0
- package/src/serverGroup/configure/wizard/pages/ServerGroupCapacityAndZones.tsx +80 -0
- package/src/serverGroup/configure/wizard/pages/ServerGroupHealthSettings.tsx +97 -0
- package/src/serverGroup/configure/wizard/pages/ServerGroupImageSettings.tsx +151 -0
- package/src/serverGroup/configure/wizard/pages/ServerGroupInstanceType.tsx +41 -0
- package/src/serverGroup/configure/wizard/pages/ServerGroupLoadBalancers.tsx +214 -0
- package/src/serverGroup/configure/wizard/pages/ServerGroupNetworkSettings.tsx +119 -0
- package/src/serverGroup/configure/wizard/pages/ServerGroupSecurityGroups.tsx +54 -0
- package/src/serverGroup/configure/wizard/pages/ServerGroupTags.tsx +40 -0
- package/src/serverGroup/configure/wizard/pages/common.tsx +72 -0
- package/src/serverGroup/configure/wizard/pages/index.ts +10 -0
- package/src/serverGroup/details/azureServerGroupDetails.spec.tsx +263 -0
- package/src/serverGroup/details/azureServerGroupDetails.tsx +318 -0
- package/src/serverGroup/details/rollback/RollbackServerGroupModal.tsx +24 -30
- package/src/serverGroup/serverGroup.transformer.js +11 -19
- package/src/serverGroup/serverGroup.transformer.spec.js +2 -6
- package/src/validation/applicationName.validator.js +14 -29
- package/dist/instance/details/instance.details.controller.d.ts +0 -2
- package/dist/loadBalancer/configure/createLoadBalancer.controller.d.ts +0 -2
- package/dist/loadBalancer/details/loadBalancerDetail.controller.d.ts +0 -2
- package/dist/pipeline/stages/bake/bakeExecutionDetails.controller.d.ts +0 -2
- package/dist/securityGroup/clone/cloneSecurityGroup.controller.d.ts +0 -2
- package/dist/securityGroup/configure/CreateSecurityGroupCtrl.d.ts +0 -2
- package/dist/securityGroup/configure/EditSecurityGroupCtrl.d.ts +0 -2
- package/dist/securityGroup/details/securityGroupDetail.controller.d.ts +0 -2
- package/dist/serverGroup/configure/serverGroup.configure.azure.module.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/CloneServerGroup.azure.controller.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/ServerGroupInstanceArchetype.controller.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/ServerGroupInstanceType.controller.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/advancedSettings/ServerGroupAdvancedSettings.controller.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/advancedSettings/advancedSettingsSelector.directive.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/basicSettings/ServerGroupBasicSettings.controller.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/basicSettings/image.regional.filter.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/capacity/capacitySelector.directive.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/healthSettings/ServerGroupHealthSettings.controller.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/healthSettings/healthSettingsSelector.directive.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/image/ServerGroupImageSettings.controller.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/image/imageSettingsSelector.directive.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/loadBalancers/ServerGroupLoadBalancers.controller.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/loadBalancers/serverGroupLoadBalancersSelector.directive.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/networkSettings/ServerGroupNetworkSettings.controller.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/networkSettings/ServerGroupNetworkSettingsSelector.directive.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/securityGroup/ServerGroupSecurityGroups.controller.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/securityGroup/serverGroupSecurityGroupsSelector.directive.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/tags/tagsSelector.directive.d.ts +0 -2
- package/dist/serverGroup/configure/wizard/zones/zoneSelector.directive.d.ts +0 -2
- package/dist/serverGroup/details/serverGroup.details.module.d.ts +0 -2
- package/dist/serverGroup/details/serverGroupDetails.azure.controller.d.ts +0 -2
- package/src/instance/details/instance.details.controller.js +0 -371
- package/src/instance/details/instance.details.controller.spec.js +0 -129
- package/src/instance/details/instanceDetails.html +0 -43
- package/src/loadBalancer/configure/advancedSettings.html +0 -95
- package/src/loadBalancer/configure/createLoadBalancer.controller.js +0 -275
- package/src/loadBalancer/configure/createLoadBalancer.controller.spec.js +0 -39
- package/src/loadBalancer/configure/createLoadBalancer.html +0 -25
- package/src/loadBalancer/configure/createLoadBalancerProperties.html +0 -128
- package/src/loadBalancer/configure/editLoadBalancer.html +0 -26
- package/src/loadBalancer/configure/healthCheck.html +0 -74
- package/src/loadBalancer/configure/listeners.html +0 -50
- package/src/loadBalancer/details/loadBalancerDetail.controller.js +0 -181
- package/src/loadBalancer/details/loadBalancerDetail.controller.spec.js +0 -39
- package/src/loadBalancer/details/loadBalancerDetail.html +0 -128
- package/src/pipeline/stages/bake/azureBakeStage.js +0 -276
- package/src/pipeline/stages/bake/bakeExecutionDetails.controller.js +0 -40
- package/src/pipeline/stages/bake/bakeExecutionDetails.html +0 -50
- package/src/pipeline/stages/bake/bakeStage.html +0 -187
- package/src/pipeline/stages/destroyAsg/azureDestroyAsgStage.js +0 -73
- package/src/pipeline/stages/destroyAsg/destroyAsgStage.html +0 -9
- package/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html +0 -1
- package/src/pipeline/stages/disableAsg/azureDisableAsgStage.js +0 -65
- package/src/pipeline/stages/disableAsg/disableAsgStage.html +0 -11
- package/src/pipeline/stages/disableAsg/disableAsgStepLabel.html +0 -1
- package/src/pipeline/stages/enableAsg/azureEnableAsgStage.js +0 -70
- package/src/pipeline/stages/enableAsg/enableAsgStage.html +0 -11
- package/src/pipeline/stages/enableAsg/enableAsgStepLabel.html +0 -1
- package/src/securityGroup/clone/cloneSecurityGroup.controller.js +0 -162
- package/src/securityGroup/clone/cloneSecurityGroup.html +0 -8
- package/src/securityGroup/configure/CreateSecurityGroup.controller.spec.js +0 -78
- package/src/securityGroup/configure/CreateSecurityGroupCtrl.js +0 -265
- package/src/securityGroup/configure/EditSecurityGroupCtrl.js +0 -222
- package/src/securityGroup/configure/configSecurityGroup.mixin.controller.js +0 -262
- package/src/securityGroup/configure/createSecurityGroup.html +0 -20
- package/src/securityGroup/configure/createSecurityGroupIngress.html +0 -75
- package/src/securityGroup/configure/createSecurityGroupProperties.html +0 -88
- package/src/securityGroup/configure/editSecurityGroup.html +0 -19
- package/src/securityGroup/details/securityGroupDetail.controller.js +0 -142
- package/src/securityGroup/details/securityGroupDetail.html +0 -78
- package/src/securityGroup/securityGroup.write.service.js +0 -57
- package/src/serverGroup/configure/serverGroup.configure.azure.module.js +0 -47
- package/src/serverGroup/configure/wizard/CloneServerGroup.azure.controller.js +0 -247
- package/src/serverGroup/configure/wizard/ServerGroupInstanceArchetype.controller.js +0 -35
- package/src/serverGroup/configure/wizard/ServerGroupInstanceType.controller.js +0 -15
- package/src/serverGroup/configure/wizard/advancedSettings/ServerGroupAdvancedSettings.controller.js +0 -25
- package/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.html +0 -5
- package/src/serverGroup/configure/wizard/advancedSettings/advancedSettingsSelector.directive.html +0 -138
- package/src/serverGroup/configure/wizard/advancedSettings/advancedSettingsSelector.directive.js +0 -43
- package/src/serverGroup/configure/wizard/basicSettings/ServerGroupBasicSettings.controller.js +0 -71
- package/src/serverGroup/configure/wizard/basicSettings/basicSettings.html +0 -131
- package/src/serverGroup/configure/wizard/basicSettings/image.regional.filter.js +0 -15
- package/src/serverGroup/configure/wizard/basicSettings/image.regional.filter.spec.js +0 -42
- package/src/serverGroup/configure/wizard/capacity/capacity.html +0 -5
- package/src/serverGroup/configure/wizard/capacity/capacitySelector.directive.html +0 -20
- package/src/serverGroup/configure/wizard/capacity/capacitySelector.directive.js +0 -21
- package/src/serverGroup/configure/wizard/capacity/zones.html +0 -5
- package/src/serverGroup/configure/wizard/healthSettings/ServerGroupHealthSettings.controller.js +0 -38
- package/src/serverGroup/configure/wizard/healthSettings/healthSettings.html +0 -5
- package/src/serverGroup/configure/wizard/healthSettings/healthSettingsSelector.directive.html +0 -32
- package/src/serverGroup/configure/wizard/healthSettings/healthSettingsSelector.directive.js +0 -22
- package/src/serverGroup/configure/wizard/image/ServerGroupImageSettings.controller.js +0 -34
- package/src/serverGroup/configure/wizard/image/imageSettings.html +0 -5
- package/src/serverGroup/configure/wizard/image/imageSettingsSelector.directive.html +0 -33
- package/src/serverGroup/configure/wizard/image/imageSettingsSelector.directive.js +0 -22
- package/src/serverGroup/configure/wizard/instanceArchetype.html +0 -33
- package/src/serverGroup/configure/wizard/instanceType/instanceType.html +0 -10
- package/src/serverGroup/configure/wizard/instanceType.html +0 -33
- package/src/serverGroup/configure/wizard/loadBalancers/ServerGroupLoadBalancers.controller.js +0 -137
- package/src/serverGroup/configure/wizard/loadBalancers/loadBalancers.html +0 -3
- package/src/serverGroup/configure/wizard/loadBalancers/serverGroupLoadBalancersSelector.directive.html +0 -41
- package/src/serverGroup/configure/wizard/loadBalancers/serverGroupLoadBalancersSelector.directive.js +0 -22
- package/src/serverGroup/configure/wizard/networkSettings/ServerGroupNetworkSettings.controller.js +0 -44
- package/src/serverGroup/configure/wizard/networkSettings/ServerGroupNetworkSettingsSelector.directive.html +0 -54
- package/src/serverGroup/configure/wizard/networkSettings/ServerGroupNetworkSettingsSelector.directive.js +0 -19
- package/src/serverGroup/configure/wizard/networkSettings/networkSettings.html +0 -3
- package/src/serverGroup/configure/wizard/securityGroup/ServerGroupSecurityGroups.controller.js +0 -28
- package/src/serverGroup/configure/wizard/securityGroup/securityGroups.html +0 -3
- package/src/serverGroup/configure/wizard/securityGroup/serverGroupSecurityGroupsSelector.directive.html +0 -40
- package/src/serverGroup/configure/wizard/securityGroup/serverGroupSecurityGroupsSelector.directive.js +0 -38
- package/src/serverGroup/configure/wizard/serverGroupWizard.html +0 -61
- package/src/serverGroup/configure/wizard/tags/tags.html +0 -5
- package/src/serverGroup/configure/wizard/tags/tagsSelector.directive.html +0 -16
- package/src/serverGroup/configure/wizard/tags/tagsSelector.directive.js +0 -30
- package/src/serverGroup/configure/wizard/templateSelection.html +0 -9
- package/src/serverGroup/configure/wizard/zones/zoneSelector.directive.html +0 -21
- package/src/serverGroup/configure/wizard/zones/zoneSelector.directive.js +0 -28
- package/src/serverGroup/details/serverGroup.details.module.js +0 -11
- package/src/serverGroup/details/serverGroupDetails.azure.controller.js +0 -260
- package/src/serverGroup/details/serverGroupDetails.html +0 -98
- package/src/subnet/subnetSelectField.directive.html +0 -28
- package/src/subnet/subnetSelectField.directive.js +0 -35
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
<div class="container-fluid form-horizontal" ng-controller="azureServerGroupImageSettingsCtrl as imageCtrl">
|
|
2
|
-
<div class="form-group">
|
|
3
|
-
<div class="col-md-3 sm-label-right">Use custom image?</div>
|
|
4
|
-
<input type="checkbox" ng-model="command.image.isCustom" ng-change="imageCtrl.clearImage()" />
|
|
5
|
-
</div>
|
|
6
|
-
|
|
7
|
-
<div class="form-group" ng-if="command.image.isCustom === true">
|
|
8
|
-
<div class="form-group">
|
|
9
|
-
<div class="col-md-3 sm-label-right">Region</div>
|
|
10
|
-
<div class="col-md-6">
|
|
11
|
-
<span>{{command.image.region}}</span>
|
|
12
|
-
</div>
|
|
13
|
-
</div>
|
|
14
|
-
<div class="form-group">
|
|
15
|
-
<div class="col-md-3 sm-label-right">Image Name</div>
|
|
16
|
-
<div class="col-md-6">
|
|
17
|
-
<input type="text" class="input-sm" ng-model="command.image.imageName" required />
|
|
18
|
-
</div>
|
|
19
|
-
</div>
|
|
20
|
-
<div class="form-group">
|
|
21
|
-
<div class="col-md-3 sm-label-right">OS Type</div>
|
|
22
|
-
<div class="col-md-6">
|
|
23
|
-
<input type="text" class="input-sm" ng-model="command.image.ostype" required />
|
|
24
|
-
</div>
|
|
25
|
-
</div>
|
|
26
|
-
<div class="form-group">
|
|
27
|
-
<div class="col-md-3 sm-label-right">URI</div>
|
|
28
|
-
<div class="col-md-6">
|
|
29
|
-
<input type="text" class="input-sm" ng-model="command.image.uri" required />
|
|
30
|
-
</div>
|
|
31
|
-
</div>
|
|
32
|
-
</div>
|
|
33
|
-
</div>
|
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
|
|
3
|
-
import { module } from 'angular';
|
|
4
|
-
|
|
5
|
-
export const AZURE_SERVERGROUP_CONFIGURE_WIZARD_IMAGESETTINGS_IMAGESETTINGS_DIRECTIVE =
|
|
6
|
-
'spinnaker.azure.serverGroup.configure.wizard.imageSettingsSelector.directive';
|
|
7
|
-
export const name = AZURE_SERVERGROUP_CONFIGURE_WIZARD_IMAGESETTINGS_IMAGESETTINGS_DIRECTIVE; // for backwards compatibility
|
|
8
|
-
module(AZURE_SERVERGROUP_CONFIGURE_WIZARD_IMAGESETTINGS_IMAGESETTINGS_DIRECTIVE, []).directive(
|
|
9
|
-
'azureServerGroupImageSettingsSelector',
|
|
10
|
-
[
|
|
11
|
-
'azureServerGroupConfigurationService',
|
|
12
|
-
function () {
|
|
13
|
-
return {
|
|
14
|
-
restrict: 'E',
|
|
15
|
-
templateUrl: require('./imageSettingsSelector.directive.html'),
|
|
16
|
-
scope: {
|
|
17
|
-
command: '=',
|
|
18
|
-
},
|
|
19
|
-
};
|
|
20
|
-
},
|
|
21
|
-
],
|
|
22
|
-
);
|
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
<form
|
|
2
|
-
ng-controller="azureInstanceArchetypeCtrl as instanceArchetypeCtrl"
|
|
3
|
-
class="container-fluid form-horizontal"
|
|
4
|
-
name="form"
|
|
5
|
-
novalidate
|
|
6
|
-
>
|
|
7
|
-
<div class="modal-body">
|
|
8
|
-
<instance-archetype-selector command="command"></instance-archetype-selector>
|
|
9
|
-
</div>
|
|
10
|
-
<div class="modal-footer">
|
|
11
|
-
<button class="btn btn-default pull-left" ng-click="wizard.previousPage(form.$valid)">
|
|
12
|
-
<span class="glyphicon glyphicon-chevron-left"></span> Back
|
|
13
|
-
</button>
|
|
14
|
-
<button ng-disabled="taskMonitor.submitting" class="btn btn-default btn-cancel" ng-click="ctrl.cancel()">
|
|
15
|
-
Cancel
|
|
16
|
-
</button>
|
|
17
|
-
<submit-button
|
|
18
|
-
ng-if="ctrl.showSubmitButton()"
|
|
19
|
-
is-disabled="form.$invalid || !ctrl.isValid() || taskMonitor.submitting"
|
|
20
|
-
label="command.viewState.submitButtonLabel"
|
|
21
|
-
submitting="taskMonitor.submitting"
|
|
22
|
-
on-click="ctrl.submit()"
|
|
23
|
-
is-new="true"
|
|
24
|
-
></submit-button>
|
|
25
|
-
<button
|
|
26
|
-
class="btn btn-primary"
|
|
27
|
-
ng-disabled="!command.viewState.instanceProfile || form.$invalid"
|
|
28
|
-
ng-click="wizard.nextPage(form.$valid)"
|
|
29
|
-
>
|
|
30
|
-
Next <span class="glyphicon glyphicon-chevron-right"></span>
|
|
31
|
-
</button>
|
|
32
|
-
</div>
|
|
33
|
-
</form>
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
<div ng-show="!!(command.region)">
|
|
2
|
-
<v2-instance-archetype-selector ng-if="command.region" command="command"></v2-instance-archetype-selector>
|
|
3
|
-
<div style="padding: 0 15px">
|
|
4
|
-
<v2-instance-type-selector
|
|
5
|
-
ng-if="command.viewState.instanceProfile && !(command.viewState.instanceProfile === 'custom' || command.viewState.instanceProfile === 'buildCustom' )"
|
|
6
|
-
command="command"
|
|
7
|
-
></v2-instance-type-selector>
|
|
8
|
-
</div>
|
|
9
|
-
</div>
|
|
10
|
-
<h5 class="text-center" ng-if="!command.region">Please select a region.</h5>
|
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
<form
|
|
2
|
-
ng-controller="azureInstanceTypeCtrl as instanceTypeCtrl"
|
|
3
|
-
class="container-fluid form-horizontal"
|
|
4
|
-
name="form"
|
|
5
|
-
novalidate
|
|
6
|
-
>
|
|
7
|
-
<div class="modal-body">
|
|
8
|
-
<instance-type-selector command="command"></instance-type-selector>
|
|
9
|
-
</div>
|
|
10
|
-
<div class="modal-footer">
|
|
11
|
-
<button class="btn btn-default pull-left" ng-click="wizard.previousPage(form.$valid)">
|
|
12
|
-
<span class="glyphicon glyphicon-chevron-left"></span> Back
|
|
13
|
-
</button>
|
|
14
|
-
<button ng-disabled="taskMonitor.submitting" class="btn btn-default btn-cancel" ng-click="ctrl.cancel()">
|
|
15
|
-
Cancel
|
|
16
|
-
</button>
|
|
17
|
-
<submit-button
|
|
18
|
-
ng-if="ctrl.showSubmitButton()"
|
|
19
|
-
is-disabled="form.$invalid || !ctrl.isValid() || taskMonitor.submitting"
|
|
20
|
-
label="command.viewState.submitButtonLabel"
|
|
21
|
-
submitting="taskMonitor.submitting"
|
|
22
|
-
on-click="ctrl.submit()"
|
|
23
|
-
is-new="true"
|
|
24
|
-
></submit-button>
|
|
25
|
-
<button
|
|
26
|
-
class="btn btn-primary"
|
|
27
|
-
ng-disabled="!command.viewState.instanceProfile || form.$invalid"
|
|
28
|
-
ng-click="wizard.nextPage(form.$valid)"
|
|
29
|
-
>
|
|
30
|
-
Next <span class="glyphicon glyphicon-chevron-right"></span>
|
|
31
|
-
</button>
|
|
32
|
-
</div>
|
|
33
|
-
</form>
|
package/src/serverGroup/configure/wizard/loadBalancers/ServerGroupLoadBalancers.controller.js
DELETED
|
@@ -1,137 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
|
|
3
|
-
import { module } from 'angular';
|
|
4
|
-
|
|
5
|
-
import { InfrastructureCaches, LOAD_BALANCER_READ_SERVICE, ModalWizard, NetworkReader } from '@spinnaker/core';
|
|
6
|
-
|
|
7
|
-
import Utility from '../../../../utility';
|
|
8
|
-
|
|
9
|
-
export const AZURE_SERVERGROUP_CONFIGURE_WIZARD_LOADBALANCERS_SERVERGROUPLOADBALANCERS_CONTROLLER =
|
|
10
|
-
'spinnaker.azure.serverGroup.configure.loadBalancer.controller';
|
|
11
|
-
export const name = AZURE_SERVERGROUP_CONFIGURE_WIZARD_LOADBALANCERS_SERVERGROUPLOADBALANCERS_CONTROLLER; // for backwards compatibility
|
|
12
|
-
module(AZURE_SERVERGROUP_CONFIGURE_WIZARD_LOADBALANCERS_SERVERGROUPLOADBALANCERS_CONTROLLER, [
|
|
13
|
-
LOAD_BALANCER_READ_SERVICE,
|
|
14
|
-
]).controller('azureServerGroupLoadBalancersCtrl', [
|
|
15
|
-
'$scope',
|
|
16
|
-
'loadBalancerReader',
|
|
17
|
-
function ($scope, loadBalancerReader) {
|
|
18
|
-
ModalWizard.markClean('load-balancers');
|
|
19
|
-
|
|
20
|
-
function loadVnetSubnets(item, type) {
|
|
21
|
-
loadBalancerReader
|
|
22
|
-
.getLoadBalancerDetails('azure', $scope.command.credentials, $scope.command.region, item)
|
|
23
|
-
.then(function (LBs) {
|
|
24
|
-
if (!LBs || LBs.length === 0) {
|
|
25
|
-
// load the subnet and vnets without a load balancer
|
|
26
|
-
const attachedVnet = $scope.command.selectedVnet;
|
|
27
|
-
const attachedSubnet = $scope.command.selectedSubnet;
|
|
28
|
-
$scope.command.selectedVnetSubnets = [];
|
|
29
|
-
$scope.command.allVnets = [];
|
|
30
|
-
NetworkReader.listNetworks().then(function (vnets) {
|
|
31
|
-
if (vnets.azure) {
|
|
32
|
-
vnets.azure.forEach((selectedVnet) => {
|
|
33
|
-
if (
|
|
34
|
-
selectedVnet.account === $scope.command.credentials &&
|
|
35
|
-
selectedVnet.region === $scope.command.region
|
|
36
|
-
) {
|
|
37
|
-
$scope.command.allVnets.push(selectedVnet);
|
|
38
|
-
|
|
39
|
-
selectedVnet.subnets.map(function (subnet) {
|
|
40
|
-
let addSubnet = true;
|
|
41
|
-
if (subnet.devices) {
|
|
42
|
-
subnet.devices.map(function (device) {
|
|
43
|
-
// only add subnets that are not assigned to an ApplicationGateway
|
|
44
|
-
if (device && device.type === 'applicationGateways') {
|
|
45
|
-
addSubnet = false;
|
|
46
|
-
}
|
|
47
|
-
});
|
|
48
|
-
}
|
|
49
|
-
if (addSubnet) {
|
|
50
|
-
$scope.command.selectedVnetSubnets.push(subnet.name);
|
|
51
|
-
if (subnet.name === attachedSubnet) {
|
|
52
|
-
$scope.command.selectedSubnet = attachedSubnet;
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
});
|
|
56
|
-
}
|
|
57
|
-
});
|
|
58
|
-
}
|
|
59
|
-
});
|
|
60
|
-
} else if (LBs && LBs.length === 1) {
|
|
61
|
-
const selectedLoadBalancer = LBs[0];
|
|
62
|
-
const attachedVnet = $scope.command.selectedVnet;
|
|
63
|
-
$scope.command.selectedVnet = null;
|
|
64
|
-
$scope.command.selectedVnetSubnets = [];
|
|
65
|
-
$scope.command.allVnets = [];
|
|
66
|
-
NetworkReader.listNetworks().then(function (vnets) {
|
|
67
|
-
if (vnets.azure) {
|
|
68
|
-
vnets.azure.forEach((selectedVnet) => {
|
|
69
|
-
if (
|
|
70
|
-
selectedVnet.account === $scope.command.credentials &&
|
|
71
|
-
selectedVnet.region === $scope.command.region
|
|
72
|
-
) {
|
|
73
|
-
$scope.command.allVnets.push(selectedVnet);
|
|
74
|
-
}
|
|
75
|
-
if (
|
|
76
|
-
selectedVnet.account === $scope.command.credentials &&
|
|
77
|
-
selectedVnet.region === $scope.command.region &&
|
|
78
|
-
((type === 'Azure Application Gateway' && selectedVnet.name == selectedLoadBalancer.vnet) ||
|
|
79
|
-
(type === 'Azure Load Balancer' && selectedVnet.name === attachedVnet.name))
|
|
80
|
-
) {
|
|
81
|
-
$scope.command.selectedVnet = selectedVnet;
|
|
82
|
-
selectedVnet.subnets.map(function (subnet) {
|
|
83
|
-
let addSubnet = true;
|
|
84
|
-
if (subnet.devices) {
|
|
85
|
-
subnet.devices.map(function (device) {
|
|
86
|
-
// only add subnets that are not assigned to an ApplicationGateway
|
|
87
|
-
if (device && device.type === 'applicationGateways') {
|
|
88
|
-
addSubnet = false;
|
|
89
|
-
}
|
|
90
|
-
});
|
|
91
|
-
}
|
|
92
|
-
if (addSubnet) {
|
|
93
|
-
$scope.command.selectedVnetSubnets.push(subnet.name);
|
|
94
|
-
}
|
|
95
|
-
});
|
|
96
|
-
}
|
|
97
|
-
});
|
|
98
|
-
}
|
|
99
|
-
});
|
|
100
|
-
}
|
|
101
|
-
});
|
|
102
|
-
}
|
|
103
|
-
|
|
104
|
-
if ($scope.command.credentials && $scope.command.region) {
|
|
105
|
-
$scope.command.viewState.networkSettingsConfigured = true;
|
|
106
|
-
$scope.command.selectedVnetSubnets = [];
|
|
107
|
-
if ($scope.command.loadBalancerName !== null && typeof $scope.command.loadBalancerName !== 'undefined') {
|
|
108
|
-
$scope.useLoadBalancer = true;
|
|
109
|
-
}
|
|
110
|
-
loadVnetSubnets($scope.command.loadBalancerName, $scope.command.loadBalancerType);
|
|
111
|
-
}
|
|
112
|
-
|
|
113
|
-
this.loadBalancerChanged = function (item) {
|
|
114
|
-
$scope.command.viewState.networkSettingsConfigured = true;
|
|
115
|
-
ModalWizard.markComplete('load-balancers');
|
|
116
|
-
|
|
117
|
-
const loadBalancers = $scope.command.backingData.loadBalancers;
|
|
118
|
-
let loadBalancerType = null;
|
|
119
|
-
|
|
120
|
-
if (loadBalancers) {
|
|
121
|
-
const loadBalancerToFind = loadBalancers.find((lb) => lb.name === item);
|
|
122
|
-
if (loadBalancerToFind) {
|
|
123
|
-
loadBalancerType = Utility.getLoadBalancerType(loadBalancerToFind.loadBalancerType).type;
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
if (item === null) {
|
|
128
|
-
$scope.command.loadBalancerName = null;
|
|
129
|
-
}
|
|
130
|
-
|
|
131
|
-
$scope.command.selectedVnetSubnets = [];
|
|
132
|
-
$scope.command.loadBalancerType = loadBalancerType;
|
|
133
|
-
InfrastructureCaches.clearCache('networks');
|
|
134
|
-
loadVnetSubnets(item, loadBalancerType);
|
|
135
|
-
};
|
|
136
|
-
},
|
|
137
|
-
]);
|
|
@@ -1,41 +0,0 @@
|
|
|
1
|
-
<h5 class="text-center" ng-if="!command.viewState.loadBalancersConfigured">Please select an account and region.</h5>
|
|
2
|
-
<div
|
|
3
|
-
ng-if="command.viewState.loadBalancersConfigured"
|
|
4
|
-
ng-controller="azureServerGroupLoadBalancersCtrl as loadBalancerCtrl"
|
|
5
|
-
>
|
|
6
|
-
<div class="form-group">
|
|
7
|
-
<div class="col-md-3 sm-label-right"><b>Load Balancers</b></div>
|
|
8
|
-
<div class="col-md-7">
|
|
9
|
-
<label for="useLoadBalancerCheckbox">
|
|
10
|
-
<input
|
|
11
|
-
type="checkbox"
|
|
12
|
-
ng-model="useLoadBalancer"
|
|
13
|
-
id="useLoadBalancerCheckbox"
|
|
14
|
-
ng-change="loadBalancerCtrl.loadBalancerChanged(null)"
|
|
15
|
-
/>
|
|
16
|
-
Use load balancer
|
|
17
|
-
</label>
|
|
18
|
-
<ui-select
|
|
19
|
-
ng-model="command.loadBalancerName"
|
|
20
|
-
class="form-control input-sm"
|
|
21
|
-
ng-change="loadBalancerCtrl.loadBalancerChanged($select.selected)"
|
|
22
|
-
ng-show="useLoadBalancer"
|
|
23
|
-
>
|
|
24
|
-
<ui-select-match placeholder="select a loadBalancer">{{$select.selected}}</ui-select-match>
|
|
25
|
-
<ui-select-choices repeat="loadBalancer in command.loadBalancers | filter: $select.search">
|
|
26
|
-
<span ng-bind-html="loadBalancer | highlight: $select.search"></span>
|
|
27
|
-
</ui-select-choices>
|
|
28
|
-
</ui-select>
|
|
29
|
-
</div>
|
|
30
|
-
</div>
|
|
31
|
-
|
|
32
|
-
<div class="form-group" ng-show="command.loadBalancerName">
|
|
33
|
-
<div class="col-md-12">
|
|
34
|
-
<div class="well-compact" ng-class="well">
|
|
35
|
-
<h5 class="text-center">
|
|
36
|
-
<p>The load balancer {{command.loadBalancerName}} is an {{command.loadBalancerType}}</p>
|
|
37
|
-
</h5>
|
|
38
|
-
</div>
|
|
39
|
-
</div>
|
|
40
|
-
</div>
|
|
41
|
-
</div>
|
package/src/serverGroup/configure/wizard/loadBalancers/serverGroupLoadBalancersSelector.directive.js
DELETED
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
|
|
3
|
-
import { module } from 'angular';
|
|
4
|
-
|
|
5
|
-
export const AZURE_SERVERGROUP_CONFIGURE_WIZARD_LOADBALANCERS_SERVERGROUPLOADBALANCERSSELECTOR_DIRECTIVE =
|
|
6
|
-
'spinnaker.azure.serverGroup.configure.loadBalancer.directive';
|
|
7
|
-
export const name = AZURE_SERVERGROUP_CONFIGURE_WIZARD_LOADBALANCERS_SERVERGROUPLOADBALANCERSSELECTOR_DIRECTIVE; // for backwards compatibility
|
|
8
|
-
module(AZURE_SERVERGROUP_CONFIGURE_WIZARD_LOADBALANCERS_SERVERGROUPLOADBALANCERSSELECTOR_DIRECTIVE, []).directive(
|
|
9
|
-
'azureServerGroupLoadBalancersSelector',
|
|
10
|
-
[
|
|
11
|
-
'azureServerGroupConfigurationService',
|
|
12
|
-
function () {
|
|
13
|
-
return {
|
|
14
|
-
restrict: 'E',
|
|
15
|
-
scope: {
|
|
16
|
-
command: '=',
|
|
17
|
-
},
|
|
18
|
-
templateUrl: require('./serverGroupLoadBalancersSelector.directive.html'),
|
|
19
|
-
};
|
|
20
|
-
},
|
|
21
|
-
],
|
|
22
|
-
);
|
package/src/serverGroup/configure/wizard/networkSettings/ServerGroupNetworkSettings.controller.js
DELETED
|
@@ -1,44 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
|
|
3
|
-
import { module } from 'angular';
|
|
4
|
-
|
|
5
|
-
import { ModalWizard } from '@spinnaker/core';
|
|
6
|
-
|
|
7
|
-
export const AZURE_SERVERGROUP_CONFIGURE_WIZARD_NETWORKSETTINGS_SERVERGROUPNETWORKSETTINGS_CONTROLLER =
|
|
8
|
-
'spinnaker.azure.serverGroup.configure.networkSettings.controller';
|
|
9
|
-
export const name = AZURE_SERVERGROUP_CONFIGURE_WIZARD_NETWORKSETTINGS_SERVERGROUPNETWORKSETTINGS_CONTROLLER; // for backwards compatibility
|
|
10
|
-
module(AZURE_SERVERGROUP_CONFIGURE_WIZARD_NETWORKSETTINGS_SERVERGROUPNETWORKSETTINGS_CONTROLLER, []).controller(
|
|
11
|
-
'azureServerGroupNetworkSettingsCtrl',
|
|
12
|
-
[
|
|
13
|
-
'$scope',
|
|
14
|
-
function ($scope) {
|
|
15
|
-
ModalWizard.markClean('network-settings');
|
|
16
|
-
|
|
17
|
-
$scope.command.selectedVnet = {
|
|
18
|
-
name: $scope.command.vnet,
|
|
19
|
-
};
|
|
20
|
-
|
|
21
|
-
$scope.command.selectedSubnet = $scope.command.subnet;
|
|
22
|
-
|
|
23
|
-
this.vnetChanged = function (item) {
|
|
24
|
-
$scope.command.vnet = item;
|
|
25
|
-
$scope.command.subnet = $scope.command.selectedSubnet = null;
|
|
26
|
-
$scope.command.selectedVnetSubnets = item.subnets.map((s) => s.name);
|
|
27
|
-
};
|
|
28
|
-
|
|
29
|
-
this.networkSettingsChanged = function (item) {
|
|
30
|
-
$scope.command.vnet = $scope.command.selectedVnet.name;
|
|
31
|
-
$scope.command.subnet = item;
|
|
32
|
-
ModalWizard.markComplete('network-settings');
|
|
33
|
-
};
|
|
34
|
-
|
|
35
|
-
this.getVnetName = function () {
|
|
36
|
-
if ($scope.command.selectedVnet) {
|
|
37
|
-
return $scope.command.selectedVnet.name;
|
|
38
|
-
} else {
|
|
39
|
-
return 'Virtual network was not selected';
|
|
40
|
-
}
|
|
41
|
-
};
|
|
42
|
-
},
|
|
43
|
-
],
|
|
44
|
-
);
|
|
@@ -1,54 +0,0 @@
|
|
|
1
|
-
<h5 class="text-center" ng-if="!command.viewState.networkSettingsConfigured">
|
|
2
|
-
Please select an account, a region and a load balancer first.
|
|
3
|
-
</h5>
|
|
4
|
-
<div
|
|
5
|
-
ng-if="command.viewState.networkSettingsConfigured"
|
|
6
|
-
ng-controller="azureServerGroupNetworkSettingsCtrl as networkSettingCtrl"
|
|
7
|
-
>
|
|
8
|
-
<div class="form-group" ng-if="command.loadBalancerType === 'Azure Load Balancer' || !command.loadBalancerType">
|
|
9
|
-
<div class="col-md-3 sm-label-right">Virtual Network</div>
|
|
10
|
-
<div class="col-md-7">
|
|
11
|
-
<ui-select
|
|
12
|
-
required
|
|
13
|
-
class="form-control input-sm"
|
|
14
|
-
ng-model="command.selectedVnet"
|
|
15
|
-
on-select="networkSettingCtrl.vnetChanged($item)"
|
|
16
|
-
>
|
|
17
|
-
<ui-select-match placeholder="Select from existing virtual networks">{{$select.selected.name}}</ui-select-match>
|
|
18
|
-
<ui-select-choices repeat="selectVnet in command.allVnets">
|
|
19
|
-
<span ng-bind-html="selectVnet.name"></span>
|
|
20
|
-
</ui-select-choices>
|
|
21
|
-
</ui-select>
|
|
22
|
-
</div>
|
|
23
|
-
</div>
|
|
24
|
-
|
|
25
|
-
<div class="form-group">
|
|
26
|
-
<div class="col-md-3 sm-label-right"><b>Subnets</b></div>
|
|
27
|
-
<div class="col-md-7">
|
|
28
|
-
<ui-select
|
|
29
|
-
required
|
|
30
|
-
ng-model="command.selectedSubnet"
|
|
31
|
-
class="form-control input-sm"
|
|
32
|
-
on-select="networkSettingCtrl.networkSettingsChanged($item)"
|
|
33
|
-
>
|
|
34
|
-
<ui-select-match placeholder="Select from an existing subnet">{{$select.selected}}</ui-select-match>
|
|
35
|
-
<ui-select-choices repeat="subnet in command.selectedVnetSubnets | filter: $select.search">
|
|
36
|
-
<span ng-bind-html="subnet | highlight: $select.search"></span>
|
|
37
|
-
</ui-select-choices>
|
|
38
|
-
</ui-select>
|
|
39
|
-
</div>
|
|
40
|
-
</div>
|
|
41
|
-
|
|
42
|
-
<div class="form-group" ng-if="!command.viewState.hideClusterNamePreview">
|
|
43
|
-
<div class="col-md-12">
|
|
44
|
-
<div class="well-compact" ng-class="well">
|
|
45
|
-
<h5 class="text-center">
|
|
46
|
-
<p>Your server group will be using a subnet in virtual network:</p>
|
|
47
|
-
<p>
|
|
48
|
-
<strong> {{networkSettingCtrl.getVnetName()}} </strong>
|
|
49
|
-
</p>
|
|
50
|
-
</h5>
|
|
51
|
-
</div>
|
|
52
|
-
</div>
|
|
53
|
-
</div>
|
|
54
|
-
</div>
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
|
|
3
|
-
import { module } from 'angular';
|
|
4
|
-
|
|
5
|
-
export const AZURE_SERVERGROUP_CONFIGURE_WIZARD_NETWORKSETTINGS_SERVERGROUPNETWORKSETTINGSSELECTOR_DIRECTIVE =
|
|
6
|
-
'spinnaker.azure.serverGroup.configure.networkSettings.directive';
|
|
7
|
-
export const name = AZURE_SERVERGROUP_CONFIGURE_WIZARD_NETWORKSETTINGS_SERVERGROUPNETWORKSETTINGSSELECTOR_DIRECTIVE; // for backwards compatibility
|
|
8
|
-
module(AZURE_SERVERGROUP_CONFIGURE_WIZARD_NETWORKSETTINGS_SERVERGROUPNETWORKSETTINGSSELECTOR_DIRECTIVE, []).directive(
|
|
9
|
-
'azureServerGroupNetworkSettingsSelector',
|
|
10
|
-
function () {
|
|
11
|
-
return {
|
|
12
|
-
restrict: 'E',
|
|
13
|
-
scope: {
|
|
14
|
-
command: '=',
|
|
15
|
-
},
|
|
16
|
-
templateUrl: require('./ServerGroupNetworkSettingsSelector.directive.html'),
|
|
17
|
-
};
|
|
18
|
-
},
|
|
19
|
-
);
|
package/src/serverGroup/configure/wizard/securityGroup/ServerGroupSecurityGroups.controller.js
DELETED
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
|
|
3
|
-
import { module } from 'angular';
|
|
4
|
-
|
|
5
|
-
import { ModalWizard } from '@spinnaker/core';
|
|
6
|
-
|
|
7
|
-
export const AZURE_SERVERGROUP_CONFIGURE_WIZARD_SECURITYGROUP_SERVERGROUPSECURITYGROUPS_CONTROLLER =
|
|
8
|
-
'spinnaker.azure.serverGroup.configure.securityGroups.controller';
|
|
9
|
-
export const name = AZURE_SERVERGROUP_CONFIGURE_WIZARD_SECURITYGROUP_SERVERGROUPSECURITYGROUPS_CONTROLLER; // for backwards compatibility
|
|
10
|
-
module(AZURE_SERVERGROUP_CONFIGURE_WIZARD_SECURITYGROUP_SERVERGROUPSECURITYGROUPS_CONTROLLER, []).controller(
|
|
11
|
-
'azureServerGroupSecurityGroupsCtrl',
|
|
12
|
-
[
|
|
13
|
-
'$scope',
|
|
14
|
-
function ($scope) {
|
|
15
|
-
ModalWizard.markClean('security-groups');
|
|
16
|
-
ModalWizard.markComplete('security-groups');
|
|
17
|
-
|
|
18
|
-
$scope.command.selectedSecurityGroup = {
|
|
19
|
-
id: $scope.command.securityGroupName,
|
|
20
|
-
};
|
|
21
|
-
|
|
22
|
-
this.securityGroupChanged = function (securityGroup) {
|
|
23
|
-
$scope.command.securityGroupName = securityGroup.id;
|
|
24
|
-
ModalWizard.markComplete('security-groups');
|
|
25
|
-
};
|
|
26
|
-
},
|
|
27
|
-
],
|
|
28
|
-
);
|
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
<h5 class="text-center" ng-if="!command.viewState.securityGroupsConfigured">Please select an account and region.</h5>
|
|
2
|
-
<div
|
|
3
|
-
ng-if="command.viewState.securityGroupsConfigured"
|
|
4
|
-
ng-controller="azureServerGroupSecurityGroupsCtrl as securityGroupCtrl"
|
|
5
|
-
>
|
|
6
|
-
<div class="form-group">
|
|
7
|
-
<div class="col-md-3 sm-label-right">
|
|
8
|
-
<b><firewall-label label="Firewalls"></firewall-label></b>
|
|
9
|
-
</div>
|
|
10
|
-
<div class="col-md-7">
|
|
11
|
-
<ui-select
|
|
12
|
-
ng-model="command.selectedSecurityGroup"
|
|
13
|
-
class="form-control input-sm"
|
|
14
|
-
on-select="securityGroupCtrl.securityGroupChanged($item)"
|
|
15
|
-
>
|
|
16
|
-
<ui-select-match placeholder="select a {{firewallLabel}}">{{$select.selected.id}}</ui-select-match>
|
|
17
|
-
<ui-select-choices
|
|
18
|
-
repeat="securityGroup in command.backingData.filtered.securityGroups | anyFieldFilter: {name: $select.search, id: $select.search}"
|
|
19
|
-
>
|
|
20
|
-
<span ng-bind-html="securityGroup.id | highlight: $select.search"></span>
|
|
21
|
-
</ui-select-choices>
|
|
22
|
-
</ui-select>
|
|
23
|
-
</div>
|
|
24
|
-
</div>
|
|
25
|
-
|
|
26
|
-
<div class="form-group small" style="margin-top: 20px">
|
|
27
|
-
<div class="col-md-9 col-md-offset-3">
|
|
28
|
-
<p>
|
|
29
|
-
<span ng-if="refreshing"><span class="fa fa-sync-alt fa-spin"></span></span>
|
|
30
|
-
<firewall-label label="Firewalls"></firewall-label>
|
|
31
|
-
<span ng-if="!refreshing">last refreshed {{ getSecurityGroupRefreshTime() | timestamp }}</span>
|
|
32
|
-
<span ng-if="refreshing"> refreshing...</span>
|
|
33
|
-
</p>
|
|
34
|
-
<p>
|
|
35
|
-
If you're not finding a <firewall-label label="firewall"></firewall-label> that was recently added,
|
|
36
|
-
<a href ng-click="refreshSecurityGroups()">click here</a> to refresh the list.
|
|
37
|
-
</p>
|
|
38
|
-
</div>
|
|
39
|
-
</div>
|
|
40
|
-
</div>
|
|
@@ -1,38 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
|
|
3
|
-
import { module } from 'angular';
|
|
4
|
-
|
|
5
|
-
import { FirewallLabels, InfrastructureCaches } from '@spinnaker/core';
|
|
6
|
-
|
|
7
|
-
export const AZURE_SERVERGROUP_CONFIGURE_WIZARD_SECURITYGROUP_SERVERGROUPSECURITYGROUPSSELECTOR_DIRECTIVE =
|
|
8
|
-
'spinnaker.azure.serverGroup.configure.securityGroupSelector.directive';
|
|
9
|
-
export const name = AZURE_SERVERGROUP_CONFIGURE_WIZARD_SECURITYGROUP_SERVERGROUPSECURITYGROUPSSELECTOR_DIRECTIVE; // for backwards compatibility
|
|
10
|
-
module(AZURE_SERVERGROUP_CONFIGURE_WIZARD_SECURITYGROUP_SERVERGROUPSECURITYGROUPSSELECTOR_DIRECTIVE, []).directive(
|
|
11
|
-
'azureServerGroupSecurityGroupsSelector',
|
|
12
|
-
[
|
|
13
|
-
'azureServerGroupConfigurationService',
|
|
14
|
-
function (azureServerGroupConfigurationService) {
|
|
15
|
-
return {
|
|
16
|
-
restrict: 'E',
|
|
17
|
-
scope: {
|
|
18
|
-
command: '=',
|
|
19
|
-
},
|
|
20
|
-
templateUrl: require('./serverGroupSecurityGroupsSelector.directive.html'),
|
|
21
|
-
link: function (scope) {
|
|
22
|
-
scope.firewallLabel = FirewallLabels.get('firewall');
|
|
23
|
-
|
|
24
|
-
scope.getSecurityGroupRefreshTime = function () {
|
|
25
|
-
return InfrastructureCaches.get('securityGroups').getStats().ageMax;
|
|
26
|
-
};
|
|
27
|
-
|
|
28
|
-
scope.refreshSecurityGroups = function () {
|
|
29
|
-
scope.refreshing = true;
|
|
30
|
-
azureServerGroupConfigurationService.refreshSecurityGroups(scope.command).then(function () {
|
|
31
|
-
scope.refreshing = false;
|
|
32
|
-
});
|
|
33
|
-
};
|
|
34
|
-
},
|
|
35
|
-
};
|
|
36
|
-
},
|
|
37
|
-
],
|
|
38
|
-
);
|
|
@@ -1,61 +0,0 @@
|
|
|
1
|
-
<div>
|
|
2
|
-
<div ng-if="state.requiresTemplateSelection">
|
|
3
|
-
<ng-include src="pages.templateSelection"></ng-include>
|
|
4
|
-
</div>
|
|
5
|
-
<div ng-if="!state.loaded" style="height: 200px" class="horizontal center middle">
|
|
6
|
-
<loading-spinner size="'small'"></loading-spinner>
|
|
7
|
-
</div>
|
|
8
|
-
<div>
|
|
9
|
-
<form name="serverGroupWizardForm" class="form-horizontal" novalidate validate-on-submit>
|
|
10
|
-
<v2-modal-wizard
|
|
11
|
-
ng-show="state.loaded && !state.requiresTemplateSelection"
|
|
12
|
-
heading="{{title}}"
|
|
13
|
-
task-monitor="taskMonitor"
|
|
14
|
-
dismiss="$dismiss()"
|
|
15
|
-
>
|
|
16
|
-
<v2-wizard-page key="basic-settings" label="Basic Settings" hide-subheading="true">
|
|
17
|
-
<ng-include src="pages.basicSettings"></ng-include>
|
|
18
|
-
</v2-wizard-page>
|
|
19
|
-
<v2-wizard-page key="image-settings" label="Image">
|
|
20
|
-
<ng-include src="pages.imageSettings"></ng-include>
|
|
21
|
-
</v2-wizard-page>
|
|
22
|
-
<v2-wizard-page key="load-balancers" label="Load Balancers" mark-complete-on-view="false">
|
|
23
|
-
<ng-include src="pages.loadBalancers"></ng-include>
|
|
24
|
-
</v2-wizard-page>
|
|
25
|
-
<v2-wizard-page key="network-settings" label="Network Settings" mark-complete-on-view="false">
|
|
26
|
-
<ng-include src="pages.networkSettings"></ng-include>
|
|
27
|
-
</v2-wizard-page>
|
|
28
|
-
<v2-wizard-page key="health-settings" label="Health" mark-complete-on-view="false">
|
|
29
|
-
<ng-include src="pages.healthSettings"></ng-include>
|
|
30
|
-
</v2-wizard-page>
|
|
31
|
-
<v2-wizard-page key="security-groups" label="{{firewallsLabel}}" mark-complete-on-view="false" done="true">
|
|
32
|
-
<ng-include src="pages.securityGroups"></ng-include>
|
|
33
|
-
</v2-wizard-page>
|
|
34
|
-
<v2-wizard-page key="instance-type" label="Instance Type" mark-complete-on-view="false" done="false">
|
|
35
|
-
<ng-include src="pages.instanceType"></ng-include>
|
|
36
|
-
</v2-wizard-page>
|
|
37
|
-
<v2-wizard-page key="zones" label="Zones" mark-complete-on-view="false" done="false">
|
|
38
|
-
<ng-include src="pages.zones"></ng-include>
|
|
39
|
-
</v2-wizard-page>
|
|
40
|
-
<v2-wizard-page key="tags" label="Tags" mark-complete-on-view="false" done="true">
|
|
41
|
-
<ng-include src="pages.tags"></ng-include>
|
|
42
|
-
</v2-wizard-page>
|
|
43
|
-
<v2-wizard-page key="advanced-settings" label="Advanced Settings" mark-complete-on-view="false" done="true">
|
|
44
|
-
<ng-include src="pages.advancedSettings"></ng-include>
|
|
45
|
-
</v2-wizard-page>
|
|
46
|
-
</v2-modal-wizard>
|
|
47
|
-
<div class="modal-footer" ng-if="state.loaded">
|
|
48
|
-
<button ng-disabled="taskMonitor.submitting" class="btn btn-default btn-cancel" ng-click="ctrl.cancel()">
|
|
49
|
-
Cancel
|
|
50
|
-
</button>
|
|
51
|
-
<submit-button
|
|
52
|
-
is-disabled="taskMonitor.submitting || !ctrl.isValid()"
|
|
53
|
-
label="command.viewState.submitButtonLabel"
|
|
54
|
-
submitting="taskMonitor.submitting"
|
|
55
|
-
on-click="serverGroupWizardForm.$valid && ctrl.submit()"
|
|
56
|
-
is-new="true"
|
|
57
|
-
></submit-button>
|
|
58
|
-
</div>
|
|
59
|
-
</form>
|
|
60
|
-
</div>
|
|
61
|
-
</div>
|