Merge in

.gitignore

@@ -28,7 +28,7 @@ build/
 dist/
 lib/
 transpiled/
-app/scripts/modules/core/src/styleguide/src/public/
+app/scripts/modules/core/src/styleguide/public/
 
 # Test Results
 test-results.xml

.travis.yml

@@ -16,7 +16,9 @@ cache:
   - node_modules
 notifications:
   slack:
-    secure: tiW8Hb82slR0ldYvtoTlF8HDTwrhzgtwFFbCH8yo/1bkHhv9xRK2rF68q+DNDk9+34dDlTs5oOGYHMc8Q27S+qJUWUaj3He0BJhDTnJPaaBSOrbeMbq795hfLdGJLu4sJeTcBQ09ci51/uVl9hrNRalB2pfa/aRGvbPraxS5+TPXZpJf2x4YkMs1unTWOqbF3D1ffhgvh5R7UoqAdx/xfrQsj9aSVTvc1OrwI36vEu+bUMTvSXJ7TrdZ7rb6wR5lgcGJ1Jhk9kwyC4qvXIT09IET2Ubq7lCUwU6IqL6tHh872eRz9pG/ZQMVomlnn1gIyLu/0xI8vgxMx7UJ69ZOpeGbdNuUnEu8x+LJ/qV+O8/oc8m2DnJ9xgJCokPkmL0lv76IHxlU7G4Py6V7p28Kk59h2hCw2NSfAnsnx8pFhdu9imw2QeG5p1ueLCThq6s6tEBAYjBS0uvye6Fv62EJJd5he867aeCfm9IuXUuT33HkM0AwUo3oJuErG3errvIQiuVNK8p5vbZLNp+amBtk2tcquUUbB8g7ui61M+YNKvzGJ1ugYUo3Sp3DyvD3DFIH+kP+w3Gw85c/maYEug1CiAbHn0B2fTWpkiOkRwOrAOwN2uKSVQHW7wmXSeJiU0ggMlwTiJ8LgN/6NckqM029NuRg8TskSeSwdnGMTTCEs00=
+    rooms:
+      - secure: nehEpy2+AWBxq5hNwn+PIrjvde0lVzpQeL/NAXxa5gm0Sw/q7t8kN0+LWDKdVOfZBE2e0GEntLo3f2Wy+dJYBGD1ce9PGXgBaHByITEn4A1QFT0aoiyBx8Rd0qSsFZLZZFMO+bQBlA2zp9/FFqAF/S7upBX9XyIwW70nO2gXEftycvf/tOuowDmhrJuwjFm4Sg++Z3s9LoFzzJ5re7hyWhAXz3nxrA32ABq6AXp5ZT96CbYFF53CTw8fep1/U/MTsbOYq+nwTFOeziCPkK7wnFPNzo1gBeXDPmInTxZPq9osimFar2bplLBs2SWQP1XNVZWmSYRVHJY7TDPYLJkRYZXDS3c+NHPe65Sw7e563E/UfhuNio6b7EfUsP615RMtEYAsfzHkTU/4DwUMd3fj5eUUE4Cazg++wV8KX0yz9CWvX5R58uD5lEG0UxxVrmFEDa6AZIrtYimxzLd7TpmZuJmw+Qy7UHwJnPHyIR8A7uZcJHEab4P6urdDs/3Ipu1QIUORUlu7ciMvWD5Ql1mE0qLGzuimaOLWjYryDFH9HAln3X6kq5iapDFzRmFitxZPwah/dAi+KpRAkRd+lg5HSa9K6ZPl8/vq9rv8hTj4fq5sJfjQeaITc+mniMYYMwn+9SN+ERFl6Yu4nRW20a1aCUslj2/ZzzjIhB2S+pBhiZY=
+      - secure: k8v5fOqIji7YPphG/8j/qbbn9BPIJUE6wHBbFhOVrdcdw1TmcleXGRzxXHl7V8yoLbPcvAD1Ff+ao6hrOGT14pzKj3kgUWV8ILMV9FPTLRBff9AysHBFkoUsHj8QgswXbEZv8rDIbtzwwE4LLUJi/9RZUTT2me+v4bfAqAbCATwIXzoxWNl2E8ls6/AdAgKwVjgpm93CCEdPWG/71dAXyYgHCjaUtfZvOiSNAIcYukCUI7x3qd8x/kDfE69yPaebW7kGrflf8XUaZYRbKNkPfAcCNgJTmXFgz36znoFd7LxwjzsX2D4VyMLPwKJz0kOZS5zYv25CtuQ75m5j3I6HtciozxZzjiJwUSiSJ2Nn5khdcC16dQxQUypYxOxfWBjSRT+of8qzVT2eueRDnrerSu2c4AxpTSalWXYfBlxJJiuFdg2fVJv1PbgYR/oMPG1ePDZuvmw2scb82WXiAICpMYBlS4diYYmSQ37xXvTaXGejSu6yn1lz+ULYggGFyUuz8qILaM01TpyUMO/66qof7ppdKtJq6rrKzeKKS87JiNcTzJ604e74KC5MdFerPaHbcihgElFho6n7mOhhPTOVdwGORzzMJScJrNO7Nz7FIHwZfL7jh5y+gGeoz9nUJWRQRAq3YhbsLSxZo2QIBDoju2xzKFTFxl1Q4z80WsEp0gE=
 env:
   global:
   - secure: B3KkWCFv2I+fqAIL6NcfK6is+CrTTsrhTOxRjD1DwnqduxfGOjrS+3qVD8NfIGx7O3MsCk0CCnz1xqiOFrLERf8elhCuEuVjumSpt9VZwpsd+hKmNQeuVoFABB1hlZrHdr2rDH17KVT+TgWNTDSt9Mk3cvRAq+j2BxOHxZXDi59PiVaRGiiM4/aEBtF0/zWfusGIHRGsouGENJU1Zi6xyt0MChx3SCDL2p5qMduGWYsnnUy4BnHMPBi+pF30mjKTI+9JVrecFRuSFezh+MEE67ZiJNw/6bAsZ35sPrd/ECEiELwiEUekpNyXu9/1AxlzaKzrHDnijuZJoEvIaKV8WYwjGjhljF0QNuWGkaKQUcIs4bOKxAY2E62/ZjDbb5J8P3V7k5FD/RHdbVva0A0g7twUNR1vJIk8DFFdY4zqgCRxCyKlQKTdTjk/tV/PjxX5MAQT5J6/OgNLohA8tLRN72xvnDd9XFaKV9RJW23a4xGNUBH24wn1Od11lqR2ZU6/oejXqSojee8IgsjcCXypwW0ZS6OAOjybjxlt/n0av4MKnLFaEmUvxRP26gGJ1H8nfgNCnsLAH9UD1y1XT3VmU7g32cv8AUKyxhh/IgBG2qiqjVNaWvqK8YrepnR0Rbti5AnUiLz8QwipWW3g9DUffUWR98Ubjzs3kMzorbRB7rM=

app/scripts/modules/amazon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spinnaker/amazon",
-  "version": "0.0.58",
+  "version": "0.0.66",
   "main": "lib/lib.js",
   "typings": "lib/index.d.ts",
   "scripts": {

app/scripts/modules/amazon/src/aws.module.ts

@@ -10,6 +10,7 @@ import { AMAZON_APPLICATION_NAME_VALIDATOR } from './validation/applicationName.
 import { VPC_MODULE } from './vpc/vpc.module';
 import { SUBNET_RENDERER } from './subnet/subnet.renderer';
 import { SERVER_GROUP_DETAILS_MODULE } from './serverGroup/details/serverGroupDetails.module';
+import { SERVER_GROUP_CONFIGURE_MODULE } from './serverGroup/configure/serverGroup.configure.aws.module';
 import { COMMON_MODULE } from './common/common.module';
 import { AMAZON_HELP } from './help/amazon.help';
 
@@ -19,6 +20,25 @@ import { AmazonLoadBalancersTag } from './loadBalancer/AmazonLoadBalancersTag';
 import './deploymentStrategy/rollingPush.strategy';
 
 import './logo/aws.logo.less';
+import { AmazonLoadBalancerChoiceModal } from './loadBalancer/configure/AmazonLoadBalancerChoiceModal';
+
+import { AmazonServerGroupActions } from './serverGroup/details/AmazonServerGroupActions';
+import { amazonServerGroupDetailsGetter } from './serverGroup/details/amazonServerGroupDetailsGetter';
+
+import {
+  AdvancedSettingsDetailsSection,
+  AmazonInfoDetailsSection,
+  CapacityDetailsSection,
+  HealthDetailsSection,
+  LaunchConfigDetailsSection,
+  LogsDetailsSection,
+  PackageDetailsSection,
+  ScalingPoliciesDetailsSection,
+  ScalingProcessesDetailsSection,
+  ScheduledActionsDetailsSection,
+  SecurityGroupsDetailsSection,
+  TagsDetailsSection,
+} from './serverGroup/details/sections';
 
 // load all templates into the $templateCache
 const templates = require.context('./', true, /\.html$/);
@@ -54,6 +74,7 @@ module(AMAZON_MODULE, [
   AWS_LOAD_BALANCER_MODULE,
   require('./instance/details/instance.details.controller').name,
   AWS_SECURITY_GROUP_MODULE,
+  SERVER_GROUP_CONFIGURE_MODULE,
   SUBNET_RENDERER,
   VPC_MODULE,
   require('./image/image.reader').name,
@@ -73,8 +94,22 @@ module(AMAZON_MODULE, [
     },
     serverGroup: {
       transformer: 'awsServerGroupTransformer',
-      detailsTemplateUrl: require('./serverGroup/details/serverGroupDetails.html'),
-      detailsController: 'awsServerGroupDetailsCtrl',
+      detailsActions: AmazonServerGroupActions,
+      detailsGetter: amazonServerGroupDetailsGetter,
+      detailsSections: [
+        AmazonInfoDetailsSection,
+        CapacityDetailsSection,
+        HealthDetailsSection,
+        LaunchConfigDetailsSection,
+        SecurityGroupsDetailsSection,
+        ScalingProcessesDetailsSection,
+        ScalingPoliciesDetailsSection,
+        ScheduledActionsDetailsSection,
+        TagsDetailsSection,
+        PackageDetailsSection,
+        AdvancedSettingsDetailsSection,
+        LogsDetailsSection,
+      ],
       cloneServerGroupTemplateUrl: require('./serverGroup/configure/wizard/serverGroupWizard.html'),
       cloneServerGroupController: 'awsCloneServerGroupCtrl',
       commandBuilder: 'awsServerGroupCommandBuilder',
@@ -90,8 +125,7 @@ module(AMAZON_MODULE, [
       transformer: 'awsLoadBalancerTransformer',
       detailsTemplateUrl: require('./loadBalancer/details/loadBalancerDetails.html'),
       detailsController: 'awsLoadBalancerDetailsCtrl',
-      createLoadBalancerTemplateUrl: require('./loadBalancer/configure/choice/awsLoadBalancerChoice.modal.html'),
-      createLoadBalancerController: 'awsLoadBalancerChoiceCtrl',
+      CreateLoadBalancerModal: AmazonLoadBalancerChoiceModal,
       targetGroupDetailsTemplateUrl: require('./loadBalancer/details/targetGroupDetails.html'),
       targetGroupDetailsController: 'awsTargetGroupDetailsCtrl',
       ClusterContainer: AmazonLoadBalancerClusterContainer,

app/scripts/modules/amazon/src/domain/IAmazonLoadBalancer.ts

@@ -1,5 +1,9 @@
 import { IAmazonLoadBalancerSourceData } from './IAmazonLoadBalancerSourceData';
-import { ILoadBalancer, ILoadBalancerDeleteCommand, ILoadBalancerUpsertCommand, IInstance, IInstanceCounts, IServerGroup, ISubnet } from '@spinnaker/core';
+import { ILoadBalancer, ILoadBalancerDeleteCommand, ILoadBalancerUpsertCommand, IInstance, IInstanceCounts, ISubnet } from '@spinnaker/core';
+import { IAmazonServerGroup } from './IAmazonServerGroup';
+
+export type ClassicListenerProtocol = 'HTTP' | 'HTTPS' | 'TCP' | 'SSL';
+export type ALBListenerProtocol = 'HTTP' | 'HTTPS';
 
 export interface IAmazonLoadBalancer extends ILoadBalancer {
   availabilityZones?: string[];
@@ -8,15 +12,16 @@ export interface IAmazonLoadBalancer extends ILoadBalancer {
   elb?: IAmazonLoadBalancerSourceData;
   isInternal?: boolean;
   regionZones: string[];
+  serverGroups: IAmazonServerGroup[];
   subnets?: string[];
   subnetDetails?: ISubnet[];
   subnetType?: string;
 }
 
 export interface IClassicListener {
-  internalProtocol: 'HTTP' | 'HTTPS' | 'TCP' | 'SSL';
+  internalProtocol: ClassicListenerProtocol;
   internalPort: number;
-  externalProtocol: 'HTTP' | 'HTTPS' | 'TCP' | 'SSL';
+  externalProtocol: ClassicListenerProtocol;
   externalPort: number;
   sslCertificateType?: string;
 }
@@ -49,6 +54,7 @@ export interface IALBListenerCertificate {
   type: string;
   name: string;
 }
+
 export interface IALBListener {
   certificates: IALBListenerCertificate[];
   defaultActions: IListenerAction[];
@@ -65,8 +71,10 @@ export interface IListenerRule {
   priority: number | 'default';
 }
 
+export type ListenerRuleConditionField = 'path-pattern' | 'host-header';
+
 export interface IListenerRuleCondition {
-  field: 'path-pattern' | 'host-header';
+  field: ListenerRuleConditionField;
   values: string[];
 }
 
@@ -97,12 +105,50 @@ export interface ITargetGroup {
   protocol: string;
   provider?: string;
   region: string; // returned from clouddriver
-  serverGroups?: IServerGroup[];
+  serverGroups?: IAmazonServerGroup[];
   type: string; // returned from clouddriver
   vpcId?: string;
   vpcName?: string;
 }
 
+export interface IALBListenerDescription {
+  certificates?: IALBListenerCertificate[];
+  protocol: 'HTTP' | 'HTTPS';
+  port: number;
+  sslPolicy?: string;
+  defaultActions: IListenerAction[];
+  rules?: IListenerRule[];
+}
+
+export interface IALBTargetGroupDescription {
+  name: string;
+  protocol: 'HTTP' | 'HTTPS';
+  port: number;
+  attributes: {
+    // Defaults to 300
+    deregistrationDelay?: number;
+    // Defaults to false
+    stickinessEnabled?: boolean;
+    // Defaults to 'lb_cookie'. The only option for now, but they promise there will be more...
+    stickinessType?: 'lb_cookie';
+    // Defaults to 86400
+    stickinessDuration?: number;
+  };
+  // Defaults to 10
+  healthCheckInterval?: number;
+  // Defaults to '200-299'
+  healthCheckMatcher?: string;
+  healthCheckPath: string;
+  healthCheckPort: string;
+  healthCheckProtocol: 'HTTP' | 'HTTPS';
+  // Defaults to 10
+  healthyThreshold?: number;
+  // Defaults to 5
+  healthCheckTimeout?: number;
+  // Defaults to 2
+  unhealthyThreshold?: number;
+}
+
 export interface IAmazonLoadBalancerUpsertCommand extends ILoadBalancerUpsertCommand {
   availabilityZones: { [region: string]: string[] };
   isInternal: boolean;
@@ -113,6 +159,7 @@ export interface IAmazonLoadBalancerUpsertCommand extends ILoadBalancerUpsertCom
   regionZones: string[];
   securityGroups: string[];
   subnetType: string;
+  usePreferredZones?: boolean;
   vpcId: string;
 }
 
@@ -137,45 +184,8 @@ export interface IAmazonClassicLoadBalancerUpsertCommand extends IAmazonLoadBala
   unhealthyThreshold?: number;
 }
 
+
 export interface IAmazonApplicationLoadBalancerUpsertCommand extends IAmazonLoadBalancerUpsertCommand {
-  listeners: {
-    certificates?: {
-      certificateArn: string;
-      name?: string; // Only used while creating the description
-      type?: string; // Only used while creating the description
-    }[];
-    protocol: 'HTTP' | 'HTTPS';
-    port: number;
-    sslPolicy?: string;
-    defaultActions: IListenerAction[];
-    rules?: IListenerRule[];
-  }[];
-  targetGroups: {
-    name: string;
-    protocol: 'HTTP' | 'HTTPS';
-    port: number;
-    attributes: {
-      // Defaults to 300
-      deregistrationDelay?: number;
-      // Defaults to false
-      stickinessEnabled?: boolean;
-      // Defaults to 'lb_cookie'. The only option for now, but they promise there will be more...
-      stickinessType?: 'lb_cookie';
-      // Defaults to 86400
-      stickinessDuration?: number;
-    };
-    // Defaults to 10
-    healthCheckInterval?: number;
-    // Defaults to '200-299'
-    healthCheckMatcher?: string;
-    healthCheckPath: string;
-    healthCheckPort: string;
-    healthCheckProtocol: 'HTTP' | 'HTTPS';
-    // Defaults to 10
-    healthyThreshold?: number;
-    // Defaults to 5
-    healthCheckTimeout?: number;
-    // Defaults to 2
-    unhealthyThreshold?: number;
-  }[];
+  listeners: IALBListenerDescription[];
+  targetGroups: IALBTargetGroupDescription[];
 }

app/scripts/modules/amazon/src/domain/IAmazonServerGroup.ts

@@ -1,22 +1,34 @@
-import { IServerGroup, IAsg } from '@spinnaker/core';
+import { IAccountDetails, IServerGroup, IAsg } from '@spinnaker/core';
 
 import { IScalingPolicy } from './IScalingPolicy';
 import { IScalingPolicyView } from 'amazon/domain';
 
 export interface IAmazonAsg extends IAsg {
+  availabilityZones: string[];
   defaultCooldown: number;
   healthCheckType: string;
   healthCheckGracePeriod: number;
   terminationPolicies: string[];
   enabledMetrics: { metric: string }[];
+  vpczoneIdentifier?: string;
 }
 
 export interface IAmazonServerGroup extends IServerGroup {
+  image?: any;
   scalingPolicies?: IScalingPolicy[];
   targetGroups?: string[];
   asg: IAmazonAsg;
 }
 
+export interface IScheduledAction {
+  recurrence: number;
+  minSize: number;
+  maxSize: number;
+  desiredCapacity: number;
+}
+
 export interface IAmazonServerGroupView extends IAmazonServerGroup {
+  accountDetails?: IAccountDetails;
   scalingPolicies: IScalingPolicyView[];
+  scheduledActions?: IScheduledAction[];
 }

app/scripts/modules/amazon/src/domain/IScalingProcess.ts

@@ -0,0 +1,6 @@
+export interface IScalingProcess {
+  name: string;
+  enabled: boolean;
+  description: string;
+  suspensionDate: number;
+}

app/scripts/modules/amazon/src/domain/index.ts

@@ -6,4 +6,5 @@ export * from './IAmazonScalingPolicy';
 export * from './IAmazonServerGroup';
 export * from './IKeyPair';
 export * from './IScalingPolicy';
+export * from './IScalingProcess';
 export * from './ITargetTrackingPolicy';

app/scripts/modules/amazon/src/instance/details/instanceDetails.html

@@ -55,7 +55,6 @@ <h3 select-on-dbl-click>
             <li ng-repeat="action in instance.insightActions"><a target=_blank href="{{action.url}}">{{action.label}}</a></li>
           </ul>
         </div>
-        <div class="clearfix"></div>
       </div>
     </div>
   </div>

app/scripts/modules/amazon/src/loadBalancer/AmazonLoadBalancersTag.tsx

@@ -69,6 +69,7 @@ export interface IAmazonLoadBalancersTagState {
 @BindAll()
 export class AmazonLoadBalancersTag extends React.Component<ILoadBalancersTagProps, IAmazonLoadBalancersTagState> {
   private loadBalancersRefreshUnsubscribe: () => void;
+  private mounted = false;
 
   constructor(props: ILoadBalancersTagProps) {
     super(props);
@@ -77,8 +78,18 @@ export class AmazonLoadBalancersTag extends React.Component<ILoadBalancersTagPro
       targetGroups: [],
     };
 
-    LoadBalancerDataUtils.populateLoadBalancers(props.application, props.serverGroup).then((loadBalancers) => this.setState({ loadBalancers }));
-    AmazonLoadBalancerDataUtils.populateTargetGroups(props.application, props.serverGroup as IAmazonServerGroup).then((targetGroups: ITargetGroup[]) => this.setState({ targetGroups }))
+    LoadBalancerDataUtils.populateLoadBalancers(props.application, props.serverGroup)
+      .then((loadBalancers) => {
+        if (this.mounted) {
+          this.setState({ loadBalancers });
+        }
+      });
+    AmazonLoadBalancerDataUtils.populateTargetGroups(props.application, props.serverGroup as IAmazonServerGroup)
+      .then((targetGroups: ITargetGroup[]) => {
+        if (this.mounted) {
+          this.setState({ targetGroups });
+        }
+      });
   }
 
   private showLoadBalancerDetails(loadBalancer: ILoadBalancer): void {
@@ -107,10 +118,12 @@ export class AmazonLoadBalancersTag extends React.Component<ILoadBalancersTagPro
   }
 
   public componentDidMount(): void {
+    this.mounted = true;
     this.loadBalancersRefreshUnsubscribe = this.props.application.getDataSource('loadBalancers').onRefresh(null, () => { this.forceUpdate(); });
   }
 
   public componentWillUnmount(): void {
+    this.mounted = false;
     this.loadBalancersRefreshUnsubscribe();
   }
 

app/scripts/modules/amazon/src/loadBalancer/TargetGroupDetails.tsx

@@ -0,0 +1,14 @@
+import * as React from 'react';
+import { Overridable, IOverridableProps } from '@spinnaker/core';
+
+export interface ITargetGroupDetailsProps extends IOverridableProps {
+}
+
+@Overridable('loadBalancer.targetGroupDetails')
+export class TargetGroupDetails extends React.Component<ITargetGroupDetailsProps> {
+  public render() {
+    return (
+      <h3>Target Group Details</h3>
+    );
+  }
+}