@spinnaker/amazon 2026.2.2 → 2026.3.0

package/src/serverGroup/configure/wizard/pages/advancedSettings/ServerGroupAdvancedSettingsCommon.tsx

@@ -58,7 +58,7 @@ export class ServerGroupAdvancedSettingsCommon extends React.Component<IServerGr
     return (
       <div className="container-fluid form-horizontal">
         <div className="form-group">
-          <div className="col-md-5 sm-label-right">
+          <div className="col-md-3 sm-label-right">
             <b>Cooldown</b>
           </div>
           <div className="col-md-2">
@@ -67,11 +67,11 @@ export class ServerGroupAdvancedSettingsCommon extends React.Component<IServerGr
           seconds
         </div>
         <div className="form-group">
-          <div className="col-md-5 sm-label-right">
+          <div className="col-md-3 sm-label-right">
             <b>Enabled Metrics </b>
             <HelpField id="aws.serverGroup.enabledMetrics" />
           </div>
-          <div className="col-md-6">
+          <div className="col-md-7">
             <Select
               multi={true}
               value={values.enabledMetrics}
@@ -87,10 +87,10 @@ export class ServerGroupAdvancedSettingsCommon extends React.Component<IServerGr
         </div>
 
         <div className="form-group">
-          <div className="col-md-5 sm-label-right">
+          <div className="col-md-3 sm-label-right">
             <b>Health Check Type</b>
           </div>
-          <div className="col-md-6">
+          <div className="col-md-7">
             <Select
               value={values.healthCheckType}
               clearable={false}
@@ -101,7 +101,7 @@ export class ServerGroupAdvancedSettingsCommon extends React.Component<IServerGr
           </div>
         </div>
         <div className="form-group">
-          <div className="col-md-5 sm-label-right">
+          <div className="col-md-3 sm-label-right">
             <b>Health Check Grace Period</b>
           </div>
           <div className="col-md-2">
@@ -115,10 +115,10 @@ export class ServerGroupAdvancedSettingsCommon extends React.Component<IServerGr
           seconds
         </div>
         <div className="form-group">
-          <div className="col-md-5 sm-label-right">
+          <div className="col-md-3 sm-label-right">
             <b>Termination Policies</b>
           </div>
-          <div className="col-md-6">
+          <div className="col-md-7">
             <Select
               multi={true}
               value={values.terminationPolicies}
@@ -134,10 +134,10 @@ export class ServerGroupAdvancedSettingsCommon extends React.Component<IServerGr
         </div>
 
         <div className="form-group">
-          <div className="col-md-5 sm-label-right">
+          <div className="col-md-3 sm-label-right">
             <b>Key Name</b>
           </div>
-          <div className="col-md-6">
+          <div className="col-md-7">
             <Select
               value={values.keyPair}
               required={true}
@@ -148,37 +148,37 @@ export class ServerGroupAdvancedSettingsCommon extends React.Component<IServerGr
           </div>
         </div>
         <div className="form-group">
-          <div className="col-md-5 sm-label-right">
+          <div className="col-md-3 sm-label-right">
             <b>Ramdisk Id (optional)</b>
           </div>
-          <div className="col-md-6">
+          <div className="col-md-7">
             <Field type="text" name="ramdiskId" className="form-control input-sm no-spel" />
           </div>
         </div>
         <div className="form-group">
-          <div className="col-md-5 sm-label-right">
+          <div className="col-md-3 sm-label-right">
             <b>IAM Instance Profile (optional)</b>
           </div>
-          <div className="col-md-6">
+          <div className="col-md-7">
             <Field type="text" className="form-control input-sm no-spel" name="iamRole" />
           </div>
         </div>
         <div className="form-group">
-          <div className="col-md-5 sm-label-right">
+          <div className="col-md-3 sm-label-right">
             <b>UserData (optional) </b>
             <HelpField id="aws.serverGroup.base64UserData" />
           </div>
-          <div className="col-md-6">
+          <div className="col-md-7">
             <Field type="text" className="form-control input-sm no-spel" name="base64UserData" />
           </div>
         </div>
         <div className="form-group">
-          <div className="col-md-5 sm-label-right">
+          <div className="col-md-3 sm-label-right">
             <b>Instance Monitoring </b>
             <HelpField id="aws.serverGroup.instanceMonitoring" />
           </div>
 
-          <div className="col-md-6 checkbox">
+          <div className="col-md-7 checkbox">
             <label>
               <input
                 type="checkbox"
@@ -190,10 +190,10 @@ export class ServerGroupAdvancedSettingsCommon extends React.Component<IServerGr
           </div>
         </div>
         <div className="form-group">
-          <div className="col-md-5 sm-label-right">
+          <div className="col-md-3 sm-label-right">
             <b>EBS Optimized</b>
           </div>
-          <div className="col-md-6 checkbox">
+          <div className="col-md-7 checkbox">
             <label>
               <input
                 type="checkbox"
@@ -206,11 +206,11 @@ export class ServerGroupAdvancedSettingsCommon extends React.Component<IServerGr
         </div>
         {asgSettings?.enableIMDSv2 && (
           <div className="form-group">
-            <div className="col-md-5 sm-label-right">
+            <div className="col-md-3 sm-label-right">
               <b>IMDSv2 </b>
               <HelpField id="aws.serverGroup.imdsv2" />
             </div>
-            <div className="col-md-6 checkbox">
+            <div className="col-md-7 checkbox">
               <label>
                 <input
                   type="checkbox"
@@ -224,7 +224,7 @@ export class ServerGroupAdvancedSettingsCommon extends React.Component<IServerGr
         )}
         {!AWSProviderSettings.disableSpotPricing && values.viewState.useSimpleInstanceTypeSelector && (
           <div className="form-group">
-            <div className="col-md-5 sm-label-right">
+            <div className="col-md-3 sm-label-right">
               <b>Spot Instances Price (optional)</b> <HelpField id="aws.serverGroup.spotMaxPrice" />
             </div>
             <div className="col-md-2">
@@ -233,10 +233,10 @@ export class ServerGroupAdvancedSettingsCommon extends React.Component<IServerGr
           </div>
         )}
         <div className="form-group">
-          <div className="col-md-5 sm-label-right">
+          <div className="col-md-3 sm-label-right">
             <b>AMI Block Device Mappings</b>
           </div>
-          <div className="col-md-6 radio">
+          <div className="col-md-7 radio">
             <div>
               <label>
                 <input
@@ -273,12 +273,12 @@ export class ServerGroupAdvancedSettingsCommon extends React.Component<IServerGr
           </div>
         </div>
         <div className="form-group">
-          <div className="col-md-5 sm-label-right">
+          <div className="col-md-3 sm-label-right">
             <b>{`Associate ${asgSettings?.enableIPv6 ? 'IPv6 (Recommended)' : 'Public IPv4'} Address`}</b>
             <HelpField id="serverGroup.ipv6" />
           </div>
           {asgSettings?.enableIPv6 && (
-            <div className="col-md-6 checkbox">
+            <div className="col-md-7 checkbox">
               <label>
                 <input
                   type="checkbox"
@@ -329,10 +329,10 @@ export class ServerGroupAdvancedSettingsCommon extends React.Component<IServerGr
           )}
         </div>
         <div className="form-group">
-          <div className="col-md-5 sm-label-right">
+          <div className="col-md-3 sm-label-right">
             <b>Scaling Processes</b>
           </div>
-          <div className="col-md-6 checkbox">
+          <div className="col-md-7 checkbox">
             {values.backingData.scalingProcesses.map((process) => (
               <div key={process.name}>
                 <label>
@@ -349,10 +349,10 @@ export class ServerGroupAdvancedSettingsCommon extends React.Component<IServerGr
         </div>
         {app.attributes.platformHealthOnlyShowOverride && (
           <div className="form-group">
-            <div className="col-md-5 sm-label-right">
+            <div className="col-md-3 sm-label-right">
               <b>Task Completion</b>
             </div>
-            <div className="col-md-6">
+            <div className="col-md-7">
               <PlatformHealthOverride
                 interestingHealthProviderNames={values.interestingHealthProviderNames}
                 platformHealthType="Amazon"
@@ -362,11 +362,13 @@ export class ServerGroupAdvancedSettingsCommon extends React.Component<IServerGr
           </div>
         )}
         <div className="form-group">
-          <div className="sm-label-left">
+          <div className="col-md-3 sm-label-right">
             <b>Tags (optional)</b>
             <HelpField id="aws.serverGroup.tags" />
           </div>
-          <MapEditor model={values.tags as any} allowEmpty={true} onChange={this.tagsChanged} />
+          <div className="col-md-7">
+            <MapEditor model={values.tags as any} allowEmpty={true} onChange={this.tagsChanged} />
+          </div>
         </div>
       </div>
     );

package/src/serverGroup/configure/wizard/securityGroups/SecurityGroupSelector.spec.tsx

@@ -0,0 +1,20 @@
+import { InfrastructureCaches } from '@spinnaker/core';
+
+import { SecurityGroupSelector } from './SecurityGroupSelector';
+
+describe('SecurityGroupSelector', () => {
+  it('renders when the security group cache has not been registered', () => {
+    spyOn(InfrastructureCaches, 'get').and.returnValue(undefined);
+
+    expect(() => new SecurityGroupSelector(buildProps() as any)).not.toThrow();
+  });
+});
+
+function buildProps() {
+  return {
+    command: { selectedProvider: 'aws' },
+    availableGroups: [],
+    groupsToEdit: [],
+    onChange: jasmine.createSpy('onChange'),
+  };
+}

package/src/serverGroup/configure/wizard/securityGroups/SecurityGroupSelector.tsx

@@ -3,7 +3,7 @@ import type { Option } from 'react-select';
 import VirtualizedSelect from 'react-virtualized-select';
 
 import type { ISecurityGroup } from '@spinnaker/core';
-import { FirewallLabels, HelpField, InfrastructureCaches, ReactInjector, timestamp } from '@spinnaker/core';
+import { DeckRuntimeContext, FirewallLabels, HelpField, InfrastructureCaches, timestamp } from '@spinnaker/core';
 
 import type { IAmazonServerGroupCommand } from '../../serverGroupConfiguration.service';
 
@@ -23,20 +23,25 @@ export interface ISecurityGroupSelectorState {
 }
 
 export class SecurityGroupSelector extends React.Component<ISecurityGroupSelectorProps, ISecurityGroupSelectorState> {
+  public static contextType = DeckRuntimeContext;
+  public declare context: React.ContextType<typeof DeckRuntimeContext>;
+
   constructor(props: ISecurityGroupSelectorProps) {
     super(props);
     this.state = {
       refreshing: false,
-      refreshTime: InfrastructureCaches.get('securityGroups').getStats().ageMax,
+      refreshTime: this.getRefreshTime(),
     };
   }
 
+  private getRefreshTime = () => InfrastructureCaches.get('securityGroups')?.getStats().ageMax || 0;
+
   private refreshSecurityGroups = () => {
     this.setState({ refreshing: true });
     if (this.props.refresh) {
       this.props.refresh().then(() => this.setState({ refreshing: false }));
     } else {
-      (ReactInjector.providerServiceDelegate.getDelegate(
+      (this.context.services.providerServiceDelegate.getDelegate(
         this.props.command.selectedProvider,
         'serverGroup.configurationService',
       ) as any)
@@ -44,7 +49,7 @@ export class SecurityGroupSelector extends React.Component<ISecurityGroupSelecto
         .then(() => {
           this.setState({
             refreshing: false,
-            refreshTime: InfrastructureCaches.get('securityGroups').getStats().ageMax,
+            refreshTime: this.getRefreshTime(),
           });
         });
     }

package/src/serverGroup/details/AmazonServerGroupActions.spec.tsx

@@ -0,0 +1,186 @@
+import { shallow } from 'enzyme';
+import React from 'react';
+
+import type { Application } from '@spinnaker/core';
+import { ConfirmationModalService, ManagedMenuItem, ServerGroupWarningMessageService } from '@spinnaker/core';
+
+import type { IAmazonServerGroupView } from '../../domain';
+import { AWSProviderSettings } from '../../aws.settings';
+import { AmazonServerGroupActionsComponent as AmazonServerGroupActions } from './AmazonServerGroupActions';
+import { AmazonRollbackServerGroupModal } from './rollback';
+
+describe('<AmazonServerGroupActions /> rollback integration', () => {
+  const originalAdHocInfraWritesEnabled = AWSProviderSettings.adHocInfraWritesEnabled;
+  const runtimeServices = {} as any;
+
+  const shallowActions = (component: React.ReactElement) => {
+    const wrapper = shallow(component);
+    (wrapper.instance() as any).context = { services: runtimeServices };
+    return wrapper;
+  };
+
+  const buildServerGroup = (overrides: Partial<IAmazonServerGroupView> = {}): IAmazonServerGroupView =>
+    ({
+      account: 'test-account',
+      app: 'test-app',
+      capacity: { desired: 2, max: 2, min: 0 },
+      cloudProvider: 'aws',
+      cluster: 'test-app-main',
+      createdTime: 2,
+      instanceCounts: { total: 2 },
+      isDisabled: false,
+      name: 'test-app-main-v002',
+      moniker: { app: 'test-app', cluster: 'test-app-main' },
+      region: 'us-east-1',
+      ...overrides,
+    } as IAmazonServerGroupView);
+
+  const buildApplication = (serverGroups: IAmazonServerGroupView[]): Application =>
+    ({
+      attributes: {},
+      getDataSource: (key: string) => (key === 'serverGroups' ? { data: serverGroups } : undefined),
+      isManagementPaused: false,
+      name: 'test-app',
+      serverGroups: { refresh: jasmine.createSpy('refresh') },
+    } as any);
+
+  const action = (wrapper: ReturnType<typeof shallow>, label: string) =>
+    wrapper.find(ManagedMenuItem).filterWhere((item) => item.prop('children') === label);
+
+  beforeEach(() => {
+    AWSProviderSettings.adHocInfraWritesEnabled = true;
+  });
+
+  afterEach(() => {
+    AWSProviderSettings.adHocInfraWritesEnabled = originalAdHocInfraWritesEnabled;
+  });
+
+  it('renders standalone Rollback as a managed action and opens the modal with exact enriched state', () => {
+    const selected = buildServerGroup({ isDisabled: true, name: 'test-app-main-v001' });
+    const rollbackSource = buildServerGroup();
+    const unrelated = buildServerGroup({ app: 'other-app', cluster: 'other-app-main', name: 'other-app-main-v001' });
+    const application = buildApplication([selected, rollbackSource, unrelated]);
+    const show = spyOn(AmazonRollbackServerGroupModal, 'show').and.returnValue(Promise.resolve({} as any));
+    const wrapper = shallowActions(<AmazonServerGroupActions app={application} serverGroup={selected} />);
+
+    const rollback = action(wrapper, 'Rollback');
+    expect(rollback.length).toBe(1);
+    expect(rollback.props()).toEqual(
+      jasmine.objectContaining({ application, resource: selected, onClick: jasmine.any(Function) }),
+    );
+
+    rollback.prop('onClick')();
+
+    expect(show).toHaveBeenCalledOnceWith(
+      {
+        allServerGroups: [selected],
+        application,
+        previousServerGroup: selected,
+        serverGroup: rollbackSource,
+      },
+      runtimeServices,
+    );
+  });
+
+  it('does not render Rollback when a disabled server group has no enabled rollback source', () => {
+    const selected = buildServerGroup({ isDisabled: true, name: 'test-app-main-v001' });
+    const wrapper = shallow(<AmazonServerGroupActions app={buildApplication([selected])} serverGroup={selected} />);
+
+    expect(action(wrapper, 'Rollback').length).toBe(0);
+  });
+
+  it('opens rollback settings when orchestrated rollback is accepted from Enable', async () => {
+    const selected = buildServerGroup({ isDisabled: true, name: 'test-app-main-v001' });
+    const rollbackSource = buildServerGroup();
+    const application = buildApplication([selected, rollbackSource]);
+    const confirm = spyOn(ConfirmationModalService, 'confirm').and.returnValue(Promise.resolve() as any);
+    const show = spyOn(AmazonRollbackServerGroupModal, 'show').and.returnValue(Promise.resolve({} as any));
+    const wrapper = shallowActions(<AmazonServerGroupActions app={application} serverGroup={selected} />);
+
+    action(wrapper, 'Enable').prop('onClick')();
+    await settle();
+
+    expect(confirm).toHaveBeenCalledTimes(1);
+    expect(show).toHaveBeenCalledOnceWith(
+      {
+        allServerGroups: [selected],
+        application,
+        previousServerGroup: selected,
+        serverGroup: rollbackSource,
+      },
+      runtimeServices,
+    );
+  });
+
+  it('continues to the ordinary Enable confirmation when orchestrated rollback is declined', async () => {
+    const selected = buildServerGroup({ isDisabled: true, name: 'test-app-main-v001' });
+    const rollbackSource = buildServerGroup();
+    const application = buildApplication([selected, rollbackSource]);
+    const confirm = spyOn(ConfirmationModalService, 'confirm').and.callFake((params: any) =>
+      params.header === 'Rolling back?' ? (Promise.reject({ source: 'footer' }) as any) : (Promise.resolve() as any),
+    );
+    const show = spyOn(AmazonRollbackServerGroupModal, 'show').and.returnValue(Promise.resolve({} as any));
+    const wrapper = shallow(<AmazonServerGroupActions app={application} serverGroup={selected} />);
+
+    action(wrapper, 'Enable').prop('onClick')();
+    await settle();
+
+    expect(show).not.toHaveBeenCalled();
+    expect(confirm).toHaveBeenCalledTimes(2);
+    expect(confirm.calls.mostRecent().args[0]).toEqual(
+      jasmine.objectContaining({
+        header: `Really enable ${selected.name}?`,
+        submitMethod: jasmine.any(Function),
+      }),
+    );
+  });
+
+  it('does nothing when the orchestrated rollback prompt is dismissed', async () => {
+    const selected = buildServerGroup({ isDisabled: true, name: 'test-app-main-v001' });
+    const rollbackSource = buildServerGroup();
+    const application = buildApplication([selected, rollbackSource]);
+    const confirm = spyOn(ConfirmationModalService, 'confirm').and.returnValue(
+      Promise.reject({ source: 'header' }) as any,
+    );
+    const show = spyOn(AmazonRollbackServerGroupModal, 'show').and.returnValue(Promise.resolve({} as any));
+    const writer = { enableServerGroup: jasmine.createSpy('enableServerGroup') };
+    const enable = writer.enableServerGroup;
+    const wrapper = shallow(<AmazonServerGroupActions app={application} serverGroup={selected} />);
+    (wrapper.instance() as any).context = { services: { serverGroupWriter: writer } };
+
+    action(wrapper, 'Enable').prop('onClick')();
+    await settle();
+
+    expect(confirm).toHaveBeenCalledTimes(1);
+    expect(show).not.toHaveBeenCalled();
+    expect(enable).not.toHaveBeenCalled();
+  });
+
+  it('closes destroyed server group details through the injected state service', () => {
+    const selected = buildServerGroup();
+    const stateService = { go: jasmine.createSpy('go'), includes: jasmine.createSpy('includes').and.returnValue(true) };
+    const confirm = spyOn(ConfirmationModalService, 'confirm');
+    spyOn(ServerGroupWarningMessageService, 'addDestroyWarningMessage');
+    const wrapper = shallow(
+      <AmazonServerGroupActions
+        app={buildApplication([selected])}
+        router={{} as any}
+        serverGroup={selected}
+        stateParams={{}}
+        stateService={stateService as any}
+      />,
+    );
+
+    action(wrapper, 'Destroy').prop('onClick')();
+    confirm.calls.mostRecent().args[0].taskMonitorConfig.onTaskComplete();
+
+    expect(stateService.includes).toHaveBeenCalledWith('**.serverGroup', {
+      accountId: 'test-account',
+      name: 'test-app-main-v002',
+      region: 'us-east-1',
+    });
+    expect(stateService.go).toHaveBeenCalledWith('^');
+  });
+});
+
+const settle = () => new Promise((resolve) => setTimeout(resolve));