@spinnaker/amazon 2026.2.2 → 2026.3.0

package/src/serverGroup/details/scheduledAction/editScheduledActions.modal.html

@@ -1,89 +0,0 @@
-<div modal-page>
-  <task-monitor monitor="taskMonitor"></task-monitor>
-  <form role="form" name="form">
-    <modal-close dismiss="$dismiss()"></modal-close>
-    <div class="modal-header">
-      <h4 class="modal-title">Edit Scheduled Actions for {{serverGroup.name}}</h4>
-    </div>
-    <div class="modal-body container-fluid form-horizontal">
-      <div class="form-group">
-        <div class="col-md-12">
-          <p>You must specify at least one of: Min Size, Max Size, Desired Capacity</p>
-          <p><strong>Note:</strong> CRON expressions are evaluated in UTC.</p>
-          <table class="table table-condensed packed">
-            <thead>
-              <tr>
-                <th>Recurrence (CRON)</th>
-                <th>Min Size</th>
-                <th>Max Size</th>
-                <th>Desired Capacity</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr ng-repeat="action in command.scheduledActions">
-                <td>
-                  <input
-                    class="form-control input-sm no-spel"
-                    type="text"
-                    ng-model="action.recurrence"
-                    name="recurrence-{{$index}}"
-                    required
-                  />
-                  <!-- TODO: Add cron-validator when endpoint is fixed -->
-                  <div class="form-group row slide-in" ng-if="form['recurrence-' + $index].$error.cronExpression">
-                    <div class="error-message">{{cronErrors['action.recurrence.cronExpression']}}</div>
-                  </div>
-                </td>
-                <td>
-                  <input
-                    class="form-control input-sm"
-                    type="number"
-                    min="0"
-                    max="{{action.maxSize || Infinity}}"
-                    ng-model="action.minSize"
-                  />
-                </td>
-                <td>
-                  <input
-                    class="form-control input-sm"
-                    type="number"
-                    min="{{action.minSize || 0}}"
-                    ng-model="action.maxSize"
-                  />
-                </td>
-                <td>
-                  <input
-                    class="form-control input-sm"
-                    type="number"
-                    ng-model="action.desiredCapacity"
-                    min="{{command.minSize || 0}}"
-                    max="{{command.maxSize || Infinity}}"
-                  />
-                </td>
-                <td>
-                  <a href class="sm-label" ng-click="ctrl.removeScheduledAction($index)"
-                    ><span class="glyphicon glyphicon-trash"></span
-                  ></a>
-                </td>
-              </tr>
-            </tbody>
-            <tfoot>
-              <tr>
-                <td colspan="5">
-                  <button class="add-new col-md-12" ng-click="ctrl.addScheduledAction()">
-                    <span class="glyphicon glyphicon-plus-sign"></span> Add new Scheduled Action
-                  </button>
-                </td>
-              </tr>
-            </tfoot>
-          </table>
-        </div>
-      </div>
-    </div>
-    <div class="modal-footer">
-      <button class="btn btn-default" ng-click="ctrl.cancel()">Cancel</button>
-      <button type="submit" class="btn btn-primary" ng-disabled="form.$invalid" ng-click="ctrl.submit()">Submit</button>
-    </div>
-  </form>
-</div>

package/src/serverGroup/details/securityGroup/editSecurityGroups.modal.controller.js

@@ -1,95 +0,0 @@
-'use strict';
-
-import { module } from 'angular';
-import _ from 'lodash';
-
-import { FirewallLabels, SECURITY_GROUP_READER, SERVER_GROUP_WRITER, TaskMonitor } from '@spinnaker/core';
-
-export const AMAZON_SERVERGROUP_DETAILS_SECURITYGROUP_EDITSECURITYGROUPS_MODAL_CONTROLLER =
-  'spinnaker.amazon.serverGroup.details.securityGroup.editSecurityGroups.modal.controller';
-export const name = AMAZON_SERVERGROUP_DETAILS_SECURITYGROUP_EDITSECURITYGROUPS_MODAL_CONTROLLER; // for backwards compatibility
-module(AMAZON_SERVERGROUP_DETAILS_SECURITYGROUP_EDITSECURITYGROUPS_MODAL_CONTROLLER, [
-  SERVER_GROUP_WRITER,
-  SECURITY_GROUP_READER,
-]).controller('EditSecurityGroupsCtrl', [
-  '$scope',
-  '$uibModalInstance',
-  'serverGroupWriter',
-  'securityGroupReader',
-  'application',
-  'serverGroup',
-  'securityGroups',
-  function (
-    $scope,
-    $uibModalInstance,
-    serverGroupWriter,
-    securityGroupReader,
-    application,
-    serverGroup,
-    securityGroups,
-  ) {
-    this.command = {
-      securityGroups: (securityGroups || []).slice(0).sort((a, b) => a.name.localeCompare(b.name)),
-    };
-
-    this.state = {
-      securityGroupsLoaded: false,
-      submitting: false,
-      verification: {},
-    };
-
-    this.infiniteScroll = {
-      currentItems: 20,
-    };
-
-    this.addMoreItems = () => (this.infiniteScroll.currentItems += 20);
-
-    this.resetCurrentItems = () => (this.infiniteScroll.currentItems = 20);
-
-    this.isValid = () => this.state.verification.verified;
-
-    securityGroupReader.getAllSecurityGroups().then((allGroups) => {
-      const account = serverGroup.account;
-      const region = serverGroup.region;
-      const vpcId = serverGroup.vpcId;
-      this.availableSecurityGroups = _.get(allGroups, [account, 'aws', region].join('.'), [])
-        .filter((group) => group.vpcId === vpcId)
-        .sort((a, b) => {
-          if (this.command.securityGroups.some((g) => g.id === a.id)) {
-            return -1;
-          }
-          if (this.command.securityGroups.some((g) => g.id === b.id)) {
-            return 1;
-          }
-          return a.name.localeCompare(b.name);
-        });
-      this.state.securityGroupsLoaded = true;
-    });
-
-    this.serverGroup = serverGroup;
-
-    this.taskMonitor = new TaskMonitor({
-      application: application,
-      title: `Update ${FirewallLabels.get('Firewalls')} for ${serverGroup.name}`,
-      modalInstance: $uibModalInstance,
-      onTaskComplete: () => application.serverGroups.refresh(),
-    });
-
-    this.submit = () => {
-      const submitMethod = () => {
-        this.state.submitting = true;
-        const hasLaunchTemplate = Boolean(serverGroup.launchTemplate);
-        return serverGroupWriter.updateSecurityGroups(
-          serverGroup,
-          this.command.securityGroups,
-          application,
-          hasLaunchTemplate,
-        );
-      };
-
-      this.taskMonitor.submit(submitMethod);
-    };
-
-    this.cancel = $uibModalInstance.dismiss;
-  },
-]);

package/src/serverGroup/details/securityGroup/editSecurityGroups.modal.html

@@ -1,40 +0,0 @@
-<div modal-page>
-  <task-monitor monitor="$ctrl.taskMonitor"></task-monitor>
-  <form role="form" name="form">
-    <modal-close dismiss="$dismiss()"></modal-close>
-    <div class="modal-header">
-      <h4 class="modal-title">
-        Edit <firewall-label label="Firewalls"></firewall-label> for {{$ctrl.serverGroup.name}}
-      </h4>
-    </div>
-    <div class="modal-body container-fluid form-horizontal">
-      <div class="form-group">
-        <div class="col-md-10 col-md-offset-1">
-          <ui-select
-            multiple
-            ng-model="$ctrl.command.securityGroups"
-            uis-open-close="$ctrl.resetCurrentItems()"
-            class="form-control input-sm"
-          >
-            <ui-select-match>{{$item.name}} ({{$item.id}})</ui-select-match>
-            <ui-select-choices
-              repeat="securityGroup as securityGroup in $ctrl.availableSecurityGroups | filter: $select.search | limitTo: $ctrl.infiniteScroll.currentItems"
-              infinite-scroll="$ctrl.addMoreItems()"
-              infinite-scroll-distance="4"
-            >
-              <span ng-bind-html="securityGroup.name | highlight: $select.search"></span>
-              (<span ng-bind-html="securityGroup.id  | highlight: $select.search"></span>)
-            </ui-select-choices>
-          </ui-select>
-        </div>
-      </div>
-    </div>
-    <aws-footer
-      action="$ctrl.submit()"
-      cancel="$ctrl.cancel()"
-      is-valid="$ctrl.isValid()"
-      account="$ctrl.serverGroup.account"
-      verification="$ctrl.state.verification"
-    ></aws-footer>
-  </form>
-</div>

package/src/serverGroup/details/serverGroupDetails.module.ts

@@ -1,18 +0,0 @@
-import { module } from 'angular';
-
-import { AMAZON_SERVERGROUP_DETAILS_ADVANCEDSETTINGS_EDITASGADVANCEDSETTINGS_MODAL_CONTROLLER } from './advancedSettings/editAsgAdvancedSettings.modal.controller';
-import { AMAZON_SERVERGROUP_DETAILS_ROLLBACK_ROLLBACKSERVERGROUP_CONTROLLER } from './rollback/rollbackServerGroup.controller';
-import { SCALING_POLICY_MODULE } from './scalingPolicy/scalingPolicy.module';
-import { AMAZON_SERVERGROUP_DETAILS_SCALINGPROCESSES_MODIFYSCALINGPROCESSES_CONTROLLER } from './scalingProcesses/modifyScalingProcesses.controller';
-import { AMAZON_SERVERGROUP_DETAILS_SCHEDULEDACTION_EDITSCHEDULEDACTIONS_MODAL_CONTROLLER } from './scheduledAction/editScheduledActions.modal.controller';
-import { AMAZON_SERVERGROUP_DETAILS_SECURITYGROUP_EDITSECURITYGROUPS_MODAL_CONTROLLER } from './securityGroup/editSecurityGroups.modal.controller';
-
-export const SERVER_GROUP_DETAILS_MODULE = 'spinnaker.amazon.serverGroup.details';
-module(SERVER_GROUP_DETAILS_MODULE, [
-  SCALING_POLICY_MODULE,
-  AMAZON_SERVERGROUP_DETAILS_SECURITYGROUP_EDITSECURITYGROUPS_MODAL_CONTROLLER,
-  AMAZON_SERVERGROUP_DETAILS_SCALINGPROCESSES_MODIFYSCALINGPROCESSES_CONTROLLER,
-  AMAZON_SERVERGROUP_DETAILS_SCHEDULEDACTION_EDITSCHEDULEDACTIONS_MODAL_CONTROLLER,
-  AMAZON_SERVERGROUP_DETAILS_ADVANCEDSETTINGS_EDITASGADVANCEDSETTINGS_MODAL_CONTROLLER,
-  AMAZON_SERVERGROUP_DETAILS_ROLLBACK_ROLLBACKSERVERGROUP_CONTROLLER,
-]);

package/src/serverGroup/serverGroup.transformer.spec.ts

@@ -1,185 +0,0 @@
-import type { IQService, IRootScopeService, IScope } from 'angular';
-import { mock } from 'angular';
-
-import type { IAmazonServerGroup, IScalingPolicyAlarmView, IStepAdjustment } from '../domain';
-import type { AwsServerGroupTransformer } from './serverGroup.transformer';
-import { AWS_SERVER_GROUP_TRANSFORMER } from './serverGroup.transformer';
-import { VpcReader } from '../vpc/VpcReader';
-
-describe('awsServerGroupTransformer', () => {
-  let transformer: AwsServerGroupTransformer, $q: IQService, $scope: IScope;
-
-  beforeEach(mock.module(AWS_SERVER_GROUP_TRANSFORMER));
-
-  beforeEach(
-    mock.inject(
-      (_awsServerGroupTransformer_: AwsServerGroupTransformer, _$q_: IQService, $rootScope: IRootScopeService) => {
-        transformer = _awsServerGroupTransformer_;
-        $q = _$q_;
-        $scope = $rootScope.$new();
-      },
-    ),
-  );
-
-  describe('normalize server group', () => {
-    beforeEach(() => {
-      spyOn(VpcReader, 'listVpcs').and.returnValue(
-        $q.when([{ account: 'test', region: 'us-east-1', id: 'vpc-1', name: 'main' } as any]),
-      );
-    });
-
-    it('adds vpc name to server group', () => {
-      const serverGroup = {
-        account: 'test',
-        region: 'us-east-1',
-        vpcId: 'vpc-1',
-        instances: [],
-      } as IAmazonServerGroup;
-      transformer.normalizeServerGroup(serverGroup);
-      $scope.$digest();
-      expect(serverGroup.vpcName).toBe('main');
-    });
-
-    it('adds empty vpc name when no vpcId found on server group', () => {
-      const serverGroup = {
-        account: 'test',
-        region: 'us-east-1',
-        instances: [],
-      } as IAmazonServerGroup;
-      transformer.normalizeServerGroup(serverGroup);
-      $scope.$digest();
-      expect(serverGroup.vpcName).toBe('');
-    });
-  });
-
-  describe('command transforms', () => {
-    it('sets subnetType property to empty string when null', () => {
-      const command: any = {
-        viewState: {
-          mode: 'create',
-          useAllImageSelection: true,
-          allImageSelection: 'something-packagebase',
-        },
-        subnetType: null,
-        application: { name: 'theApp' },
-      };
-
-      let transformed = transformer.convertServerGroupCommandToDeployConfiguration(command);
-      expect(transformed.subnetType).toBe('');
-
-      command.subnetType = 'internal';
-      transformed = transformer.convertServerGroupCommandToDeployConfiguration(command);
-      expect(transformed.subnetType).toBe('internal');
-    });
-  });
-
-  describe('normalize server group details', () => {
-    it('adds appropriate comparator to alarm', () => {
-      const serverGroup = {
-        scalingPolicies: [
-          {
-            alarms: [
-              { comparisonOperator: 'LessThanThreshold' },
-              { comparisonOperator: 'GreaterThanThreshold' },
-              { comparisonOperator: 'LessThanOrEqualToThreshold' },
-              { comparisonOperator: 'GreaterThanOrEqualToThreshold' },
-              { comparisonOperator: 'WhatIsThis' },
-            ],
-          },
-        ],
-      } as IAmazonServerGroup;
-      transformer.normalizeServerGroupDetails(serverGroup);
-      const alarms = serverGroup.scalingPolicies[0].alarms as IScalingPolicyAlarmView[];
-      expect(alarms.map((a) => a.comparator)).toEqual(['<', '>', '≤', '≥', undefined]);
-    });
-
-    it('adds operator, absAdjustment to simple policies', () => {
-      const serverGroup = {
-        scalingPolicies: [{ scalingAdjustment: 10 }, { scalingAdjustment: 0 }, { scalingAdjustment: -5 }],
-      } as IAmazonServerGroup;
-      const transformed = transformer.normalizeServerGroupDetails(serverGroup);
-      const policies = transformed.scalingPolicies;
-      expect(policies.map((a) => a.absAdjustment)).toEqual([10, 0, 5]);
-      expect(policies.map((a) => a.operator)).toEqual(['increase', 'increase', 'decrease']);
-    });
-
-    it('adds operator, absAdjustment to step policies', () => {
-      const serverGroup = {
-        scalingPolicies: [
-          {
-            stepAdjustments: [
-              { scalingAdjustment: 10, metricIntervalLowerBound: 0 },
-              { scalingAdjustment: 0, metricIntervalLowerBound: 6 },
-              { scalingAdjustment: -5, metricIntervalLowerBound: 11 },
-            ],
-          },
-        ],
-      } as IAmazonServerGroup;
-      const transformed = transformer.normalizeServerGroupDetails(serverGroup);
-      const steps = transformed.scalingPolicies[0].stepAdjustments;
-      expect(steps.map((a) => a.absAdjustment)).toEqual([10, 0, 5]);
-      expect(steps.map((a) => a.operator)).toEqual(['increase', 'increase', 'decrease']);
-    });
-
-    describe('sorting step adjustments', () => {
-      beforeEach(function () {
-        this.test = (steps: IStepAdjustment[], expected: any[]) => {
-          const serverGroup = {
-            scalingPolicies: [
-              {
-                stepAdjustments: steps,
-              },
-            ],
-          } as IAmazonServerGroup;
-          transformer.normalizeServerGroupDetails(serverGroup);
-          const check = serverGroup.scalingPolicies[0].stepAdjustments;
-          expect(check.map((s) => s.scalingAdjustment)).toEqual(expected);
-        };
-      });
-
-      it('reverse sorts step adjustments by lower bound when none have an upper bound defined', function () {
-        this.test(
-          [
-            { scalingAdjustment: 10, metricIntervalLowerBound: 3 },
-            { scalingAdjustment: 0, metricIntervalLowerBound: 5 },
-            { scalingAdjustment: -5, metricIntervalLowerBound: 1 },
-          ],
-          [-5, 10, 0],
-        );
-      });
-
-      it('reverse sorts step adjustments by lower bound when some do not have an upper bound defined', function () {
-        this.test(
-          [
-            { id: 1, scalingAdjustment: 10, metricIntervalLowerBound: 3, metricIntervalUpperBound: 5 },
-            { id: 2, scalingAdjustment: 0, metricIntervalLowerBound: 5 },
-            { id: 3, scalingAdjustment: -5, metricIntervalLowerBound: 1, metricIntervalUpperBound: 3 },
-          ],
-          [-5, 10, 0],
-        );
-      });
-
-      it('reverse sorts step adjustments by upper bound when all have an upper bound defined', function () {
-        this.test(
-          [
-            { id: 1, scalingAdjustment: 10, metricIntervalLowerBound: 3, metricIntervalUpperBound: 5 },
-            { id: 2, scalingAdjustment: 0, metricIntervalLowerBound: 5, metricIntervalUpperBound: 9 },
-            { id: 3, scalingAdjustment: -5, metricIntervalLowerBound: 1, metricIntervalUpperBound: 0 },
-          ],
-          [0, 10, -5],
-        );
-      });
-
-      it('verify float adjustments work within the range', function () {
-        this.test(
-          [
-            { id: 1, scalingAdjustment: 10, metricIntervalLowerBound: 3.5, metricIntervalUpperBound: 5.5 },
-            { id: 2, scalingAdjustment: 0, metricIntervalLowerBound: 5.5 },
-            { id: 3, scalingAdjustment: -5, metricIntervalLowerBound: 1.2, metricIntervalUpperBound: 3.5 },
-          ],
-          [-5, 10, 0],
-        );
-      });
-    });
-  });
-});

package/src/subnet/SubnetSelectInput.spec.tsx

@@ -1,91 +0,0 @@
-import { mock } from 'angular';
-import { render, shallow } from 'enzyme';
-import React from 'react';
-
-import type { Application } from '@spinnaker/core';
-import { ApplicationModelBuilder } from '@spinnaker/core';
-import { mockServerGroupDataSourceConfig, mockSubnet } from '@spinnaker/mocks';
-
-import { SubnetSelectInput } from './SubnetSelectInput';
-
-describe('SubnetSelectInput', () => {
-  let application: Application;
-
-  beforeEach(
-    mock.inject(() => {
-      application = ApplicationModelBuilder.createApplicationForTests('testapp', mockServerGroupDataSourceConfig);
-    }),
-  );
-
-  // Selectable state
-  const INPUT_PROPS = {
-    value: 'test',
-    onChange: () => {},
-    application,
-    readOnly: false,
-    hideClassic: false,
-    subnets: [mockSubnet],
-    region: 'us-east-1',
-    credentials: 'test_credentials',
-  };
-
-  it('should render an input', () => {
-    const wrapper = shallow(<SubnetSelectInput {...INPUT_PROPS} />);
-    const input = wrapper.find('SelectInput');
-    const paragraph = wrapper.find('p');
-    expect(input.length).toBeTruthy();
-    expect(paragraph.length).toBeFalsy();
-  });
-
-  it('should generate options', () => {
-    const wrapper = render(<SubnetSelectInput {...INPUT_PROPS} />);
-    expect(wrapper.find('option').length).toBeGreaterThan(0);
-  });
-});
-
-describe('SubnetSelectInput read only', () => {
-  let application: Application;
-
-  beforeEach(
-    mock.inject(() => {
-      application = ApplicationModelBuilder.createApplicationForTests('testapp', mockServerGroupDataSourceConfig);
-    }),
-  );
-
-  // Read only state, with value
-  const READ_ONLY_PROPS = {
-    value: 'test',
-    onChange: () => {},
-    application,
-    readOnly: true,
-    hideClassic: false,
-    subnets: [mockSubnet],
-    region: 'us-east-1',
-    credentials: 'test_credentials',
-  };
-
-  // Read only state with null value
-  const NULL_VALUE_PROPS = {
-    ...READ_ONLY_PROPS,
-    value: '',
-  };
-
-  it('should render the value', () => {
-    const wrapper = shallow(<SubnetSelectInput {...READ_ONLY_PROPS} />);
-
-    const input = wrapper.find('SelectInput');
-    const paragraph = wrapper.find('p');
-    expect(input.length).toBeFalsy();
-    expect(paragraph.length).toBeTruthy();
-    expect(paragraph.text()).toEqual(READ_ONLY_PROPS.value);
-  });
-
-  it('should render the default value', () => {
-    const wrapper = shallow(<SubnetSelectInput {...NULL_VALUE_PROPS} />);
-    const input = wrapper.find('SelectInput');
-    const paragraph = wrapper.find('p');
-    expect(input.length).toBeFalsy();
-    expect(paragraph.length).toBeTruthy();
-    expect(paragraph.text()).toEqual('None (EC2 Classic)');
-  });
-});

package/src/subnet/subnet.renderer.ts

@@ -1,12 +0,0 @@
-import { module } from 'angular';
-
-import type { IServerGroup } from '@spinnaker/core';
-
-export class AwsSubnetRenderer {
-  public render(serverGroup: IServerGroup): string {
-    return serverGroup.subnetType;
-  }
-}
-
-export const SUBNET_RENDERER = 'spinnaker.amazon.subnet.renderer';
-module(SUBNET_RENDERER, []).service('awsSubnetRenderer', AwsSubnetRenderer);

package/src/vpc/vpc.module.ts

@@ -1,9 +0,0 @@
-import { module } from 'angular';
-import { react2angular } from 'react2angular';
-
-import { withErrorBoundary } from '@spinnaker/core';
-
-import { VpcTag } from './VpcTag';
-
-export const VPC_MODULE = 'spinnaker.amazon.vpc';
-module(VPC_MODULE, []).component('vpcTag', react2angular(withErrorBoundary(VpcTag, 'vpcTag'), ['vpcId']));