Skip to content

Commit

Permalink
fix(azure): Specify cloud provider when deleting lb
Browse files Browse the repository at this point in the history
Deleting a load balancer was failing because 'loadBalancer.providerType' was undefined and it was defaulting to 'aws'. Also refactor to use the core loadBalancerWriter instead of our own implementation
  • Loading branch information
ejizba committed Mar 28, 2017
1 parent d84f93f commit 09683e7
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 67 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Expand Up @@ -9,5 +9,6 @@
Netflix, Inc <*@netflix.com>
Google, Inc <*@google.com>
Pivotal, Inc <*@pivotal.io>
Microsoft, Inc <*@microsoft.com>
Veritas Technologies LLC <*@veritas.com>
Target, Inc <*@target.com>
Expand Up @@ -8,12 +8,13 @@ import {INFRASTRUCTURE_CACHE_SERVICE} from 'core/cache/infrastructureCaches.serv
import {NAMING_SERVICE} from 'core/naming/naming.service';
import {NETWORK_READ_SERVICE} from 'core/network/network.read.service';
import {TASK_MONITOR_BUILDER} from 'core/task/monitor/taskMonitor.builder';
import {LOAD_BALANCER_WRITE_SERVICE} from 'core/loadBalancer/loadBalancer.write.service';

let angular = require('angular');

module.exports = angular.module('spinnaker.azure.loadBalancer.create.controller', [
require('angular-ui-router'),
require('../loadBalancer.write.service.js'),
LOAD_BALANCER_WRITE_SERVICE,
ACCOUNT_SERVICE,
require('../loadBalancer.transformer.js'),
V2_MODAL_WIZARD_SERVICE,
Expand All @@ -27,7 +28,7 @@ module.exports = angular.module('spinnaker.azure.loadBalancer.create.controller'
.controller('azureCreateLoadBalancerCtrl', function($scope, $uibModalInstance, $state,
accountService, azureLoadBalancerTransformer,
infrastructureCaches, networkReader,
v2modalWizardService, azureLoadBalancerWriter, taskMonitorBuilder,
v2modalWizardService, loadBalancerWriter, taskMonitorBuilder,
namingService, application, loadBalancer, isNew) {

var ctrl = this;
Expand Down Expand Up @@ -247,7 +248,7 @@ module.exports = angular.module('spinnaker.azure.loadBalancer.create.controller'
$scope.loadBalancer.probes[0].probePath = undefined;
}

return azureLoadBalancerWriter.upsertLoadBalancer($scope.loadBalancer, application, descriptor, params);
return loadBalancerWriter.upsertLoadBalancer($scope.loadBalancer, application, descriptor, params);
}
);
};
Expand Down
Expand Up @@ -6,18 +6,19 @@ let angular = require('angular');
import {SECURITY_GROUP_READER} from 'core/securityGroup/securityGroupReader.service';
import {CONFIRMATION_MODAL_SERVICE} from 'core/confirmationModal/confirmationModal.service';
import {LOAD_BALANCER_READ_SERVICE} from 'core/loadBalancer/loadBalancer.read.service';
import {LOAD_BALANCER_WRITE_SERVICE} from 'core/loadBalancer/loadBalancer.write.service';

module.exports = angular.module('spinnaker.azure.loadBalancer.details.controller', [
require('angular-ui-router'),
SECURITY_GROUP_READER,
require('../loadBalancer.write.service.js'),
LOAD_BALANCER_WRITE_SERVICE,
LOAD_BALANCER_READ_SERVICE,
CONFIRMATION_MODAL_SERVICE,
require('core/presentation/collapsibleSection/collapsibleSection.directive.js'),
require('core/utils/selectOnDblClick.directive.js'),
])
.controller('azureLoadBalancerDetailsCtrl', function ($scope, $state, $exceptionHandler, $uibModal, loadBalancer, app,
securityGroupReader, confirmationModalService, azureLoadBalancerWriter, loadBalancerReader, $q) {
securityGroupReader, confirmationModalService, loadBalancerWriter, loadBalancerReader, $q) {

$scope.state = {
loading: true
Expand Down Expand Up @@ -94,10 +95,16 @@ module.exports = angular.module('spinnaker.azure.loadBalancer.details.controller
title: 'Deleting ' + loadBalancer.name,
};

var submitMethod = function () {
return azureLoadBalancerWriter.deleteLoadBalancer(loadBalancer, app);
const command = {
cloudProvider: 'azure',
loadBalancerName: $scope.loadBalancer.name,
credentials: $scope.loadBalancer.account,
region: loadBalancer.region,
appName: app.name
};

const submitMethod = () => loadBalancerWriter.deleteLoadBalancer(command, app);

confirmationModalService.confirm({
header: 'Really delete ' + loadBalancer.name + '?',
buttonText: 'Delete ' + loadBalancer.name,
Expand All @@ -108,6 +115,5 @@ module.exports = angular.module('spinnaker.azure.loadBalancer.details.controller
submitMethod: submitMethod
});
};

}
);

This file was deleted.

0 comments on commit 09683e7

Please sign in to comment.