Merge branch 'master' into userpool-ses

Author: mergify[bot]

packages/@aws-cdk/aws-ec2/lib/instance-types.ts

@@ -466,6 +466,16 @@ export enum InstanceClass {
    */
   G4DN = 'g4dn',
 
+  /**
+   * Graphics-optimized instances, 5th generation
+   */
+  GRAPHICS5 = 'g5',
+
+  /**
+   * Graphics-optimized instances, 5th generation
+   */
+  G5 = 'g5',
+
   /**
    * Parallel-processing optimized instances, 2nd generation
    */
@@ -666,6 +676,11 @@ export enum InstanceSize {
    */
   XLARGE32 = '32xlarge',
 
+  /**
+   * Instance size XLARGE48 (48xlarge)
+   */
+  XLARGE48 = '48xlarge',
+
   /**
    * Instance size METAL (metal)
    */

packages/@aws-cdk/aws-ecr-assets/lib/image-asset.ts

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as ecr from '@aws-cdk/aws-ecr';
-import { Annotations, AssetStaging, FeatureFlags, FileFingerprintOptions, IgnoreMode, Stack, SymlinkFollowMode, Token, Stage } from '@aws-cdk/core';
+import { Annotations, AssetStaging, FeatureFlags, FileFingerprintOptions, IgnoreMode, Stack, SymlinkFollowMode, Token, Stage, CfnResource } from '@aws-cdk/core';
 import * as cxapi from '@aws-cdk/cx-api';
 import { Construct } from 'constructs';
 
@@ -147,6 +147,30 @@ export class DockerImageAsset extends CoreConstruct implements IAsset {
    */
   public readonly assetHash: string;
 
+  /**
+   * The path to the asset, relative to the current Cloud Assembly
+   *
+   * If asset staging is disabled, this will just be the original path.
+   *
+   * If asset staging is enabled it will be the staged path.
+   */
+  private readonly assetPath: string;
+
+  /**
+   * The path to the Dockerfile, relative to the assetPath
+   */
+  private readonly dockerfilePath?: string;
+
+  /**
+   * Build args to pass to the `docker build` command.
+   */
+  private readonly dockerBuildArgs?: { [key: string]: string };
+
+  /**
+   * Docker target to build to
+   */
+  private readonly dockerBuildTarget?: string;
+
   constructor(scope: Construct, id: string, props: DockerImageAssetProps) {
     super(scope, id);
 
@@ -160,7 +184,8 @@ export class DockerImageAsset extends CoreConstruct implements IAsset {
     }
 
     // validate the docker file exists
-    const file = path.join(dir, props.file || 'Dockerfile');
+    this.dockerfilePath = props.file || 'Dockerfile';
+    const file = path.join(dir, this.dockerfilePath);
     if (!fs.existsSync(file)) {
       throw new Error(`Cannot find file at ${file}`);
     }
@@ -223,17 +248,53 @@ export class DockerImageAsset extends CoreConstruct implements IAsset {
     this.assetHash = staging.assetHash;
 
     const stack = Stack.of(this);
+    this.assetPath = staging.relativeStagedPath(stack);
+    this.dockerBuildArgs = props.buildArgs;
+    this.dockerBuildTarget = props.target;
+
     const location = stack.synthesizer.addDockerImageAsset({
-      directoryName: staging.relativeStagedPath(stack),
-      dockerBuildArgs: props.buildArgs,
-      dockerBuildTarget: props.target,
+      directoryName: this.assetPath,
+      dockerBuildArgs: this.dockerBuildArgs,
+      dockerBuildTarget: this.dockerBuildTarget,
       dockerFile: props.file,
       sourceHash: staging.assetHash,
     });
 
     this.repository = ecr.Repository.fromRepositoryName(this, 'Repository', location.repositoryName);
     this.imageUri = location.imageUri;
   }
+
+  /**
+   * Adds CloudFormation template metadata to the specified resource with
+   * information that indicates which resource property is mapped to this local
+   * asset. This can be used by tools such as SAM CLI to provide local
+   * experience such as local invocation and debugging of Lambda functions.
+   *
+   * Asset metadata will only be included if the stack is synthesized with the
+   * "aws:cdk:enable-asset-metadata" context key defined, which is the default
+   * behavior when synthesizing via the CDK Toolkit.
+   *
+   * @see https://github.com/aws/aws-cdk/issues/1432
+   *
+   * @param resource The CloudFormation resource which is using this asset [disable-awslint:ref-via-interface]
+   * @param resourceProperty The property name where this asset is referenced
+   */
+  public addResourceMetadata(resource: CfnResource, resourceProperty: string) {
+    if (!this.node.tryGetContext(cxapi.ASSET_RESOURCE_METADATA_ENABLED_CONTEXT)) {
+      return; // not enabled
+    }
+
+    // tell tools such as SAM CLI that the resourceProperty of this resource
+    // points to a local path and include the path to de dockerfile, docker build args, and target,
+    // in order to enable local invocation of this function.
+    resource.cfnOptions.metadata = resource.cfnOptions.metadata || { };
+    resource.cfnOptions.metadata[cxapi.ASSET_RESOURCE_METADATA_PATH_KEY] = this.assetPath;
+    resource.cfnOptions.metadata[cxapi.ASSET_RESOURCE_METADATA_DOCKERFILE_PATH_KEY] = this.dockerfilePath;
+    resource.cfnOptions.metadata[cxapi.ASSET_RESOURCE_METADATA_DOCKER_BUILD_ARGS_KEY] = this.dockerBuildArgs;
+    resource.cfnOptions.metadata[cxapi.ASSET_RESOURCE_METADATA_DOCKER_BUILD_TARGET_KEY] = this.dockerBuildTarget;
+    resource.cfnOptions.metadata[cxapi.ASSET_RESOURCE_METADATA_PROPERTY_KEY] = resourceProperty;
+  }
+
 }
 
 function validateProps(props: DockerImageAssetProps) {

packages/@aws-cdk/aws-iot-actions/README.md

@@ -136,9 +136,7 @@ import * as s3 from '@aws-cdk/aws-s3';
 import * as firehose from '@aws-cdk/aws-kinesisfirehose';
 import * as destinations from '@aws-cdk/aws-kinesisfirehose-destinations';
 
-const bucket = new s3.Bucket(this, 'MyBucket', {
-  removalPolicy: cdk.RemovalPolicy.DESTROY,
-});
+const bucket = new s3.Bucket(this, 'MyBucket');
 const stream = new firehose.DeliveryStream(this, 'MyStream', {
   destinations: [new destinations.S3Bucket(bucket)],
 });
@@ -149,7 +147,7 @@ const topicRule = new iot.TopicRule(this, 'TopicRule', {
     new actions.FirehoseStreamAction(stream, {
       batchMode: true,
       recordSeparator: actions.FirehoseStreamRecordSeparator.NEWLINE,
-    })
+    }),
   ],
 });
 ```

packages/@aws-cdk/aws-iot-actions/lib/firehose-stream-action.ts

@@ -32,7 +32,7 @@ export enum FirehoseStreamRecordSeparator {
 /**
  * Configuration properties of an action for the Kinesis Data Firehose stream.
  */
-export interface FirehoseStreamProps extends CommonActionProps {
+export interface FirehoseStreamActionProps extends CommonActionProps {
   /**
    * Whether to deliver the Kinesis Data Firehose stream as a batch by using `PutRecordBatch`.
    * When batchMode is true and the rule's SQL statement evaluates to an Array, each Array
@@ -64,7 +64,7 @@ export class FirehoseStreamAction implements iot.IAction {
    * @param stream The Kinesis Data Firehose stream to which to put records.
    * @param props Optional properties to not use default
    */
-  constructor(private readonly stream: firehose.IDeliveryStream, props: FirehoseStreamProps = {}) {
+  constructor(private readonly stream: firehose.IDeliveryStream, props: FirehoseStreamActionProps = {}) {
     this.batchMode = props.batchMode;
     this.recordSeparator = props.recordSeparator;
     this.role = props.role;