@spinnaker/amazon 0.11.0 → 0.12.2

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

@@ -1,9 +1,10 @@
 import React from 'react';
 
-import { CollapsibleSection, confirmNotManaged, ModalInjector, SETTINGS } from '@spinnaker/core';
+import { CollapsibleSection, confirmNotManaged, ModalInjector } from '@spinnaker/core';
 import { HelpField } from '@spinnaker/core';
 
 import type { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
+import { AWSProviderSettings } from '../../../aws.settings';
 
 export class AdvancedSettingsDetailsSection extends React.Component<IAmazonServerGroupDetailsSectionProps> {
   private editAdvancedSettings = (): void => {
@@ -49,7 +50,7 @@ export class AdvancedSettingsDetailsSection extends React.Component<IAmazonServe
             <dd>{`${asg.capacityRebalance}`}</dd>,
           ]}
         </dl>
-        {SETTINGS.awsAdHocInfraWritesEnabled && (
+        {AWSProviderSettings.adHocInfraWritesEnabled && (
           <a className="clickable" onClick={this.editAdvancedSettings}>
             Edit Advanced Settings
           </a>

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

@@ -1,15 +1,10 @@
 import React from 'react';
 
 import type { ICapacity } from '@spinnaker/core';
-import {
-  CapacityDetailsSection,
-  CollapsibleSection,
-  Overridable,
-  SETTINGS,
-  ViewScalingActivitiesLink,
-} from '@spinnaker/core';
+import { CapacityDetailsSection, CollapsibleSection, Overridable, ViewScalingActivitiesLink } from '@spinnaker/core';
 
 import type { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
+import { AWSProviderSettings } from '../../../aws.settings';
 import { AmazonResizeServerGroupModal } from '../resize/AmazonResizeServerGroupModal';
 
 @Overridable('amazon.serverGroup.CapacityDetailsSection')
@@ -28,7 +23,7 @@ export class AmazonCapacityDetailsSection extends React.Component<IAmazonServerG
         <CapacityDetailsSection current={serverGroup.instances.length} capacity={capacity} />
 
         <div>
-          {SETTINGS.awsAdHocInfraWritesEnabled && (
+          {AWSProviderSettings.adHocInfraWritesEnabled && (
             <a className="clickable" onClick={() => AmazonResizeServerGroupModal.show({ application, serverGroup })}>
               Resize Server Group
             </a>

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

@@ -1,9 +1,12 @@
-import React from 'react';
 import { shallow } from 'enzyme';
+import React from 'react';
+
+import type { Application } from '@spinnaker/core';
+import { ApplicationModelBuilder } from '@spinnaker/core';
 import { mockLaunchTemplate, mockServerGroup } from '@spinnaker/mocks';
-import { IAmazonMixedInstancesPolicy, IAmazonServerGroupView, IScalingPolicy } from '../../../domain';
+
+import type { IAmazonMixedInstancesPolicy, IAmazonServerGroupView, IScalingPolicy } from '../../../domain';
 import { InstancesDistributionDetailsSection } from '../../../index';
-import { Application, ApplicationModelBuilder } from '@spinnaker/core';
 
 describe('InstancesDistribution', () => {
   let app: Application;
@@ -50,7 +53,7 @@ describe('InstancesDistribution', () => {
     ]);
     let index = 0;
     expectedLabels.forEach((value, key) => {
-      let labeledValue = actualLabeledValues.at(index++);
+      const labeledValue = actualLabeledValues.at(index++);
       expect(labeledValue.prop('label')).toEqual(key);
       expect(labeledValue.prop('value')).toEqual(value);
     });
@@ -77,7 +80,7 @@ describe('InstancesDistribution', () => {
     ]);
     let index = 0;
     expectedLabels.forEach((value, key) => {
-      let labeledValue = actualLabeledValues.at(index++);
+      const labeledValue = actualLabeledValues.at(index++);
       expect(labeledValue.prop('label')).toEqual(key);
       expect(labeledValue.prop('value')).toEqual(value);
     });

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

@@ -1,15 +1,18 @@
-import React from 'react';
 import { shallow } from 'enzyme';
+import React from 'react';
+
+import type { Application } from '@spinnaker/core';
+import { ApplicationModelBuilder } from '@spinnaker/core';
 import {
   createCustomMockLaunchTemplate,
   mockLaunchTemplate,
   mockLaunchTemplateData,
   mockServerGroup,
 } from '@spinnaker/mocks';
-import { Application, ApplicationModelBuilder } from '@spinnaker/core';
-import { IAmazonServerGroupView, IAmazonMixedInstancesPolicy, IScalingPolicy } from '../../../domain';
+
 import { LaunchTemplateDetailsSection } from './LaunchTemplateDetailsSection';
 import { MultipleInstanceTypesSubSection } from './MultipleInstanceTypesSubSection';
+import type { IAmazonMixedInstancesPolicy, IAmazonServerGroupView, IScalingPolicy } from '../../../domain';
 
 describe('Launch template details', () => {
   let app: Application;
@@ -144,7 +147,7 @@ describe('Launch template details', () => {
     ]);
     let index = 0;
     expectedLabels.forEach((value, key) => {
-      let labeledValue = actualLabeledValues.at(index++);
+      const labeledValue = actualLabeledValues.at(index++);
       expect(labeledValue.prop('label')).toEqual(key);
       value != '' && expect(labeledValue.prop('value')).toEqual(value);
     });
@@ -239,7 +242,7 @@ describe('Launch template details', () => {
   });
 
   it('should not render multiple instance types subsection when overrides are not specified', () => {
-    let testServerGroup = baseServerGroupWithMipOverrides;
+    const testServerGroup = baseServerGroupWithMipOverrides;
     testServerGroup.mixedInstancesPolicy.launchTemplateOverridesForInstanceType = null;
 
     const multipleInstanceTypes = shallow(

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

@@ -1,10 +1,10 @@
 import React from 'react';
 
-import { CollapsibleSection, Overridable, SETTINGS, Tooltip } from '@spinnaker/core';
+import { CollapsibleSection, Overridable, Tooltip } from '@spinnaker/core';
 
 import type { IAmazonServerGroupDetailsSectionProps } from './IAmazonServerGroupDetailsSectionProps';
+import { AWSProviderSettings } from '../../../aws.settings';
 import type { IAmazonServerGroupView, IScalingProcess } from '../../../domain';
-
 import { CreateScalingPolicyButton } from '../scalingPolicy/CreateScalingPolicyButton';
 import { ScalingPolicySummary } from '../scalingPolicy/ScalingPolicySummary';
 import { AutoScalingProcessService } from '../scalingProcesses/AutoScalingProcessService';
@@ -54,7 +54,7 @@ export class ScalingPoliciesDetailsSection extends React.Component<IAmazonServer
         {serverGroup.scalingPolicies.map((policy) => (
           <ScalingPolicySummary key={policy.policyARN} policy={policy} serverGroup={serverGroup} application={app} />
         ))}
-        {SETTINGS.awsAdHocInfraWritesEnabled ? (
+        {AWSProviderSettings.adHocInfraWritesEnabled ? (
           <CreateScalingPolicyButton serverGroup={serverGroup} application={app} />
         ) : (
           <p>Can not create scaling policy, because ad-hoc operations are disabled for AWS providers.</p>

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

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

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

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

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

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

package/src/serverGroup/serverGroup.transformer.spec.ts

@@ -1,7 +1,9 @@
-import { mock, IQService, IRootScopeService, IScope } from 'angular';
+import type { IQService, IRootScopeService, IScope } from 'angular';
+import { mock } from 'angular';
 
-import { AWS_SERVER_GROUP_TRANSFORMER, AwsServerGroupTransformer } from './serverGroup.transformer';
-import { IScalingPolicyAlarmView, IAmazonServerGroup, IStepAdjustment } from '../domain';
+import type { IAmazonServerGroup, IScalingPolicyAlarmView, IStepAdjustment } from '../domain';
+import type { AwsServerGroupTransformer } from './serverGroup.transformer';
+import { AWS_SERVER_GROUP_TRANSFORMER } from './serverGroup.transformer';
 import { VpcReader } from '../vpc/VpcReader';
 
 describe('awsServerGroupTransformer', () => {

package/src/subnet/SubnetSelectInput.spec.tsx

@@ -1,10 +1,13 @@
-import React from 'react';
-import { shallow, render } from 'enzyme';
 import { mock } from 'angular';
-import { SubnetSelectInput } from './SubnetSelectInput';
-import { Application, ApplicationModelBuilder } from '@spinnaker/core';
+import { render, shallow } from 'enzyme';
+import React from 'react';
+
+import type { Application } from '@spinnaker/core';
+import { ApplicationModelBuilder } from '@spinnaker/core';
 import { mockServerGroupDataSourceConfig, mockSubnet } from '@spinnaker/mocks';
 
+import { SubnetSelectInput } from './SubnetSelectInput';
+
 describe('SubnetSelectInput', () => {
   let application: Application;
 

package/src/vpc/{VpcReader.spec.js → VpcReader.spec.ts}

@@ -1,16 +1,8 @@
-'use strict';
-import { mockHttpClient } from 'core/api/mock/jasmine';
+// eslint-disable-next-line @spinnaker/import-from-npm-not-relative
+import { mockHttpClient } from '../../../core/src/api/mock/jasmine';
 import { VpcReader } from '../vpc/VpcReader';
 
 describe('VpcReader', function () {
-  var $scope;
-
-  beforeEach(
-    window.inject(function ($rootScope) {
-      $scope = $rootScope.$new();
-    }),
-  );
-
   afterEach(function () {
     VpcReader.resetCache();
   });

package/src/vpc/VpcTag.spec.tsx

@@ -0,0 +1,37 @@
+import { mount } from 'enzyme';
+import React from 'react';
+
+import { VpcTag } from './VpcTag';
+import { VpcReader } from '../vpc/VpcReader';
+
+const tick = () => new Promise((resolve) => setTimeout(resolve));
+
+describe('VpcTag', function () {
+  describe('vpc tag rendering - no VPC provided', function () {
+    it('displays default message when no vpcId supplied', function () {
+      const component = mount(<VpcTag vpcId={undefined} />);
+      expect(component.text()).toBe('None (EC2 Classic)');
+    });
+
+    it('displays default message when null vpcId supplied', function () {
+      const component = mount(<VpcTag vpcId={null} />);
+      expect(component.text()).toBe('None (EC2 Classic)');
+    });
+  });
+
+  describe('vpc tag rendering - VPC provided', function () {
+    it('displays vpc name when found', async function () {
+      spyOn(VpcReader, 'getVpcName').and.returnValue(Promise.resolve('Main VPC'));
+      const component = mount(<VpcTag vpcId="vpc-1" />);
+      await tick();
+      expect(component.text()).toBe('Main VPC (vpc-1)');
+    });
+
+    it('displays vpc id when not found', async function () {
+      spyOn(VpcReader, 'getVpcName').and.returnValue(Promise.resolve(null));
+      const component = mount(<VpcTag vpcId="vpc-2" />);
+      await tick();
+      expect(component.text()).toBe('(vpc-2)');
+    });
+  });
+});

package/src/vpc/vpc.module.ts

@@ -1,5 +1,9 @@
 import { module } from 'angular';
-import { AMAZON_VPC_VPCTAG_DIRECTIVE } from './vpcTag.directive';
+import { react2angular } from 'react2angular';
+
+import { withErrorBoundary } from '@spinnaker/core';
+
+import { VpcTag } from './VpcTag';
 
 export const VPC_MODULE = 'spinnaker.amazon.vpc';
-module(VPC_MODULE, [AMAZON_VPC_VPCTAG_DIRECTIVE]);
+module(VPC_MODULE, []).component('vpcTag', react2angular(withErrorBoundary(VpcTag, 'vpcTag'), ['vpcId']));

package/dist/reactShims/aws.ngReact.d.ts

@@ -1,11 +0,0 @@
-/// <reference types="angular" />
-import type React from 'react';
-import { ReactInject } from '@spinnaker/core';
-import type { IScalingPolicySummaryProps } from '../serverGroup/details/scalingPolicy/ScalingPolicySummary';
-import IInjectorService = angular.auto.IInjectorService;
-export declare class AwsNgReactInjector extends ReactInject {
-    $injectorProxy: IInjectorService;
-    ScalingPolicySummary: React.ComponentClass<IScalingPolicySummaryProps>;
-    initialize($injector: IInjectorService): void;
-}
-export declare const AwsNgReact: AwsNgReactInjector;

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

@@ -1,10 +0,0 @@
-export interface IScalingPolicyTypeConfig {
-    type: string;
-    summaryTemplateUrl: string;
-}
-export declare class ScalingPolicyTypeRegistrar {
-    private policyTypes;
-    registerPolicyType(policyConfig: IScalingPolicyTypeConfig): void;
-    getPolicyConfig(policyType: string): IScalingPolicyTypeConfig;
-}
-export declare const ScalingPolicyTypeRegistry: ScalingPolicyTypeRegistrar;

package/dist/serverGroup/details/scalingPolicy/alarmBasedSummary.component.d.ts

@@ -1,2 +0,0 @@
-export const AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_ALARMBASEDSUMMARY_COMPONENT: "spinnaker.amazon.serverGroup.details.scalingPolicy.alarmBasedSummary.component";
-export const name: "spinnaker.amazon.serverGroup.details.scalingPolicy.alarmBasedSummary.component";

package/dist/serverGroup/details/scalingPolicy/detailsSummary.component.d.ts

@@ -1,12 +0,0 @@
-import type { IComponentOptions, IController } from 'angular';
-import type { Application, IServerGroup } from '@spinnaker/core';
-import type { IScalingPolicy } from '../../../domain';
-export declare class ScalingPolicyDetailsSummaryController implements IController {
-    templateUrl: string;
-    policy: IScalingPolicy;
-    serverGroup: IServerGroup;
-    application: Application;
-    $onInit(): void;
-}
-export declare const scalingPolicyDetailsSummary: IComponentOptions;
-export declare const DETAILS_SUMMARY = "spinnaker.amazon.scalingPolicy.details.summary.component";

package/dist/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.d.ts

@@ -1 +0,0 @@
-export declare const SCALING_POLICY_POPOVER = "spinnaker.amazon.serverGroup.details.scalingPolicy.popover.component";

package/dist/serverGroup/details/scalingPolicy/stepPolicySummary.component.d.ts

@@ -1 +0,0 @@
-export declare const STEP_POLICY_SUMMARY_COMPONENT = "spinnaker.amazon.scalingPolicy.stepPolicySummary.component";

package/dist/serverGroup/details/scalingPolicy/targetTracking/TargetTrackingPolicy.config.d.ts

@@ -1 +0,0 @@
-export {};

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

@@ -1,2 +0,0 @@
-import './TargetTrackingPolicy.config';
-export declare const TARGET_TRACKING_MODULE = "spinnaker.amazon.scalingPolicy.targetTracking";

package/dist/serverGroup/details/scalingPolicy/targetTracking/targetTrackingChart.component.d.ts

@@ -1 +0,0 @@
-export declare const TARGET_TRACKING_CHART_COMPONENT = "spinnaker.amazon.scalingPolicy.targetTracking.chart.component";

package/dist/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.component.d.ts

@@ -1 +0,0 @@
-export declare const TARGET_TRACKING_SUMMARY_COMPONENT = "spinnaker.amazon.scalingPolicy.targetTracking.summary.component";

package/dist/vpc/vpcTag.directive.d.ts

@@ -1,2 +0,0 @@
-export const AMAZON_VPC_VPCTAG_DIRECTIVE: "spinnaker.amazon.vpc.tag.directive";
-export const name: "spinnaker.amazon.vpc.tag.directive";

package/src/image/image.reader.spec.js

@@ -1,123 +0,0 @@
-'use strict';
-import { mockHttpClient } from 'core/api/mock/jasmine';
-import { AwsImageReader } from './image.reader';
-
-describe('Service: aws Image Reader', function () {
-  var service, scope;
-
-  beforeEach(
-    window.inject(function ($rootScope) {
-      service = new AwsImageReader();
-      scope = $rootScope.$new();
-    }),
-  );
-
-  describe('findImages', function () {
-    var query = 'abc',
-      region = 'us-west-1';
-
-    const buildQueryString = () => `/images/find?provider=aws&q=${query}&region=${region}`;
-
-    it('queries gate when 3 characters are supplied', async function () {
-      const http = mockHttpClient();
-      var result = null;
-
-      http.expectGET(buildQueryString()).respond(200, [{ success: true }]);
-
-      service.findImages({ provider: 'aws', q: query, region: region }).then(function (results) {
-        result = results;
-      });
-
-      await http.flush();
-
-      expect(result.length).toBe(1);
-      expect(result[0].success).toBe(true);
-    });
-
-    it('queries gate when more than 3 characters are supplied', async function () {
-      const http = mockHttpClient();
-      var result = null;
-
-      query = 'abcd';
-
-      http.expectGET(buildQueryString()).respond(200, [{ success: true }]);
-
-      var promise = service.findImages({ provider: 'aws', q: query, region: region });
-
-      promise.then(function (results) {
-        result = results;
-      });
-
-      await http.flush();
-
-      expect(result.length).toBe(1);
-      expect(result[0].success).toBe(true);
-    });
-
-    it('returns a message prompting user to enter more characters when less than 3 are supplied', function () {
-      query = 'ab';
-
-      var result = null;
-
-      service.findImages({ provider: 'aws', q: query, region: region }).then(function (results) {
-        result = results;
-      });
-
-      scope.$digest();
-
-      expect(result.length).toBe(1);
-      expect(result[0].message).toBe('Please enter at least 3 characters...');
-    });
-
-    it('returns an empty array when server errors', async function () {
-      const http = mockHttpClient();
-      query = 'abc';
-      var result = null;
-
-      http.expectGET(buildQueryString()).respond(404, {});
-
-      service.findImages({ provider: 'aws', q: query, region: region }).then(function (results) {
-        result = results;
-      });
-
-      await http.flush();
-
-      expect(result.length).toBe(0);
-    });
-  });
-
-  describe('getImage', function () {
-    var imageName = 'abc',
-      region = 'us-west-1',
-      credentials = 'test';
-
-    const buildQueryString = () => `/images/${credentials}/${region}/${imageName}?provider=aws`;
-
-    it('returns null if server returns 404 or an empty list', async function () {
-      const http = mockHttpClient();
-      var result = 'not null';
-
-      http.expectGET(buildQueryString()).respond(404, {});
-
-      service.getImage(imageName, region, credentials).then(function (results) {
-        result = results;
-      });
-
-      await http.flush();
-
-      expect(result).toBe(null);
-
-      result = 'not null';
-
-      http.expectGET(buildQueryString()).respond(200, []);
-
-      service.getImage(imageName, region, credentials).then(function (results) {
-        result = results;
-      });
-
-      await http.flush();
-
-      expect(result).toBe(null);
-    });
-  });
-});