diff --git a/packages/amazon/src/loadBalancer/details/LoadBalancerActions.tsx b/packages/amazon/src/loadBalancer/details/LoadBalancerActions.tsx index b2a624af7f5..ac4db4f2354 100644 --- a/packages/amazon/src/loadBalancer/details/LoadBalancerActions.tsx +++ b/packages/amazon/src/loadBalancer/details/LoadBalancerActions.tsx @@ -66,38 +66,6 @@ export class LoadBalancerActions extends React.Component { - const { app, loadBalancer, loadBalancerFromParams } = this.props; - - if (loadBalancer.instances && loadBalancer.instances.length) { - return; - } - - const taskMonitor = { - application: app, - title: 'Deleting ' + loadBalancerFromParams.name, - }; - - const command: IAmazonLoadBalancerDeleteCommand = { - cloudProvider: loadBalancer.cloudProvider, - loadBalancerName: loadBalancer.name, - loadBalancerType: loadBalancer.loadBalancerType || 'classic', - regions: [loadBalancer.region], - credentials: loadBalancer.account, - vpcId: get(loadBalancer, 'elb.vpcId', null), - }; - - const submitMethod = () => LoadBalancerWriter.deleteLoadBalancer(command, app); - - ConfirmationModalService.confirm({ - header: `Really delete ${loadBalancerFromParams.name} in ${loadBalancerFromParams.region}: ${loadBalancerFromParams.accountId}?`, - buttonText: `Delete ${loadBalancerFromParams.name}`, - account: loadBalancerFromParams.accountId, - taskMonitorConfig: taskMonitor, - submitMethod, - }); - }; - private entityTagUpdate = (): void => { this.props.app.loadBalancers.refresh(); }; @@ -136,11 +104,6 @@ export class LoadBalancerActions extends React.Component )} - {allowDeletion && ( - - Delete Load Balancer - - )} {!allowDeletion && (
  • diff --git a/packages/appengine/src/loadBalancer/details/details.controller.ts b/packages/appengine/src/loadBalancer/details/details.controller.ts index 866cad0ff81..e5e65fa450a 100644 --- a/packages/appengine/src/loadBalancer/details/details.controller.ts +++ b/packages/appengine/src/loadBalancer/details/details.controller.ts @@ -49,35 +49,6 @@ class AppengineLoadBalancerDetailsController implements IController { }); } - public deleteLoadBalancer(): void { - const taskMonitor = { - application: this.app, - title: 'Deleting ' + this.loadBalancer.name, - }; - - const submitMethod = () => { - const loadBalancer: ILoadBalancerDeleteCommand = { - cloudProvider: this.loadBalancer.cloudProvider, - loadBalancerName: this.loadBalancer.name, - credentials: this.loadBalancer.account, - }; - return LoadBalancerWriter.deleteLoadBalancer(loadBalancer, this.app); - }; - - ConfirmationModalService.confirm({ - header: 'Really delete ' + this.loadBalancer.name + '?', - buttonText: 'Delete ' + this.loadBalancer.name, - body: this.getConfirmationModalBodyHtml(), - account: this.loadBalancer.account, - taskMonitorConfig: taskMonitor, - submitMethod, - }); - } - - public canDeleteLoadBalancer(): boolean { - return this.loadBalancer.name !== 'default'; - } - private extractLoadBalancer(): void { this.loadBalancer = this.app.getDataSource('loadBalancers').data.find((test: ILoadBalancer) => { return test.name === this.loadBalancerFromParams.name && test.account === this.loadBalancerFromParams.accountId; diff --git a/packages/appengine/src/loadBalancer/details/details.html b/packages/appengine/src/loadBalancer/details/details.html index 7cec90d5bf0..38a8db23f03 100644 --- a/packages/appengine/src/loadBalancer/details/details.html +++ b/packages/appengine/src/loadBalancer/details/details.html @@ -28,16 +28,7 @@

    {{ctrl.lo diff --git a/packages/azure/src/loadBalancer/details/loadBalancerDetail.controller.js b/packages/azure/src/loadBalancer/details/loadBalancerDetail.controller.js index 790e6d7ac97..eee4051d48d 100644 --- a/packages/azure/src/loadBalancer/details/loadBalancerDetail.controller.js +++ b/packages/azure/src/loadBalancer/details/loadBalancerDetail.controller.js @@ -147,35 +147,5 @@ angular }, }); }; - - this.deleteLoadBalancer = function deleteLoadBalancer() { - if ($scope.loadBalancer.instances && $scope.loadBalancer.instances.length) { - return; - } - - const taskMonitor = { - application: app, - title: 'Deleting ' + loadBalancer.name, - }; - - const command = { - cloudProvider: 'azure', - loadBalancerName: $scope.loadBalancer.name, - loadBalancerType: $scope.loadBalancer.loadBalancerType, - 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, - account: loadBalancer.accountId, - taskMonitorConfig: taskMonitor, - submitMethod: submitMethod, - }); - }; }, ]); diff --git a/packages/azure/src/loadBalancer/details/loadBalancerDetail.html b/packages/azure/src/loadBalancer/details/loadBalancerDetail.html index 12992e8503f..c909d310cdb 100644 --- a/packages/azure/src/loadBalancer/details/loadBalancerDetail.html +++ b/packages/azure/src/loadBalancer/details/loadBalancerDetail.html @@ -28,16 +28,7 @@

    {{loadBal diff --git a/packages/cloudrun/src/loadBalancer/details/details.controller.ts b/packages/cloudrun/src/loadBalancer/details/details.controller.ts index d0555e70b45..0b7d6bca543 100644 --- a/packages/cloudrun/src/loadBalancer/details/details.controller.ts +++ b/packages/cloudrun/src/loadBalancer/details/details.controller.ts @@ -4,8 +4,7 @@ import { module } from 'angular'; import type { IModalService } from 'angular-ui-bootstrap'; import { cloneDeep } from 'lodash'; -import type { Application, ILoadBalancer, ILoadBalancerDeleteCommand } from '@spinnaker/core'; -import { ConfirmationModalService, LoadBalancerWriter } from '@spinnaker/core'; +import type { Application, ILoadBalancer } from '@spinnaker/core'; import type { ICloudrunLoadBalancer } from '../../common/domain/index'; interface ILoadBalancerFromStateParams { @@ -63,66 +62,6 @@ class CloudrunLoadBalancerDetailsController implements IController { } } - public deleteLoadBalancer(): void { - const taskMonitor = { - application: this.app, - title: 'Deleting ' + this.loadBalancer.name, - }; - - const submitMethod = () => { - const loadBalancer: ILoadBalancerDeleteCommand = { - cloudProvider: this.loadBalancer.cloudProvider, - loadBalancerName: this.loadBalancer.name, - credentials: this.loadBalancer.account, - }; - return LoadBalancerWriter.deleteLoadBalancer(loadBalancer, this.app); - }; - - ConfirmationModalService.confirm({ - header: 'Really delete ' + this.loadBalancer.name + '?', - buttonText: 'Delete ' + this.loadBalancer.name, - body: this.getConfirmationModalBodyHtml(), - account: this.loadBalancer.account, - taskMonitorConfig: taskMonitor, - submitMethod, - }); - } - - public canDeleteLoadBalancer(): boolean { - return this.loadBalancer.name !== 'default'; - } - - private getConfirmationModalBodyHtml(): string { - const serverGroupNames = this.loadBalancer.serverGroups.map((serverGroup) => serverGroup.name); - const hasAny = serverGroupNames ? serverGroupNames.length > 0 : false; - const hasMoreThanOne = serverGroupNames ? serverGroupNames.length > 1 : false; - - // HTML accepted by the confirmationModalService is static (i.e., not managed by angular). - if (hasAny) { - if (hasMoreThanOne) { - const listOfServerGroupNames = serverGroupNames.map((name) => `
  • ${name}
    • `).join(''); - return `
    -

    - Deleting ${this.loadBalancer.name} will destroy the following server groups: -

      - ${listOfServerGroupNames} -
    -

    -
    - `; - } else { - return `
    -

    - Deleting ${this.loadBalancer.name} will destroy ${serverGroupNames[0]}. -

    -
    - `; - } - } else { - return null; - } - } - private autoClose(): void { if (this.$scope.$$destroyed) { return; diff --git a/packages/cloudrun/src/loadBalancer/details/details.html b/packages/cloudrun/src/loadBalancer/details/details.html index 70b8ccc1203..17e1d7ce9a0 100644 --- a/packages/cloudrun/src/loadBalancer/details/details.html +++ b/packages/cloudrun/src/loadBalancer/details/details.html @@ -28,16 +28,7 @@

    {{ctrl.lo diff --git a/packages/core/src/loadBalancer/loadBalancer.write.service.ts b/packages/core/src/loadBalancer/loadBalancer.write.service.ts index a4e58964658..ce7619e376a 100644 --- a/packages/core/src/loadBalancer/loadBalancer.write.service.ts +++ b/packages/core/src/loadBalancer/loadBalancer.write.service.ts @@ -27,16 +27,6 @@ export interface ILoadBalancerDeleteCommand extends IJob { } export class LoadBalancerWriter { - public static deleteLoadBalancer(command: ILoadBalancerDeleteCommand, application: Application): PromiseLike { - command.type = 'deleteLoadBalancer'; - - return TaskExecutor.executeTask({ - job: [command], - application, - description: `Delete load balancer: ${command.loadBalancerName}`, - }); - } - public static upsertLoadBalancer( command: ILoadBalancerUpsertCommand, application: Application, diff --git a/packages/dcos/src/loadBalancer/details/details.controller.js b/packages/dcos/src/loadBalancer/details/details.controller.js index c7455292320..7e519c62aae 100644 --- a/packages/dcos/src/loadBalancer/details/details.controller.js +++ b/packages/dcos/src/loadBalancer/details/details.controller.js @@ -85,34 +85,5 @@ angular.module(DCOS_LOADBALANCER_DETAILS_DETAILS_CONTROLLER, []).controller('dco }, }); }; - - this.deleteLoadBalancer = function deleteLoadBalancer() { - if ($scope.loadBalancer.instances && $scope.loadBalancer.instances.length) { - return; - } - - const taskMonitor = { - application: application, - title: 'Deleting ' + loadBalancer.name, - }; - - const command = { - cloudProvider: 'dcos', - loadBalancerName: $scope.loadBalancer.name, - dcosCluster: $scope.loadBalancer.dcosCluster, - region: $scope.loadBalancer.region, - credentials: $scope.loadBalancer.account, - }; - - const submitMethod = () => LoadBalancerWriter.deleteLoadBalancer(command, application); - - ConfirmationModalService.confirm({ - header: 'Really delete ' + loadBalancer.name + '?', - buttonText: 'Delete ' + loadBalancer.name, - account: loadBalancer.account, - taskMonitorConfig: taskMonitor, - submitMethod: submitMethod, - }); - }; }, ]); diff --git a/packages/dcos/src/loadBalancer/details/details.html b/packages/dcos/src/loadBalancer/details/details.html index 20509136c11..cf44e469962 100644 --- a/packages/dcos/src/loadBalancer/details/details.html +++ b/packages/dcos/src/loadBalancer/details/details.html @@ -28,16 +28,7 @@

    {{loadBal diff --git a/packages/google/src/loadBalancer/configure/http/httpLoadBalancer.write.service.js b/packages/google/src/loadBalancer/configure/http/httpLoadBalancer.write.service.js index f9f56afc4ba..dc5594c3c9f 100644 --- a/packages/google/src/loadBalancer/configure/http/httpLoadBalancer.write.service.js +++ b/packages/google/src/loadBalancer/configure/http/httpLoadBalancer.write.service.js @@ -29,28 +29,5 @@ angular }); } - function deleteLoadBalancers(loadBalancer, application, params = {}) { - const job = { - type: 'deleteLoadBalancer', - loadBalancerName: loadBalancer.listeners[0].name, - regions: [loadBalancer.region || 'global'], - region: loadBalancer.region || 'global', - loadBalancerType: loadBalancer.loadBalancerType, - cloudProvider: loadBalancer.provider, - credentials: loadBalancer.account, - }; - - angular.extend(job, params); - - InfrastructureCaches.clearCache('backendServices'); - InfrastructureCaches.clearCache('healthChecks'); - - return TaskExecutor.executeTask({ - job: [job], - application: application, - description: `Delete load balancer: ${loadBalancer.urlMapName} in ${loadBalancer.account}:global`, - }); - } - - return { upsertLoadBalancers, deleteLoadBalancers }; + return upsertLoadBalancers; }); diff --git a/packages/google/src/loadBalancer/details/loadBalancerDetail.controller.js b/packages/google/src/loadBalancer/details/loadBalancerDetail.controller.js index c4497ba1181..3b7d834c503 100644 --- a/packages/google/src/loadBalancer/details/loadBalancerDetail.controller.js +++ b/packages/google/src/loadBalancer/details/loadBalancerDetail.controller.js @@ -234,19 +234,6 @@ angular }); }; - this.deleteLoadBalancer = function deleteLoadBalancer() { - if (!($scope.loadBalancer.instances && $scope.loadBalancer.instances.length)) { - $uibModal.open({ - controller: 'gceLoadBalancerDeleteModalCtrl as ctrl', - templateUrl: require('./deleteModal/deleteModal.html'), - resolve: { - application: () => application, - loadBalancer: () => $scope.loadBalancer, - }, - }); - } - }; - this.isHttpLoadBalancer = (lb) => gceHttpLoadBalancerUtils.isHttpLoadBalancer(lb); this.getNetworkId = function getNetworkId(loadBalancer) { diff --git a/packages/google/src/loadBalancer/details/loadBalancerDetails.html b/packages/google/src/loadBalancer/details/loadBalancerDetails.html index 65b291738ad..2e0b562eebe 100644 --- a/packages/google/src/loadBalancer/details/loadBalancerDetails.html +++ b/packages/google/src/loadBalancer/details/loadBalancerDetails.html @@ -41,16 +41,7 @@