@spinnaker/amazon 0.8.7 → 0.8.11

package/src/serverGroup/details/scalingPolicy/upsert/ScalingPolicyAdditionalSettings.tsx

@@ -6,6 +6,7 @@ import { react2angular } from 'react2angular';
 import { HelpField, NumberInput, withErrorBoundary } from '@spinnaker/core';
 
 import { IUpsertScalingPolicyCommand } from '../ScalingPolicyWriter';
+import './ScalingPolicyAdditionalSettings.less';
 
 export interface IScalingPolicyAdditionalSettingsProps {
   command: IUpsertScalingPolicyCommand;
@@ -31,13 +32,13 @@ export const ScalingPolicyAdditionalSettings = ({
   };
 
   return (
-    <div>
+    <div className="ScalingPolicyAdditionalSettings">
       <h4 className="section-heading">Additional Settings</h4>
       <div className="section-body section-additional-settings">
         {!isNew && (
           <div className="row">
             <div className="col-md-2 sm-label-right">Policy Name</div>
-            <div className="col-md-10 content-fields">
+            <div className="col-md-10 horizontal middle">
               <span className="form-control-static select-placeholder">{commandView.name}</span>
             </div>
           </div>
@@ -45,14 +46,14 @@ export const ScalingPolicyAdditionalSettings = ({
         {!isInstanceType && (
           <div className="row">
             <div className="col-md-2 sm-label-right">Adjustment Step</div>
-            <div className="col-md-10 content-fields">
+            <div className="col-md-10 horizontal middle">
               <span className="form-control-static select-placeholder">
-                {`${operator} instannces in increments of at least `}
+                {`${operator} instances in increments of at least `}
               </span>
               <NumberInput
                 value={commandView.minAdjustmentMagnitude}
                 onChange={(e) => setCommandField('minAdjustmentMagnitude', Number.parseInt(e.target.value))}
-                inputClassName="sp-margin-xs-right input-sm number-input-sm"
+                inputClassName="sp-margin-xs-xaxis input-sm number-input-sm"
               />
               <span className="input-label"> instance(s) </span>
             </div>
@@ -61,7 +62,7 @@ export const ScalingPolicyAdditionalSettings = ({
         {Boolean(commandView.simple) && (
           <div className="row">
             <div className="col-md-2 sm-label-right">Cooldown</div>
-            <div className="col-md-10 content-fields">
+            <div className="col-md-10 horizontal middle">
               <span className="form-control-static select-placeholder"> Wait at least </span>
               <NumberInput
                 value={commandView.simple?.cooldown}
@@ -75,7 +76,7 @@ export const ScalingPolicyAdditionalSettings = ({
         {Boolean(commandView.step?.estimatedInstanceWarmup) && operator !== 'Remove' && (
           <div className="row">
             <div className="col-md-2 sm-label-right">Warmup</div>
-            <div className="col-md-10 content-fields">
+            <div className="col-md-10 horizontal middle">
               <span className="form-control-static select-placeholder">Instances need</span>
               <NumberInput
                 value={commandView.step.estimatedInstanceWarmup}
@@ -92,7 +93,7 @@ export const ScalingPolicyAdditionalSettings = ({
               <span className="sp-margin-xs-right">Cooldown</span>
               <HelpField id={`${commandView.cloudProvider || commandView.provider}.autoscaling.cooldown`} />
             </div>
-            <div className="col-md-10 content-fields">
+            <div className="col-md-10 horizontal middle">
               <NumberInput
                 value={commandView.step?.cooldown}
                 onChange={(e) => setCommandField('step.cooldown', Number.parseInt(e.target.value))}

package/src/serverGroup/details/scalingPolicy/upsert/UpsertScalingPolicyModal.tsx

@@ -0,0 +1,211 @@
+import { cloneDeep } from 'lodash';
+import * as React from 'react';
+
+import { Application, IModalComponentProps, TaskMonitorModal } from '@spinnaker/core';
+
+import { ScalingPolicyAdditionalSettings } from './ScalingPolicyAdditionalSettings';
+import { ScalingPolicyCommandBuilder } from './ScalingPolicyCommandBuilderService';
+import { IStepPolicyDescription, IUpsertScalingPolicyCommand } from '../ScalingPolicyWriter';
+import { AlarmConfigurer } from './alarm/AlarmConfigurer';
+import { IAmazonServerGroup, IScalingPolicy, IStepAdjustment, ITargetTrackingPolicy } from '../../../../domain';
+import { SimplePolicyAction } from './simple/SimplePolicyAction';
+import { AdjustmentTypeView, Operator, StepPolicyAction } from './step/StepPolicyAction';
+
+export interface IUpsertScalingPolicyModalProps extends IModalComponentProps {
+  app: Application;
+  policy: IScalingPolicy;
+  serverGroup: IAmazonServerGroup;
+}
+
+export const UpsertScalingPolicyModal = ({
+  app,
+  closeModal,
+  dismissModal,
+  policy,
+  serverGroup,
+}: IUpsertScalingPolicyModalProps) => {
+  const modalProps = { closeModal, dismissModal };
+  const [command, setCommand] = React.useState<IUpsertScalingPolicyCommand>({} as IUpsertScalingPolicyCommand);
+  React.useEffect(() => {
+    const baseCommand = ScalingPolicyCommandBuilder.buildNewCommand(
+      'Step',
+      serverGroup,
+      policy as ITargetTrackingPolicy,
+    );
+    setCommand(baseCommand);
+  }, []);
+
+  const adjustmentBasis = policy.stepAdjustments?.length
+    ? policy.stepAdjustments[0].scalingAdjustment
+    : policy.scalingAdjustment;
+  const [action, setAction] = React.useState<Operator>(
+    command.adjustmentType === 'ExactCapacity' ? 'Set to' : adjustmentBasis > 0 ? 'Add' : 'Remove',
+  );
+  const adjustmentTypeView =
+    command.adjustmentType === 'ExactCapacity' || command.adjustmentType === 'ChangeInCapacity'
+      ? 'instances'
+      : 'percent of group';
+
+  const isStep = command.step;
+  const mode = !policy.policyARN ? 'Create' : 'Edit';
+  const comparatorBound = command?.alarm?.comparisonOperator?.indexOf('Greater') === 0 ? 'max' : 'min';
+
+  const boundsChanged = (step: IStepPolicyDescription) => {
+    const source = comparatorBound === 'min' ? 'metricIntervalLowerBound' : 'metricIntervalUpperBound';
+    const target = source === 'metricIntervalLowerBound' ? 'metricIntervalUpperBound' : 'metricIntervalLowerBound';
+
+    const adjustments = step.stepAdjustments;
+    (adjustments || []).forEach((a, index) => {
+      if (adjustments.length > index + 1) {
+        adjustments[index + 1][target] = a[source];
+      }
+    });
+    // Remove the source boundary from the last step
+    delete adjustments[adjustments.length - 1][source];
+  };
+
+  const scalingAdjustmentChanged = (adjustment: number) => {
+    const newCommand = cloneDeep(command);
+    newCommand.simplescalingAdjustment = adjustment;
+    setCommand(newCommand);
+  };
+
+  const stepsChanged = (newSteps: IStepAdjustment[]) => {
+    const newCommand = cloneDeep(command);
+    newCommand.step.stepAdjustments = newSteps;
+    boundsChanged(newCommand.step);
+    setCommand(newCommand);
+  };
+
+  const adjustmentTypeChanged = (action: Operator, type: AdjustmentTypeView) => {
+    setAction(action);
+
+    const newType =
+      type !== 'instances' ? 'PercentChangeInCapacity' : action === 'Set to' ? 'ExactCapacity' : 'ChangeInCapacity';
+    setCommand({
+      ...command,
+      adjustmentType: newType,
+    });
+  };
+
+  const toggleMode = () => {
+    const updatedCommand = cloneDeep(command);
+    const cooldownOrWarmup = command.step ? command.step.estimatedInstanceWarmup : command.simple.cooldown;
+
+    if (command.step) {
+      delete updatedCommand.step;
+      updatedCommand.simple = ScalingPolicyCommandBuilder.buildSimplePolicy({
+        cooldown: cooldownOrWarmup,
+      } as IScalingPolicy);
+    } else {
+      const stepAdjustments = [
+        {
+          scalingAdjustment: command.simple.scalingAdjustment,
+        },
+      ] as IStepAdjustment[];
+      if (comparatorBound === 'min') {
+        stepAdjustments[0].metricIntervalUpperBound = 0;
+      } else {
+        stepAdjustments[0].metricIntervalLowerBound = 0;
+      }
+      const stepPolicy = {
+        estimatedInstanceWarmup: cooldownOrWarmup,
+        stepAdjustments: stepAdjustments,
+      };
+      delete updatedCommand.simple;
+      updatedCommand.step = ScalingPolicyCommandBuilder.buildStepPolicy(
+        stepPolicy as IScalingPolicy,
+        updatedCommand.alarm.threshold,
+        cooldownOrWarmup,
+      );
+
+      boundsChanged(updatedCommand.step);
+    }
+
+    setCommand(updatedCommand);
+  };
+
+  return (
+    <TaskMonitorModal<IUpsertScalingPolicyCommand>
+      {...modalProps}
+      title={`${mode} scaling policy`}
+      application={app}
+      description={`${mode} scaling policy for ${serverGroup.name}`}
+      initialValues={command}
+      mapValuesToTask={() => {
+        const preppedValues = ScalingPolicyCommandBuilder.prepareCommandForUpsert(command, action === 'Remove');
+        return {
+          application: app,
+          job: [
+            {
+              type: preppedValues.type || 'upsertScalingPolicy',
+              ...preppedValues,
+            },
+          ],
+        };
+      }}
+      render={() => (
+        <div>
+          <h4 className="section-heading">Conditions</h4>
+          <div className="section-body">
+            <AlarmConfigurer
+              alarm={command.alarm}
+              multipleAlarms={Boolean(policy?.alarms?.length > 1)}
+              serverGroup={serverGroup}
+              stepAdjustments={command.step.stepAdjustments}
+              stepsChanged={stepsChanged}
+              updateAlarm={(alarm) => setCommand({ ...command, alarm } as IUpsertScalingPolicyCommand)}
+            />
+          </div>
+          <h4 className="section-heading">Actions</h4>
+          <div className="section-body">
+            {!command.alarm?.metricName && <h4 className="text-center">Select a metric</h4>}
+            {command.alarm?.metricName && !isStep && (
+              <div>
+                <div className="row">
+                  <div className="col-md-10 col-md-offset-1">
+                    <p>
+                      This is a simple scaling policy. To declare different actions based on the magnitude of the alarm,
+                      <b>
+                        switch to a
+                        <a className="clickable sp-margin-xs-l" onClick={toggleMode}>
+                          step policy
+                        </a>
+                        .
+                      </b>
+                    </p>
+                  </div>
+                </div>
+                <SimplePolicyAction
+                  adjustmentType={adjustmentTypeView}
+                  adjustmentTypeChanged={adjustmentTypeChanged}
+                  operator={action}
+                  scalingAdjustment={command.simple?.scalingAdjustment}
+                  updateScalingAdjustment={scalingAdjustmentChanged}
+                />
+              </div>
+            )}
+            {command.alarm?.metricName && isStep && (
+              <StepPolicyAction
+                adjustmentType={adjustmentTypeView}
+                adjustmentTypeChanged={adjustmentTypeChanged}
+                alarm={command.alarm}
+                isMin={comparatorBound === 'min'}
+                operator={action}
+                step={command.step}
+                stepsChanged={stepsChanged}
+              />
+            )}
+          </div>
+          <ScalingPolicyAdditionalSettings
+            command={command}
+            isInstanceType={adjustmentTypeView === 'instances'}
+            isNew={Boolean(!policy.policyARN)}
+            operator={action}
+            updateCommand={setCommand}
+          />
+        </div>
+      )}
+    />
+  );
+};

package/src/serverGroup/details/scalingPolicy/upsert/alarm/AlarmConfigurer.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import { ICloudMetricStatistics, NumberInput, ReactSelectInput } from '@spinnaker/core';
+import { ICloudMetricStatistics, NumberInput, ReactSelectInput, usePrevious } from '@spinnaker/core';
 
 import { MetricSelector } from './MetricSelector';
 import { MetricAlarmChart } from '../../chart/MetricAlarmChart';
@@ -46,9 +46,10 @@ export const AlarmConfigurer = ({
   const comparatorBound = alarm.comparisonOperator?.indexOf('Greater') === 0 ? 'max' : 'min';
   const [alarmView, setAlarmView] = React.useState<IScalingPolicyAlarm>(alarm);
   const [unit, setUnit] = React.useState<string>(alarmView?.unit);
+  const prevComparator = usePrevious(comparatorBound);
 
   React.useEffect(() => {
-    if (stepAdjustments) {
+    if (stepAdjustments && prevComparator !== undefined) {
       const source = comparatorBound === 'max' ? 'metricIntervalLowerBound' : 'metricIntervalUpperBound';
       const newStep: IStepAdjustment = {
         scalingAdjustment: 1,
@@ -58,6 +59,16 @@ export const AlarmConfigurer = ({
     }
   }, [comparatorBound]);
 
+  React.useEffect(() => {
+    const source = comparatorBound === 'max' ? 'metricIntervalLowerBound' : 'metricIntervalUpperBound';
+    if (stepAdjustments?.length) {
+      const updatedStepAdjustments = [...stepAdjustments];
+      // Always set the first step at the alarm threshold
+      updatedStepAdjustments[0][source] = alarmView.threshold;
+      stepsChanged(updatedStepAdjustments);
+    }
+  }, [alarmView.threshold]);
+
   const onChartLoaded = (stats: ICloudMetricStatistics) => setUnit(stats.unit);
 
   const onAlarmChange = (key: string, value: any) => {
@@ -69,23 +80,6 @@ export const AlarmConfigurer = ({
     updateAlarm(newAlarm);
   };
 
-  const onThresholdChange = (bound: number) => {
-    const newAlarm = {
-      ...alarmView,
-      threshold: bound,
-    };
-    setAlarmView(newAlarm);
-    updateAlarm(newAlarm);
-
-    const source = comparatorBound === 'max' ? 'metricIntervalLowerBound' : 'metricIntervalUpperBound';
-    if (stepAdjustments?.length) {
-      const updatedStepAdjustments = [...stepAdjustments];
-      // Always set the first step at the alarm threshold
-      updatedStepAdjustments[0][source] = bound;
-      stepsChanged(updatedStepAdjustments);
-    }
-  };
-
   const onMetricChange = (newAlarm: IScalingPolicyAlarm) => {
     setAlarmView(newAlarm);
     updateAlarm(newAlarm);
@@ -120,7 +114,7 @@ export const AlarmConfigurer = ({
       )}
       <div className="row sp-margin-s-yaxis">
         <div className="col-md-2 sm-label-right">Whenever</div>
-        <div className="col-md-10 horizontal middle">
+        <div className="col-md-10 horizontal">
           <ReactSelectInput
             value={alarmView.statistic}
             onChange={(e) => onAlarmChange('statistic', e.target.value)}
@@ -128,7 +122,7 @@ export const AlarmConfigurer = ({
             clearable={false}
             inputClassName="sp-margin-xs-right configurer-field-lg"
           />
-          <span className="input-label sp-margin-xs-right"> of </span>
+          <span className="input-label sp-margin-xs-right sp-margin-s-top"> of </span>
           <MetricSelector alarm={alarmView} serverGroup={serverGroup} updateAlarm={onMetricChange} />
         </div>
       </div>
@@ -145,7 +139,7 @@ export const AlarmConfigurer = ({
           <div className="sp-margin-xl-left">
             <NumberInput
               value={alarmView.threshold}
-              onChange={(e) => onThresholdChange(Number.parseInt(e.target.value))}
+              onChange={(e) => onAlarmChange('threshold', Number.parseInt(e.target.value))}
               inputClassName="sp-margin-xs-right configurer-field-lg"
             />
           </div>
@@ -170,7 +164,7 @@ export const AlarmConfigurer = ({
           />
         </div>
       </div>
-      <div className="row sp-margin-s-yaxis" ng-if="$ctrl.alarm.metricName">
+      <div className="row sp-margin-s-yaxis">
         <div className="col-md-10 col-md-offset-1">
           {alarm && (
             <div>

package/src/serverGroup/details/scalingPolicy/upsert/alarm/DimensionsEditor.tsx

@@ -82,8 +82,8 @@ export const DimensionsEditor = ({ alarm, serverGroup, updateAvailableMetrics }:
       ))}
       {!alarm.disableEditingDimensions && (
         <div className="row">
-          <div className="col-md-10">
-            <button className="btn btn-block btn-xs add-new" onClick={addDimension}>
+          <div>
+            <button type="button" className="btn btn-block btn-xs add-new" onClick={addDimension}>
               <span className="glyphicon glyphicon-plus-sign sp-margin-xs-left"></span>
               Add dimension
             </button>

package/src/serverGroup/details/scalingPolicy/upsert/alarm/MetricSelector.tsx

@@ -53,7 +53,8 @@ export const MetricSelector = ({ alarm, updateAlarm, serverGroup }: IMetricSelec
   const dimensionValuesStr = buildDimensionValues(alarm?.dimensions || []);
 
   const fetchCloudMetrics = () => {
-    return CloudMetricsReader.listMetrics('aws', serverGroup.account, serverGroup.region, dimensionsObject).then(
+    const account = serverGroup.cloudProvider === 'aws' ? serverGroup.account : serverGroup?.awsAccount;
+    return CloudMetricsReader.listMetrics('aws', account, serverGroup.region, dimensionsObject).then(
       (metrics: ICloudMetricDescriptor[]) => {
         const sortedMetrics: IMetricOption[] = metrics
           .map((m) => ({

package/src/serverGroup/details/scalingPolicy/upsert/step/StepPolicyAction.tsx

@@ -6,8 +6,8 @@ import { IScalingPolicyAlarm, IStepAdjustment } from '../../../../../domain';
 
 import './StepPolicyAction.less';
 
-type Operator = 'Add' | 'Remove' | 'Set to';
-type AdjustmentTypeView = 'instances' | 'percent of group';
+export type Operator = 'Add' | 'Remove' | 'Set to';
+export type AdjustmentTypeView = 'instances' | 'percent of group';
 
 export interface IStepPolicyActionProps {
   adjustmentType: AdjustmentTypeView;
@@ -97,7 +97,7 @@ export const StepPolicyAction = ({
               stringOptions={adjustmentTypeOptions}
               onChange={(e) => onAdjustmentTypeChange(e.target.value)}
               clearable={false}
-              inputClassName="adjustment-type-input"
+              inputClassName="adjustment-type-input sp-margin-xs-left"
             />
           )}
           <span className="sp-margin-xs-xaxis">
@@ -149,7 +149,7 @@ export const StepPolicyAction = ({
       ))}
       <div className="row sp-margin-s">
         <div className="col-md-10 col-md-offset-1">
-          <button className="btn btn-block btn-sm add-new" onClick={addStep}>
+          <button type="button" className="btn btn-block btn-sm add-new" onClick={addStep}>
             <span className="glyphicon glyphicon-plus-sign"></span>
             Add step
           </button>

package/src/serverGroup/details/sections/{InstancesDiversificationDetailsSection.spec.tsx → InstancesDistributionDetailsSection.spec.tsx}

@@ -2,10 +2,10 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { mockLaunchTemplate, mockServerGroup } from '@spinnaker/mocks';
 import { IAmazonMixedInstancesPolicy, IAmazonServerGroupView, IScalingPolicy } from '../../../domain';
-import { InstancesDiversificationDetailsSection } from '../../../index';
+import { InstancesDistributionDetailsSection } from '../../../index';
 import { Application, ApplicationModelBuilder } from '@spinnaker/core';
 
-describe('Instance diversification', () => {
+describe('InstancesDistribution', () => {
   let app: Application;
   beforeEach(() => {
     app = ApplicationModelBuilder.createApplicationForTests('testapp');
@@ -14,7 +14,7 @@ describe('Instance diversification', () => {
   const serverGroupWithMip = {
     ...mockServerGroup,
     mixedInstancesPolicy: {
-      instancesDiversification: {
+      instancesDistribution: {
         onDemandAllocationStrategy: 'prioritized',
         onDemandBaseCapacity: 1,
         onDemandPercentageAboveBaseCapacity: 50,
@@ -31,13 +31,13 @@ describe('Instance diversification', () => {
       ...mockServerGroup,
       launchTemplate: mockLaunchTemplate,
     } as IAmazonServerGroupView;
-    const wrapper = shallow(<InstancesDiversificationDetailsSection serverGroup={serverGroupWithLt} app={app} />);
+    const wrapper = shallow(<InstancesDistributionDetailsSection serverGroup={serverGroupWithLt} app={app} />);
 
     expect(wrapper.isEmptyRender()).toEqual(true);
   });
 
   it('should render for server group with mixed instances policy', () => {
-    const wrapper = shallow(<InstancesDiversificationDetailsSection serverGroup={serverGroupWithMip} app={app} />);
+    const wrapper = shallow(<InstancesDistributionDetailsSection serverGroup={serverGroupWithMip} app={app} />);
     expect(wrapper.isEmptyRender()).toEqual(false);
 
     const actualLabeledValues = wrapper.find('LabeledValue');
@@ -60,10 +60,10 @@ describe('Instance diversification', () => {
     const newServerGroup = {
       ...serverGroupWithMip,
     };
-    newServerGroup.mixedInstancesPolicy.instancesDiversification.spotAllocationStrategy = 'lowest-price';
-    newServerGroup.mixedInstancesPolicy.instancesDiversification.spotInstancePools = 5;
+    newServerGroup.mixedInstancesPolicy.instancesDistribution.spotAllocationStrategy = 'lowest-price';
+    newServerGroup.mixedInstancesPolicy.instancesDistribution.spotInstancePools = 5;
 
-    const wrapper = shallow(<InstancesDiversificationDetailsSection serverGroup={newServerGroup} app={app} />);
+    const wrapper = shallow(<InstancesDistributionDetailsSection serverGroup={newServerGroup} app={app} />);
     expect(wrapper.isEmptyRender()).toEqual(false);
 
     const actualLabeledValues = wrapper.find('LabeledValue');

package/src/serverGroup/details/sections/{InstancesDiversificationDetailsSection.tsx → InstancesDistributionDetailsSection.tsx}

@@ -3,46 +3,46 @@ import React from 'react';
 import { CollapsibleSection, LabeledValue, LabeledValueList } from '@spinnaker/core';
 import { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
 
-export const InstancesDiversificationDetailsSection = ({ serverGroup }: IAmazonServerGroupDetailsSectionProps) => {
+export const InstancesDistributionDetailsSection = ({ serverGroup }: IAmazonServerGroupDetailsSectionProps) => {
   if (!serverGroup.mixedInstancesPolicy) {
     return null;
   }
 
-  const instancesDiversification = serverGroup.mixedInstancesPolicy.instancesDiversification;
+  const instancesDistribution = serverGroup.mixedInstancesPolicy.instancesDistribution;
   return (
-    <CollapsibleSection heading="Instance Diversification">
+    <CollapsibleSection heading="Instances Distribution">
       <LabeledValueList className="horizontal-when-filters-collapsed">
         <LabeledValue
           label="On-Demand Allocation Strategy"
           helpFieldId="aws.serverGroup.odAllocationStrategy"
-          value={instancesDiversification.onDemandAllocationStrategy}
+          value={instancesDistribution.onDemandAllocationStrategy}
         />
         <LabeledValue
           label="On-Demand Base Capacity"
           helpFieldId="aws.serverGroup.odBase"
-          value={instancesDiversification.onDemandBaseCapacity}
+          value={instancesDistribution.onDemandBaseCapacity}
         />
         <LabeledValue
           label="On-Demand Percentage Above Base Capacity"
           helpFieldId="aws.serverGroup.odPercentAboveBase"
-          value={instancesDiversification.onDemandPercentageAboveBaseCapacity}
+          value={instancesDistribution.onDemandPercentageAboveBaseCapacity}
         />
         <LabeledValue
           label="Spot Allocation Strategy"
           helpFieldId="aws.serverGroup.spotAllocationStrategy"
-          value={instancesDiversification.spotAllocationStrategy}
+          value={instancesDistribution.spotAllocationStrategy}
         />
-        {instancesDiversification.spotInstancePools && (
+        {instancesDistribution.spotInstancePools && (
           <LabeledValue
             label="Spot Instance Pools"
             helpFieldId="aws.serverGroup.spotInstancePoolCount"
-            value={instancesDiversification.spotInstancePools}
+            value={instancesDistribution.spotInstancePools}
           />
         )}
         <LabeledValue
           label="Max Spot Price"
           helpFieldId="aws.serverGroup.spotMaxPrice"
-          value={instancesDiversification.spotMaxPrice || 'on-demand price, default'}
+          value={instancesDistribution.spotMaxPrice || 'on-demand price, default'}
         />
       </LabeledValueList>
     </CollapsibleSection>

package/src/serverGroup/details/sections/LaunchTemplateDetailsSection.spec.tsx

@@ -45,7 +45,7 @@ describe('Launch template details', () => {
     scalingPolicies: [] as IScalingPolicy[],
     mixedInstancesPolicy: {
       allowedInstanceTypes: ['some.type.medium', 'some.type.large'],
-      instancesDiversification: {
+      instancesDistribution: {
         onDemandAllocationStrategy: 'prioritized',
         onDemandBaseCapacity: 1,
         onDemandPercentageAboveBaseCapacity: 50,

package/src/serverGroup/details/sections/LaunchTemplateDetailsSection.tsx

@@ -18,7 +18,7 @@ export const LaunchTemplateDetailsSection = ({ serverGroup }: IAmazonServerGroup
 
   const { launchTemplateData } = launchTemplate;
   const maxSpotPrice = isMip
-    ? serverGroup.mixedInstancesPolicy.instancesDiversification.spotMaxPrice
+    ? serverGroup.mixedInstancesPolicy.instancesDistribution.spotMaxPrice
     : launchTemplateData?.instanceMarketOptions?.spotOptions?.maxPrice;
   const creditSpecification = launchTemplateData?.creditSpecification?.cpuCredits;
   const launchTemplateOverrides = isMip

package/src/serverGroup/details/sections/MultipleInstanceTypesSubSection.tsx

@@ -32,7 +32,7 @@ export function MultipleInstanceTypesSubSection(props: { instanceTypeOverrides:
         </thead>
         <tbody>
           {props.instanceTypeOverrides.map((override) => [
-            <tr>
+            <tr key={override.instanceType}>
               <td headers="instanceType">{override.instanceType}</td>
               <td headers="weight">{override.weightedCapacity}</td>
             </tr>,

package/src/serverGroup/details/sections/index.ts

@@ -3,7 +3,7 @@ export * from './AmazonInfoDetailsSection';
 export * from './AmazonCapacityDetailsSection';
 export * from './HealthDetailsSection';
 export * from './IAmazonServerGroupDetailsSectionProps';
-export * from './InstancesDiversificationDetailsSection';
+export * from './InstancesDistributionDetailsSection';
 export * from './LaunchConfigDetailsSection';
 export * from './LaunchTemplateDetailsSection';
 export * from './LogsDetailsSection';

package/dist/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.controller.d.ts

@@ -1,41 +0,0 @@
-import { IComponentController, IScope } from 'angular';
-import { IModalServiceInstance } from 'angular-ui-bootstrap';
-import { Subject } from 'rxjs';
-import { Application, IServerGroup, TaskMonitor } from '@spinnaker/core';
-import { IUpsertScalingPolicyCommand } from '../ScalingPolicyWriter';
-import { ICustomizedMetricSpecification, ITargetTrackingConfiguration, ITargetTrackingPolicy } from '../../../../domain';
-export declare type MetricType = 'custom' | 'predefined';
-export interface ITargetTrackingState {
-    metricType: MetricType;
-    unit: string;
-    scaleInChanged: boolean;
-}
-export interface ITargetTrackingPolicyCommand extends IUpsertScalingPolicyCommand {
-    estimatedInstanceWarmup: number;
-    targetTrackingConfiguration: ITargetTrackingConfiguration;
-}
-export declare class UpsertTargetTrackingController implements IComponentController {
-    private $uibModalInstance;
-    policy: ITargetTrackingPolicy;
-    serverGroup: IServerGroup;
-    application: Application;
-    private $scope;
-    predefinedMetrics: string[];
-    statistics: string[];
-    alarmUpdated: Subject<unknown>;
-    taskMonitor: TaskMonitor;
-    state: ITargetTrackingState;
-    command: ITargetTrackingPolicyCommand;
-    static $inject: string[];
-    constructor($uibModalInstance: IModalServiceInstance, policy: ITargetTrackingPolicy, serverGroup: IServerGroup, application: Application, $scope: IScope);
-    $onInit(): void;
-    metricTypeChanged: (type: MetricType) => void;
-    toggleMetricType: () => void;
-    updateUnit: (unit: string) => void;
-    scaleInChanged(): void;
-    alarmChanged: (newAlarm: ICustomizedMetricSpecification) => void;
-    commandChanged: (updatedCommand: ITargetTrackingPolicyCommand) => void;
-    cancel(): void;
-    save(): void;
-    private buildCommand;
-}

package/dist/serverGroup/details/scalingPolicy/upsert/alarm/alarmConfigurer.component.d.ts

@@ -1,2 +0,0 @@
-export const AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_UPSERT_ALARM_ALARMCONFIGURER_COMPONENT: "spinnaker.amazon.serverGroup.details.scalingPolicy.alarm.configurer";
-export const name: "spinnaker.amazon.serverGroup.details.scalingPolicy.alarm.configurer";

package/dist/serverGroup/details/scalingPolicy/upsert/alarm/dimensionsEditor.component.d.ts

@@ -1,2 +0,0 @@
-export const AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_UPSERT_ALARM_DIMENSIONSEDITOR_COMPONENT: "spinnaker.amazon.serverGroup.details.scalingPolicy.dimensionEditor";
-export const name: "spinnaker.amazon.serverGroup.details.scalingPolicy.dimensionEditor";

package/dist/serverGroup/details/scalingPolicy/upsert/simple/simplePolicyAction.component.d.ts

@@ -1,2 +0,0 @@
-export const AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_UPSERT_SIMPLE_SIMPLEPOLICYACTION_COMPONENT: "spinnaker.amazon.serverGroup.details.scalingPolicy.upsert.actions.simplePolicy";
-export const name: "spinnaker.amazon.serverGroup.details.scalingPolicy.upsert.actions.simplePolicy";

package/dist/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.controller.d.ts

@@ -1,2 +0,0 @@
-export const AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_UPSERT_UPSERTSCALINGPOLICY_CONTROLLER: "spinnaker.amazon.serverGroup.details.scalingPolicy.upsertScalingPolicy.controller";
-export const name: "spinnaker.amazon.serverGroup.details.scalingPolicy.upsertScalingPolicy.controller";

package/dist/serverGroup/details/sections/InstancesDiversificationDetailsSection.d.ts

@@ -1,2 +0,0 @@
-import { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
-export declare const InstancesDiversificationDetailsSection: ({ serverGroup }: IAmazonServerGroupDetailsSectionProps) => JSX.Element;