Skip to content

Commit 8e4e2e2

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'master' into nija-at/bundling-import-return
2 parents 0045cea + 8fb30ea commit 8e4e2e2

6 files changed

Lines changed: 58 additions & 29 deletions

File tree

‎packages/@aws-cdk/assets/lib/fs/options.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export interface CopyOptions {
1010
* A strategy for how to handle symlinks.
1111
*
1212
* @default Never
13+
* @deprecated use `followSymlinks` instead
1314
*/
1415
readonly follow?: FollowMode;
1516

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

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import * as fs from 'fs';
22
import * as path from 'path';
33
import * as ecr from '@aws-cdk/aws-ecr';
4-
import { Annotations, FeatureFlags, IgnoreMode, Stack, Token } from '@aws-cdk/core';
4+
import { Annotations, AssetStaging, FeatureFlags, FileFingerprintOptions, IgnoreMode, Stack, SymlinkFollowMode, Token } from '@aws-cdk/core';
55
import * as cxapi from '@aws-cdk/cx-api';
66
import { Construct } from 'constructs';
77

88
// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
99
// eslint-disable-next-line
10-
import { FingerprintOptions, IAsset, Staging } from '@aws-cdk/assets';
10+
import { FingerprintOptions, FollowMode, IAsset } from '@aws-cdk/assets';
1111
// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
1212
// eslint-disable-next-line no-duplicate-imports, import/order
1313
import { Construct as CoreConstruct } from '@aws-cdk/core';
1414

1515
/**
1616
* Options for DockerImageAsset
1717
*/
18-
export interface DockerImageAssetOptions extends FingerprintOptions {
18+
export interface DockerImageAssetOptions extends FingerprintOptions, FileFingerprintOptions {
1919
/**
2020
* ECR repository name
2121
*
@@ -156,8 +156,9 @@ export class DockerImageAsset extends CoreConstruct implements IAsset {
156156
// deletion of the ECR repository the app used).
157157
extraHash.version = '1.21.0';
158158

159-
const staging = new Staging(this, 'Staging', {
159+
const staging = new AssetStaging(this, 'Staging', {
160160
...props,
161+
follow: props.followSymlinks ?? toSymlinkFollow(props.follow),
161162
exclude,
162163
ignoreMode,
163164
sourcePath: dir,
@@ -200,3 +201,13 @@ function validateBuildArgs(buildArgs?: { [key: string]: string }) {
200201
}
201202
}
202203
}
204+
205+
function toSymlinkFollow(follow?: FollowMode): SymlinkFollowMode | undefined {
206+
switch (follow) {
207+
case undefined: return undefined;
208+
case FollowMode.NEVER: return SymlinkFollowMode.NEVER;
209+
case FollowMode.ALWAYS: return SymlinkFollowMode.ALWAYS;
210+
case FollowMode.BLOCK_EXTERNAL: return SymlinkFollowMode.BLOCK_EXTERNAL;
211+
case FollowMode.EXTERNAL: return SymlinkFollowMode.EXTERNAL;
212+
}
213+
}

‎packages/@aws-cdk/aws-lambda-nodejs/README.md‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33

44
---
55

6-
![cdk-constructs: Experimental](https://img.shields.io/badge/cdk--constructs-experimental-important.svg?style=for-the-badge)
7-
8-
> The APIs of higher level constructs in this module are experimental and under active development.
9-
> They are subject to non-backward compatible changes or removal in any future version. These are
10-
> not subject to the [Semantic Versioning](https://semver.org/) model and breaking changes will be
11-
> announced in the release notes. This means that while you may use them, you may need to update
12-
> your source code when upgrading to a newer version of this package.
6+
![cdk-constructs: Stable](https://img.shields.io/badge/cdk--constructs-stable-success.svg?style=for-the-badge)
137

148
---
159

‎packages/@aws-cdk/aws-lambda-nodejs/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
"engines": {
8585
"node": ">= 10.13.0 <13 || >=13.7.0"
8686
},
87-
"stability": "experimental",
88-
"maturity": "experimental",
87+
"stability": "stable",
88+
"maturity": "stable",
8989
"awscdkio": {
9090
"announce": false
9191
},

‎packages/@aws-cdk/aws-s3-assets/lib/asset.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { CopyOptions } from '@aws-cdk/assets';
1414
// eslint-disable-next-line no-duplicate-imports, import/order
1515
import { Construct as CoreConstruct } from '@aws-cdk/core';
1616

17-
export interface AssetOptions extends CopyOptions, cdk.AssetOptions {
17+
export interface AssetOptions extends CopyOptions, cdk.FileCopyOptions, cdk.AssetOptions {
1818
/**
1919
* A list of principals that should be able to read this asset from S3.
2020
* You can use `asset.grantRead(principal)` to grant read permissions later.
@@ -127,7 +127,7 @@ export class Asset extends CoreConstruct implements cdk.IAsset {
127127
const staging = new cdk.AssetStaging(this, 'Stage', {
128128
...props,
129129
sourcePath: path.resolve(props.path),
130-
follow: toSymlinkFollow(props.follow),
130+
follow: props.followSymlinks ?? toSymlinkFollow(props.follow),
131131
assetHash: props.assetHash ?? props.sourceHash,
132132
});
133133

‎packages/@aws-cdk/core/lib/fs/options.ts‎

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,9 @@ export enum IgnoreMode {
5656
* context flag is set.
5757
*/
5858
DOCKER = 'docker'
59-
};
60-
61-
/**
62-
* Obtains applied when copying directories into the staging location.
63-
*/
64-
export interface CopyOptions {
65-
/**
66-
* A strategy for how to handle symlinks.
67-
*
68-
* @default SymlinkFollowMode.NEVER
69-
*/
70-
readonly follow?: SymlinkFollowMode;
59+
}
7160

61+
interface FileOptions {
7262
/**
7363
* Glob patterns to exclude from the copy.
7464
*
@@ -85,9 +75,30 @@ export interface CopyOptions {
8575
}
8676

8777
/**
88-
* Options related to calculating source hash.
78+
* Options applied when copying directories
79+
*/
80+
export interface CopyOptions extends FileOptions {
81+
/**
82+
* A strategy for how to handle symlinks.
83+
*
84+
* @default SymlinkFollowMode.NEVER
85+
*/
86+
readonly follow?: SymlinkFollowMode;
87+
}
88+
89+
/**
90+
* Options applied when copying directories into the staging location.
8991
*/
90-
export interface FingerprintOptions extends CopyOptions {
92+
export interface FileCopyOptions extends FileOptions {
93+
/**
94+
* A strategy for how to handle symlinks.
95+
*
96+
* @default SymlinkFollowMode.NEVER
97+
*/
98+
readonly followSymlinks?: SymlinkFollowMode;
99+
}
100+
101+
interface ExtraHashOptions {
91102
/**
92103
* Extra information to encode into the fingerprint (e.g. build instructions
93104
* and other inputs)
@@ -96,3 +107,15 @@ export interface FingerprintOptions extends CopyOptions {
96107
*/
97108
readonly extraHash?: string;
98109
}
110+
111+
/**
112+
* Options related to calculating source hash.
113+
*/
114+
export interface FingerprintOptions extends CopyOptions, ExtraHashOptions {
115+
}
116+
117+
/**
118+
* Options related to calculating source hash.
119+
*/
120+
export interface FileFingerprintOptions extends FileCopyOptions, ExtraHashOptions {
121+
}

0 commit comments

Comments
 (0)