@spinnaker/amazon 0.8.14 → 0.11.0

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

@@ -1,19 +1,11 @@
 import { get, has } from 'lodash';
 import React from 'react';
 
-import {
-  AccountTag,
-  CollapsibleSection,
-  EntitySource,
-  IEntityTags,
-  IViewChangesConfig,
-  SETTINGS,
-  timestamp,
-  ViewChangesLink,
-} from '@spinnaker/core';
+import type { IEntityTags, IViewChangesConfig } from '@spinnaker/core';
+import { AccountTag, CollapsibleSection, EntitySource, SETTINGS, timestamp, ViewChangesLink } from '@spinnaker/core';
 
-import { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
-import { IAmazonServerGroupView } from '../../../domain';
+import type { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
+import type { IAmazonServerGroupView } from '../../../domain';
 import { VpcTag } from '../../../vpc/VpcTag';
 
 export interface IAmazonInfoDetailsSectionState {

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

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { CollapsibleSection, HealthCounts } from '@spinnaker/core';
 
-import { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
+import type { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
 
 export class HealthDetailsSection extends React.Component<IAmazonServerGroupDetailsSectionProps> {
   public render(): JSX.Element {

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

@@ -1,5 +1,5 @@
-import { IServerGroupDetailsSectionProps } from '@spinnaker/core';
-import { IAmazonServerGroupView } from '../../../domain';
+import type { IServerGroupDetailsSectionProps } from '@spinnaker/core';
+import type { IAmazonServerGroupView } from '../../../domain';
 
 export interface IAmazonServerGroupDetailsSectionProps extends IServerGroupDetailsSectionProps {
   serverGroup: IAmazonServerGroupView;

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

@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { CollapsibleSection, LabeledValue, LabeledValueList } from '@spinnaker/core';
-import { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
+import type { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
 
 export const InstancesDistributionDetailsSection = ({ serverGroup }: IAmazonServerGroupDetailsSectionProps) => {
   if (!serverGroup.mixedInstancesPolicy) {

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

@@ -2,8 +2,8 @@ import React from 'react';
 
 import { CollapsibleSection, ShowUserData } from '@spinnaker/core';
 
-import { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
-import { IAmazonServerGroupView } from '../../../domain';
+import type { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
+import type { IAmazonServerGroupView } from '../../../domain';
 import { getBaseImageName } from '../utils';
 
 export interface ILaunchConfigDetailsSectionState {

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

@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { CollapsibleSection, LabeledValue, LabeledValueList, ShowUserData } from '@spinnaker/core';
-import { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
+import type { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
 import { MultipleInstanceTypesSubSection } from './MultipleInstanceTypesSubSection';
 import { getBaseImageName } from '../utils';
 

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

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { CollapsibleSection, ViewScalingActivitiesLink } from '@spinnaker/core';
 
-import { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
+import type { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
 
 export class LogsDetailsSection extends React.Component<IAmazonServerGroupDetailsSectionProps> {
   public render(): JSX.Element {

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

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { CollapsibleSection, HelpField } from '@spinnaker/core';
 
-import { IAmazonLaunchTemplateOverrides } from '../../../index';
+import type { IAmazonLaunchTemplateOverrides } from '../../../index';
 
 import './multipleInstanceTypesSubSection.less';
 

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

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { CollapsibleSection } from '@spinnaker/core';
 
-import { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
+import type { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
 
 export interface IPackageDetailsSectionState {
   commitHash: string;

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

@@ -1,11 +1,12 @@
 import React from 'react';
 
-import { CollapsibleSection, Overridable, Tooltip } from '@spinnaker/core';
+import { CollapsibleSection, Overridable, SETTINGS, Tooltip } from '@spinnaker/core';
+
+import type { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
+import type { IAmazonServerGroupView, IScalingProcess } from '../../../domain';
 
-import { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
-import { IAmazonServerGroupView, IScalingProcess } from '../../../domain';
-import { AwsNgReact } from '../../../reactShims';
 import { CreateScalingPolicyButton } from '../scalingPolicy/CreateScalingPolicyButton';
+import { ScalingPolicySummary } from '../scalingPolicy/ScalingPolicySummary';
 import { AutoScalingProcessService } from '../scalingProcesses/AutoScalingProcessService';
 
 @Overridable('aws.serverGroup.ScalingPoliciesDetailsSection')
@@ -28,8 +29,6 @@ export class ScalingPoliciesDetailsSection extends React.Component<IAmazonServer
     const { app, serverGroup } = this.props;
     const scalingPoliciesDisabled = ScalingPoliciesDetailsSection.arePoliciesDisabled(serverGroup);
 
-    const { ScalingPolicySummary } = AwsNgReact;
-
     return (
       <CollapsibleSection
         cacheKey="Scaling Policies"
@@ -55,7 +54,11 @@ export class ScalingPoliciesDetailsSection extends React.Component<IAmazonServer
         {serverGroup.scalingPolicies.map((policy) => (
           <ScalingPolicySummary key={policy.policyARN} policy={policy} serverGroup={serverGroup} application={app} />
         ))}
-        <CreateScalingPolicyButton serverGroup={serverGroup} application={app} />
+        {SETTINGS.awsAdHocInfraWritesEnabled ? (
+          <CreateScalingPolicyButton serverGroup={serverGroup} application={app} />
+        ) : (
+          <p>Can not create scaling policy, because ad-hoc operations are disabled for AWS providers.</p>
+        )}
       </CollapsibleSection>
     );
   }

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

@@ -1,9 +1,17 @@
 import React from 'react';
 
-import { CollapsibleSection, confirmNotManaged, HelpField, ModalInjector, timestamp, Tooltip } from '@spinnaker/core';
+import {
+  CollapsibleSection,
+  confirmNotManaged,
+  HelpField,
+  ModalInjector,
+  SETTINGS,
+  timestamp,
+  Tooltip,
+} from '@spinnaker/core';
 
-import { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
-import { IScalingProcess } from '../../../domain';
+import type { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
+import type { IScalingProcess } from '../../../domain';
 import { AutoScalingProcessService } from '../scalingProcesses/AutoScalingProcessService';
 
 export interface IScalingProcessesDetailsSectionState {
@@ -101,9 +109,11 @@ export class ScalingProcessesDetailsSection extends React.Component<
             </li>
           ))}
         </ul>
-        <a className="clickable" onClick={this.toggleScalingProcesses}>
-          Edit Scaling Processes
-        </a>
+        {SETTINGS.awsAdHocInfraWritesEnabled && (
+          <a className="clickable" onClick={this.toggleScalingProcesses}>
+            Edit Scaling Processes
+          </a>
+        )}
       </CollapsibleSection>
     );
   }

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

@@ -1,9 +1,9 @@
 import React from 'react';
 
-import { CollapsibleSection, ModalInjector, Tooltip } from '@spinnaker/core';
+import { CollapsibleSection, ModalInjector, SETTINGS, Tooltip } from '@spinnaker/core';
 
-import { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
-import { IScalingProcess } from '../../../domain';
+import type { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
+import type { IScalingProcess } from '../../../domain';
 import { AutoScalingProcessService } from '../scalingProcesses/AutoScalingProcessService';
 import { ScheduledAction } from '../scheduledAction/ScheduledAction';
 
@@ -80,9 +80,11 @@ export class ScheduledActionsDetailsSection extends React.Component<
           </p>
         )}
         {serverGroup.scheduledActions.length === 0 && <p>No Scheduled Actions are configured for this server group.</p>}
-        <a className="clickable" onClick={this.editScheduledActions}>
-          Edit Scheduled Actions
-        </a>
+        {SETTINGS.awsAdHocInfraWritesEnabled && (
+          <a className="clickable" onClick={this.editScheduledActions}>
+            Edit Scheduled Actions
+          </a>
+        )}
       </CollapsibleSection>
     );
   }

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

@@ -2,16 +2,10 @@ import { UISref } from '@uirouter/react';
 import { chain, find, sortBy } from 'lodash';
 import React from 'react';
 
-import {
-  CollapsibleSection,
-  confirmNotManaged,
-  FirewallLabels,
-  ISecurityGroup,
-  ISecurityGroupsByAccount,
-  ModalInjector,
-} from '@spinnaker/core';
+import type { ISecurityGroup, ISecurityGroupsByAccount } from '@spinnaker/core';
+import { CollapsibleSection, confirmNotManaged, FirewallLabels, ModalInjector, SETTINGS } from '@spinnaker/core';
 
-import { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
+import type { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
 import { AwsSecurityGroupReader } from '../../../securityGroup/securityGroup.reader';
 
 export interface ISecurityGroupsDetailsSectionState {
@@ -113,7 +107,7 @@ export class SecurityGroupsDetailsSection extends React.Component<
             </li>
           ))}
         </ul>
-        {serverGroup.vpcId && (
+        {SETTINGS.awsAdHocInfraWritesEnabled && serverGroup.vpcId && (
           <a className="clickable" onClick={this.updateSecurityGroups}>
             Edit {FirewallLabels.get('Firewalls')}
           </a>

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

@@ -3,7 +3,7 @@ import React from 'react';
 
 import { CollapsibleSection } from '@spinnaker/core';
 
-import { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
+import type { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
 
 export class TagsDetailsSection extends React.Component<IAmazonServerGroupDetailsSectionProps> {
   public render(): JSX.Element {

package/src/serverGroup/serverGroup.transformer.ts

@@ -1,9 +1,9 @@
 import { module } from 'angular';
 import { defaults } from 'lodash';
 
-import { IVpc } from '@spinnaker/core';
+import type { IVpc } from '@spinnaker/core';
 
-import {
+import type {
   IAmazonServerGroup,
   IAmazonServerGroupView,
   IScalingAdjustmentView,

package/src/subnet/SubnetSelectField.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react';
 
-import { Application, HelpField, ISubnet, Markdown } from '@spinnaker/core';
+import type { Application, ISubnet } from '@spinnaker/core';
+import { HelpField, Markdown } from '@spinnaker/core';
 
 import { SubnetSelectInput } from './SubnetSelectInput';
 import { AWSProviderSettings } from '../aws.settings';

package/src/subnet/SubnetSelectInput.tsx

@@ -1,17 +1,9 @@
 import { get } from 'lodash';
 import React from 'react';
-import { Option } from 'react-select';
-
-import {
-  Application,
-  createFakeReactSyntheticEvent,
-  ISelectInputProps,
-  ISubnet,
-  Omit,
-  SelectInput,
-  useDeepObjectDiff,
-  useMountStatusRef,
-} from '@spinnaker/core';
+import type { Option } from 'react-select';
+
+import type { Application, ISelectInputProps, ISubnet, Omit } from '@spinnaker/core';
+import { createFakeReactSyntheticEvent, SelectInput, useDeepObjectDiff, useMountStatusRef } from '@spinnaker/core';
 import { AWSProviderSettings } from '../aws.settings';
 
 export interface ISubnetSelectInputProps extends Omit<ISelectInputProps, 'options'> {

package/src/subnet/subnet.renderer.ts

@@ -1,6 +1,6 @@
 import { module } from 'angular';
 
-import { IServerGroup } from '@spinnaker/core';
+import type { IServerGroup } from '@spinnaker/core';
 
 export class AwsSubnetRenderer {
   public render(serverGroup: IServerGroup): string {

package/src/validation/ApplicationNameValidator.ts

@@ -1,4 +1,5 @@
-import { ApplicationNameValidator, FirewallLabels, IApplicationNameValidator } from '@spinnaker/core';
+import type { IApplicationNameValidator } from '@spinnaker/core';
+import { ApplicationNameValidator, FirewallLabels } from '@spinnaker/core';
 import { AWSProviderSettings } from '../aws.settings';
 
 class AmazonApplicationNameValidator implements IApplicationNameValidator {

package/src/vpc/VpcReader.ts

@@ -1,4 +1,5 @@
-import { IVpc, NetworkReader } from '@spinnaker/core';
+import type { IVpc } from '@spinnaker/core';
+import { NetworkReader } from '@spinnaker/core';
 
 export class VpcReader {
   private static cache: PromiseLike<IVpc[]>;

package/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingPopover.html

@@ -1,5 +0,0 @@
-<target-tracking-chart
-  config="$ctrl.policy.targetTrackingConfiguration"
-  server-group="$ctrl.serverGroup"
-  update-unit="$ctrl.updateUnit"
-></target-tracking-chart>