@spinnaker/amazon 2026.2.2 → 2026.3.0

package/src/reactShims/aws.react.injector.ts

@@ -1,25 +0,0 @@
-import IInjectorService = angular.auto.IInjectorService;
-
-import type { FunctionReader } from '@spinnaker/core';
-import { ReactInject } from '@spinnaker/core';
-import type { EvaluateCloudFormationChangeSetExecutionService } from '../pipeline/stages/deployCloudFormation/evaluateCloudFormationChangeSetExecution.service';
-import type { AwsServerGroupCommandBuilder } from '../serverGroup/configure/serverGroupCommandBuilder.service';
-
-import type { AwsServerGroupConfigurationService } from '../serverGroup/configure/serverGroupConfiguration.service';
-import type { AwsServerGroupTransformer } from '../serverGroup/serverGroup.transformer';
-
-// prettier-ignore
-export class AwsReactInject extends ReactInject {
-  public get awsInstanceTypeService() { return this.$injector.get('awsInstanceTypeService') as any; }
-  public get awsServerGroupCommandBuilder() { return this.$injector.get('awsServerGroupCommandBuilder') as AwsServerGroupCommandBuilder; }
-  public get awsServerGroupConfigurationService() { return this.$injector.get('awsServerGroupConfigurationService') as AwsServerGroupConfigurationService; }
-  public get awsServerGroupTransformer() { return this.$injector.get('awsServerGroupTransformer') as AwsServerGroupTransformer; }
-
-  public get functionReader() { return this.$injector.get('functionReader') as FunctionReader; }
-  public get evaluateCloudFormationChangeSetExecutionService() { return this.$injector.get('evaluateCloudFormationChangeSetExecutionService') as EvaluateCloudFormationChangeSetExecutionService; }
-  public initialize($injector: IInjectorService) {
-    this.$injector = $injector;
-  }
-}
-
-export const AwsReactInjector: AwsReactInject = new AwsReactInject();

package/src/reactShims/aws.react.module.ts

@@ -1,12 +0,0 @@
-import { module } from 'angular';
-
-import { AwsReactInjector } from './aws.react.injector';
-
-export const AWS_REACT_MODULE = 'spinnaker.amazon.react';
-module(AWS_REACT_MODULE, []).run([
-  '$injector',
-  function ($injector: any) {
-    // Make angular services importable and (TODO when relevant) convert angular components to react
-    AwsReactInjector.initialize($injector);
-  },
-]);

package/src/reactShims/index.ts

@@ -1 +0,0 @@
-export * from './aws.react.injector';

package/src/securityGroup/clone/cloneSecurityGroup.controller.js

@@ -1,106 +0,0 @@
-'use strict';
-
-import * as angular from 'angular';
-import _ from 'lodash';
-
-import { AccountService, FirewallLabels } from '@spinnaker/core';
-import { AMAZON_SECURITYGROUP_CONFIGURE_CONFIGSECURITYGROUP_MIXIN_CONTROLLER } from '../configure/configSecurityGroup.mixin.controller';
-
-export const AMAZON_SECURITYGROUP_CLONE_CLONESECURITYGROUP_CONTROLLER =
-  'spinnaker.amazon.securityGroup.clone.controller';
-export const name = AMAZON_SECURITYGROUP_CLONE_CLONESECURITYGROUP_CONTROLLER; // for backwards compatibility
-angular
-  .module(AMAZON_SECURITYGROUP_CLONE_CLONESECURITYGROUP_CONTROLLER, [
-    AMAZON_SECURITYGROUP_CONFIGURE_CONFIGSECURITYGROUP_MIXIN_CONTROLLER,
-  ])
-  .controller('awsCloneSecurityGroupController', [
-    '$scope',
-    '$uibModalInstance',
-    '$controller',
-    'securityGroup',
-    'application',
-    function ($scope, $uibModalInstance, $controller, securityGroup, application) {
-      const vm = this;
-
-      vm.firewallLabel = FirewallLabels.get('Firewall');
-
-      $scope.pages = {
-        location: require('../configure/createSecurityGroupProperties.html'),
-        ingress: require('../configure/createSecurityGroupIngress.html'),
-      };
-
-      securityGroup.credentials = securityGroup.accountName;
-      $scope.namePreview = securityGroup.name;
-
-      angular.extend(
-        this,
-        $controller('awsConfigSecurityGroupMixin', {
-          $scope: $scope,
-          $uibModalInstance: $uibModalInstance,
-          application: application,
-          securityGroup: securityGroup,
-        }),
-      );
-      $scope.state.isNew = true;
-      // We want to let people clone as a means to copy security groups across
-      // regions so don't block them because the names already exist.
-      $scope.allowDuplicateNames = true;
-      // Used to prevent cloning into an the exiting region
-      $scope.state.isClone = true;
-      $scope.state.originRegion = securityGroup.regions && securityGroup.regions[0];
-
-      AccountService.listAccounts('aws').then(function (accounts) {
-        $scope.accounts = accounts;
-        vm.accountUpdated();
-      });
-
-      securityGroup.securityGroupIngress = _.chain(securityGroup.inboundRules)
-        .filter(function (rule) {
-          return rule.securityGroup;
-        })
-        .map(function (rule) {
-          return rule.portRanges.map(function (portRange) {
-            return {
-              name: rule.securityGroup.name,
-              type: rule.protocol,
-              startPort: portRange.startPort,
-              endPort: portRange.endPort,
-            };
-          });
-        })
-        .flatten()
-        .value();
-
-      securityGroup.ipIngress = _.chain(securityGroup.inboundRules)
-        .filter(function (rule) {
-          return rule.range;
-        })
-        .map(function (rule) {
-          return rule.portRanges.map(function (portRange) {
-            return {
-              cidr: rule.range.ip + rule.range.cidr,
-              type: rule.protocol,
-              startPort: portRange.startPort,
-              endPort: portRange.endPort,
-            };
-          });
-        })
-        .flatten()
-        .value();
-
-      vm.upsert = function () {
-        // <account-select-field> only updates securityGroup.credentials, but Orca looks at account* before looking at credentials
-        // Updating the rest of the attributes to send the correct (expected) account for all attributes
-        const { credentials } = $scope.securityGroup;
-        Object.assign($scope.securityGroup, {
-          account: credentials,
-          accountName: credentials,
-          accountId: credentials,
-        });
-
-        vm.mixinUpsert('Clone');
-      };
-
-      vm.initializeSecurityGroups().then(vm.initializeAccounts);
-    },
-  ]);

package/src/securityGroup/clone/cloneSecurityGroup.html

@@ -1,19 +0,0 @@
-<ng-form role="form" name="form" novalidate>
-  <v2-modal-wizard heading="Clone {{ctrl.firewallLabel}}" task-monitor="taskMonitor" dismiss="$dismiss()">
-    <v2-wizard-page key="Location" label="Location">
-      <ng-include src="pages.location"></ng-include>
-    </v2-wizard-page>
-    <v2-wizard-page key="Ingress" label="Ingress" done="true" mark-clean-on-view="false">
-      <ng-include src="pages.ingress"></ng-include>
-    </v2-wizard-page>
-  </v2-modal-wizard>
-  <div class="modal-footer">
-    <button class="btn btn-default" ng-click="ctrl.cancel()">Cancel</button>
-    <submit-button
-      is-disabled="form.$invalid || !wizard.isComplete() || state.submitting || state.removedRules.length > 0 || !customComponentIsvalid || state.regionError"
-      submitting="state.submitting"
-      on-click="ctrl.upsert()"
-      is-new="isNew"
-    ></submit-button>
-  </div>
-</ng-form>

package/src/securityGroup/configure/CreateSecurityGroup.controller.spec.js

@@ -1,307 +0,0 @@
-'use strict';
-
-import { map } from 'lodash';
-
-import { AccountService, InfrastructureCaches, ModalWizard } from '@spinnaker/core';
-
-import { AWSProviderSettings } from '../../aws.settings';
-import { VpcReader } from '../../vpc';
-
-describe('Controller: CreateSecurityGroup', function () {
-  beforeEach(
-    window.module(require('./CreateSecurityGroupCtrl').name, require('./configSecurityGroup.mixin.controller').name),
-  );
-
-  afterEach(AWSProviderSettings.resetToOriginal);
-
-  describe('filtering', function () {
-    this.oldGet = InfrastructureCaches.get;
-
-    beforeEach(() => {
-      InfrastructureCaches.get = () => {
-        return {
-          getStats: () => {
-            return { ageMax: 0 };
-          },
-        };
-      };
-    });
-    afterEach(() => {
-      InfrastructureCaches.get = this.oldGet;
-    });
-
-    // Initialize the controller and a mock scope
-    beforeEach(
-      window.inject(function ($controller, $rootScope, $q, securityGroupReader) {
-        this.$scope = $rootScope.$new();
-        this.$q = $q;
-        this.securityGroupReader = securityGroupReader;
-
-        spyOn(AccountService, 'listAllAccounts').and.returnValue($q.when([{ name: 'prod' }, { name: 'test' }]));
-
-        spyOn(AccountService, 'getRegionsForAccount').and.returnValue($q.when(['us-east-1', 'us-west-1']));
-
-        spyOn(VpcReader, 'listVpcs').and.returnValue(
-          $q.when([
-            { id: 'vpc1-pe', name: 'vpc 1', account: 'prod', region: 'us-east-1', deprecated: false, label: 'vpc 1' },
-            { id: 'vpc2-pw', name: 'vpc 2', account: 'prod', region: 'us-west-1', deprecated: false, label: 'vpc 2' },
-            { id: 'vpc1-te', name: 'vpc 1', account: 'test', region: 'us-east-1', deprecated: false, label: 'vpc 1' },
-            { id: 'vpc2-te', name: 'vpc 2', account: 'test', region: 'us-east-1', deprecated: false, label: 'vpc 2' },
-            { id: 'vpc2-tw', name: 'vpc 2', account: 'test', region: 'us-west-1', deprecated: false, label: 'vpc 2' },
-          ]),
-        );
-
-        spyOn(this.securityGroupReader, 'getAllSecurityGroups').and.returnValue(
-          $q.when({
-            prod: {
-              aws: {
-                'us-east-1': [
-                  { name: 'group1', vpcId: null, id: '1' },
-                  { name: 'group2', vpcId: null, id: '2' },
-                  { name: 'group3', vpcId: 'vpc1-pe', id: '3' },
-                ],
-                'us-west-1': [
-                  { name: 'group1', vpcId: null, id: '1' },
-                  { name: 'group3', vpcId: 'vpc2-pw', id: '3' },
-                ],
-              },
-            },
-            test: {
-              aws: {
-                'us-east-1': [
-                  { name: 'group1', vpcId: null, id: '1' },
-                  { name: 'group2', vpcId: 'vpc1-te', id: '2' },
-                  { name: 'group3', vpcId: 'vpc1-te', id: '3' },
-                  { name: 'group4', vpcId: 'vpc2-te', id: '4' },
-                ],
-                'us-west-1': [
-                  { name: 'group1', vpcId: null, id: '1' },
-                  { name: 'group3', vpcId: 'vpc1-tw', id: '3' },
-                  { name: 'group3', vpcId: 'vpc2-tw', id: '3' },
-                  { name: 'group5', vpcId: 'vpc2-tw', id: '5' },
-                ],
-              },
-            },
-          }),
-        );
-
-        this.initializeCtrl = function () {
-          this.ctrl = $controller('awsCreateSecurityGroupCtrl', {
-            $scope: this.$scope,
-            $uibModalInstance: { result: this.$q.when(null) },
-            securityGroupReader: this.securityGroupReader,
-            application: this.application || { attributes: {} },
-            securityGroup: { regions: [], securityGroupIngress: [] },
-          });
-          this.$scope.$digest();
-        };
-      }),
-    );
-
-    it('initializes with no firewalls available for ingress permissions', function () {
-      this.initializeCtrl();
-      expect(this.$scope.availableSecurityGroups.length).toBe(0);
-    });
-
-    it('sets up available firewalls once an account and region are selected', function () {
-      this.initializeCtrl();
-      this.$scope.securityGroup.credentials = 'prod';
-      this.ctrl.accountUpdated();
-      this.$scope.$digest();
-      expect(this.$scope.availableSecurityGroups.length).toBe(0);
-
-      this.$scope.securityGroup.regions = ['us-east-1'];
-      this.ctrl.accountUpdated();
-      this.$scope.$digest();
-      expect(this.$scope.availableSecurityGroups.length).toBe(1);
-      expect(this.$scope.existingSecurityGroupNames).toEqual(['group3']);
-    });
-
-    it('filters existing names based on join of groups from all regions', function () {
-      this.initializeCtrl();
-      this.$scope.securityGroup.credentials = 'test';
-      this.$scope.securityGroup.regions = ['us-east-1', 'us-west-1'];
-      this.$scope.securityGroup.vpcId = 'vpc2-te';
-      this.$scope.securityGroup.vpcName = 'vpc 2';
-      this.ctrl.accountUpdated();
-      this.$scope.$digest();
-      expect(this.$scope.availableSecurityGroups.length).toBe(0);
-      expect(this.$scope.existingSecurityGroupNames.sort()).toEqual(['group3', 'group4', 'group5']);
-    });
-
-    it('filters available names based on intersection of groups from all regions', function () {
-      this.initializeCtrl();
-      this.$scope.securityGroup.credentials = 'test';
-      this.$scope.securityGroup.regions = ['us-east-1', 'us-west-1'];
-      this.$scope.securityGroup.vpcId = 'vpc1-tw';
-      this.ctrl.accountUpdated();
-      this.$scope.$digest();
-      expect(this.$scope.availableSecurityGroups.length).toBe(0);
-    });
-
-    it('filters VPCs based on account + region', function () {
-      this.initializeCtrl();
-      this.$scope.securityGroup.credentials = 'test';
-      this.$scope.securityGroup.regions = ['us-east-1', 'us-west-1'];
-      this.ctrl.accountUpdated();
-      this.$scope.$digest();
-      expect(map(this.$scope.vpcs, 'label').sort()).toEqual(['vpc 2']);
-
-      this.$scope.securityGroup.regions = ['us-east-1'];
-      this.ctrl.accountUpdated();
-      this.$scope.$digest();
-      expect(map(this.$scope.vpcs, 'label').sort()).toEqual(['vpc 1', 'vpc 2']);
-    });
-
-    it('loves a default VPC!', function () {
-      AWSProviderSettings.defaults.vpc = 'vpc 2';
-      AWSProviderSettings.classicLaunchLockout = -1;
-      this.initializeCtrl();
-      this.$scope.securityGroup.credentials = 'test';
-      this.$scope.securityGroup.regions = ['us-east-1'];
-      this.$scope.securityGroup.vpcName = 'vpc 2';
-      this.ctrl.regionUpdated();
-      this.$scope.$digest();
-      expect(this.$scope.securityGroup.vpcId).toBe('vpc2-te');
-    });
-
-    describe('firewall removal', function () {
-      beforeEach(function () {
-        spyOn(ModalWizard, 'markDirty').and.returnValue(null);
-        this.initializeCtrl();
-        let securityGroup = this.$scope.securityGroup;
-        securityGroup.credentials = 'prod';
-        securityGroup.regions = ['us-east-1'];
-        this.ctrl.accountUpdated();
-        this.$scope.$digest();
-      });
-
-      it('removes rules that are not available when account changes', function () {
-        let securityGroup = this.$scope.securityGroup;
-        securityGroup.credentials = 'test';
-        this.ctrl.accountUpdated();
-        this.$scope.$digest();
-        this.$scope.availableSecurityGroups.forEach((group) =>
-          securityGroup.securityGroupIngress.push({ name: group }),
-        );
-        expect(securityGroup.securityGroupIngress.length).toBe(2);
-
-        securityGroup.credentials = 'prod';
-        this.ctrl.accountUpdated();
-        this.$scope.$digest();
-        expect(this.$scope.state.removedRules.length).toBe(1);
-        expect(ModalWizard.markDirty).toHaveBeenCalledWith('Ingress');
-      });
-
-      it('does not repeatedly add removed rule warnings when multiple rules for the same group are removed', function () {
-        let securityGroup = this.$scope.securityGroup;
-        securityGroup.credentials = 'test';
-        this.ctrl.accountUpdated();
-        this.$scope.$digest();
-        this.$scope.availableSecurityGroups.forEach((group) => {
-          securityGroup.securityGroupIngress.push({ name: group, startPort: 7001, endPort: 7001, protocol: 'HTTPS' });
-          securityGroup.securityGroupIngress.push({ name: group, startPort: 7000, endPort: 7000, protocol: 'HTTP' });
-        });
-        expect(securityGroup.securityGroupIngress.length).toBe(4);
-
-        securityGroup.credentials = 'prod';
-        this.ctrl.accountUpdated();
-        this.$scope.$digest();
-        expect(this.$scope.state.removedRules).toEqual(['group2']);
-        expect(ModalWizard.markDirty).toHaveBeenCalledWith('Ingress');
-      });
-    });
-
-    describe('classic locking', function () {
-      function init(self) {
-        self.initializeCtrl();
-        self.ctrl.regionUpdated();
-        self.$scope.$digest();
-      }
-
-      it('does not hide classic when aws provider not configured', function () {
-        init(this);
-        expect(this.$scope.hideClassic).toBe(false);
-      });
-
-      it('does not hide classic when classicLaunchLockout not configured', function () {
-        AWSProviderSettings.classicLaunchLockout = undefined;
-        init(this);
-        expect(this.$scope.hideClassic).toBe(false);
-      });
-
-      it('does not hide classic when application has no attributes', function () {
-        AWSProviderSettings.classicLaunchLockout = 10;
-        init(this);
-        expect(this.$scope.hideClassic).toBe(false);
-
-        this.application = {};
-        init(this);
-        expect(this.$scope.hideClassic).toBe(false);
-      });
-
-      it('does not hide classic when application is older than lockout date', function () {
-        this.application = { attributes: { createTs: 9 } };
-        init(this);
-        expect(this.$scope.hideClassic).toBe(false);
-      });
-
-      it('hides classic when application createTs is numeric and the same as lockout', function () {
-        AWSProviderSettings.classicLaunchLockout = 10;
-        this.application = { attributes: { createTs: 10 } };
-        init(this);
-        expect(this.$scope.hideClassic).toBe(true);
-      });
-
-      it('hides classic when application createTs is numeric and after lockout', function () {
-        AWSProviderSettings.classicLaunchLockout = 10;
-        this.application = { attributes: { createTs: 11 } };
-        init(this);
-        expect(this.$scope.hideClassic).toBe(true);
-      });
-
-      it('hides classic when application createTs is a string and the same as lockout', function () {
-        AWSProviderSettings.classicLaunchLockout = 10;
-        this.application = { attributes: { createTs: '10' } };
-        init(this);
-        expect(this.$scope.hideClassic).toBe(true);
-      });
-
-      it('hides classic when application createTs is a string and after lockout', function () {
-        AWSProviderSettings.classicLaunchLockout = 10;
-        this.application = { attributes: { createTs: '11' } };
-        init(this);
-        expect(this.$scope.hideClassic).toBe(true);
-      });
-
-      it('sets vpcId to first active if classic is locked', function () {
-        AWSProviderSettings.classicLaunchLockout = 10;
-        this.application = { attributes: { createTs: 10 } };
-        this.initializeCtrl();
-
-        this.$scope.securityGroup.credentials = 'prod';
-        this.$scope.securityGroup.regions = ['us-east-1'];
-        this.$scope.securityGroup.vpcName = 'vpc 1';
-
-        this.ctrl.regionUpdated();
-        this.$scope.$digest();
-
-        expect(this.$scope.securityGroup.vpcId).toBe('vpc1-pe');
-      });
-
-      it('leaves vpcId alone if already selected and classic locked', function () {
-        AWSProviderSettings.classicLaunchLockout = 10;
-
-        this.application = { attributes: { createTs: 10 } };
-        this.initializeCtrl();
-        this.$scope.securityGroup.vpcId = 'vpc2-te';
-        this.$scope.securityGroup.vpcName = 'vpc 2';
-        this.$scope.securityGroup.credentials = 'test';
-        this.$scope.securityGroup.regions = ['us-east-1'];
-        this.ctrl.regionUpdated();
-        this.$scope.$digest();
-        expect(this.$scope.securityGroup.vpcId).toBe('vpc2-te');
-      });
-    });
-  });
-});

package/src/securityGroup/configure/CreateSecurityGroupCtrl.js

@@ -1,47 +0,0 @@
-'use strict';
-
-import UIROUTER_ANGULARJS from '@uirouter/angularjs';
-import * as angular from 'angular';
-
-import { CACHE_INITIALIZER_SERVICE, FirewallLabels } from '@spinnaker/core';
-
-export const AMAZON_SECURITYGROUP_CONFIGURE_CREATESECURITYGROUPCTRL =
-  'spinnaker.amazon.securityGroup.create.controller';
-export const name = AMAZON_SECURITYGROUP_CONFIGURE_CREATESECURITYGROUPCTRL; // for backwards compatibility
-angular
-  .module(AMAZON_SECURITYGROUP_CONFIGURE_CREATESECURITYGROUPCTRL, [UIROUTER_ANGULARJS, CACHE_INITIALIZER_SERVICE])
-  .controller('awsCreateSecurityGroupCtrl', [
-    '$scope',
-    '$uibModalInstance',
-    '$state',
-    '$controller',
-    'cacheInitializer',
-    'application',
-    'securityGroup',
-    function ($scope, $uibModalInstance, $state, $controller, cacheInitializer, application, securityGroup) {
-      $scope.pages = {
-        location: require('./createSecurityGroupProperties.html'),
-        ingress: require('./createSecurityGroupIngress.html'),
-      };
-
-      const ctrl = this;
-
-      ctrl.translate = (label) => FirewallLabels.get(label);
-
-      angular.extend(
-        this,
-        $controller('awsConfigSecurityGroupMixin', {
-          $scope: $scope,
-          $uibModalInstance: $uibModalInstance,
-          application: application,
-          securityGroup: securityGroup,
-        }),
-      );
-
-      $scope.state.isNew = true;
-
-      ctrl.upsert = () => ctrl.mixinUpsert('Create');
-
-      ctrl.initializeSecurityGroups().then(ctrl.initializeAccounts);
-    },
-  ]);

package/src/securityGroup/configure/EditSecurityGroupCtrl.js

@@ -1,115 +0,0 @@
-'use strict';
-
-import UIROUTER_ANGULARJS from '@uirouter/angularjs';
-import * as angular from 'angular';
-import _ from 'lodash';
-
-import { FirewallLabels, SecurityGroupWriter, TaskMonitor } from '@spinnaker/core';
-
-export const AMAZON_SECURITYGROUP_CONFIGURE_EDITSECURITYGROUPCTRL = 'spinnaker.amazon.securityGroup.edit.controller';
-export const name = AMAZON_SECURITYGROUP_CONFIGURE_EDITSECURITYGROUPCTRL; // for backwards compatibility
-angular
-  .module(AMAZON_SECURITYGROUP_CONFIGURE_EDITSECURITYGROUPCTRL, [UIROUTER_ANGULARJS])
-  .controller('awsEditSecurityGroupCtrl', [
-    '$scope',
-    '$uibModalInstance',
-    '$state',
-    'application',
-    'securityGroup',
-    '$controller',
-    function ($scope, $uibModalInstance, $state, application, securityGroup, $controller) {
-      $scope.self = $scope;
-      $scope.pages = {
-        ingress: require('./createSecurityGroupIngress.html'),
-      };
-
-      $scope.securityGroup = securityGroup;
-
-      $scope.state = {
-        refreshingSecurityGroups: false,
-      };
-
-      $scope.securityGroup.regions = [$scope.securityGroup.region];
-      $scope.securityGroup.credentials = $scope.securityGroup.accountName;
-
-      angular.extend(
-        this,
-        $controller('awsConfigSecurityGroupMixin', {
-          $scope: $scope,
-          $uibModalInstance: $uibModalInstance,
-          application: application,
-          securityGroup: securityGroup,
-        }),
-      );
-
-      $scope.state.isNew = false;
-
-      $scope.taskMonitor = new TaskMonitor({
-        application: application,
-        title: `Updating your ${FirewallLabels.get('firewall')}`,
-        modalInstance: $uibModalInstance,
-        onTaskComplete: () => application.securityGroups.refresh(),
-      });
-
-      securityGroup.securityGroupIngress = _.chain(securityGroup.inboundRules)
-        .filter((rule) => rule.securityGroup)
-        .map((rule) =>
-          rule.portRanges.map((portRange) => {
-            const vpcId = rule.securityGroup.vpcId === securityGroup.vpcId ? null : rule.securityGroup.vpcId;
-            return {
-              accountName: rule.securityGroup.accountName || rule.securityGroup.accountId,
-              accountId: rule.securityGroup.accountId,
-              vpcId: vpcId,
-              id: rule.securityGroup.id,
-              name: rule.securityGroup.inferredName ? null : rule.securityGroup.name,
-              type: rule.protocol,
-              startPort: portRange.startPort,
-              endPort: portRange.endPort,
-              existing: true,
-            };
-          }),
-        )
-        .flatten()
-        .value();
-
-      securityGroup.ipIngress = _.chain(securityGroup.inboundRules)
-        .filter(function (rule) {
-          return rule.range;
-        })
-        .map(function (rule) {
-          return rule.portRanges.map(function (portRange) {
-            return {
-              cidr: rule.range.ip + rule.range.cidr,
-              type: rule.protocol,
-              startPort: portRange.startPort,
-              endPort: portRange.endPort,
-            };
-          });
-        })
-        .flatten()
-        .value();
-
-      this.upsert = function () {
-        const group = $scope.securityGroup;
-        const command = {
-          credentials: group.accountName,
-          name: group.name,
-          description: group.description,
-          vpcId: group.vpcId,
-          region: group.region,
-          securityGroupIngress: group.securityGroupIngress,
-          ipIngress: group.ipIngress,
-        };
-
-        $scope.taskMonitor.submit(function () {
-          return SecurityGroupWriter.upsertSecurityGroup(command, application, 'Update');
-        });
-      };
-
-      this.cancel = function () {
-        $uibModalInstance.dismiss();
-      };
-
-      this.initializeSecurityGroups().then(this.initializeAccounts);
-    },
-  ]);