From a078cc1c29e92d44e7685c70c0bd6c618fa41725 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 6 Oct 2022 14:35:43 +0000
Subject: [PATCH 1/6] fix(core): Do not set static document base URL (#9890)
 (#9892)

The previous change to enable optional path-based routing (#9802) added a `<base>` tag, which regressed serving hash-based routing at non-root public paths.

This change returns to AngularJS's default behavior when using hash-based routing.  Note that path-based routing will continue to only function when served from a domain root.

Resolves spinnaker/spinnaker#6723

(cherry picked from commit 5ac75160cf8b6099aaea8b31874ebbbb13409b2a)

Co-authored-by: jcavanagh <jcavanagh@users.noreply.github.com>
---
 packages/app/index.deck                       | 1 -
 packages/core/src/bootstrap/angular.config.ts | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/app/index.deck b/packages/app/index.deck
index eac7721a389..0da9162adae 100644
--- a/packages/app/index.deck
+++ b/packages/app/index.deck
@@ -5,7 +5,6 @@
   <meta charset="utf-8">
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width">
-  <base href="/">
 
   <!-- Sample loading styles -->
   <style>
diff --git a/packages/core/src/bootstrap/angular.config.ts b/packages/core/src/bootstrap/angular.config.ts
index 6fcdfa32a81..2755902cef1 100644
--- a/packages/core/src/bootstrap/angular.config.ts
+++ b/packages/core/src/bootstrap/angular.config.ts
@@ -35,6 +35,7 @@ bootstrapModule.config([
     $locationProvider.html5Mode({
       enabled: SETTINGS.feature.html5Routing,
       rewriteLinks: false,
+      requireBase: false,
     });
   },
 ]);

From eeed4998eb6ec3fe4b6aa6a97c2a956f82917c35 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 18 Oct 2022 18:07:20 +0000
Subject: [PATCH 2/6] fix(aws): fix instance type selector by allowing instance
 types that can't be validated. (#9893) (#9895)

* fix(aws): fix instance type selector by allowing instance types that can't be validated.

https://github.com/spinnaker/spinnaker/issues/6734

* fix(aws): adding test for instance type selector fix

https://github.com/spinnaker/spinnaker/issues/6734
(cherry picked from commit 563b6f6cbfc72a3122d4cfe669ffc347c9dd7168)

Co-authored-by: Prathibha Datta Kumar <kprathib@amazon.com>
---
 .../src/instance/awsInstanceType.service.spec.js       | 10 +++++++++-
 .../amazon/src/instance/awsInstanceType.service.ts     | 10 ++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/packages/amazon/src/instance/awsInstanceType.service.spec.js b/packages/amazon/src/instance/awsInstanceType.service.spec.js
index 17ff1a61e58..a88035fc55b 100644
--- a/packages/amazon/src/instance/awsInstanceType.service.spec.js
+++ b/packages/amazon/src/instance/awsInstanceType.service.spec.js
@@ -254,6 +254,11 @@ describe('Service: InstanceType', function () {
 
   describe('filterInstanceTypes', function () {
     const instanceTypes = [
+      {
+        account: 'test',
+        region: 'us-east-1',
+        name: 'test.type.incomplete',
+      },
       {
         account: 'test',
         region: 'us-west-2',
@@ -301,9 +306,10 @@ describe('Service: InstanceType', function () {
       },
     ];
 
-    it('filters instance types by VPC, virtualization type and architecture', function () {
+    it('filters instance types by VPC, virtualization type and architecture, only if the information exists', function () {
       const service = this.awsInstanceTypeService;
       expect(map(service.filterInstanceTypes(instanceTypes, 'hvm', true, 'x86_64'), 'name')).toEqual([
+        'test.type.incomplete',
         'm1.small',
         'hs1.8xlarge',
         'm2.xlarge',
@@ -316,11 +322,13 @@ describe('Service: InstanceType', function () {
         'm2.xlarge',
       ]);
       expect(map(service.filterInstanceTypes(instanceTypes, 'hvm', true, 'i386'), 'name')).toEqual([
+        'test.type.incomplete',
         'm1.small',
         'hs1.8xlarge',
         't2.nano',
       ]);
       expect(map(service.filterInstanceTypes(instanceTypes, 'paravirtual', true, 'i386'), 'name')).toEqual([
+        'test.type.incomplete',
         'm1.small',
         'hs1.8xlarge',
       ]);
diff --git a/packages/amazon/src/instance/awsInstanceType.service.ts b/packages/amazon/src/instance/awsInstanceType.service.ts
index 8248c5abbf5..622df969e4e 100644
--- a/packages/amazon/src/instance/awsInstanceType.service.ts
+++ b/packages/amazon/src/instance/awsInstanceType.service.ts
@@ -184,10 +184,16 @@ module(AMAZON_INSTANCE_AWSINSTANCETYPE_SERVICE, []).factory('awsInstanceTypeServ
         if (!vpcConfigured && !families.ec2ClassicSupported.includes(i.name.split('.')[0])) {
           return false;
         }
-        if (virtualizationType && !i.supportedVirtualizationTypes.includes(virtualizationType)) {
+
+        if (
+          virtualizationType &&
+          i.supportedVirtualizationTypes &&
+          !i.supportedVirtualizationTypes.includes(virtualizationType)
+        ) {
           return false;
         }
-        if (architecture && !i.supportedArchitectures.includes(architecture)) {
+
+        if (architecture && i.supportedArchitectures && !i.supportedArchitectures.includes(architecture)) {
           return false;
         }
 

From c3ea5bcee44c9b10e87bb0327a9e1834076a51e4 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 16:37:46 +0000
Subject: [PATCH 3/6] fix(links): update link to spinnaker release changelog
 (#9897) (#9900)

* fix(links): update link to spinnaker release changelog

* prettier

(cherry picked from commit 159151368e99da0e990d607039268e20b8b1a8b2)

Co-authored-by: Jared Stehler <jared.stehler@gmail.com>
---
 packages/core/src/config/settings.ts | 3 +--
 packages/core/src/help/HelpMenu.tsx  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/config/settings.ts b/packages/core/src/config/settings.ts
index ae23fbbfe4a..255c18bd6a5 100644
--- a/packages/core/src/config/settings.ts
+++ b/packages/core/src/config/settings.ts
@@ -162,8 +162,7 @@ SETTINGS.analytics = SETTINGS.analytics || {};
 SETTINGS.providers = SETTINGS.providers || {};
 SETTINGS.defaultTimeZone = SETTINGS.defaultTimeZone || 'America/Los_Angeles';
 SETTINGS.dockerInsights = SETTINGS.dockerInsights || { enabled: false, url: '' };
-SETTINGS.changelogUrl =
-  SETTINGS.changelogUrl || 'https://www.spinnaker.io/community/releases/versions/:version-changelog';
+SETTINGS.changelogUrl = SETTINGS.changelogUrl || 'https://spinnaker.io/changelogs/:version-changelog';
 SETTINGS.managedDelivery = SETTINGS.managedDelivery || {
   defaultManifest: 'spinnaker.yml',
   manifestBasePath: '.spinnaker',
diff --git a/packages/core/src/help/HelpMenu.tsx b/packages/core/src/help/HelpMenu.tsx
index bd872c62dcb..e7add8d099f 100644
--- a/packages/core/src/help/HelpMenu.tsx
+++ b/packages/core/src/help/HelpMenu.tsx
@@ -38,8 +38,7 @@ const Version = () => {
     return null;
   }
 
-  const CHANGELOG_PATH = SETTINGS.version.replace(/\./g, '-');
-  const CHANGELOG_URL = SETTINGS.changelogUrl.replace(':version', CHANGELOG_PATH);
+  const CHANGELOG_URL = SETTINGS.changelogUrl.replace(':version', SETTINGS.version);
 
   return (
     <MenuItem href={CHANGELOG_URL} target="_blank">

From f2c0467e7d61f19b74afd6096b58a54394139bfb Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 16:57:22 +0000
Subject: [PATCH 4/6] fix(aws): Fixing bugs related to clone CX when instance
 types are incompatible with image/region (#9901) (#9907)

* fix(aws): Fixing bugs related to clone UX when instance types are incompatible with image/region

Displaying warnings when incompatible instance types are removed

https://github.com/spinnaker/spinnaker/issues/6734

* fix(aws): PR feedback

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit d7290c4d61d880c0b5dfa3abb1573e1b0550603e)

Co-authored-by: Prathibha Datta Kumar <kprathib@amazon.com>
---
 .../serverGroupConfiguration.service.ts       | 24 ++++-
 .../instanceType/InstanceTypeSelector.tsx     | 94 +++++++++++++------
 .../instanceType/InstanceTypeWarning.tsx      | 44 +++++++++
 .../advancedMode/AdvancedModeSelector.tsx     |  3 +
 .../AmazonInstanceTypeInfoRenderer.tsx        | 28 +++---
 .../advancedMode/InstanceTypeTable.tsx        |  6 ++
 .../simpleMode/SimpleModeSelector.tsx         |  3 +
 .../wizard/pages/ServerGroupBasicSettings.tsx |  3 +
 .../wizard/pages/ServerGroupInstanceType.tsx  | 16 +++-
 .../serverGroup/serverGroup.transformer.ts    |  4 +
 10 files changed, 177 insertions(+), 48 deletions(-)
 create mode 100644 packages/amazon/src/serverGroup/configure/wizard/instanceType/InstanceTypeWarning.tsx

diff --git a/packages/amazon/src/serverGroup/configure/serverGroupConfiguration.service.ts b/packages/amazon/src/serverGroup/configure/serverGroupConfiguration.service.ts
index a0566a926cf..aa50e38218b 100644
--- a/packages/amazon/src/serverGroup/configure/serverGroupConfiguration.service.ts
+++ b/packages/amazon/src/serverGroup/configure/serverGroupConfiguration.service.ts
@@ -3,6 +3,7 @@ import {
   chain,
   clone,
   cloneDeep,
+  difference,
   extend,
   find,
   flatten,
@@ -61,6 +62,7 @@ export type IBlockDeviceMappingSource = 'source' | 'ami' | 'default';
 
 export interface IAmazonServerGroupCommandDirty extends IServerGroupCommandDirty {
   targetGroups?: string[];
+  launchTemplateOverridesForInstanceType?: IAmazonInstanceTypeOverride[];
 }
 
 export interface IAmazonServerGroupCommandResult extends IServerGroupCommandResult {
@@ -376,11 +378,13 @@ export class AwsServerGroupConfigurationService {
 
   public configureInstanceTypes(command: IAmazonServerGroupCommand): IServerGroupCommandResult {
     const result: IAmazonServerGroupCommandResult = { dirty: {} };
+
     if (command.region && (command.virtualizationType || command.viewState.disableImageSelection)) {
       let filteredTypesInfo: IAmazonInstanceType[] = this.awsInstanceTypeService.getAvailableTypesForRegions(
         command.backingData.instanceTypesInfo,
         [command.region],
       );
+
       if (command.virtualizationType || command.amiArchitecture) {
         filteredTypesInfo = this.awsInstanceTypeService.filterInstanceTypes(
           filteredTypesInfo,
@@ -389,18 +393,35 @@ export class AwsServerGroupConfigurationService {
           command.amiArchitecture,
         );
       }
-
       const filteredTypes: string[] = map(filteredTypesInfo, 'name');
+
+      // handle incompatibility for single instance type case
       if (command.instanceType && !filteredTypes.includes(command.instanceType)) {
         result.dirty.instanceType = command.instanceType;
         command.instanceType = null;
       }
+
+      // handle incompatibility for multiple instance types case
+      const multipleInstanceTypes: string[] = map(command.launchTemplateOverridesForInstanceType, 'instanceType');
+      const validInstanceTypes: string[] = intersection(multipleInstanceTypes, filteredTypes);
+      const invalidInstanceTypes: string[] = difference(multipleInstanceTypes, validInstanceTypes);
+
+      if (command.launchTemplateOverridesForInstanceType && invalidInstanceTypes.length > 0) {
+        result.dirty.launchTemplateOverridesForInstanceType = command.launchTemplateOverridesForInstanceType.filter(
+          (it) => invalidInstanceTypes.includes(it.instanceType),
+        );
+        command.launchTemplateOverridesForInstanceType = command.launchTemplateOverridesForInstanceType.filter((it) =>
+          validInstanceTypes.includes(it.instanceType),
+        );
+      }
+
       command.backingData.filtered.instanceTypes = filteredTypes;
       command.backingData.filtered.instanceTypesInfo = filteredTypesInfo;
     } else {
       command.backingData.filtered.instanceTypes = [];
       command.backingData.filtered.instanceTypesInfo = [];
     }
+
     extend(command.viewState.dirty, result.dirty);
     return result;
   }
@@ -613,6 +634,7 @@ export class AwsServerGroupConfigurationService {
       });
       command.vpcId = subnet ? subnet.vpcId : null;
     }
+
     extend(result.dirty, this.configureInstanceTypes(command).dirty);
     return result;
   }
diff --git a/packages/amazon/src/serverGroup/configure/wizard/instanceType/InstanceTypeSelector.tsx b/packages/amazon/src/serverGroup/configure/wizard/instanceType/InstanceTypeSelector.tsx
index f29587ca572..32fb0bb9ebe 100644
--- a/packages/amazon/src/serverGroup/configure/wizard/instanceType/InstanceTypeSelector.tsx
+++ b/packages/amazon/src/serverGroup/configure/wizard/instanceType/InstanceTypeSelector.tsx
@@ -16,51 +16,83 @@ export interface IInstanceTypeSelectorProps {
 
 export function InstanceTypeSelector(props: IInstanceTypeSelectorProps) {
   const { instanceTypeDetails } = props;
-  const { values: command, setFieldValue } = props.formik;
+  const { values, setFieldValue } = props.formik;
   const isLaunchTemplatesEnabled = AWSProviderSettings.serverGroups?.enableLaunchTemplates;
 
-  const useSimpleMode = command.viewState.useSimpleInstanceTypeSelector;
-  const [unlimitedCpuCredits, setUnlimitedCpuCredits] = useState(command.unlimitedCpuCredits);
+  const useSimpleMode = values.viewState.useSimpleInstanceTypeSelector;
+  const [unlimitedCpuCredits, setUnlimitedCpuCredits] = useState(values.unlimitedCpuCredits);
 
   useEffect(() => {
-    if (command.unlimitedCpuCredits !== unlimitedCpuCredits) {
+    if (values.unlimitedCpuCredits !== unlimitedCpuCredits) {
       setFieldValue('unlimitedCpuCredits', unlimitedCpuCredits);
     }
   }, [unlimitedCpuCredits]);
 
+  const clearWarnings = () => {
+    const { formik } = props;
+
+    // clear for both keys to support consistency between simple and advanced modes
+    formik.values.viewState.dirty['instanceType'] = null;
+    formik.values.viewState.dirty['launchTemplateOverridesForInstanceType'] = null;
+
+    formik.validateForm();
+  };
+
   const handleModeChange = (useSimpleModeNew: boolean) => {
     if (useSimpleMode !== useSimpleModeNew) {
       setFieldValue('viewState', {
-        ...command.viewState,
+        ...values.viewState,
         useSimpleInstanceTypeSelector: useSimpleModeNew,
       });
 
       // update selected instance type(s) if mode changed.
       // Simple mode uses command.instanceType to track selected type. Advanced mode uses command.launchTemplateOverridesForInstanceType to track selected types.
-      const multipleInstanceTypesInProps = command.launchTemplateOverridesForInstanceType;
-      const singleInstanceTypeInProps = command.instanceType;
-
-      const toSimple = useSimpleModeNew && multipleInstanceTypesInProps?.length;
-      const toAdvanced = !useSimpleModeNew && singleInstanceTypeInProps;
-      if (toSimple) {
-        const highestPriorityNum = Math.min(...multipleInstanceTypesInProps.map((it) => it.priority));
-        const instanceTypeWithHighestPriority = multipleInstanceTypesInProps.find(
-          (it) => it.priority === highestPriorityNum,
-        ).instanceType;
-
-        setFieldValue('instanceType', instanceTypeWithHighestPriority);
-        setFieldValue('launchTemplateOverridesForInstanceType', []);
-        command.instanceTypeChanged(command);
-      } else if (toAdvanced) {
-        const instanceTypes: IAmazonInstanceTypeOverride[] = [
-          {
-            instanceType: singleInstanceTypeInProps,
-            priority: 1,
-          },
-        ];
-        setFieldValue('instanceType', undefined);
-        setFieldValue('launchTemplateOverridesForInstanceType', instanceTypes);
-        command.launchTemplateOverridesChanged(command);
+      if (useSimpleModeNew) {
+        const multipleInstanceTypesInProps = values.launchTemplateOverridesForInstanceType;
+        const dirtyMultipleInstanceTypesInProps = values.viewState.dirty.launchTemplateOverridesForInstanceType;
+
+        if (multipleInstanceTypesInProps?.length) {
+          const instanceTypeWithHighestPriority = multipleInstanceTypesInProps.reduce((prev, current) => {
+            return prev.priority < current.priority ? prev : current;
+          }).instanceType;
+          setFieldValue('instanceType', instanceTypeWithHighestPriority);
+          setFieldValue('launchTemplateOverridesForInstanceType', []);
+          values.instanceTypeChanged(values);
+        }
+
+        if (dirtyMultipleInstanceTypesInProps?.length) {
+          const instanceTypeWithHighestPriorityDirty = dirtyMultipleInstanceTypesInProps.reduce((prev, current) => {
+            return prev.priority < current.priority ? prev : current;
+          }).instanceType;
+          setFieldValue('viewState.dirty.instanceType', instanceTypeWithHighestPriorityDirty);
+          setFieldValue('viewState.dirty.launchTemplateOverridesForInstanceType', []);
+        }
+      } else if (!useSimpleModeNew) {
+        const singleInstanceTypeInProps = values.instanceType;
+        const dirtySingleInstanceTypeInProps = values.viewState.dirty.instanceType;
+
+        if (singleInstanceTypeInProps) {
+          const instanceTypes: IAmazonInstanceTypeOverride[] = [
+            {
+              instanceType: singleInstanceTypeInProps,
+              priority: 1,
+            },
+          ];
+          setFieldValue('instanceType', undefined);
+          setFieldValue('launchTemplateOverridesForInstanceType', instanceTypes);
+          values.launchTemplateOverridesChanged(values);
+        }
+
+        if (dirtySingleInstanceTypeInProps) {
+          const dirtyInstanceTypes: IAmazonInstanceTypeOverride[] = [
+            {
+              instanceType: dirtySingleInstanceTypeInProps,
+              priority: 1,
+            },
+          ];
+          setFieldValue('viewState.dirty.instanceType', undefined);
+          setFieldValue('viewState.dirty.launchTemplateOverridesForInstanceType', dirtyInstanceTypes);
+        }
       }
     }
   };
@@ -86,6 +118,7 @@ export function InstanceTypeSelector(props: IInstanceTypeSelectorProps) {
           formik={props.formik}
           instanceTypeDetails={instanceTypeDetails}
           setUnlimitedCpuCredits={setUnlimitedCpuCredits}
+          clearWarnings={clearWarnings}
         />
       </div>
     );
@@ -124,9 +157,10 @@ export function InstanceTypeSelector(props: IInstanceTypeSelectorProps) {
         )}
       </div>
       <SimpleModeSelector
-        command={command}
+        command={values}
         setUnlimitedCpuCredits={setUnlimitedCpuCredits}
         setFieldValue={setFieldValue}
+        clearWarnings={clearWarnings}
       />
     </div>
   );
diff --git a/packages/amazon/src/serverGroup/configure/wizard/instanceType/InstanceTypeWarning.tsx b/packages/amazon/src/serverGroup/configure/wizard/instanceType/InstanceTypeWarning.tsx
new file mode 100644
index 00000000000..9968e8296c7
--- /dev/null
+++ b/packages/amazon/src/serverGroup/configure/wizard/instanceType/InstanceTypeWarning.tsx
@@ -0,0 +1,44 @@
+import React from 'react';
+
+import type { IAmazonServerGroupCommandDirty } from '../../serverGroupConfiguration.service';
+
+export function InstanceTypeWarning(props: { dirty: IAmazonServerGroupCommandDirty; clearWarnings: () => void }) {
+  if (
+    props.dirty.instanceType ||
+    (props.dirty.launchTemplateOverridesForInstanceType &&
+      props.dirty.launchTemplateOverridesForInstanceType.length > 0)
+  ) {
+    return (
+      <div className="col-md-12">
+        <div className="alert alert-warning">
+          <p>
+            <i className="fa fa-exclamation-triangle" />
+            {props.dirty.instanceType &&
+              'The following instance type was found incompatible with the selected image/region and was removed:'}
+            {props.dirty.launchTemplateOverridesForInstanceType &&
+              props.dirty.launchTemplateOverridesForInstanceType.length > 0 &&
+              'The following instance type(s) were found incompatible with the selected image/region and were removed:'}
+          </p>
+          <ul>
+            {props.dirty.instanceType && <li key={props.dirty.instanceType}>{props.dirty.instanceType}</li>}
+            {props.dirty.launchTemplateOverridesForInstanceType &&
+              props.dirty.launchTemplateOverridesForInstanceType.length > 0 &&
+              props.dirty.launchTemplateOverridesForInstanceType.map((it) => (
+                <li key={it.instanceType}>
+                  {it.instanceType}
+                  {it.weightedCapacity ? ' with weight ' + it.weightedCapacity : ''}
+                </li>
+              ))}
+          </ul>
+          <p className="text-right">
+            <a className="btn btn-sm btn-default dirty-flag-dismiss clickable" onClick={() => props.clearWarnings()}>
+              Okay
+            </a>
+          </p>
+        </div>
+      </div>
+    );
+  } else {
+    return null;
+  }
+}
diff --git a/packages/amazon/src/serverGroup/configure/wizard/instanceType/advancedMode/AdvancedModeSelector.tsx b/packages/amazon/src/serverGroup/configure/wizard/instanceType/advancedMode/AdvancedModeSelector.tsx
index 5edf2fed7ef..dbf11151e27 100644
--- a/packages/amazon/src/serverGroup/configure/wizard/instanceType/advancedMode/AdvancedModeSelector.tsx
+++ b/packages/amazon/src/serverGroup/configure/wizard/instanceType/advancedMode/AdvancedModeSelector.tsx
@@ -15,6 +15,7 @@ export interface IAdvancedModeSelectorProps {
   formik: FormikProps<IAmazonServerGroupCommand>;
   instanceTypeDetails: IAmazonInstanceTypeCategory[];
   setUnlimitedCpuCredits: (unlimitedCpuCredits: boolean | undefined) => void;
+  clearWarnings: () => void;
 }
 
 /**
@@ -93,6 +94,8 @@ export function AdvancedModeSelector(props: IAdvancedModeSelectorProps) {
         }
         handleInstanceTypesChange={handleInstanceTypesChange}
         setUnlimitedCpuCredits={setUnlimitedCpuCredits}
+        viewState={command.viewState}
+        clearWarnings={props.clearWarnings}
       />
     </div>
   );
diff --git a/packages/amazon/src/serverGroup/configure/wizard/instanceType/advancedMode/AmazonInstanceTypeInfoRenderer.tsx b/packages/amazon/src/serverGroup/configure/wizard/instanceType/advancedMode/AmazonInstanceTypeInfoRenderer.tsx
index 0be71177acf..7f15fe21d3f 100644
--- a/packages/amazon/src/serverGroup/configure/wizard/instanceType/advancedMode/AmazonInstanceTypeInfoRenderer.tsx
+++ b/packages/amazon/src/serverGroup/configure/wizard/instanceType/advancedMode/AmazonInstanceTypeInfoRenderer.tsx
@@ -4,50 +4,50 @@ import React from 'react';
 import type { IAmazonInstanceType } from '../../../../../instance/awsInstanceType.service';
 
 export function AmazonInstanceTypeInfoRenderer(props: { instanceType: IAmazonInstanceType }) {
-  const spotSupport = props.instanceType.supportedUsageClasses.includes('spot') ? '| SPOT supported' : '';
-  const CpuMem = `${props.instanceType.defaultVCpus} vCPU | ${props.instanceType.memoryInGiB} Gib Memory ${spotSupport}`;
-  const instanceStorageInfo = props.instanceType.instanceStorageSupported && (
+  const spotSupport = props.instanceType?.supportedUsageClasses?.includes('spot') ? '| SPOT supported' : '';
+  const CpuMem = `${props.instanceType?.defaultVCpus} vCPU | ${props.instanceType?.memoryInGiB} Gib Memory ${spotSupport}`;
+  const instanceStorageInfo = props.instanceType?.instanceStorageSupported && (
     <span>
       <br />
       <span className={`select-option-label-attributes`}>
-        {`Instance Storage: ${_.toUpper(props.instanceType.instanceStorageInfo.storageTypes)} | ${
-          props.instanceType.instanceStorageInfo.totalSizeInGB
+        {`Instance Storage: ${_.toUpper(props.instanceType?.instanceStorageInfo?.storageTypes)} | ${
+          props.instanceType?.instanceStorageInfo?.totalSizeInGB
         } Gib total size`}
       </span>
     </span>
   );
-  const ebsInfo = props.instanceType.ebsInfo && (
+  const ebsInfo = props.instanceType?.ebsInfo && (
     <span>
       <br />
       <span className={`select-option-label-attributes`}>
-        {`EBS: optimization ${props.instanceType.ebsInfo.ebsOptimizedSupport} | NVMe ${props.instanceType.ebsInfo.nvmeSupport} | Encryption ${props.instanceType.ebsInfo.encryptionSupport}`}
+        {`EBS: optimization ${props.instanceType?.ebsInfo?.ebsOptimizedSupport} | NVMe ${props.instanceType?.ebsInfo?.nvmeSupport} | Encryption ${props.instanceType?.ebsInfo?.encryptionSupport}`}
       </span>
     </span>
   );
-  const gpuInfo = props.instanceType.gpuInfo && (
+  const gpuInfo = props.instanceType?.gpuInfo && (
     <span>
       <br />
       <span className={`select-option-label-attributes`}>
-        {`GPU: ${props.instanceType.gpuInfo.totalGpuMemoryInMiB} MiB total memory`}
-        {props.instanceType.gpuInfo.gpus.map(
+        {`GPU: ${props.instanceType?.gpuInfo?.totalGpuMemoryInMiB} MiB total memory`}
+        {props.instanceType?.gpuInfo?.gpus.map(
           (g) => ` | ${g.count} ${g.manufacturer} ${g.name} GPUs, size: ${g.gpuSizeInMiB} MiB`,
         )}
       </span>
     </span>
   );
-  const generationInfo = typeof props.instanceType.currentGeneration !== 'undefined' &&
-    props.instanceType.currentGeneration !== null && (
+  const generationInfo = typeof props.instanceType?.currentGeneration !== 'undefined' &&
+    props.instanceType?.currentGeneration !== null && (
       <span>
         <br />
         <span className={`select-option-label-attributes`}>
-          {props.instanceType.currentGeneration ? 'Current Generation' : 'Previous Generation'}
+          {props.instanceType?.currentGeneration ? 'Current Generation' : 'Previous Generation'}
         </span>
       </span>
     );
 
   return (
     <span>
-      <span className={`select-option-label`}>{props.instanceType.name}</span>
+      <span className={`select-option-label`}>{props.instanceType?.name}</span>
       <br />
       <span className={`select-option-label-attributes`}>{CpuMem}</span>
       {instanceStorageInfo}
diff --git a/packages/amazon/src/serverGroup/configure/wizard/instanceType/advancedMode/InstanceTypeTable.tsx b/packages/amazon/src/serverGroup/configure/wizard/instanceType/advancedMode/InstanceTypeTable.tsx
index 940d6cfdaf3..4914c1ffc06 100644
--- a/packages/amazon/src/serverGroup/configure/wizard/instanceType/advancedMode/InstanceTypeTable.tsx
+++ b/packages/amazon/src/serverGroup/configure/wizard/instanceType/advancedMode/InstanceTypeTable.tsx
@@ -6,10 +6,12 @@ import { CpuCreditsToggle } from '../CpuCreditsToggle';
 import { InstanceTypeTableBody } from './InstanceTypeTableBody';
 import { Header, Heading } from './InstanceTypeTableParts';
 import { Footer } from './InstanceTypeTableParts';
+import { InstanceTypeWarning } from '../InstanceTypeWarning';
 import { AWSProviderSettings } from '../../../../../aws.settings';
 import type { IAmazonInstanceTypeCategory } from '../../../../../instance/awsInstanceType.service';
 import type { IAmazonInstanceType } from '../../../../../instance/awsInstanceType.service';
 import type { IAmazonInstanceTypeOverride } from '../../../serverGroupConfiguration.service';
+import type { IAmazonServerGroupCommandViewState } from '../../../serverGroupConfiguration.service';
 
 import './advancedMode.less';
 
@@ -21,6 +23,8 @@ export interface IInstanceTypeTableProps {
   availableInstanceTypesList: IAmazonInstanceType[];
   handleInstanceTypesChange: (instanceTypes: IAmazonInstanceTypeOverride[]) => void;
   setUnlimitedCpuCredits: (unlimitedCpuCredits: boolean | undefined) => void;
+  viewState: IAmazonServerGroupCommandViewState;
+  clearWarnings: () => void;
 }
 
 export function InstanceTypeTable(props: IInstanceTypeTableProps) {
@@ -96,6 +100,7 @@ export function InstanceTypeTable(props: IInstanceTypeTableProps) {
           profileLabel={label}
           profileDescriptionArr={descriptionListOverride ? descriptionListOverride : families.map((f) => f.description)}
         />
+        <InstanceTypeWarning dirty={props.viewState.dirty} clearWarnings={props.clearWarnings} />
         {isCpuCreditsEnabled && cpuCreditsToggle}
         <table className="table table-hover">
           <Header isCustom={isCustom} showCpuCredits={showCpuCredits} />
@@ -115,6 +120,7 @@ export function InstanceTypeTable(props: IInstanceTypeTableProps) {
     return (
       <div className={'row sub-section'}>
         <Heading isCustom={isCustom} />
+        <InstanceTypeWarning dirty={props.viewState.dirty} clearWarnings={props.clearWarnings} />
         {isCpuCreditsEnabled && cpuCreditsToggle}
         <table className="table table-hover">
           <Header isCustom={isCustom} />
diff --git a/packages/amazon/src/serverGroup/configure/wizard/instanceType/simpleMode/SimpleModeSelector.tsx b/packages/amazon/src/serverGroup/configure/wizard/instanceType/simpleMode/SimpleModeSelector.tsx
index 676be5f4371..96e4ebe6596 100644
--- a/packages/amazon/src/serverGroup/configure/wizard/instanceType/simpleMode/SimpleModeSelector.tsx
+++ b/packages/amazon/src/serverGroup/configure/wizard/instanceType/simpleMode/SimpleModeSelector.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 import { NgReact } from '@spinnaker/core';
 
 import { CpuCreditsToggle } from '../CpuCreditsToggle';
+import { InstanceTypeWarning } from '../InstanceTypeWarning';
 import { AWSProviderSettings } from '../../../../../aws.settings';
 import type { IAmazonServerGroupCommand } from '../../../serverGroupConfiguration.service';
 
@@ -10,6 +11,7 @@ export interface ISimpleModeSelectorProps {
   command: IAmazonServerGroupCommand;
   setUnlimitedCpuCredits: (unlimitedCpuCredits: boolean | undefined) => void;
   setFieldValue: (field: keyof IAmazonServerGroupCommand, value: any, shouldValidate?: boolean) => void;
+  clearWarnings: () => void;
 }
 
 export function SimpleModeSelector(props: ISimpleModeSelectorProps) {
@@ -41,6 +43,7 @@ export function SimpleModeSelector(props: ISimpleModeSelectorProps) {
           onTypeChanged={instanceTypeChanged}
           onProfileChanged={instanceProfileChanged}
         />
+        <InstanceTypeWarning dirty={command.viewState.dirty} clearWarnings={props.clearWarnings} />
         <div style={{ padding: '0 15px' }}>
           {command.viewState.instanceProfile && command.viewState.instanceProfile !== 'custom' && (
             <InstanceTypeSelector command={command} onTypeChanged={instanceTypeChanged} />
diff --git a/packages/amazon/src/serverGroup/configure/wizard/pages/ServerGroupBasicSettings.tsx b/packages/amazon/src/serverGroup/configure/wizard/pages/ServerGroupBasicSettings.tsx
index 8464edb149b..becab228d54 100644
--- a/packages/amazon/src/serverGroup/configure/wizard/pages/ServerGroupBasicSettings.tsx
+++ b/packages/amazon/src/serverGroup/configure/wizard/pages/ServerGroupBasicSettings.tsx
@@ -98,6 +98,9 @@ export class ServerGroupBasicSettings
         setFieldValue('associateIPv6Address', false);
       }
     }
+
+    // an image change might clear the single or multiple instance types previously selected with the image, validate the form to surface related errors.
+    this.props.formik.validateForm();
   };
 
   private accountUpdated = (account: string): void => {
diff --git a/packages/amazon/src/serverGroup/configure/wizard/pages/ServerGroupInstanceType.tsx b/packages/amazon/src/serverGroup/configure/wizard/pages/ServerGroupInstanceType.tsx
index 8be7165d7c9..9ae34d971fe 100644
--- a/packages/amazon/src/serverGroup/configure/wizard/pages/ServerGroupInstanceType.tsx
+++ b/packages/amazon/src/serverGroup/configure/wizard/pages/ServerGroupInstanceType.tsx
@@ -31,12 +31,22 @@ export class ServerGroupInstanceType
     const errors: FormikErrors<IAmazonServerGroupCommand> = {};
 
     if (values.viewState.useSimpleInstanceTypeSelector) {
-      if (!values.instanceType) {
+      // For the clone scenario, when values.instanceType is cleared for various reasons (see serverGroupConfiguration.service.ts),
+      // the previously selected instance type might be cleared/ unselected to fail-fast and this might look like unexpected behavior. But, there is always a reason when this happens.
+      // The error handling below adds transparency around what changed and why.
+      if (values.viewState.dirty.instanceType) {
+        errors.instanceType = 'You must confirm removed instance type and pick a compatible instance type.';
+      } else if (!values.instanceType) {
         errors.instanceType = 'Instance Type required.';
       }
     } else {
-      const advancedModeErrors = this.validateAdvancedModeFields(values, errors);
-      Object.assign(errors, { ...advancedModeErrors });
+      const prevInstanceTypes = values.viewState.dirty.launchTemplateOverridesForInstanceType;
+      if (prevInstanceTypes && prevInstanceTypes.length > 0) {
+        errors.instanceType = 'You must confirm removed instance types and/or pick more instance types.';
+      } else {
+        const advancedModeErrors = this.validateAdvancedModeFields(values, errors);
+        Object.assign(errors, { ...advancedModeErrors });
+      }
     }
 
     return errors;
diff --git a/packages/amazon/src/serverGroup/serverGroup.transformer.ts b/packages/amazon/src/serverGroup/serverGroup.transformer.ts
index 09db751bfba..e501e4a54ca 100644
--- a/packages/amazon/src/serverGroup/serverGroup.transformer.ts
+++ b/packages/amazon/src/serverGroup/serverGroup.transformer.ts
@@ -96,6 +96,10 @@ export class AwsServerGroupTransformer {
     deployConfig.targetGroups = base.targetGroups || [];
     deployConfig.account = deployConfig.credentials;
     deployConfig.subnetType = deployConfig.subnetType || '';
+    deployConfig.instanceType =
+      deployConfig.instanceType ||
+      (deployConfig.launchTemplateOverridesForInstanceType &&
+        deployConfig.launchTemplateOverridesForInstanceType[0].instanceType); // populate instanceType for backwards compatibility
 
     if (base.viewState.mode !== 'clone') {
       delete deployConfig.source;

From ab3cb6e06576efdd4357e25b443c2bea3c483605 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 29 Nov 2022 21:44:59 +0000
Subject: [PATCH 5/6] chore(dependencies): Autobump spinnakerGradleVersion
 (#9916) (#9927)

Co-authored-by: root <root@2dd4f76bffcc>
(cherry picked from commit 64d03bc6f57bdb995dc9a9025b3e836b8a489f54)

Co-authored-by: spinnakerbot <spinbot@spinnaker.io>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index d1e41dbff79..38608dce324 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-spinnakerGradleVersion=8.23.0
+spinnakerGradleVersion=8.24.0

From 30cb2e2288232a6ca5939942e5c8a6150d7cdd36 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 15:25:43 +0000
Subject: [PATCH 6/6] feat(pipeline): added feature flag for pipeline when mj
 stage child (#9914) (#9921)

* feat(pipeline): added feature flag for pipeline when mj stage child

* fix(pipeline): added verification for sub pipe data

* added guard verification for undefined data

Co-authored-by: Fernando Freire <fernando.freire@armory.io>
(cherry picked from commit 4b6fd53c4674b37c1c9742b9a9fdedb8e1fda5ca)

Co-authored-by: Oscar Michel Herrera <oscarmichelh@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 halconfig/settings.js                         |  1 +
 packages/app/src/settings.js                  |  2 ++
 .../executions/execution/ExecutionMarker.tsx  | 28 +++++++++++--------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/halconfig/settings.js b/halconfig/settings.js
index bf64cee85b8..c91a282f308 100644
--- a/halconfig/settings.js
+++ b/halconfig/settings.js
@@ -13,6 +13,7 @@ var defaultMetricsStore = '{%canary.defaultMetricsStore%}';
 var defaultMetricsAccountName = '{%canary.defaultMetricsAccount%}';
 var defaultStorageAccountName = '{%canary.defaultStorageAccount%}';
 var fiatEnabled = '{%features.fiat%}' === 'true';
+var manualJudgmentParentPipelineEnabled = '{%features.manualJudgmentParentPipeline%}' === 'true';
 var mineCanaryEnabled = '{%features.mineCanary%}' === 'true';
 var pipelineTemplatesEnabled = '{%features.pipelineTemplates%}' === 'true';
 var reduxLoggerEnabled = '{%canary.reduxLogger%}' === 'true';
diff --git a/packages/app/src/settings.js b/packages/app/src/settings.js
index 11e09a39688..dddcda51fb4 100644
--- a/packages/app/src/settings.js
+++ b/packages/app/src/settings.js
@@ -50,6 +50,7 @@ const managedServiceAccountsEnabled =
   process.env.MANAGED_SERVICE_ACCOUNTS_ENABLED === 'true';
 const managedResourcesEnabled =
   import.meta.env.VITE_MANAGED_RESOURCES_ENABLED === 'true' || process.env.MANAGED_RESOURCES_ENABLED === 'true';
+const manualJudgmentParentPipelineEnabled = import.meta.env.MJ_PARENTPIPELINE_ENABLED === 'true' || false;
 const onDemandClusterThreshold =
   import.meta.env.VITE_ON_DEMAND_CLUSTER_THRESHOLD || process.env.ON_DEMAND_CLUSTER_THRESHOLD || '350';
 const reduxLoggerEnabled = import.meta.env.VITE_REDUX_LOGGER === 'true' || process.env.REDUX_LOGGER === 'true';
@@ -117,6 +118,7 @@ window.spinnakerSettings = {
     mdGitIntegration: mdGitIntegrationEnabled,
     managedServiceAccounts: managedServiceAccountsEnabled,
     managedResources: managedResourcesEnabled,
+    manualJudgmentParentPipeline: manualJudgmentParentPipelineEnabled,
     notifications: false,
     pagerDuty: false,
     pipelineTemplates: false,
diff --git a/packages/core/src/pipeline/executions/execution/ExecutionMarker.tsx b/packages/core/src/pipeline/executions/execution/ExecutionMarker.tsx
index ce1518e935c..43ae80f6541 100644
--- a/packages/core/src/pipeline/executions/execution/ExecutionMarker.tsx
+++ b/packages/core/src/pipeline/executions/execution/ExecutionMarker.tsx
@@ -95,18 +95,24 @@ export class ExecutionMarker extends React.Component<IExecutionMarkerProps, IExe
   public render() {
     const { stage, application, execution, active, previousStageActive, width } = this.props;
     let stageType = (stage.activeStageType || stage.type).toLowerCase(); // support groups
-    stage.stages.forEach((childStage: IStage) => {
-      if (childStage.type == 'pipeline') {
-        const childPipeline = application.executions.data.find((p: any) => p.id === childStage.context.executionId);
-        if (childPipeline != undefined) {
-          childPipeline.stages.forEach((stageToCheck: IStage) => {
-            if (stageToCheck.type == 'manualJudgment' && stageToCheck.status == 'RUNNING') {
-              stageType = 'manualjudgment';
-            }
-          });
+    if (SETTINGS.feature.manualJudgmentParentPipeline) {
+      stage.stages.forEach((childStage: IStage) => {
+        if (
+          childStage.type == 'pipeline' &&
+          application.executions != undefined &&
+          application.executions.data != undefined
+        ) {
+          const childPipeline = application.executions.data.find((p: any) => p.id === childStage.context.executionId);
+          if (childPipeline != undefined) {
+            childPipeline.stages.forEach((stageToCheck: IStage) => {
+              if (stageToCheck.type == 'manualJudgment' && stageToCheck.status == 'RUNNING') {
+                stageType = 'manualjudgment';
+              }
+            });
+          }
         }
-      }
-    });
+      });
+    }
     const pipelineStatus = this.stageStatus(stage.status.toLowerCase());
     const markerClassName = [
       stage.type !== 'group' ? 'clickable' : '',