Skip to content

Commit 780ae85

Browse files
abidhasan-awsabidhasan-aws
committed
chore: resolve merge conflict
2 parents 2ce377c + 0f0a873 commit 780ae85

File tree

5 files changed

+171
-24
lines changed

5 files changed

+171
-24
lines changed

‎packages/@aws-cdk/aws-bedrock-agentcore-alpha/agentcore/runtime/runtime.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Duration, Stack, Annotations, Token, Arn, ArnFormat, Lazy } from 'aws-c
33
import * as bedrockagentcore from 'aws-cdk-lib/aws-bedrockagentcore';
44
import * as ec2 from 'aws-cdk-lib/aws-ec2';
55
import * as iam from 'aws-cdk-lib/aws-iam';
6-
import { addConstructMetadata } from 'aws-cdk-lib/core/lib/metadata-resource';
6+
import { addConstructMetadata, MethodMetadata } from 'aws-cdk-lib/core/lib/metadata-resource';
77
import { propertyInjectable } from 'aws-cdk-lib/core/lib/prop-injectable';
88
import { Construct } from 'constructs';
99
import {
@@ -683,6 +683,7 @@ export class Runtime extends RuntimeBase {
683683
* @param options Optional configuration for the endpoint
684684
* @returns The created RuntimeEndpoint
685685
*/
686+
@MethodMetadata()
686687
public addEndpoint(
687688
endpointName: string,
688689
options?: AddEndpointOptions,

‎packages/aws-cdk-lib/core/lib/analytics-data-source/classes.ts‎

Lines changed: 99 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13620,6 +13620,7 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
1362013620
'removalPolicy': 'RemovalPolicy',
1362113621
'imageScanOnPush': 'boolean',
1362213622
'imageTagMutability': 'TagMutability',
13623+
'imageTagMutabilityExclusionFilters': '*',
1362313624
'autoDeleteImages': 'boolean',
1362413625
'emptyOnDelete': 'boolean',
1362513626
'addToResourcePolicy': [
@@ -22932,23 +22933,7 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
2293222933
},
2293322934
'definitionBody': '*',
2293422935
'definitionSubstitutions': '*',
22935-
'role': {
22936-
'roleArn': '*',
22937-
'roleName': '*',
22938-
'assumeRoleAction': '*',
22939-
'policyFragment': '*',
22940-
'principalAccount': '*',
22941-
'grantPrincipal': {
22942-
'assumeRoleAction': '*',
22943-
'principalAccount': '*'
22944-
},
22945-
'stack': '*',
22946-
'env': {
22947-
'account': '*',
22948-
'region': '*'
22949-
},
22950-
'node': '*'
22951-
},
22936+
'role': '*',
2295222937
'timeout': '*',
2295322938
'comment': '*',
2295422939
'queryLanguage': 'QueryLanguage',
@@ -23435,6 +23420,103 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
2343523420
'executeOnHandlerChange': 'boolean'
2343623421
}
2343723422
},
23423+
'aws-bedrock-agentcore-alpha.agentcore': {
23424+
'RuntimeEndpoint': {
23425+
'endpointName': '*',
23426+
'agentRuntimeId': '*',
23427+
'agentRuntimeVersion': '*',
23428+
'description': '*',
23429+
'tags': '*'
23430+
},
23431+
'Runtime': {
23432+
'runtimeName': '*',
23433+
'agentRuntimeArtifact': '*',
23434+
'executionRole': {
23435+
'roleArn': '*',
23436+
'roleName': '*',
23437+
'assumeRoleAction': '*',
23438+
'policyFragment': '*',
23439+
'principalAccount': '*',
23440+
'grantPrincipal': {
23441+
'assumeRoleAction': '*',
23442+
'principalAccount': '*'
23443+
},
23444+
'stack': '*',
23445+
'env': {
23446+
'account': '*',
23447+
'region': '*'
23448+
},
23449+
'node': '*'
23450+
},
23451+
'networkConfiguration': '*',
23452+
'description': '*',
23453+
'protocolConfiguration': 'ProtocolType',
23454+
'environmentVariables': '*',
23455+
'authorizerConfiguration': '*',
23456+
'tags': '*',
23457+
'addEndpoint': [
23458+
'*',
23459+
{
23460+
'description': '*',
23461+
'version': '*'
23462+
}
23463+
]
23464+
},
23465+
'BrowserCustom': {
23466+
'browserCustomName': '*',
23467+
'description': '*',
23468+
'networkConfiguration': '*',
23469+
'recordingConfig': {
23470+
'enabled': 'boolean',
23471+
's3Location': {
23472+
'bucketName': '*',
23473+
'objectKey': '*',
23474+
'objectVersion': '*'
23475+
}
23476+
},
23477+
'executionRole': {
23478+
'roleArn': '*',
23479+
'roleName': '*',
23480+
'assumeRoleAction': '*',
23481+
'policyFragment': '*',
23482+
'principalAccount': '*',
23483+
'grantPrincipal': {
23484+
'assumeRoleAction': '*',
23485+
'principalAccount': '*'
23486+
},
23487+
'stack': '*',
23488+
'env': {
23489+
'account': '*',
23490+
'region': '*'
23491+
},
23492+
'node': '*'
23493+
},
23494+
'tags': '*'
23495+
},
23496+
'CodeInterpreterCustom': {
23497+
'codeInterpreterCustomName': '*',
23498+
'description': '*',
23499+
'executionRole': {
23500+
'roleArn': '*',
23501+
'roleName': '*',
23502+
'assumeRoleAction': '*',
23503+
'policyFragment': '*',
23504+
'principalAccount': '*',
23505+
'grantPrincipal': {
23506+
'assumeRoleAction': '*',
23507+
'principalAccount': '*'
23508+
},
23509+
'stack': '*',
23510+
'env': {
23511+
'account': '*',
23512+
'region': '*'
23513+
},
23514+
'node': '*'
23515+
},
23516+
'networkConfiguration': '*',
23517+
'tags': '*'
23518+
}
23519+
},
2343823520
'aws-bedrock-alpha.bedrock': {
2343923521
'AgentAlias': {
2344023522
'agentAliasName': '*',

‎packages/aws-cdk-lib/core/lib/analytics-data-source/enums.ts‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2744,6 +2744,10 @@ export const AWS_CDK_ENUMS: { [key: string]: any } = {
27442744
"name",
27452745
"position"
27462746
],
2747+
"OrcFormatVersion": [
2748+
"V0_11",
2749+
"V0_12"
2750+
],
27472751
"OrchestrationType": [
27482752
"DEFAULT",
27492753
"CUSTOM_ORCHESTRATION"
@@ -2825,6 +2829,10 @@ export const AWS_CDK_ENUMS: { [key: string]: any } = {
28252829
"ParamsAndSecretsVersions": [
28262830
"1.0.103"
28272831
],
2832+
"ParquetWriterVersion": [
2833+
"V1",
2834+
"V2"
2835+
],
28282836
"ParserProcessorType": [
28292837
0,
28302838
1,
@@ -3043,6 +3051,10 @@ export const AWS_CDK_ENUMS: { [key: string]: any } = {
30433051
"UDP",
30443052
"TCP_UDP"
30453053
],
3054+
"ProtocolType": [
3055+
"MCP",
3056+
"HTTP"
3057+
],
30463058
"ProviderType": [
30473059
"CodeStarSourceConnection"
30483060
],
@@ -3274,7 +3286,7 @@ export const AWS_CDK_ENUMS: { [key: string]: any } = {
32743286
"MULTIVALUE"
32753287
],
32763288
"Runtime": [
3277-
"nodejs18.x",
3289+
"nodejs20.x",
32783290
"python3.9",
32793291
"python3.10",
32803292
"python3.11",
@@ -3352,6 +3364,7 @@ export const AWS_CDK_ENUMS: { [key: string]: any } = {
33523364
"TLSv1.2_2018",
33533365
"TLSv1.2_2019",
33543366
"TLSv1.2_2021",
3367+
"TLSv1.2_2025",
33553368
"TLSv1.3_2025"
33563369
],
33573370
"ServerSideEncryption": [

‎packages/aws-cdk-lib/core/lib/analytics-data-source/enums/module-enumlikes.json‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,8 @@
382382
"V3_8_X_KRAFT",
383383
"V3_9_X",
384384
"V3_9_X_KRAFT",
385-
"V4_0_X_KRAFT"
385+
"V4_0_X_KRAFT",
386+
"V4_1_X_KRAFT"
386387
]
387388
},
388389
"aws-cdk/packages/@aws-cdk/aws-neptune-alpha/lib/cluster.ts": {
@@ -416,7 +417,9 @@
416417
"V1_4_3_0",
417418
"V1_4_4_0",
418419
"V1_4_5_0",
419-
"V1_4_5_1"
420+
"V1_4_5_1",
421+
"V1_4_6_0",
422+
"V1_4_6_1"
420423
],
421424
"LogType": [
422425
"AUDIT"
@@ -754,6 +757,7 @@
754757
"ANTHROPIC_CLAUDE_3_HAIKU_20240307_V1_0_48K",
755758
"ANTHROPIC_CLAUDE_3_5_HAIKU_20241022_V1_0",
756759
"ANTHROPIC_CLAUDE_3_HAIKU_20240307_V1_0_200K",
760+
"ANTHROPIC_CLAUDE_HAIKU_4_5_20251001_V1_0",
757761
"ANTHROPIC_CLAUDE_3_OPUS_20240229_V1_0",
758762
"ANTHROPIC_CLAUDE_3_OPUS_20240229_V1_0_12K",
759763
"ANTHROPIC_CLAUDE_3_OPUS_20240229_V1_0_28K",
@@ -2168,6 +2172,31 @@
21682172
"UNCOMPRESSED"
21692173
]
21702174
},
2175+
"aws-cdk/packages/aws-cdk-lib/aws-kinesisfirehose/lib/record-format/input.ts": {
2176+
"TimestampParser": [
2177+
"EPOCH_MILLIS"
2178+
],
2179+
"InputFormat": [
2180+
"OPENX_JSON",
2181+
"HIVE_JSON"
2182+
]
2183+
},
2184+
"aws-cdk/packages/aws-cdk-lib/aws-kinesisfirehose/lib/record-format/output.ts": {
2185+
"ParquetCompression": [
2186+
"GZIP",
2187+
"SNAPPY",
2188+
"UNCOMPRESSED"
2189+
],
2190+
"OrcCompression": [
2191+
"ZLIB",
2192+
"SNAPPY",
2193+
"NONE"
2194+
],
2195+
"OutputFormat": [
2196+
"PARQUET",
2197+
"ORC"
2198+
]
2199+
},
21712200
"aws-cdk/packages/aws-cdk-lib/aws-lambda/lib/adot-layers.ts": {
21722201
"AdotLambdaLayerJavaSdkVersion": [
21732202
"V1_32_0_1",
@@ -3286,6 +3315,7 @@
32863315
"VER_13_00_6455_2_V1",
32873316
"VER_13_00_6460_7_V1",
32883317
"VER_13_00_6465_1_V1",
3318+
"VER_13_00_6470_1_V1",
32893319
"VER_14",
32903320
"VER_14_00_1000_169_V1",
32913321
"VER_14_00_3015_40_V1",
@@ -3308,6 +3338,7 @@
33083338
"VER_14_00_3485_1_V1",
33093339
"VER_14_00_3495_9_V1",
33103340
"VER_14_00_3500_1_V1",
3341+
"VER_14_00_3505_1_V1",
33113342
"VER_15",
33123343
"VER_15_00_4043_16_V1",
33133344
"VER_15_00_4355_3_V1",
@@ -3333,6 +3364,7 @@
33333364
"VER_15_00_4430_1_V1",
33343365
"VER_15_00_4435_7_V1",
33353366
"VER_15_00_4440_1_V1",
3367+
"VER_15_00_4445_1_V1",
33363368
"VER_16",
33373369
"VER_16_00_4085_2_V1",
33383370
"VER_16_00_4095_4_V1",
@@ -3349,7 +3381,8 @@
33493381
"VER_16_00_4185_3_V1",
33503382
"VER_16_00_4195_2_V1",
33513383
"VER_16_00_4205_1_V1",
3352-
"VER_16_00_4210_1_V1"
3384+
"VER_16_00_4210_1_V1",
3385+
"VER_16_00_4215_2_V1"
33533386
],
33543387
"DatabaseInstanceEngine": [
33553388
"MARIADB",
@@ -3509,7 +3542,8 @@
35093542
"SYNTHETICS_PYTHON_SELENIUM_4_1",
35103543
"SYNTHETICS_PYTHON_SELENIUM_5_0",
35113544
"SYNTHETICS_PYTHON_SELENIUM_5_1",
3512-
"SYNTHETICS_PYTHON_SELENIUM_6_0"
3545+
"SYNTHETICS_PYTHON_SELENIUM_6_0",
3546+
"SYNTHETICS_PYTHON_SELENIUM_7_0"
35133547
]
35143548
},
35153549
"aws-cdk/packages/aws-cdk-lib/core/lib/cfn-pseudo.ts": {

‎packages/aws-cdk-lib/core/lib/analytics-data-source/enums/module-enums.json‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@
4545
"DUAL_STACK"
4646
]
4747
},
48+
"aws-cdk/packages/@aws-cdk/aws-bedrock-agentcore-alpha/agentcore/runtime/types.ts": {
49+
"ProtocolType": [
50+
"MCP",
51+
"HTTP"
52+
]
53+
},
4854
"aws-cdk/packages/@aws-cdk/aws-bedrock-alpha/bedrock/agents/agent-collaborator.ts": {
4955
"AgentCollaboratorType": [
5056
"SUPERVISOR",
@@ -955,7 +961,7 @@
955961
},
956962
"aws-cdk/packages/@aws-cdk/custom-resource-handlers/lib/custom-resources-framework/config.ts": {
957963
"Runtime": [
958-
"nodejs18.x",
964+
"nodejs20.x",
959965
"python3.9",
960966
"python3.10",
961967
"python3.11",
@@ -1801,6 +1807,7 @@
18011807
"TLSv1.2_2018",
18021808
"TLSv1.2_2019",
18031809
"TLSv1.2_2021",
1810+
"TLSv1.2_2025",
18041811
"TLSv1.3_2025"
18051812
],
18061813
"LambdaEdgeEventType": [
@@ -4529,6 +4536,16 @@
45294536
2
45304537
]
45314538
},
4539+
"aws-cdk/packages/aws-cdk-lib/aws-kinesisfirehose/lib/record-format/output.ts": {
4540+
"ParquetWriterVersion": [
4541+
"V1",
4542+
"V2"
4543+
],
4544+
"OrcFormatVersion": [
4545+
"V0_11",
4546+
"V0_12"
4547+
]
4548+
},
45324549
"aws-cdk/packages/aws-cdk-lib/aws-kms/lib/key.ts": {
45334550
"KeySpec": [
45344551
"SYMMETRIC_DEFAULT",

0 commit comments

Comments
 (0)