Skip to content

Commit 9ac0686

Browse files
authored
Merge branch 'master' into fix-drain-hook-lambda
2 parents 74c223e + aa45ede commit 9ac0686

File tree

6 files changed

+20
-17
lines changed

6 files changed

+20
-17
lines changed

.github/workflows/issue-label-assign.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ jobs:
159159
{"keywords":["(@aws-cdk/aws-servicediscovery)","(aws-servicediscovery)","(servicediscovery)","(service discovery)","(service-discovery)"],"labels":["@aws-cdk/aws-servicediscovery"],"assignees":["MrArnoldPalmer"]},
160160
{"keywords":["(@aws-cdk/aws-ses)","(aws-ses)","(ses)"],"labels":["@aws-cdk/aws-ses"],"assignees":["iliapolo"]},
161161
{"keywords":["(@aws-cdk/aws-ses-actions)","(aws-ses-actions)","(ses-actions)","(ses actions)"],"labels":["@aws-cdk/aws-ses-actions"],"assignees":["iliapolo"]},
162+
{"keywords":["(@aws-cdk/aws-signer)","(aws-signer)","(signer)"],"labels":["@aws-cdk/aws-signer"],"assignees":["nija-at"]},
162163
{"keywords":["(@aws-cdk/aws-sns)","(aws-sns)","(sns)"],"labels":["@aws-cdk/aws-sns"],"assignees":["MrArnoldPalmer"]},
163164
{"keywords":["(@aws-cdk/aws-sns-subscriptions)","(aws-sns-subscriptions)","(sns-subscriptions)","(sns subscriptions)"],"labels":["@aws-cdk/aws-sns-subscriptions"],"assignees":["MrArnoldPalmer"]},
164165
{"keywords":["(@aws-cdk/aws-sqs)","(aws-sqs)","(sqs)"],"labels":["@aws-cdk/aws-sqs"],"assignees":["MrArnoldPalmer"]},

packages/@aws-cdk/aws-lambda/lib/code-signing-config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ export enum UntrustedArtifactOnDeployment {
1010
/**
1111
* Lambda blocks the deployment request if signature validation checks fail.
1212
*/
13-
ENFORCE = 'enforce',
13+
ENFORCE = 'Enforce',
1414

1515
/**
1616
* Lambda allows the deployment of the code package, but issues a warning.
1717
* Lambda issues a new Amazon CloudWatch metric, called a signature validation error and also stores the warning in CloudTrail.
1818
*/
19-
WARN = 'warn',
19+
WARN = 'Warn',
2020
}
2121

2222
/**

packages/@aws-cdk/aws-lambda/test/code-signing-config.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe('code signing config', () => {
2828
}],
2929
},
3030
CodeSigningPolicies: {
31-
UntrustedArtifactOnDeployment: lambda.UntrustedArtifactOnDeployment.WARN,
31+
UntrustedArtifactOnDeployment: 'Warn',
3232
},
3333
});
3434
});
@@ -78,7 +78,7 @@ describe('code signing config', () => {
7878

7979
expect(stack).toHaveResource('AWS::Lambda::CodeSigningConfig', {
8080
CodeSigningPolicies: {
81-
UntrustedArtifactOnDeployment: lambda.UntrustedArtifactOnDeployment.ENFORCE,
81+
UntrustedArtifactOnDeployment: 'Enforce',
8282
},
8383
Description: 'test description',
8484
});

packages/@aws-cdk/aws-signer/README.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,7 @@
55

66
![cfn-resources: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)
77

8-
> All classes with the `Cfn` prefix in this module ([CFN Resources]) are always stable and safe to use.
9-
>
10-
> [CFN Resources]: https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib
11-
12-
![cdk-constructs: Experimental](https://img.shields.io/badge/cdk--constructs-experimental-important.svg?style=for-the-badge)
13-
14-
> The APIs of higher level constructs in this module are experimental and under active development.
15-
> They are subject to non-backward compatible changes or removal in any future version. These are
16-
> not subject to the [Semantic Versioning](https://semver.org/) model and breaking changes will be
17-
> announced in the release notes. This means that while you may use them, you may need to update
18-
> your source code when upgrading to a newer version of this package.
8+
![cdk-constructs: Stable](https://img.shields.io/badge/cdk--constructs-stable-success.svg?style=for-the-badge)
199

2010
---
2111

packages/@aws-cdk/aws-signer/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@
8989
"engines": {
9090
"node": ">= 10.13.0 <13 || >=13.7.0"
9191
},
92-
"stability": "experimental",
93-
"maturity": "experimental",
92+
"stability": "stable",
93+
"maturity": "stable",
9494
"awscdkio": {
9595
"announce": false
9696
},

packages/@aws-cdk/pipelines/README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,18 @@ ID: ...)
749749
The stack failed its previous deployment, and is in a non-retryable state.
750750
Go into the CloudFormation console, delete the stack, and retry the deployment.
751751

752+
### Cannot find module 'xxxx' or its corresponding type declarations
753+
754+
You may see this if you are using TypeScript or other NPM-based languages,
755+
when using NPM 7 on your workstation (where you generate `package-lock.json`)
756+
and NPM 6 on the CodeBuild image used for synthesizing.
757+
758+
It looks like NPM 7 has started writing less information to `package-lock.json`,
759+
leading NPM 6 reading that same file to not install all required packages anymore.
760+
761+
Make sure you are using the same NPM version everywhere, either downgrade your
762+
workstation's version or upgrade the CodeBuild version.
763+
752764
## Current Limitations
753765

754766
Limitations that we are aware of and will address:

0 commit comments

Comments
 (0)