Skip to content

Commit 53145b2

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into merge-back/2.74.0
2 parents e732c32 + 0bc2efe commit 53145b2

File tree

91 files changed

+1683
-1789
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+1683
-1789
lines changed

‎build.sh

+1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ concurrency=$(node -p 'Math.max(1, require("os").cpus().length - 1)')
9999
flags=""
100100
if [ "$ci" == "true" ]; then
101101
flags="--stream --no-progress --skip-nx-cache"
102+
export FORCE_COLOR=false
102103
fi
103104

104105
echo "============================================================================================="

‎packages/@aws-cdk-testing/cli-integ/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"axios": "^0.27.2",
4444
"fs-extra": "^9.1.0",
4545
"glob": "^7.2.3",
46-
"jest": "^27.5.1",
46+
"jest": "^29.5.0",
4747
"jest-junit": "^14.0.1",
4848
"make-runnable": "^1.4.1",
4949
"npm": "^8.19.4",

‎packages/@aws-cdk/aws-amplify-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@aws-cdk/integ-runner": "0.0.0",
8888
"@aws-cdk/cfn2ts": "0.0.0",
8989
"@aws-cdk/pkglint": "0.0.0",
90-
"@types/jest": "^27.5.2",
90+
"@types/jest": "^29.5.0",
9191
"aws-sdk": "^2.1329.0",
9292
"aws-cdk-lib": "0.0.0",
9393
"constructs": "^10.0.0"

‎packages/@aws-cdk/aws-apigatewayv2-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"@aws-cdk/integ-runner": "0.0.0",
9191
"@aws-cdk/cfn2ts": "0.0.0",
9292
"@aws-cdk/pkglint": "0.0.0",
93-
"@types/jest": "^27.5.2",
93+
"@types/jest": "^29.5.0",
9494
"aws-cdk-lib": "0.0.0",
9595
"constructs": "^10.0.0"
9696
},

‎packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@aws-cdk/integ-runner": "0.0.0",
8888
"@aws-cdk/pkglint": "0.0.0",
8989
"@types/aws-lambda": "^8.10.111",
90-
"@types/jest": "^27.5.2",
90+
"@types/jest": "^29.5.0",
9191
"aws-cdk-lib": "0.0.0",
9292
"constructs": "^10.0.0",
9393
"@aws-cdk/aws-apigatewayv2-integrations-alpha": "0.0.0",

‎packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"@aws-cdk/cdk-build-tools": "0.0.0",
8686
"@aws-cdk/integ-runner": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/jest": "^27.5.2",
88+
"@types/jest": "^29.5.0",
8989
"aws-cdk-lib": "0.0.0",
9090
"constructs": "^10.0.0",
9191
"@aws-cdk/integ-tests-alpha": "0.0.0",

‎packages/@aws-cdk/aws-apprunner-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"aws-cdk-lib": "0.0.0",
9090
"@aws-cdk/integ-runner": "0.0.0",
9191
"@aws-cdk/pkglint": "0.0.0",
92-
"@types/jest": "^27.5.2",
92+
"@types/jest": "^29.5.0",
9393
"constructs": "^10.0.0",
9494
"@aws-cdk/integ-tests-alpha": "0.0.0"
9595
},

‎packages/@aws-cdk/aws-batch-alpha/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@
8585
"@aws-cdk/integ-runner": "0.0.0",
8686
"@aws-cdk/cfn2ts": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/jest": "^27.5.2",
89-
"jest": "^27.5.1",
88+
"@types/jest": "^29.5.0",
89+
"jest": "^29.5.0",
9090
"aws-cdk-lib": "0.0.0",
9191
"constructs": "^10.0.0",
9292
"@aws-cdk/integ-tests-alpha": "0.0.0"

‎packages/@aws-cdk/aws-batch-alpha/test/ecs-container-definition.test.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ import { ArnPrincipal, Role } from 'aws-cdk-lib/aws-iam';
88
import * as logs from 'aws-cdk-lib/aws-logs';
99
import { Secret } from 'aws-cdk-lib/aws-secretsmanager';
1010
import { Size, Stack } from 'aws-cdk-lib';
11-
import { capitalizePropertyNames } from 'aws-cdk-lib/core/lib/util';
1211
import { EcsContainerDefinitionProps, EcsEc2ContainerDefinition, EcsFargateContainerDefinition, EcsJobDefinition, EcsVolume, IEcsEc2ContainerDefinition, LinuxParameters, UlimitName } from '../lib';
1312
import { CfnJobDefinitionProps } from 'aws-cdk-lib/aws-batch';
14-
13+
import { capitalizePropertyNames } from './utils';
1514

1615
// GIVEN
1716
const defaultContainerProps: EcsContainerDefinitionProps = {

‎packages/@aws-cdk/aws-batch-alpha/test/eks-container-definition.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Template } from 'aws-cdk-lib/assertions';
22
import * as ecs from 'aws-cdk-lib/aws-ecs';
33
import { Size, Stack } from 'aws-cdk-lib';
4-
import { capitalizePropertyNames } from 'aws-cdk-lib/core/lib/util';
4+
import { capitalizePropertyNames } from './utils';
55
import { EksContainerDefinitionProps, EksContainerDefinition, EksJobDefinition, ImagePullPolicy, EksVolume, EmptyDirMediumType } from '../lib';
66
import { CfnJobDefinitionProps } from 'aws-cdk-lib/aws-batch';
77

@@ -681,4 +681,4 @@ describe('eks container', () => {
681681
},
682682
});
683683
});
684-
});
684+
});

‎packages/@aws-cdk/aws-batch-alpha/test/job-definition-base.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Template } from 'aws-cdk-lib/assertions';
22
import { InstanceClass, InstanceSize, InstanceType } from 'aws-cdk-lib/aws-ec2';
33
import * as ecs from 'aws-cdk-lib/aws-ecs';
44
import { /*Aws,*/ Duration, Size, Stack } from 'aws-cdk-lib';
5-
import { capitalizePropertyNames } from 'aws-cdk-lib/core/lib/util';
5+
import { capitalizePropertyNames } from './utils';
66
import * as batch from '../lib';
77
import { CfnJobDefinitionProps } from 'aws-cdk-lib/aws-batch';
88

‎packages/@aws-cdk/aws-batch-alpha/test/managed-compute-environment.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2';
33
import * as eks from 'aws-cdk-lib/aws-eks';
44
import { ArnPrincipal, Role, ServicePrincipal } from 'aws-cdk-lib/aws-iam';
55
import { Stack, Duration } from 'aws-cdk-lib';
6-
import { capitalizePropertyNames } from 'aws-cdk-lib/core/lib/util';
6+
import { capitalizePropertyNames } from './utils';
77
import * as batch from '../lib';
88
import { AllocationStrategy, ManagedEc2EcsComputeEnvironment, ManagedEc2EcsComputeEnvironmentProps, ManagedEc2EksComputeEnvironment, ManagedEc2EksComputeEnvironmentProps } from '../lib';
99
import { CfnComputeEnvironmentProps } from 'aws-cdk-lib/aws-batch';

‎packages/@aws-cdk/aws-batch-alpha/test/unmanaged-compute-environment.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Template } from 'aws-cdk-lib/assertions';
22
import { Role, ServicePrincipal } from 'aws-cdk-lib/aws-iam';
33
import { Stack } from 'aws-cdk-lib/core';
4-
import { capitalizePropertyNames } from 'aws-cdk-lib/core/lib/util';
4+
import { capitalizePropertyNames } from './utils';
55
import { CfnComputeEnvironmentProps } from 'aws-cdk-lib/aws-batch';
66
import { UnmanagedComputeEnvironment } from '../lib/unmanaged-compute-environment';
77

‎packages/@aws-cdk/aws-batch-alpha/test/utils.ts

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import { Stack } from 'aws-cdk-lib';
2+
import { IConstruct } from 'constructs';
3+
4+
/**
5+
* Given an object, converts all keys to PascalCase given they are currently in camel case.
6+
* @param obj The object.
7+
*/
8+
export function capitalizePropertyNames(construct: IConstruct, obj: any): any {
9+
const stack = Stack.of(construct);
10+
obj = stack.resolve(obj);
11+
12+
if (typeof(obj) !== 'object') {
13+
return obj;
14+
}
15+
16+
if (Array.isArray(obj)) {
17+
return obj.map(x => capitalizePropertyNames(construct, x));
18+
}
19+
20+
const newObj: any = { };
21+
for (const key of Object.keys(obj)) {
22+
const value = obj[key];
23+
24+
const first = key.charAt(0).toUpperCase();
25+
const newKey = first + key.slice(1);
26+
newObj[newKey] = capitalizePropertyNames(construct, value);
27+
}
28+
29+
return newObj;
30+
}

‎packages/@aws-cdk/aws-cloud9-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"@aws-cdk/cfn2ts": "0.0.0",
8686
"@aws-cdk/integ-runner": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/jest": "^27.5.2",
88+
"@types/jest": "^29.5.0",
8989
"aws-cdk-lib": "0.0.0",
9090
"constructs": "^10.0.0",
9191
"@aws-cdk/integ-tests-alpha": "0.0.0"

‎packages/@aws-cdk/aws-codestar-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@aws-cdk/integ-runner": "0.0.0",
8888
"@aws-cdk/cfn2ts": "0.0.0",
8989
"@aws-cdk/pkglint": "0.0.0",
90-
"@types/jest": "^27.5.2",
90+
"@types/jest": "^29.5.0",
9191
"aws-cdk-lib": "0.0.0",
9292
"constructs": "^10.0.0"
9393
},

‎packages/@aws-cdk/aws-cognito-identitypool-alpha/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
"@aws-cdk/cdk-build-tools": "0.0.0",
8585
"@aws-cdk/integ-runner": "0.0.0",
8686
"@aws-cdk/pkglint": "0.0.0",
87-
"@types/jest": "^27.5.2",
88-
"jest": "^27.5.1",
87+
"@types/jest": "^29.5.0",
88+
"jest": "^29.5.0",
8989
"aws-cdk-lib": "0.0.0",
9090
"constructs": "^10.0.0"
9191
},

‎packages/@aws-cdk/aws-gamelift-alpha/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@
8585
"@aws-cdk/integ-runner": "0.0.0",
8686
"@aws-cdk/cfn2ts": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/jest": "^27.5.2",
89-
"jest": "^27.5.1",
88+
"@types/jest": "^29.5.0",
89+
"jest": "^29.5.0",
9090
"aws-cdk-lib": "0.0.0",
9191
"constructs": "^10.0.0",
9292
"@aws-cdk/integ-tests-alpha": "0.0.0"

‎packages/@aws-cdk/aws-glue-alpha/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@
8585
"@aws-cdk/integ-runner": "0.0.0",
8686
"@aws-cdk/cfn2ts": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/jest": "^27.5.2",
89-
"jest": "^27.5.1",
88+
"@types/jest": "^29.5.0",
89+
"jest": "^29.5.0",
9090
"aws-cdk-lib": "0.0.0",
9191
"constructs": "^10.0.0"
9292
},

‎packages/@aws-cdk/aws-iot-actions-alpha/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
"@aws-cdk/cdk-build-tools": "0.0.0",
8585
"@aws-cdk/integ-runner": "0.0.0",
8686
"@aws-cdk/pkglint": "0.0.0",
87-
"@types/jest": "^27.5.2",
88-
"jest": "^27.5.1",
87+
"@types/jest": "^29.5.0",
88+
"jest": "^29.5.0",
8989
"constructs": "^10.0.0",
9090
"aws-cdk-lib": "0.0.0",
9191
"@aws-cdk/aws-kinesisfirehose-destinations-alpha": "0.0.0",

‎packages/@aws-cdk/aws-iot-alpha/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@
8585
"@aws-cdk/integ-runner": "0.0.0",
8686
"@aws-cdk/cfn2ts": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/jest": "^27.5.2",
89-
"jest": "^27.5.1",
88+
"@types/jest": "^29.5.0",
89+
"jest": "^29.5.0",
9090
"aws-cdk-lib": "0.0.0",
9191
"constructs": "^10.0.0",
9292
"@aws-cdk/integ-tests-alpha": "0.0.0"

‎packages/@aws-cdk/aws-iotevents-actions-alpha/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@
7777
"@aws-cdk/cdk-build-tools": "0.0.0",
7878
"@aws-cdk/integ-runner": "0.0.0",
7979
"@aws-cdk/pkglint": "0.0.0",
80-
"@types/jest": "^27.5.2",
81-
"jest": "^27.5.1",
80+
"@types/jest": "^29.5.0",
81+
"jest": "^29.5.0",
8282
"aws-cdk-lib": "0.0.0",
8383
"constructs": "^10.0.0",
8484
"@aws-cdk/integ-tests-alpha": "0.0.0",

‎packages/@aws-cdk/aws-iotevents-alpha/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@
8787
"@aws-cdk/integ-runner": "0.0.0",
8888
"@aws-cdk/cfn2ts": "0.0.0",
8989
"@aws-cdk/pkglint": "0.0.0",
90-
"@types/jest": "^27.5.2",
91-
"jest": "^27.5.1",
90+
"@types/jest": "^29.5.0",
91+
"jest": "^29.5.0",
9292
"aws-cdk-lib": "0.0.0",
9393
"constructs": "^10.0.0",
9494
"@aws-cdk/integ-tests-alpha": "0.0.0"

‎packages/@aws-cdk/aws-ivs-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"@aws-cdk/integ-runner": "0.0.0",
9494
"@aws-cdk/cfn2ts": "0.0.0",
9595
"@aws-cdk/pkglint": "0.0.0",
96-
"@types/jest": "^27.5.2",
96+
"@types/jest": "^29.5.0",
9797
"aws-cdk-lib": "0.0.0",
9898
"constructs": "^10.0.0",
9999
"@aws-cdk/integ-tests-alpha": "0.0.0"

‎packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
"@aws-cdk/cdk-build-tools": "0.0.0",
8181
"@aws-cdk/integ-runner": "0.0.0",
8282
"@aws-cdk/pkglint": "0.0.0",
83-
"@types/jest": "^27.5.2",
84-
"jest": "^27.5.1",
83+
"@types/jest": "^29.5.0",
84+
"jest": "^29.5.0",
8585
"aws-cdk-lib": "0.0.0",
8686
"constructs": "^10.0.0",
8787
"@aws-cdk/integ-tests-alpha": "0.0.0"

‎packages/@aws-cdk/aws-kinesisfirehose-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"@aws-cdk/integ-runner": "0.0.0",
8686
"@aws-cdk/cfn2ts": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/jest": "^27.5.2",
88+
"@types/jest": "^29.5.0",
8989
"aws-cdk-lib": "0.0.0",
9090
"constructs": "^10.0.0"
9191
},

‎packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
"@aws-cdk/integ-runner": "0.0.0",
8080
"@aws-cdk/cfn2ts": "0.0.0",
8181
"@aws-cdk/pkglint": "0.0.0",
82-
"@types/jest": "^27.5.2",
83-
"jest": "^27.5.1",
82+
"@types/jest": "^29.5.0",
83+
"jest": "^29.5.0",
8484
"aws-cdk-lib": "0.0.0",
8585
"constructs": "^10.0.0",
8686
"@aws-cdk/aws-kinesisfirehose-alpha": "0.0.0"

‎packages/@aws-cdk/aws-lambda-go-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"@aws-cdk/cdk-build-tools": "0.0.0",
8989
"@aws-cdk/integ-runner": "0.0.0",
9090
"@aws-cdk/pkglint": "0.0.0",
91-
"@types/jest": "^27.5.2",
91+
"@types/jest": "^29.5.0",
9292
"aws-cdk-lib": "0.0.0",
9393
"constructs": "^10.0.0"
9494
},

‎packages/@aws-cdk/aws-lambda-python-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"@aws-cdk/cdk-build-tools": "0.0.0",
8080
"@aws-cdk/integ-runner": "0.0.0",
8181
"@aws-cdk/pkglint": "0.0.0",
82-
"@types/jest": "^27.5.2",
82+
"@types/jest": "^29.5.0",
8383
"aws-cdk-lib": "0.0.0",
8484
"constructs": "^10.0.0",
8585
"@aws-cdk/integ-tests-alpha": "0.0.0"

‎packages/@aws-cdk/aws-location-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"@aws-cdk/integ-runner": "0.0.0",
8989
"@aws-cdk/cfn2ts": "0.0.0",
9090
"@aws-cdk/pkglint": "0.0.0",
91-
"@types/jest": "^27.5.2",
91+
"@types/jest": "^29.5.0",
9292
"aws-cdk-lib": "0.0.0",
9393
"constructs": "^10.0.0",
9494
"@aws-cdk/integ-tests-alpha": "0.0.0"

‎packages/@aws-cdk/aws-msk-alpha/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@
8787
"@aws-cdk/integ-runner": "0.0.0",
8888
"@aws-cdk/cfn2ts": "0.0.0",
8989
"@aws-cdk/pkglint": "0.0.0",
90-
"@types/jest": "^27.5.2",
91-
"jest": "^27.5.1",
90+
"@types/jest": "^29.5.0",
91+
"jest": "^29.5.0",
9292
"aws-cdk-lib": "0.0.0",
9393
"constructs": "^10.0.0",
9494
"@aws-cdk/integ-tests-alpha": "0.0.0"

0 commit comments

Comments
 (0)