update master

.github/workflows/approve_package_bumps.yml

@@ -39,8 +39,14 @@ jobs:
 
       - name: Add ready to merge label
         if: steps.purebump.outputs.ispurebump == 'true'
-        uses: actions/github@v1.0.0
+        # pin to v3.0.0 tag by commit hash
+        uses: actions/github-script@626af12
         with:
-          args: label "ready to merge"
-        env:
-          GITHUB_TOKEN: ${{ secrets.SPINNAKERBOT_TOKEN }}
+          github-token: ${{ secrets.SPINNAKERBOT_TOKEN }}
+          script: |
+            github.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['ready to rebase']
+            })

.storybook/main.js

@@ -1,8 +1,9 @@
-const deckWebpackConfigurer = require('../webpack.config');
 const createCompiler = require('@storybook/addon-docs/mdx-compiler-plugin');
 
+const deckWebpackConfigurer = require('../webpack.config');
+
 module.exports = {
-  addons: ['@storybook/preset-typescript', '@storybook/addon-essentials'],
+  addons: ['@storybook/preset-typescript', '@storybook/addon-essentials', '@storybook/addon-storysource'],
   stories: [
     '../app/scripts/modules/core/src/presentation/**/*.stories.[tj]sx',
     '../app/scripts/modules/core/src/presentation/**/*.stories.mdx',
@@ -30,6 +31,16 @@ module.exports = {
           { loader: '@mdx-js/loader', options: { compilers: [createCompiler()] } },
         ],
       },
+      {
+        test: /\.stories\.tsx?$/,
+        loaders: [
+          {
+            loader: require.resolve('@storybook/source-loader'),
+            options: { parser: 'typescript' },
+          },
+        ],
+        enforce: 'pre',
+      },
     ];
 
     config.watch = true;

.storybook/preview.js

@@ -0,0 +1,13 @@
+import { setConsoleOptions } from '@storybook/addon-console';
+
+setConsoleOptions({
+  panelInclude: [/{/],
+});
+
+export const parameters = {
+  options: {
+    storySort: {
+      order: ['Forms', ['Intro']],
+    },
+  },
+};

Dockerfile.compile

@@ -1,4 +1,8 @@
-FROM openjdk:8
+FROM openjdk:11-slim
+
+RUN apt-get update && apt-get install -y \
+  git
+
 LABEL maintainer="sig-platform@spinnaker.io"
 ENV GRADLE_USER_HOME /workspace/.gradle
 ENV GRADLE_OPTS -Xmx2048m

app/scripts/app.ts

@@ -1,3 +1,4 @@
+///<reference path="./modules/core/src/types/index.d.ts" />
 import 'jquery'; // ensures jQuery is loaded before Angular so Angular does not use jqlite
 import { module } from 'angular';
 import './strictDi';

app/scripts/modules/amazon/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@spinnaker/amazon",
   "license": "Apache-2.0",
-  "version": "0.0.268",
+  "version": "0.0.284",
   "main": "lib/lib.js",
   "typings": "lib/index.d.ts",
   "scripts": {
-    "clean": "../../../../node_modules/rimraf/bin.js lib",
-    "lib": "npm run clean && ../../../../node_modules/typescript/bin/tsc && node ../../../../node_modules/webpack/bin/webpack.js",
-    "prepublishOnly": "npm run lib"
+    "clean": "../../../../node_modules/.bin/rimraf lib",
+    "lib": "npm run build",
+    "prepublishOnly": "npm run lib",
+    "build": "npm run clean && ../../../../node_modules/.bin/tsc && node ../../../../node_modules/.bin/webpack"
   }
 }

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

@@ -70,11 +70,13 @@ import { AMAZON_INSTANCE_DETAILS_INSTANCE_DETAILS_CONTROLLER } from './instance/
 import { AMAZON_SEARCH_SEARCHRESULTFORMATTER } from './search/searchResultFormatter';
 import { AWS_EVALUATE_CLOUD_FORMATION_CHANGE_SET_EXECUTION_SERVICE } from './pipeline/stages/deployCloudFormation/evaluateCloudFormationChangeSetExecution.service';
 import { INSTANCE_STATUS_COMPONENT } from './instance/details/instanceStatus.component';
+import { INSTANCE_TAGS_COMPONENT } from './instance/details/instanceTags.component';
+import { INSTANCE_SECURITY_GROUPS_COMPONENT } from './instance/details/instanceSecurityGroups.component';
 import { AMAZON_INSTANCE_INFORMATION_COMPONENT } from './instance/details/amazonInstanceInformation.component';
 
 // load all templates into the $templateCache
 const templates = require.context('./', true, /\.html$/);
-templates.keys().forEach(function(key) {
+templates.keys().forEach(function (key) {
   templates(key);
 });
 
@@ -111,6 +113,8 @@ module(AMAZON_MODULE, [
   CLOUD_FORMATION_CHANGE_SET_INFO,
   AWS_EVALUATE_CLOUD_FORMATION_CHANGE_SET_EXECUTION_SERVICE,
   INSTANCE_STATUS_COMPONENT,
+  INSTANCE_TAGS_COMPONENT,
+  INSTANCE_SECURITY_GROUPS_COMPONENT,
   AMAZON_INSTANCE_INFORMATION_COMPONENT,
 ]).config(() => {
   CloudProviderRegistry.registerProvider('aws', {

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

@@ -46,6 +46,7 @@ export interface IAWSProviderSettings extends IProviderSettings {
     enableIPv6?: boolean;
     enableIMDSv2?: boolean;
     defaultIMDSv2AppAgeLimit?: number;
+    enableCpuCredits?: boolean;
   };
   useAmiBlockDeviceMappings?: boolean;
 }

app/scripts/modules/amazon/src/certificates/AmazonCertificateReader.ts

@@ -1,21 +1,20 @@
-import { IPromise } from 'angular';
 import { groupBy, sortBy } from 'lodash';
 
 import { AccountService, CertificateReader } from '@spinnaker/core';
 import { IAmazonCertificate } from 'amazon/domain';
 
 export class AmazonCertificateReader {
-  public static listCertificates(): IPromise<{ [accountId: string]: IAmazonCertificate[] }> {
+  public static listCertificates(): PromiseLike<{ [accountId: string]: IAmazonCertificate[] }> {
     return CertificateReader.listCertificatesByProvider('aws').then((certificates: IAmazonCertificate[]) => {
       // This account grouping should really go into clouddriver but since it's not, put it here for now.
-      return AccountService.listAllAccounts('aws').then(allAccountDetails => {
+      return AccountService.listAllAccounts('aws').then((allAccountDetails) => {
         const accountIdToName = allAccountDetails.reduce((acc, accountDetails) => {
           acc[accountDetails.accountId] = accountDetails.name;
           return acc;
         }, {} as { [id: string]: string });
 
         const sortedCertificates = sortBy(certificates, 'serverCertificateName');
-        return groupBy(sortedCertificates, cert => {
+        return groupBy(sortedCertificates, (cert) => {
           const [, , , , accountId] = cert.arn.split(':');
           return accountIdToName[accountId] || 'unknown';
         });

app/scripts/modules/amazon/src/common/AwsModalFooter.tsx

@@ -25,7 +25,7 @@ export class AwsModalFooter extends React.Component<IAwsModalFooterProps, IAwsMo
   public componentDidMount() {
     AccountService.accounts$
       .take(1)
-      .map((accounts: IAccountDetails[]) => accounts.find(account => account.name === this.props.account))
+      .map((accounts: IAccountDetails[]) => accounts.find((account) => account.name === this.props.account))
       .subscribe((account: IAccountDetails) => {
         this.setState({ requireVerification: !!account && account.challengeDestructiveActions });
       });

app/scripts/modules/amazon/src/deploymentStrategy/AdditionalFields.tsx

@@ -39,7 +39,7 @@ export class AdditionalFields extends React.Component<IRollingPushStrategyAdditi
               <input
                 type="checkbox"
                 checked={command.termination.relaunchAllInstances}
-                onChange={e => this.handleChange('relaunchAllInstances', e.target.checked)}
+                onChange={(e) => this.handleChange('relaunchAllInstances', e.target.checked)}
               />
               <b>Relaunch all instances</b>
               <HelpField id="strategy.rollingPush.relaunchAll" />
@@ -58,7 +58,7 @@ export class AdditionalFields extends React.Component<IRollingPushStrategyAdditi
                 className="form-control input-sm"
                 type="number"
                 value={command.termination.totalRelaunches}
-                onChange={e => this.handleChange('totalRelaunches', e.target.value)}
+                onChange={(e) => this.handleChange('totalRelaunches', e.target.value)}
                 min="0"
               />
             </div>
@@ -76,7 +76,7 @@ export class AdditionalFields extends React.Component<IRollingPushStrategyAdditi
                 className="form-control input-sm"
                 type="number"
                 value={command.termination.concurrentRelaunches}
-                onChange={e => this.handleChange('concurrentRelaunches', e.target.value)}
+                onChange={(e) => this.handleChange('concurrentRelaunches', e.target.value)}
                 min="1"
               />
             </div>
@@ -94,7 +94,7 @@ export class AdditionalFields extends React.Component<IRollingPushStrategyAdditi
                 className="input input-sm"
                 style={{ width: '100px' }}
                 value={command.termination.order}
-                onChange={e => this.handleChange('order', e.target.value)}
+                onChange={(e) => this.handleChange('order', e.target.value)}
               >
                 <option value="oldest">oldest first</option>
                 <option value="newest">newest first</option>

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

@@ -1,8 +1,11 @@
 import { IInstance } from '@spinnaker/core';
+import { IAmazonSecurityGroup } from './IAmazonSecurityGroup';
 
 export interface IAmazonInstance extends IInstance {
   imageId?: string;
   instanceType?: string;
+  capacityType?: string;
+  securityGroups?: IAmazonSecurityGroup[];
   subnetId?: string;
   targetGroups?: string[];
 }

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

@@ -46,6 +46,9 @@ export interface IMetadataOptions {
 export interface INetworkInterface {
   deviceIndex: number;
   groups: string[];
+  ipv6AddressCount?: number;
+  associatePublicIpAddress?: boolean;
+  ipv6Addresses?: string[];
 }
 
 export interface ITagSpecification {
@@ -56,10 +59,15 @@ export interface ITagSpecification {
   }>;
 }
 
+export interface ICreditSpecification {
+  cpuCredits?: string;
+}
+
 export interface ILaunchTemplateData {
   [attribute: string]: any;
   blockDeviceMappings?: IBlockDeviceMapping[];
   cpuOptions?: ICpuOptions;
+  creditSpecification?: ICreditSpecification;
   disableApiTermination?: boolean;
   ebsOptimized: boolean;
   elasticGpuSpecifications?: IElasticGpuSpecification[];

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

@@ -56,6 +56,7 @@ export interface IAmazonApplicationLoadBalancer extends IAmazonLoadBalancer {
   ipAddressType?: string; // returned from clouddriver
   deletionProtection: boolean;
   idleTimeout: number;
+  loadBalancingCrossZone: boolean;
 }
 
 export interface IAmazonNetworkLoadBalancer extends IAmazonLoadBalancer {
@@ -64,6 +65,7 @@ export interface IAmazonNetworkLoadBalancer extends IAmazonLoadBalancer {
   ipAddressType?: string; // returned from clouddriver
   deletionProtection: boolean;
   idleTimeout: number;
+  loadBalancingCrossZone: boolean;
 }
 
 export interface IRedirectActionConfig {
@@ -267,6 +269,7 @@ export interface IAmazonApplicationLoadBalancerUpsertCommand extends IAmazonLoad
 
 export interface IAmazonNetworkLoadBalancerUpsertCommand extends IAmazonLoadBalancerUpsertCommand {
   deletionProtection: boolean;
+  loadBalancingCrossZone: boolean;
   listeners: IListenerDescription[];
   targetGroups: INLBTargetGroupDescription[];
 }

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

@@ -0,0 +1,4 @@
+export interface IAmazonSecurityGroup {
+  groupId: string;
+  groupName: string;
+}

app/scripts/modules/amazon/src/function/configure/ExecutionRole.tsx

@@ -12,18 +12,16 @@ export interface IExecutionRoleProps {
   functionDef: IAmazonFunction;
 }
 
-export class ExecutionRole extends React.Component<IExecutionRoleProps>
+export class ExecutionRole
+  extends React.Component<IExecutionRoleProps>
   implements IWizardPageComponent<IAmazonFunctionUpsertCommand> {
   constructor(props: IExecutionRoleProps) {
     super(props);
   }
 
   public validate(values: IAmazonFunctionUpsertCommand): FormikErrors<IAmazonFunctionUpsertCommand> {
     const validator = new FormValidator(values);
-    validator
-      .field('role', 'Role ARN')
-      .required()
-      .withValidators(iamRoleValidator);
+    validator.field('role', 'Role ARN').required().withValidators(iamRoleValidator);
     return validator.validateForm();
   }
 
@@ -35,7 +33,7 @@ export class ExecutionRole extends React.Component<IExecutionRoleProps>
             <FormikFormField
               name="role"
               label="Role ARN"
-              input={props => <TextInput {...props} placeholder="Enter role ARN" name="role" />}
+              input={(props) => <TextInput {...props} placeholder="Enter role ARN" name="role" />}
               required={true}
             />
           </div>