Skip to content

Commit 3fa4f25

Browse files
authored
Merge branch 'main' into add-endpoint
2 parents cf48637 + b6f763b commit 3fa4f25

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

packages/aws-cdk-lib/aws-ec2/lib/security-group.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ export class SecurityGroup extends SecurityGroupBase {
434434
* Look up a security group.
435435
*/
436436
private static fromLookupAttributes(scope: Construct, id: string, options: SecurityGroupLookupOptions) {
437-
if (Token.isUnresolved(options.securityGroupId) || Token.isUnresolved(options.securityGroupName) || Token.isUnresolved(options.vpc?.vpcId)) {
437+
if (Token.isUnresolved(options.securityGroupId) || Token.isUnresolved(options.securityGroupName) || Token.isUnresolved(options.vpc?.vpcId)) {
438438
throw new Error('All arguments to look up a security group must be concrete (no Tokens)');
439439
}
440440

@@ -515,8 +515,8 @@ export class SecurityGroup extends SecurityGroupBase {
515515
this.securityGroup = new CfnSecurityGroup(this, 'Resource', {
516516
groupName: this.physicalName,
517517
groupDescription,
518-
securityGroupIngress: Lazy.any({ produce: () => this.directIngressRules }, { omitEmptyArray: true } ),
519-
securityGroupEgress: Lazy.any({ produce: () => this.directEgressRules }, { omitEmptyArray: true } ),
518+
securityGroupIngress: Lazy.any({ produce: () => this.directIngressRules }, { omitEmptyArray: true }),
519+
securityGroupEgress: Lazy.any({ produce: () => this.directEgressRules }, { omitEmptyArray: true }),
520520
vpcId: props.vpc.vpcId,
521521
});
522522

@@ -552,7 +552,7 @@ export class SecurityGroup extends SecurityGroupBase {
552552
// In the case of "allowAllOutbound", we don't add any more rules. There
553553
// is only one rule which allows all traffic and that subsumes any other
554554
// rule.
555-
if (!remoteRule) { // Warn only if addEgressRule() was explicitely called
555+
if (!remoteRule) { // Warn only if addEgressRule() was explicitly called
556556
Annotations.of(this).addWarningV2('@aws-cdk/aws-ec2:ipv4IgnoreEgressRule', 'Ignoring Egress rule since \'allowAllOutbound\' is set to true; To add customized rules, set allowAllOutbound=false on the SecurityGroup');
557557
}
558558
return;
@@ -567,7 +567,7 @@ export class SecurityGroup extends SecurityGroupBase {
567567
// In the case of "allowAllIpv6Outbound", we don't add any more rules. There
568568
// is only one rule which allows all traffic and that subsumes any other
569569
// rule.
570-
if (!remoteRule) { // Warn only if addEgressRule() was explicitely called
570+
if (!remoteRule) { // Warn only if addEgressRule() was explicitly called
571571
Annotations.of(this).addWarningV2('@aws-cdk/aws-ec2:ipv6IgnoreEgressRule', 'Ignoring Egress rule since \'allowAllIpv6Outbound\' is set to true; To add customized rules, set allowAllIpv6Outbound=false on the SecurityGroup');
572572
}
573573
return;
@@ -653,7 +653,7 @@ export class SecurityGroup extends SecurityGroupBase {
653653
const description = this.allowAllOutbound ? ALLOW_ALL_RULE.description : MATCH_NO_TRAFFIC.description;
654654
super.addEgressRule(peer, port, description, false);
655655
} else {
656-
const rule = this.allowAllOutbound? ALLOW_ALL_RULE : MATCH_NO_TRAFFIC;
656+
const rule = this.allowAllOutbound ? ALLOW_ALL_RULE : MATCH_NO_TRAFFIC;
657657
this.directEgressRules.push(rule);
658658
}
659659
}

packages/aws-cdk-lib/aws-rds/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1215,7 +1215,7 @@ new rds.ServerlessClusterFromSnapshot(this, 'Cluster', {
12151215

12161216
You can access your Aurora DB cluster using the built-in Data API. The Data API doesn't require a persistent connection to the DB cluster. Instead, it provides a secure HTTP endpoint and integration with AWS SDKs.
12171217

1218-
The following example shows granting Data API access to a Lamba function.
1218+
The following example shows granting Data API access to a Lambda function.
12191219

12201220
```ts
12211221
declare const vpc: ec2.Vpc;

packages/aws-cdk-lib/aws-rds/lib/aurora-cluster-instance.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export interface ServerlessV2ClusterInstanceProps extends ClusterInstanceOptions
145145
*
146146
* For serverless v2 instances this means:
147147
* - true: The serverless v2 reader will scale to match the writer instance (provisioned or serverless)
148-
* - false: The serverless v2 reader will scale with the read workfload on the instance
148+
* - false: The serverless v2 reader will scale with the read workload on the instance
149149
*
150150
* @default false
151151
*/

packages/aws-cdk-lib/aws-rds/lib/instance.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ export enum LicenseModel {
263263
LICENSE_INCLUDED = 'license-included',
264264

265265
/**
266-
* Bring your own licencse.
266+
* Bring your own license.
267267
*/
268268
BRING_YOUR_OWN_LICENSE = 'bring-your-own-license',
269269

@@ -1356,7 +1356,7 @@ export class DatabaseInstanceReadReplica extends DatabaseInstanceNew implements
13561356
}
13571357

13581358
// The read replica instance always uses the same engine as the source instance
1359-
// but some CF validations require the engine to be explicitely passed when some
1359+
// but some CF validations require the engine to be explicitly passed when some
13601360
// properties are specified.
13611361
const shouldPassEngine = props.domain != null;
13621362

0 commit comments

Comments
 (0)