@spinnaker/amazon 0.8.14 → 0.11.0

package/src/loadBalancer/details/LoadBalancerActions.tsx

@@ -2,9 +2,9 @@ import { get, values } from 'lodash';
 import React from 'react';
 import { Dropdown } from 'react-bootstrap';
 
+import type { Application } from '@spinnaker/core';
 import {
   AddEntityTagLinks,
-  Application,
   ApplicationReader,
   ConfirmationModalService,
   HelpField,
@@ -14,8 +14,8 @@ import {
 } from '@spinnaker/core';
 
 import { LoadBalancerTypes } from '../configure/LoadBalancerTypes';
-import { IAmazonLoadBalancer, IAmazonLoadBalancerDeleteCommand } from '../../domain';
-import { ILoadBalancerFromStateParams } from './loadBalancerDetails.controller';
+import type { IAmazonLoadBalancer, IAmazonLoadBalancerDeleteCommand } from '../../domain';
+import type { ILoadBalancerFromStateParams } from './loadBalancerDetails.controller';
 
 export interface ILoadBalancerActionsProps {
   app: Application;
@@ -114,49 +114,51 @@ export class LoadBalancerActions extends React.Component<ILoadBalancerActionsPro
 
     return (
       <div style={{ display: 'inline-block' }}>
-        <Dropdown className="dropdown" id="load-balancer-actions-dropdown">
-          <Dropdown.Toggle className="btn btn-sm btn-primary dropdown-toggle">
-            <span>Load Balancer Actions</span>
-          </Dropdown.Toggle>
-          <Dropdown.Menu className="dropdown-menu">
-            {application && (
-              <ManagedMenuItem resource={loadBalancer} application={app} onClick={this.editLoadBalancer}>
-                Edit Load Balancer
-              </ManagedMenuItem>
-            )}
-            {!application && (
-              <li className="disabled">
-                <a>
-                  Edit Load Balancer{' '}
-                  <HelpField
-                    content={`The application <b>${loadBalancerAppName}</b> must be configured before this load balancer can be edited.`}
-                  />
-                </a>
-              </li>
-            )}
-            {allowDeletion && (
-              <ManagedMenuItem resource={loadBalancer} application={app} onClick={this.deleteLoadBalancer}>
-                Delete Load Balancer
-              </ManagedMenuItem>
-            )}
-            {!allowDeletion && (
-              <li className="disabled">
-                <a>
-                  Delete Load Balancer{' '}
-                  <HelpField content="You must detach all instances before you can delete this load balancer." />
-                </a>
-              </li>
-            )}
-            {SETTINGS && SETTINGS.feature.entityTags && (
-              <AddEntityTagLinks
-                component={loadBalancer}
-                application={app}
-                entityType="loadBalancer"
-                onUpdate={this.entityTagUpdate}
-              />
-            )}
-          </Dropdown.Menu>
-        </Dropdown>
+        {SETTINGS.awsAdHocInfraWritesEnabled && (
+          <Dropdown className="dropdown" id="load-balancer-actions-dropdown">
+            <Dropdown.Toggle className="btn btn-sm btn-primary dropdown-toggle">
+              <span>Load Balancer Actions</span>
+            </Dropdown.Toggle>
+            <Dropdown.Menu className="dropdown-menu">
+              {application && (
+                <ManagedMenuItem resource={loadBalancer} application={app} onClick={this.editLoadBalancer}>
+                  Edit Load Balancer
+                </ManagedMenuItem>
+              )}
+              {!application && (
+                <li className="disabled">
+                  <a>
+                    Edit Load Balancer{' '}
+                    <HelpField
+                      content={`The application <b>${loadBalancerAppName}</b> must be configured before this load balancer can be edited.`}
+                    />
+                  </a>
+                </li>
+              )}
+              {allowDeletion && (
+                <ManagedMenuItem resource={loadBalancer} application={app} onClick={this.deleteLoadBalancer}>
+                  Delete Load Balancer
+                </ManagedMenuItem>
+              )}
+              {!allowDeletion && (
+                <li className="disabled">
+                  <a>
+                    Delete Load Balancer{' '}
+                    <HelpField content="You must detach all instances before you can delete this load balancer." />
+                  </a>
+                </li>
+              )}
+              {SETTINGS && SETTINGS.feature.entityTags && (
+                <AddEntityTagLinks
+                  component={loadBalancer}
+                  application={app}
+                  entityType="loadBalancer"
+                  onUpdate={this.entityTagUpdate}
+                />
+              )}
+            </Dropdown.Menu>
+          </Dropdown>
+        )}
       </div>
     );
   }

package/src/loadBalancer/details/loadBalancerDetails.controller.ts

@@ -1,24 +1,27 @@
-import { StateService } from '@uirouter/angularjs';
+import type { StateService } from '@uirouter/angularjs';
 import UIROUTER_ANGULARJS from '@uirouter/angularjs';
-import { IController, IQService, IScope, module } from 'angular';
+import type { IController, IQService, IScope } from 'angular';
+import { module } from 'angular';
 import { head, sortBy } from 'lodash';
 
-import {
+import type {
   Application,
-  FirewallLabels,
   IApplicationSecurityGroup,
   ILoadBalancer,
   ISecurityGroup,
   ISubnet,
-  LOAD_BALANCER_READ_SERVICE,
   LoadBalancerReader,
+  SecurityGroupReader,
+} from '@spinnaker/core';
+import {
+  FirewallLabels,
+  LOAD_BALANCER_READ_SERVICE,
   MANAGED_RESOURCE_DETAILS_INDICATOR,
   SECURITY_GROUP_READER,
-  SecurityGroupReader,
   SETTINGS,
   SubnetReader,
 } from '@spinnaker/core';
-import {
+import type {
   IAmazonApplicationLoadBalancer,
   IAmazonLoadBalancer,
   IAmazonLoadBalancerSourceData,

package/src/loadBalancer/details/targetGroupDetails.controller.ts

@@ -1,9 +1,11 @@
-import { StateService } from '@uirouter/angularjs';
+import type { StateService } from '@uirouter/angularjs';
 import UIROUTER_ANGULARJS from '@uirouter/angularjs';
-import { IController, IQService, IScope, module } from 'angular';
+import type { IController, IQService, IScope } from 'angular';
+import { module } from 'angular';
 
-import { Application, ILoadBalancer, MANAGED_RESOURCE_DETAILS_INDICATOR } from '@spinnaker/core';
-import { IAmazonApplicationLoadBalancer, ITargetGroup } from '../../domain/IAmazonLoadBalancer';
+import type { Application, ILoadBalancer } from '@spinnaker/core';
+import { MANAGED_RESOURCE_DETAILS_INDICATOR } from '@spinnaker/core';
+import type { IAmazonApplicationLoadBalancer, ITargetGroup } from '../../domain/IAmazonLoadBalancer';
 
 export interface ITargetGroupFromStateParams {
   accountId: string;

package/src/loadBalancer/loadBalancer.transformer.ts

@@ -1,18 +1,10 @@
 import { chain, filter, flatten, map } from 'lodash';
 import { $q } from 'ngimport';
 
-import {
-  AccountService,
-  Application,
-  IHealth,
-  IInstance,
-  IServerGroup,
-  IVpc,
-  NameUtils,
-  SETTINGS,
-} from '@spinnaker/core';
+import type { Application, IHealth, IInstance, IServerGroup, IVpc } from '@spinnaker/core';
+import { AccountService, NameUtils, SETTINGS } from '@spinnaker/core';
 import { AWSProviderSettings } from '../aws.settings';
-import {
+import type {
   IALBListenerCertificate,
   IAmazonApplicationLoadBalancer,
   IAmazonApplicationLoadBalancerUpsertCommand,

package/src/loadBalancer/targetGroup.states.ts

@@ -1,7 +1,8 @@
-import { StateParams } from '@uirouter/angularjs';
+import type { StateParams } from '@uirouter/angularjs';
 import { module } from 'angular';
 
-import { APPLICATION_STATE_PROVIDER, ApplicationStateProvider, INestedState } from '@spinnaker/core';
+import type { ApplicationStateProvider, INestedState } from '@spinnaker/core';
+import { APPLICATION_STATE_PROVIDER } from '@spinnaker/core';
 
 import { TargetGroupDetails } from './TargetGroupDetails';
 

package/src/pipeline/stages/deployCloudFormation/CloudFormationChangeSetInfo.tsx

@@ -2,15 +2,8 @@ import { module } from 'angular';
 import React, { useState } from 'react';
 import { react2angular } from 'react2angular';
 
-import {
-  CheckboxInput,
-  IStage,
-  IStageConfigProps,
-  ReactSelectInput,
-  StageConfigField,
-  TextInput,
-  withErrorBoundary,
-} from '@spinnaker/core';
+import type { IStage, IStageConfigProps } from '@spinnaker/core';
+import { CheckboxInput, ReactSelectInput, StageConfigField, TextInput, withErrorBoundary } from '@spinnaker/core';
 
 export interface ICloudFormationChangeSetInfoProps {
   stage: IStage[];

package/src/pipeline/stages/deployCloudFormation/cloudFormationTemplateEntry.component.ts

@@ -1,4 +1,5 @@
-import { IComponentOptions, IController, IScope, module } from 'angular';
+import type { IComponentOptions, IController, IScope } from 'angular';
+import { module } from 'angular';
 import { yamlDocumentsToString } from '@spinnaker/core';
 
 class CloudFormationTemplateController implements IController {

package/src/pipeline/stages/deployCloudFormation/deployCloudFormationExecutionDetails.tsx

@@ -1,11 +1,7 @@
 import * as React from 'react';
 
-import {
-  ExecutionDetailsSection,
-  ExecutionStepDetails,
-  IExecutionDetailsSectionProps,
-  StageFailureMessage,
-} from '@spinnaker/core';
+import type { IExecutionDetailsSectionProps } from '@spinnaker/core';
+import { ExecutionDetailsSection, ExecutionStepDetails, StageFailureMessage } from '@spinnaker/core';
 
 export class DeployExecutionDetails extends React.Component<IExecutionDetailsSectionProps> {
   public static title = 'Task Status';

package/src/pipeline/stages/deployCloudFormation/deployCloudFormationStackConfig.controller.ts

@@ -1,15 +1,9 @@
-import { IController, IScope } from 'angular';
+import type { IController, IScope } from 'angular';
 import { extend } from 'lodash';
 import { $q } from 'ngimport';
 
-import {
-  AccountService,
-  ExpectedArtifactSelectorViewController,
-  IAccountDetails,
-  IArtifact,
-  IExpectedArtifact,
-  NgGenericArtifactDelegate,
-} from '@spinnaker/core';
+import type { IAccountDetails, IArtifact, IExpectedArtifact } from '@spinnaker/core';
+import { AccountService, ExpectedArtifactSelectorViewController, NgGenericArtifactDelegate } from '@spinnaker/core';
 
 export class DeployCloudFormationStackConfigController implements IController {
   public state = {

package/src/pipeline/stages/deployCloudFormation/deployCloudFormationStackStage.ts

@@ -1,6 +1,7 @@
 import { module } from 'angular';
 
-import { ArtifactReferenceService, ExpectedArtifactService, IStage, Registry } from '@spinnaker/core';
+import type { IStage } from '@spinnaker/core';
+import { ArtifactReferenceService, ExpectedArtifactService, Registry } from '@spinnaker/core';
 
 import { DeployExecutionDetails } from './deployCloudFormationExecutionDetails';
 import { DeployCloudFormationStackConfigController } from './deployCloudFormationStackConfig.controller';

package/src/pipeline/stages/deployCloudFormation/evaluateCloudFormationChangeSetExecution.service.ts

@@ -1,7 +1,8 @@
 import { module } from 'angular';
-import { EXECUTION_SERVICE, ExecutionService } from '@spinnaker/core';
-import { IExecution, IExecutionStage } from '@spinnaker/core';
-import { Application } from '@spinnaker/core';
+import type { ExecutionService } from '@spinnaker/core';
+import { EXECUTION_SERVICE } from '@spinnaker/core';
+import type { IExecution, IExecutionStage } from '@spinnaker/core';
+import type { Application } from '@spinnaker/core';
 
 export class EvaluateCloudFormationChangeSetExecutionService {
   public static $inject = ['executionService'];

package/src/pipeline/stages/deployCloudFormation/evaluateCloudFormationChangeSetExecutionApproval.tsx

@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 
-import { Application, IExecution, IExecutionStage, Spinner } from '@spinnaker/core';
+import type { Application, IExecution, IExecutionStage } from '@spinnaker/core';
+import { Spinner } from '@spinnaker/core';
 import { AwsReactInjector } from '../../../reactShims';
 
 export interface IEvaluateCloudFormationChangeSetExecutionApprovalProps {

package/src/pipeline/stages/deployCloudFormation/evaluateCloudFormationChangeSetExecutionDetails.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import { IExecutionDetailsSectionProps } from '@spinnaker/core';
+import type { IExecutionDetailsSectionProps } from '@spinnaker/core';
 import { ExecutionDetailsSection } from '@spinnaker/core';
 import { EvaluateCloudFormationChangeSetExecutionApproval } from './evaluateCloudFormationChangeSetExecutionApproval';
 

package/src/pipeline/stages/deployCloudFormation/evaluateCloudFormationChangeSetExecutionLabel.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { OverlayTrigger, Tooltip } from 'react-bootstrap';
 
-import { IExecution, IExecutionStageSummary } from '@spinnaker/core';
-import { Application } from '@spinnaker/core';
+import type { IExecution, IExecutionStageSummary } from '@spinnaker/core';
+import type { Application } from '@spinnaker/core';
 import { ExecutionBarLabel, HoverablePopover } from '@spinnaker/core';
 
 import { EvaluateCloudFormationChangeSetExecutionApproval } from './evaluateCloudFormationChangeSetExecutionApproval';

package/src/pipeline/stages/deployCloudFormation/evaluateCloudFormationChangeSetExecutionMarkerIcon.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { IExecutionMarkerIconProps } from '@spinnaker/core';
+import type { IExecutionMarkerIconProps } from '@spinnaker/core';
 
 export class EvaluateCloudFormationChangeSetExecutionMarkerIcon extends React.Component<IExecutionMarkerIconProps> {
   constructor(props: IExecutionMarkerIconProps) {

package/src/reactShims/aws.ngReact.ts

@@ -1,8 +1,8 @@
 import { angular2react } from 'angular2react';
-import React from 'react';
+import type React from 'react';
 
 import { ReactInject } from '@spinnaker/core';
-import { IScalingPolicySummaryProps } from '../serverGroup/details/scalingPolicy/ScalingPolicySummary';
+import type { IScalingPolicySummaryProps } from '../serverGroup/details/scalingPolicy/ScalingPolicySummary';
 import { scalingPolicyDetailsSummary } from '../serverGroup/details/scalingPolicy/detailsSummary.component';
 
 import IInjectorService = angular.auto.IInjectorService;

package/src/reactShims/aws.react.injector.ts

@@ -1,10 +1,11 @@
 import IInjectorService = angular.auto.IInjectorService;
 
-import { FunctionReader, ReactInject } from '@spinnaker/core';
-import { EvaluateCloudFormationChangeSetExecutionService } from '../pipeline/stages/deployCloudFormation/evaluateCloudFormationChangeSetExecution.service';
+import type { FunctionReader } from '@spinnaker/core';
+import { ReactInject } from '@spinnaker/core';
+import type { EvaluateCloudFormationChangeSetExecutionService } from '../pipeline/stages/deployCloudFormation/evaluateCloudFormationChangeSetExecution.service';
 
-import { AwsServerGroupConfigurationService } from '../serverGroup/configure/serverGroupConfiguration.service';
-import { AwsServerGroupTransformer } from '../serverGroup/serverGroup.transformer';
+import type { AwsServerGroupConfigurationService } from '../serverGroup/configure/serverGroupConfiguration.service';
+import type { AwsServerGroupTransformer } from '../serverGroup/serverGroup.transformer';
 
 // prettier-ignore
 export class AwsReactInject extends ReactInject {

package/src/reactShims/aws.react.module.ts

@@ -1,6 +1,5 @@
 import { module } from 'angular';
 
-import { AwsNgReact } from './aws.ngReact';
 import { AwsReactInjector } from './aws.react.injector';
 
 export const AWS_REACT_MODULE = 'spinnaker.amazon.react';
@@ -9,6 +8,5 @@ module(AWS_REACT_MODULE, []).run([
   function ($injector: any) {
     // Make angular services importable and (TODO when relevant) convert angular components to react
     AwsReactInjector.initialize($injector);
-    AwsNgReact.initialize($injector);
   },
 ]);

package/src/reactShims/index.ts

@@ -1,2 +1 @@
-export * from './aws.ngReact';
 export * from './aws.react.injector';

package/src/securityGroup/configure/ingressRuleGroupSelector.component.ts

@@ -1,8 +1,9 @@
-import { IComponentOptions, IController, module } from 'angular';
+import type { IComponentOptions, IController } from 'angular';
+import { module } from 'angular';
 import { intersection, uniq } from 'lodash';
-import { Subject, Subscription } from 'rxjs';
+import type { Subject, Subscription } from 'rxjs';
 
-import {
+import type {
   IAccountDetails,
   ISecurityGroup,
   ISecurityGroupRule,

package/src/securityGroup/configure/securityGroupDetailsCustom.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Overridable } from '@spinnaker/core';
-import { ISecurityGroupDetail } from '@spinnaker/core';
+import type { ISecurityGroupDetail } from '@spinnaker/core';
 
 export interface IAdditionalIpRulesProps {
   securityGroupDetails: ISecurityGroupDetail;

package/src/securityGroup/details/securityGroupDetail.controller.js

@@ -14,6 +14,7 @@ import {
   RecentHistoryService,
   SECURITY_GROUP_READER,
   SecurityGroupWriter,
+  SETTINGS,
 } from '@spinnaker/core';
 
 import { AMAZON_SECURITYGROUP_CLONE_CLONESECURITYGROUP_CONTROLLER } from '../clone/cloneSecurityGroup.controller';
@@ -45,6 +46,8 @@ angular
       // needed for standalone instances
       $scope.detailsTemplateUrl = CloudProviderRegistry.getValue('aws', 'securityGroup.detailsTemplateUrl');
 
+      $scope.isDisabled = !SETTINGS.awsAdHocInfraWritesEnabled;
+
       $scope.state = {
         loading: true,
         standalone: app.isStandalone,

package/src/securityGroup/details/securityGroupDetail.html

@@ -29,7 +29,7 @@
         </render-if-feature>
       </h3>
     </div>
-    <div class="actions">
+    <div class="actions" ng-hide="isDisabled">
       <div class="dropdown" uib-dropdown dropdown-append-to-body>
         <button type="button" class="btn btn-sm btn-primary dropdown-toggle" ng-disabled="disabled" uib-dropdown-toggle>
           <firewall-label label="Firewall"></firewall-label> Actions <span class="caret"></span>

package/src/securityGroup/securityGroup.reader.ts

@@ -1,6 +1,6 @@
 import { module } from 'angular';
 
-import { ISecurityGroup, ISecurityGroupsByAccount } from '@spinnaker/core';
+import type { ISecurityGroup, ISecurityGroupsByAccount } from '@spinnaker/core';
 
 export class AwsSecurityGroupReader {
   public resolveIndexedSecurityGroup(

package/src/serverGroup/configure/AmazonImageSelectInput.tsx

@@ -1,6 +1,6 @@
 import { $q } from 'ngimport';
 import React from 'react';
-import { HandlerRendererResult, MenuRendererProps, Option, OptionValues, ReactSelectProps } from 'react-select';
+import type { HandlerRendererResult, MenuRendererProps, Option, OptionValues, ReactSelectProps } from 'react-select';
 import {
   BehaviorSubject,
   combineLatest as observableCombineLatest,
@@ -10,8 +10,10 @@ import {
 } from 'rxjs';
 import { catchError, debounceTime, distinctUntilChanged, map, switchMap, takeUntil, tap } from 'rxjs/operators';
 
-import { Application, HelpField, TetheredSelect, ValidationMessage } from '@spinnaker/core';
-import { AwsImageReader, IAmazonImage } from '../../image';
+import type { Application } from '@spinnaker/core';
+import { HelpField, TetheredSelect, ValidationMessage } from '@spinnaker/core';
+import type { IAmazonImage } from '../../image';
+import { AwsImageReader } from '../../image';
 
 export interface IAmazonImageSelectorProps {
   onChange: (value: IAmazonImage) => void;

package/src/serverGroup/configure/serverGroupCommandBuilder.service.js

@@ -369,7 +369,7 @@ angular
                 ebsOptimized: launchTemplateData.ebsOptimized,
                 spotPrice: maxPrice || undefined,
                 requireIMDSv2: Boolean(
-                  launchTemplateData.metadataOptions && launchTemplateData.metadataOptions.httpsTokens === 'required',
+                  launchTemplateData.metadataOptions && launchTemplateData.metadataOptions.httpTokens === 'required',
                 ),
                 unlimitedCpuCredits: launchTemplateData.creditSpecification
                   ? launchTemplateData.creditSpecification.cpuCredits === 'unlimited'

package/src/serverGroup/configure/serverGroupConfiguration.service.ts

@@ -16,10 +16,8 @@ import {
 } from 'lodash';
 import { $q } from 'ngimport';
 
-import {
-  AccountService,
+import type {
   Application,
-  CACHE_INITIALIZER_SERVICE,
   CacheInitializerService,
   IAccountDetails,
   IDeploymentStrategy,
@@ -32,20 +30,24 @@ import {
   IServerGroupCommandResult,
   IServerGroupCommandViewState,
   ISubnet,
-  LOAD_BALANCER_READ_SERVICE,
   LoadBalancerReader,
+  SecurityGroupReader,
+  ServerGroupCommandRegistry,
+} from '@spinnaker/core';
+import {
+  AccountService,
+  CACHE_INITIALIZER_SERVICE,
+  LOAD_BALANCER_READ_SERVICE,
   NameUtils,
   SECURITY_GROUP_READER,
-  SecurityGroupReader,
   SERVER_GROUP_COMMAND_REGISTRY_PROVIDER,
-  ServerGroupCommandRegistry,
   setMatchingResourceSummary,
   SubnetReader,
 } from '@spinnaker/core';
 
 import { AWSProviderSettings } from '../../aws.settings';
 import { AutoScalingProcessService } from '../details/scalingProcesses/AutoScalingProcessService';
-import {
+import type {
   IAmazonLoadBalancerSourceData,
   IApplicationLoadBalancerSourceData,
   IKeyPair,

package/src/serverGroup/configure/wizard/AmazonCloneServerGroupModal.tsx

@@ -1,18 +1,8 @@
 import { get } from 'lodash';
 import React from 'react';
 
-import {
-  Application,
-  FirewallLabels,
-  IModalComponentProps,
-  IStage,
-  noop,
-  ReactInjector,
-  ReactModal,
-  TaskMonitor,
-  WizardModal,
-  WizardPage,
-} from '@spinnaker/core';
+import type { Application, IModalComponentProps, IStage } from '@spinnaker/core';
+import { FirewallLabels, noop, ReactInjector, ReactModal, TaskMonitor, WizardModal, WizardPage } from '@spinnaker/core';
 
 import { ServerGroupTemplateSelection } from './ServerGroupTemplateSelection';
 import {
@@ -25,7 +15,7 @@ import {
   ServerGroupZones,
 } from './pages';
 import { AwsReactInjector } from '../../../reactShims';
-import { IAmazonServerGroupCommand } from '../serverGroupConfiguration.service';
+import type { IAmazonServerGroupCommand } from '../serverGroupConfiguration.service';
 
 export interface IAmazonCloneServerGroupModalProps extends IModalComponentProps {
   title: string;

package/src/serverGroup/configure/wizard/ServerGroupTemplateSelection.tsx

@@ -1,12 +1,7 @@
 import React from 'react';
 
-import {
-  Application,
-  DeployInitializer,
-  FirewallLabels,
-  IServerGroupCommand,
-  ITemplateSelectionText,
-} from '@spinnaker/core';
+import type { Application, IServerGroupCommand, ITemplateSelectionText } from '@spinnaker/core';
+import { DeployInitializer, FirewallLabels } from '@spinnaker/core';
 
 export interface IServerGroupTemplateSelectionProps {
   app: Application;

package/src/serverGroup/configure/wizard/capacity/CapacitySelector.tsx

@@ -1,8 +1,10 @@
 import React from 'react';
-import Select, { Option } from 'react-select';
+import type { Option } from 'react-select';
+import Select from 'react-select';
 
-import { HelpField, IServerGroupCommand, SpelNumberInput } from '@spinnaker/core';
-import { IMinMaxDesiredProps } from './MinMaxDesired';
+import type { IServerGroupCommand } from '@spinnaker/core';
+import { HelpField, SpelNumberInput } from '@spinnaker/core';
+import type { IMinMaxDesiredProps } from './MinMaxDesired';
 
 export interface ICapacitySelectorProps {
   command: IServerGroupCommand;

package/src/serverGroup/configure/wizard/capacity/MinMaxDesired.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
-import { IServerGroupCommand, SpelNumberInput } from '@spinnaker/core';
+import type { IServerGroupCommand } from '@spinnaker/core';
+import { SpelNumberInput } from '@spinnaker/core';
 
 export interface IMinMaxDesiredProps {
   command: IServerGroupCommand;

package/src/serverGroup/configure/wizard/instanceType/CpuCreditsToggle.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import { ToggleButtonGroup, ToggleSize } from '@spinnaker/core';
 import { AwsReactInjector } from '../../../../reactShims';
 
-import { IAmazonServerGroupCommand } from '../../serverGroupConfiguration.service';
+import type { IAmazonServerGroupCommand } from '../../serverGroupConfiguration.service';
 
 export interface ICpuCreditsToggleProps {
   command: IAmazonServerGroupCommand;

package/src/serverGroup/configure/wizard/pages/ServerGroupBasicSettings.tsx

@@ -1,14 +1,13 @@
-import { Field, FormikErrors, FormikProps } from 'formik';
+import type { FormikErrors, FormikProps } from 'formik';
+import { Field } from 'formik';
 import React from 'react';
 
+import type { Application, IServerGroup, IWizardPageComponent } from '@spinnaker/core';
 import {
   AccountSelectInput,
-  Application,
   DeployingIntoManagedClusterWarning,
   DeploymentStrategySelector,
   HelpField,
-  IServerGroup,
-  IWizardPageComponent,
   Markdown,
   NameUtils,
   ReactInjector,
@@ -21,8 +20,8 @@ import {
 
 import { AmazonImageSelectInput } from '../../AmazonImageSelectInput';
 import { AWSProviderSettings } from '../../../../aws.settings';
-import { IAmazonImage } from '../../../../image';
-import { IAmazonServerGroupCommand } from '../../serverGroupConfiguration.service';
+import type { IAmazonImage } from '../../../../image';
+import type { IAmazonServerGroupCommand } from '../../serverGroupConfiguration.service';
 import { SubnetSelectField } from '../../../../subnet';
 
 const isExpressionLanguage = (field: string) => field && field.includes('${');