@spinnaker/amazon 0.11.0 → 0.12.2

package/dist/instance/awsInstanceType.service.d.ts

@@ -1,2 +1,10 @@
-export const AMAZON_INSTANCE_AWSINSTANCETYPE_SERVICE: "spinnaker.amazon.instanceType.service";
-export const name: "spinnaker.amazon.instanceType.service";
+import type { IInstanceTypeCategory, IPreferredInstanceType } from '@spinnaker/core';
+export interface IAmazonPreferredInstanceType extends IPreferredInstanceType {
+    cpuCreditsPerHour?: number;
+}
+export interface IAmazonInstanceTypeCategory extends IInstanceTypeCategory {
+    showCpuCredits?: boolean;
+    descriptionListOverride?: string[];
+}
+export declare const AMAZON_INSTANCE_AWSINSTANCETYPE_SERVICE = "spinnaker.amazon.instanceType.service";
+export declare const name = "spinnaker.amazon.instanceType.service";

package/dist/instance/awsInstanceTypes.d.ts

@@ -0,0 +1,10 @@
+import type { IInstanceTypeCategory, IInstanceTypeFamily } from '@spinnaker/core';
+interface IAwsInstanceTypeCategory extends IInstanceTypeCategory {
+    showCpuCredits?: boolean;
+    descriptionListOverride?: string[];
+}
+export declare const defaultCategories: IAwsInstanceTypeCategory[];
+export declare const categories: (IAwsInstanceTypeCategory & {
+    families: IInstanceTypeFamily[];
+})[];
+export {};

package/dist/instance/details/CostFactor.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+export interface ICostFactorProps {
+    min: number;
+    max?: number;
+}
+export declare const CostFactor: ({ min, max }: ICostFactorProps) => JSX.Element;

package/dist/search/searchResultFormatter.d.ts

@@ -1,2 +1,2 @@
-export const AMAZON_SEARCH_SEARCHRESULTFORMATTER: "spinnaker.amazon.search.searchResultFormatter";
-export const name: "spinnaker.amazon.search.searchResultFormatter";
+export declare const AMAZON_SEARCH_SEARCHRESULTFORMATTER = "spinnaker.amazon.search.searchResultFormatter";
+export declare const name = "spinnaker.amazon.search.searchResultFormatter";

package/dist/serverGroup/configure/serverGroupConfiguration.service.d.ts

@@ -22,8 +22,15 @@ export interface IAmazonServerGroupCommandViewState extends IServerGroupCommandV
     dirty: IAmazonServerGroupCommandDirty;
     spelTargetGroups: string[];
     spelLoadBalancers: string[];
+    useSimpleInstanceTypeSelector: boolean;
+}
+export interface IAmazonInstanceTypeOverride {
+    instanceType: string;
+    weightedCapacity?: number;
+    priority?: number;
 }
 export interface IAmazonServerGroupCommand extends IServerGroupCommand {
+    viewState: IAmazonServerGroupCommandViewState;
     associateIPv6Address?: boolean;
     associatePublicIpAddress: boolean;
     backingData: IAmazonServerGroupCommandBackingData;
@@ -41,11 +48,17 @@ export interface IAmazonServerGroupCommand extends IServerGroupCommand {
     setLaunchTemplate?: boolean;
     unlimitedCpuCredits?: boolean;
     capacityRebalance?: boolean;
-    viewState: IAmazonServerGroupCommandViewState;
+    onDemandAllocationStrategy?: string;
+    onDemandBaseCapacity?: number;
+    onDemandPercentageAboveBaseCapacity?: number;
+    spotAllocationStrategy?: string;
+    spotInstancePools?: number;
+    launchTemplateOverridesForInstanceType?: IAmazonInstanceTypeOverride[];
     getBlockDeviceMappingsSource: (command: IServerGroupCommand) => IBlockDeviceMappingSource;
     selectBlockDeviceMappingsSource: (command: IServerGroupCommand, selection: string) => void;
     usePreferredZonesChanged: (command: IServerGroupCommand) => IAmazonServerGroupCommandResult;
     regionIsDeprecated: (command: IServerGroupCommand) => boolean;
+    launchTemplateOverridesChanged: (command: IServerGroupCommand) => void;
 }
 export declare class AwsServerGroupConfigurationService {
     private securityGroupReader;

package/dist/serverGroup/configure/wizard/instanceType/CpuCreditsToggle.d.ts

@@ -1,9 +1,8 @@
 /// <reference types="react" />
-import type { IAmazonServerGroupCommand } from '../../serverGroupConfiguration.service';
 export interface ICpuCreditsToggleProps {
-    command: IAmazonServerGroupCommand;
-    newInstanceType?: string;
-    newProfileType?: string;
+    unlimitedCpuCredits?: boolean;
+    selectedInstanceTypes: string[];
+    currentProfile: string;
     setUnlimitedCpuCredits: (unlimitedCpuCredits: boolean | undefined) => void;
 }
 export declare function CpuCreditsToggle(props: ICpuCreditsToggleProps): JSX.Element;

package/dist/serverGroup/configure/wizard/instanceType/InstanceTypeSelector.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="react" />
+import type { FormikProps } from 'formik/dist/types';
+import type { IInstanceTypeCategory } from '@spinnaker/core';
+import type { IAmazonServerGroupCommand } from '../../serverGroupConfiguration.service';
+export interface IInstanceTypeSelectorProps {
+    formik: FormikProps<IAmazonServerGroupCommand>;
+    instanceTypeDetails: IInstanceTypeCategory[];
+}
+export declare function InstanceTypeSelector(props: IInstanceTypeSelectorProps): JSX.Element;

package/dist/serverGroup/configure/wizard/instanceType/advancedMode/AdvancedModeSelector.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="react" />
+import type { FormikProps } from 'formik/dist/types';
+import type { IAmazonInstanceTypeCategory } from '../../../../../instance/awsInstanceType.service';
+import type { IAmazonServerGroupCommand } from '../../../serverGroupConfiguration.service';
+export interface IAdvancedModeSelectorProps {
+    formik: FormikProps<IAmazonServerGroupCommand>;
+    instanceTypeDetails: IAmazonInstanceTypeCategory[];
+    setUnlimitedCpuCredits: (unlimitedCpuCredits: boolean | undefined) => void;
+}
+/**
+ * Note: Launch templates support is expected to be enabled if this component is rendered.
+ */
+export declare function AdvancedModeSelector(props: IAdvancedModeSelectorProps): JSX.Element;

package/dist/serverGroup/configure/wizard/instanceType/advancedMode/InstanceProfileSelector.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="react" />
+import type { IAmazonInstanceTypeCategory } from '../../../../../instance/awsInstanceType.service';
+import './advancedMode.less';
+export interface IInstanceProfileSelectorProps {
+    currentProfile: string;
+    handleProfileChange: (profile: string) => void;
+    instanceProfileList: IAmazonInstanceTypeCategory[];
+}
+export declare function InstanceProfileSelector(props: IInstanceProfileSelectorProps): JSX.Element;

package/dist/serverGroup/configure/wizard/instanceType/advancedMode/InstanceTypeRow.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="react" />
+import type { IAmazonPreferredInstanceType } from '../../../../../instance/awsInstanceType.service';
+import type { IAmazonInstanceTypeOverride } from '../../../serverGroupConfiguration.service';
+export interface IRowProps {
+    isCustom: boolean;
+    selectedType?: IAmazonInstanceTypeOverride;
+    instanceTypeDetails?: IAmazonPreferredInstanceType;
+    removeInstanceType?: (typeToRemove: string) => void;
+    addOrUpdateInstanceType: (instanceType: string, weight: string) => void;
+}
+export declare function InstanceTypeRow(props: IRowProps): JSX.Element;

package/dist/serverGroup/configure/wizard/instanceType/advancedMode/InstanceTypeTable.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="react" />
+import type { IAmazonInstanceTypeCategory } from '../../../../../instance/awsInstanceType.service';
+import type { IAmazonInstanceTypeOverride } from '../../../serverGroupConfiguration.service';
+import './advancedMode.less';
+export interface IInstanceTypeTableProps {
+    currentProfile: string;
+    selectedInstanceTypesMap: Map<string, IAmazonInstanceTypeOverride>;
+    unlimitedCpuCreditsInCmd: boolean;
+    profileDetails: IAmazonInstanceTypeCategory;
+    availableInstanceTypesList: string[];
+    handleInstanceTypesChange: (instanceTypes: IAmazonInstanceTypeOverride[]) => void;
+    setUnlimitedCpuCredits: (unlimitedCpuCredits: boolean | undefined) => void;
+}
+export declare function InstanceTypeTable(props: IInstanceTypeTableProps): JSX.Element;

package/dist/serverGroup/configure/wizard/instanceType/advancedMode/InstanceTypeTableBody.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="react" />
+import type { SortEnd } from 'react-sortable-hoc';
+import type { IInstanceTypeFamily } from '@spinnaker/core';
+import type { IAmazonInstanceTypeOverride } from '../../../serverGroupConfiguration.service';
+export declare function InstanceTypeTableBody(props: {
+    isCustom: boolean;
+    profileFamiliesDetails?: IInstanceTypeFamily[];
+    selectedInstanceTypesMap: Map<string, IAmazonInstanceTypeOverride>;
+    addOrUpdateInstanceType: (instanceType: string, weight: string) => void;
+    removeInstanceType: (instanceType: string) => void;
+    handleSortEnd: (sortEnd: SortEnd) => void;
+}): JSX.Element;

package/dist/serverGroup/configure/wizard/instanceType/advancedMode/InstanceTypeTableParts.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="react" />
+export declare function Heading(props: {
+    isCustom: boolean;
+    profileLabel?: string;
+    profileDescriptionArr?: string[];
+}): JSX.Element;
+export declare function Header(props: {
+    isCustom: boolean;
+    showCpuCredits?: boolean;
+}): JSX.Element;
+export declare function Footer(props: {
+    isCustom: boolean;
+    availableInstanceTypesList: string[];
+    addOrUpdateInstanceType: (type: string, weight: string) => void;
+}): JSX.Element;

package/dist/serverGroup/configure/wizard/instanceType/advancedMode/InstancesDistribution.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import type { FormikProps } from 'formik';
+import type { IAmazonServerGroupCommand } from '../../../serverGroupConfiguration.service';
+import './InstancesDistribution.less';
+export interface IInstancesDistributionProps {
+    formik: FormikProps<IAmazonServerGroupCommand>;
+}
+export declare function InstancesDistribution(props: IInstancesDistributionProps): JSX.Element;

package/dist/serverGroup/configure/wizard/instanceType/simpleMode/SimpleModeSelector.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import type { IAmazonServerGroupCommand } from '../../../serverGroupConfiguration.service';
+export interface ISimpleModeSelectorProps {
+    command: IAmazonServerGroupCommand;
+    setUnlimitedCpuCredits: (unlimitedCpuCredits: boolean | undefined) => void;
+    setFieldValue: (field: keyof IAmazonServerGroupCommand, value: any, shouldValidate?: boolean) => void;
+}
+export declare function SimpleModeSelector(props: ISimpleModeSelectorProps): JSX.Element;

package/dist/serverGroup/configure/wizard/pages/ServerGroupInstanceType.d.ts

@@ -1,19 +1,22 @@
 import type { FormikErrors, FormikProps } from 'formik';
 import React from 'react';
 import type { IWizardPageComponent } from '@spinnaker/core';
+import type { IAmazonInstanceTypeCategory } from '../../../../instance/awsInstanceType.service';
 import type { IAmazonServerGroupCommand } from '../../serverGroupConfiguration.service';
 export interface IServerGroupInstanceTypeProps {
     formik: FormikProps<IAmazonServerGroupCommand>;
 }
 export interface IServerGroupInstanceTypeState {
-    newInstanceType?: string;
-    newProfileType?: string;
+    instanceTypeDetails: IAmazonInstanceTypeCategory[];
 }
 export declare class ServerGroupInstanceType extends React.Component<IServerGroupInstanceTypeProps, IServerGroupInstanceTypeState> implements IWizardPageComponent<IAmazonServerGroupCommand> {
-    constructor(props: IServerGroupInstanceTypeProps);
+    state: IServerGroupInstanceTypeState;
+    private props$;
+    private destroy$;
     validate(values: IAmazonServerGroupCommand): FormikErrors<IAmazonServerGroupCommand>;
-    private instanceProfileChanged;
-    private instanceTypeChanged;
-    private setUnlimitedCpuCredits;
+    private validateAdvancedModeFields;
+    componentDidMount(): void;
+    componentDidUpdate(): void;
+    componentWillUnmount(): void;
     render(): JSX.Element;
 }

package/dist/serverGroup/details/scalingPolicy/ScalingPolicySummary.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="react" />
 import type { Application, IServerGroup } from '@spinnaker/core';
 import type { IScalingPolicyView } from '../../../domain';
-import './scalingPolicySummary.component.less';
 export interface IScalingPolicySummaryProps {
     application: Application;
     policy: IScalingPolicyView;

package/dist/serverGroup/details/scalingPolicy/chart/MetricAlarmChart.d.ts

@@ -1,15 +1,11 @@
 /// <reference types="react" />
-import type { Observable } from 'rxjs';
 import type { ICloudMetricStatistics } from '@spinnaker/core';
 import type { IAmazonServerGroup, IScalingPolicyAlarm } from '../../../../domain';
 interface IMetricAlarmChartProps {
     serverGroup: IAmazonServerGroup;
     alarm: IScalingPolicyAlarm;
-    alarmUpdated?: Observable<any>;
     onChartLoaded?: (stats: ICloudMetricStatistics) => void;
 }
 export declare function MetricAlarmChart(props: IMetricAlarmChartProps): JSX.Element;
 export declare function MetricAlarmChartImpl(props: IMetricAlarmChartProps): JSX.Element;
-export declare const AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_CHART_METRICALARMCHART_COMPONENT = "spinnaker.amazon.serverGroup.details.scalingPolicy.metricAlarmChart.component";
-export declare const name = "spinnaker.amazon.serverGroup.details.scalingPolicy.metricAlarmChart.component";
 export {};

package/dist/serverGroup/details/scalingPolicy/index.d.ts

@@ -1,6 +1,5 @@
 export { DateLineChart } from './chart/DateLineChart';
 export { MetricAlarmChart } from './chart/MetricAlarmChart';
-export * from './ScalingPolicyTypeRegistry';
 export * from './CreateScalingPolicyButton';
 export * from './ScalingPolicyWriter';
 export * from './StepPolicySummary';

package/dist/serverGroup/details/scalingPolicy/targetTracking/TargetTrackingChart.d.ts

@@ -1,11 +1,9 @@
 /// <reference types="react" />
-import { Subject } from 'rxjs';
 import type { IAmazonServerGroup, ITargetTrackingConfiguration } from '../../../../domain';
 export interface ITargetTrackingChartProps {
-    alarmUpdated?: Subject<void>;
     config: ITargetTrackingConfiguration;
     serverGroup: IAmazonServerGroup;
     unit?: string;
     updateUnit?: (unit: string) => void;
 }
-export declare const TargetTrackingChart: ({ alarmUpdated, config, serverGroup, updateUnit, }: ITargetTrackingChartProps) => JSX.Element;
+export declare const TargetTrackingChart: ({ config, serverGroup, updateUnit }: ITargetTrackingChartProps) => JSX.Element;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spinnaker/amazon",
   "license": "Apache-2.0",
-  "version": "0.11.0",
+  "version": "0.12.2",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -13,7 +13,7 @@
     "lib": "npm run build"
   },
   "dependencies": {
-    "@spinnaker/core": "^0.14.1",
+    "@spinnaker/core": "^0.16.0",
     "@uirouter/angularjs": "1.0.26",
     "@uirouter/core": "6.0.8",
     "@uirouter/react": "1.0.7",
@@ -39,9 +39,9 @@
     "rxjs": "6.6.7"
   },
   "devDependencies": {
-    "@spinnaker/eslint-plugin": "^3.0.0",
+    "@spinnaker/eslint-plugin": "^3.0.1",
     "@spinnaker/mocks": "1.0.7",
-    "@spinnaker/scripts": "^0.2.2",
+    "@spinnaker/scripts": "^0.2.4",
     "@types/angular": "1.6.26",
     "@types/angular-ui-bootstrap": "0.13.41",
     "@types/classnames": "2.2.0",
@@ -55,5 +55,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "b36e5fa30e23cd60007e6839b0dab5e41bd410d5"
+  "gitHead": "59026ea6af7b81ffb8e8c59e18f43396906ddafb"
 }

package/src/aws.module.ts

@@ -1,7 +1,8 @@
 import { module } from 'angular';
 
-import { CloudProviderRegistry, DeploymentStrategyRegistry, SETTINGS } from '@spinnaker/core';
+import { CloudProviderRegistry, DeploymentStrategyRegistry } from '@spinnaker/core';
 
+import { AWSProviderSettings } from './aws.settings';
 import { COMMON_MODULE } from './common/common.module';
 import './deploymentStrategy/rollingPush.strategy';
 import { AmazonFunctionDetails } from './function';
@@ -52,7 +53,6 @@ import {
   AmazonUpsertTargetTrackingModal,
   TargetTrackingChart,
 } from './serverGroup/details/scalingPolicy';
-
 import {
   AdvancedSettingsDetailsSection,
   AmazonCapacityDetailsSection,
@@ -117,7 +117,7 @@ module(AMAZON_MODULE, [
 ]).config(() => {
   CloudProviderRegistry.registerProvider('aws', {
     name: 'Amazon',
-    adHocInfrastructureWritesEnabled: SETTINGS.awsAdHocInfraWritesEnabled,
+    adHocInfrastructureWritesEnabled: AWSProviderSettings.adHocInfraWritesEnabled,
     logo: {
       path: amazonLogo,
     },

package/src/aws.settings.ts

@@ -7,6 +7,7 @@ export interface IClassicLaunchAllowlist {
 }
 
 export interface IAWSProviderSettings extends IProviderSettings {
+  adHocInfraWritesEnabled?: boolean;
   bakeWarning?: string;
   classicLaunchLockout?: number;
   classicLaunchAllowlist?: IClassicLaunchAllowlist[];
@@ -65,5 +66,6 @@ export const AWSProviderSettings: IAWSProviderSettings = (SETTINGS.providers.aws
   defaults: {},
 };
 if (AWSProviderSettings) {
+  AWSProviderSettings.adHocInfraWritesEnabled = AWSProviderSettings.adHocInfraWritesEnabled ?? true;
   AWSProviderSettings.resetToOriginal = SETTINGS.resetProvider('aws');
 }

package/src/function/details/FunctionActions.spec.tsx

@@ -1,15 +1,18 @@
-import React from 'react';
 import { shallow } from 'enzyme';
+import React from 'react';
+
+import type { Application } from '@spinnaker/core';
 
-import { Application, SETTINGS } from '@spinnaker/core';
-import { IAmazonFunction, FunctionActions } from '../../index';
+import { AWSProviderSettings } from '../../aws.settings';
+import type { IAmazonFunction } from '../../index';
+import { FunctionActions } from '../../index';
 
 describe('FunctionActions', () => {
   it('should render correct state when all attributes exist', () => {
-    let app = { name: 'app' } as Application;
+    const app = { name: 'app' } as Application;
 
-    let functionDef = { functionName: 'app-function' } as IAmazonFunction;
-    SETTINGS.awsAdHocInfraWritesEnabled = true;
+    const functionDef = { functionName: 'app-function' } as IAmazonFunction;
+    AWSProviderSettings.adHocInfraWritesEnabled = true;
 
     const wrapper = shallow(
       <FunctionActions
@@ -23,16 +26,16 @@ describe('FunctionActions', () => {
       />,
     );
 
-    let dropDown = wrapper.find('DropdownToggle');
+    const dropDown = wrapper.find('DropdownToggle');
 
     expect(dropDown.childAt(0).text()).toEqual('Function Actions');
   });
 
-  it('should not render DropdownToggle if awsAdHocInfraWritesEnabled is false', () => {
-    let app = { name: 'app' } as Application;
+  it('should not render DropdownToggle if aws.adHocInfraWritesEnabled is false', () => {
+    const app = { name: 'app' } as Application;
 
-    let functionDef = { functionName: 'app-function' } as IAmazonFunction;
-    SETTINGS.awsAdHocInfraWritesEnabled = false;
+    const functionDef = { functionName: 'app-function' } as IAmazonFunction;
+    AWSProviderSettings.adHocInfraWritesEnabled = false;
 
     const wrapper = shallow(
       <FunctionActions
@@ -46,7 +49,7 @@ describe('FunctionActions', () => {
       />,
     );
 
-    let dropDown = wrapper.find('div');
+    const dropDown = wrapper.find('div');
     expect(dropDown.children().length).toEqual(0);
   });
 });

package/src/function/details/FunctionActions.tsx

@@ -12,6 +12,7 @@ import {
 
 import type { IFunctionFromStateParams } from './AmazonFunctionDetails';
 import { CreateLambdaFunction } from '../CreateLambdaFunction';
+import { AWSProviderSettings } from '../../aws.settings';
 import type { IAmazonFunction, IAmazonFunctionDeleteCommand } from '../../domain';
 
 export interface IFunctionActionsProps {
@@ -96,7 +97,7 @@ export class FunctionActions extends React.Component<IFunctionActionsProps, IFun
 
     return (
       <div style={{ display: 'inline-block' }}>
-        {SETTINGS.awsAdHocInfraWritesEnabled && (
+        {AWSProviderSettings.adHocInfraWritesEnabled && (
           <Dropdown className="dropdown" id="function-actions-dropdown">
             <Dropdown.Toggle className="btn btn-sm btn-primary dropdown-toggle">
               <span>Function Actions</span>

package/src/help/amazon.help.ts

@@ -59,18 +59,20 @@ const helpContents: { [key: string]: string } = {
     '(Optional) <b>Detail</b> is a string of free-form alphanumeric characters and hyphens to describe any other variables.',
   'aws.serverGroup.imageName':
     '(Required) <b>Image</b> is the deployable Amazon Machine Image. Images are restricted to the account and region selected.',
+  'aws.serverGroup.storageType': `AWS offers various storage options like temporary block-level storage via instance store (SSD, HDD) and Amazon Elastic Block Store (EBS). This column lists the storage type supported for the instance type.`,
+  'aws.serverGroup.instancesDistribution': `Learn more in <a target="_blank" href="https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-purchase-options.html">AWS docs</a>.`,
   'aws.serverGroup.spotMaxPrice':
-    'The maximum price per unit hour to pay for a Spot instance. By default (empty), Amazon EC2 Auto Scaling uses the On-Demand price as the maximum Spot price',
+    'The maximum price per unit hour to pay for a Spot instance. By <b>default (empty)</b>, Amazon EC2 Auto Scaling uses the On-Demand price as the maximum Spot price.',
   'aws.serverGroup.spotAllocationStrategy': `<p>Indicates how to allocate instances across Spot Instance pools.</p>
       <ul>
         <li><b>capacity-optimized (recommended)</b>: Instances launched using Spot pools that are optimally chosen based on the available Spot capacity.</li>
         <li><b>capacity-optimized-prioritized</b>: Instances launched using the priority on a best-effort basis to determine which launch template override to use first, but AWS optimizes for capacity first.</li>
-        <li><b>lowest-price</b>: Instances launched using Spot pools with the lowest price, and evenly allocated across the number of Spot pools specified</li>
+        <li><b>lowest-price (default)</b>: Instances launched using Spot pools with the lowest price, and evenly allocated across the number of Spot pools specified</li>
       </ul>`,
-  'aws.serverGroup.spotInstancePoolCount': `Number of lowest priced Spot Instance pools to diversify across. Only applicable for strategy 'lowest-price'.`,
-  'aws.serverGroup.odAllocationStrategy': `The only strategy / default is 'prioritized'. The order of instance types in the list of launch template overrides is used to determine which instance type to use first when fulfilling On-Demand capacity.`,
-  'aws.serverGroup.odBase': `Minimum amount of the Auto Scaling Group's capacity that must be fulfilled by On-Demand Instances. This base portion is provisioned first as the group scales.`,
-  'aws.serverGroup.odPercentAboveBase': `Percentages of On-Demand and Spot instances for additional capacity beyond OnDemandBaseCapacity.`,
+  'aws.serverGroup.spotInstancePoolCount': `Number of lowest priced Spot Instance pools to diversify across. Only applicable for strategy 'lowest-price'. <b>Default: 2.</b>`,
+  'aws.serverGroup.odAllocationStrategy': `The only strategy / <b>default is 'prioritized'</b>. The order specified in the list of selected instance types is used to determine which instance type to use first when fulfilling On-Demand capacity.`,
+  'aws.serverGroup.odBase': `Minimum amount of the Auto Scaling Group's capacity that must be fulfilled by On-Demand Instances. This base portion is provisioned first as the group scales. <b>Default: 0.</b>`,
+  'aws.serverGroup.odPercentAboveBase': `Percentages of On-Demand and Spot instances for additional capacity beyond OnDemandBaseCapacity.<b>Default: 100.</b>`,
   'aws.serverGroup.instanceTypeWeight': `The number of capacity units gives the instance type a proportional weight to other instance types. When specified, weights count towards desired capacity.`,
   'aws.serverGroup.instanceTypes': `Specify up to 20 instance types.`,
   'aws.serverGroup.multipleInstanceTypes': `Instance types a server group can launch, first (highest priority) to last (lowest priority).`,
@@ -82,6 +84,7 @@ const helpContents: { [key: string]: string } = {
             To burst above the baseline, the instance spends credits that it has accrued in its CPU credit balance.</li>
       </ul>`,
   'aws.serverGroup.capacityRebalance': `Enabling <b>Capacity Rebalance</b> allows EC2 Auto Scaling to proactively replace Spot Instances that have received a rebalance recommendation, <b>before</b> it is interrupted by AWS EC2.`,
+  'aws.serverGroup.advancedMode': `Advanced mode allows you to configure allocation strategies, multiple instance types with weighting, instance distribution across Spot / On-Demand and their proportions in the server group. Learn more in <a target="_blank" href="https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-purchase-options.html">AWS docs</a>.`,
   'aws.serverGroup.legacyUdf': `<p>(Optional) <b>User Data Format</b> allows overriding of the format used when generating user data during deployment. The default format used is configured
       in the application's attributes, editable via the 'Config' tab.</p>
       <p><b>Default</b> will use the value from the application's configuration.</p>

package/src/image/image.reader.spec.ts

@@ -0,0 +1,75 @@
+import { mock } from 'angular';
+import { $rootScope } from 'ngimport';
+// eslint-disable-next-line @spinnaker/import-from-npm-not-relative
+import { mockHttpClient } from '../../../core/src/api/mock/jasmine';
+import { AwsImageReader } from './image.reader';
+
+describe('Service: aws Image Reader', function () {
+  let service: AwsImageReader;
+
+  beforeEach(() => (service = new AwsImageReader()));
+  beforeEach(mock.inject());
+
+  describe('findImages', function () {
+    const region = 'us-west-2';
+    const buildQueryString = (query: string, region: string) => `/images/find?q=${query}&region=${region}`;
+
+    it('queries gate when 3 characters are supplied', async function () {
+      const q = 'que';
+      const http = mockHttpClient({ autoFlush: true });
+      http.expectGET(buildQueryString(q, region)).respond(200, [{ success: true }]);
+      const result = await service.findImages({ q, region });
+
+      expect(result.length).toBe(1);
+      expect((result[0] as any).success).toBe(true);
+    });
+
+    it('queries gate when more than 3 characters are supplied', async function () {
+      const q = 'abcd';
+      const http = mockHttpClient({ autoFlush: true });
+      http.expectGET(buildQueryString(q, region)).respond(200, [{ success: true }]);
+      const result = await service.findImages({ q, region });
+      expect(result.length).toBe(1);
+      expect((result[0] as any).success).toBe(true);
+    });
+
+    it('returns a message prompting user to enter more characters when less than 3 are supplied', async function () {
+      const q = 'ab';
+      let result: any;
+      service.findImages({ q, region }).then((response) => (result = response));
+      $rootScope.$digest();
+      expect(result.length).toBe(1);
+      expect((result[0] as any).message).toBe('Please enter at least 3 characters...');
+    });
+
+    it('returns an empty array when server errors', async function () {
+      const q = 'abc';
+      const http = mockHttpClient({ autoFlush: true });
+      http.expectGET(buildQueryString(q, region)).respond(404, {});
+      const result = await service.findImages({ q, region });
+      expect(result.length).toBe(0);
+    });
+  });
+
+  describe('getImage', function () {
+    const imageName = 'abc';
+    const region = 'us-west-1';
+    const credentials = 'test';
+
+    const buildQueryString = () => `/images/${credentials}/${region}/${imageName}?provider=aws`;
+
+    it('returns null if server returns 404', async function () {
+      const http = mockHttpClient({ autoFlush: true });
+      http.expectGET(buildQueryString()).respond(404, {});
+      const result = await service.getImage(imageName, region, credentials);
+      expect(result).toBe(null);
+    });
+
+    it('returns null if server returns an empty list', async function () {
+      const http = mockHttpClient({ autoFlush: true });
+      http.expectGET(buildQueryString()).respond(200, []);
+      const result2 = await service.getImage(imageName, region, credentials);
+      expect(result2).toBe(null);
+    });
+  });
+});