From 560ece7d01b7388f074fc548ed3dff60677b96ec Mon Sep 17 00:00:00 2001 From: Lasse Christiansen Date: Fri, 30 Aug 2024 22:01:46 +0200 Subject: [PATCH 1/9] Updated (and streamlined) the default runtime to be DOTNET_8 --- API.md | 2 +- src/function.ts | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/API.md b/API.md index 3d5db93..77d599e 100644 --- a/API.md +++ b/API.md @@ -2033,7 +2033,7 @@ public readonly runtime: Runtime; ``` - *Type:* aws-cdk-lib.aws_lambda.Runtime -- *Default:* lambda.Runtime.PROVIDED_AL2 +- *Default:* lambda.Runtime.DOTNET_8 The runtime environment. diff --git a/src/function.ts b/src/function.ts index c9fc9fd..99189de 100644 --- a/src/function.ts +++ b/src/function.ts @@ -13,7 +13,7 @@ export interface DotNetFunctionProps extends lambda.FunctionOptions { /** * The runtime environment. Only runtimes of the .NET family and provided family are supported. * - * @default lambda.Runtime.PROVIDED_AL2 + * @default lambda.Runtime.DOTNET_8 */ readonly runtime?: lambda.Runtime; @@ -63,8 +63,7 @@ export class DotNetFunction extends lambda.Function { // Find aws-lambda-tools-defaults.json in project directory const lambdaToolsDefaults = getLambdaToolsDefaults(projectDir); - // Resolve Lambda runtime from properties, aws-lambda-tools-defaults.json or default to PROVIDED_AL2 - + // Resolve Lambda runtime from properties, aws-lambda-tools-defaults.json or default to DOTNET_8 let runtime = props.runtime; if (!runtime) { const toolsRuntime = lambdaToolsDefaults?.['function-runtime'] as @@ -80,7 +79,7 @@ export class DotNetFunction extends lambda.Function { : lambda.RuntimeFamily.OTHER; runtime = new lambda.Runtime(toolsRuntime, family); } else { - runtime = lambda.Runtime.DOTNET_6; + runtime = lambda.Runtime.DOTNET_8; } } if ( From e6768157974f35dc7cd45fb6929a6be0679fd9b0 Mon Sep 17 00:00:00 2001 From: Lasse Christiansen Date: Thu, 12 Sep 2024 13:37:13 +0200 Subject: [PATCH 2/9] Started work on updating integ tests. --- test/{integ.function-dotnet8.ts => integ.function-dotnet6.ts} | 4 ++-- .../Function.cs | 0 .../LambdaHandler.csproj | 2 +- test/lambda-handler/LambdaHandler.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename test/{integ.function-dotnet8.ts => integ.function-dotnet6.ts} (94%) rename test/{lambda-handler-dotnet8 => lambda-handler-dotnet6}/Function.cs (100%) rename test/{lambda-handler-dotnet8 => lambda-handler-dotnet6}/LambdaHandler.csproj (94%) diff --git a/test/integ.function-dotnet8.ts b/test/integ.function-dotnet6.ts similarity index 94% rename from test/integ.function-dotnet8.ts rename to test/integ.function-dotnet6.ts index be3e02f..b86cc88 100644 --- a/test/integ.function-dotnet8.ts +++ b/test/integ.function-dotnet6.ts @@ -15,9 +15,9 @@ class TestStack extends Stack { super(scope, id, props); const fn = new lambda.DotNetFunction(this, 'lambda-handler', { - projectDir: 'lambda-handler-dotnet8', + projectDir: 'lambda-handler-dotnet6', handler: 'LambdaHandler::LambdaHandler.Function::FunctionHandler', - runtime: Runtime.DOTNET_8, + runtime: Runtime.DOTNET_6, }); this.functionName = fn.functionName; diff --git a/test/lambda-handler-dotnet8/Function.cs b/test/lambda-handler-dotnet6/Function.cs similarity index 100% rename from test/lambda-handler-dotnet8/Function.cs rename to test/lambda-handler-dotnet6/Function.cs diff --git a/test/lambda-handler-dotnet8/LambdaHandler.csproj b/test/lambda-handler-dotnet6/LambdaHandler.csproj similarity index 94% rename from test/lambda-handler-dotnet8/LambdaHandler.csproj rename to test/lambda-handler-dotnet6/LambdaHandler.csproj index 335cb5f..216d667 100644 --- a/test/lambda-handler-dotnet8/LambdaHandler.csproj +++ b/test/lambda-handler-dotnet6/LambdaHandler.csproj @@ -1,6 +1,6 @@ - net8.0 + net6.0 true Lambda diff --git a/test/lambda-handler/LambdaHandler.csproj b/test/lambda-handler/LambdaHandler.csproj index 216d667..335cb5f 100644 --- a/test/lambda-handler/LambdaHandler.csproj +++ b/test/lambda-handler/LambdaHandler.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 true Lambda From 2af000bdb2bbf2209b853d88beb91c7216fed1c2 Mon Sep 17 00:00:00 2001 From: Lasse Christiansen Date: Mon, 16 Sep 2024 21:34:30 +0200 Subject: [PATCH 3/9] Updated 'lambda-handler-aot' and 'lambda-handler-docker' to .NET 8. --- test/lambda-handler-aot/LambdaHandler.csproj | 2 +- test/lambda-handler-docker/LambdaHandler.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/lambda-handler-aot/LambdaHandler.csproj b/test/lambda-handler-aot/LambdaHandler.csproj index aa89114..d1f26df 100644 --- a/test/lambda-handler-aot/LambdaHandler.csproj +++ b/test/lambda-handler-aot/LambdaHandler.csproj @@ -1,6 +1,6 @@ - net7.0 + net8.0 Exe bootstrap true diff --git a/test/lambda-handler-docker/LambdaHandler.csproj b/test/lambda-handler-docker/LambdaHandler.csproj index 216d667..335cb5f 100644 --- a/test/lambda-handler-docker/LambdaHandler.csproj +++ b/test/lambda-handler-docker/LambdaHandler.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 true Lambda From d6033ca78688e9872669eb12692df2bae8e3047b Mon Sep 17 00:00:00 2001 From: Lasse Christiansen Date: Mon, 16 Sep 2024 21:40:24 +0200 Subject: [PATCH 4/9] Removed the 'integ.function-dotnet8' test as .NET 8 is now the default runtime (will be replaced by a dotnet6 variant). --- .../cdk.out | 1 - .../integ-lambda-dotnet-function.assets.json | 32 -- ...integ-lambda-dotnet-function.template.json | 112 ------ .../integ.json | 13 - ...efaultTestDeployAssert02A806B6.assets.json | 32 -- ...aultTestDeployAssert02A806B6.template.json | 187 ---------- .../manifest.json | 162 -------- .../tree.json | 346 ------------------ 8 files changed, 885 deletions(-) delete mode 100644 test/integ.function-dotnet8.ts.snapshot/cdk.out delete mode 100644 test/integ.function-dotnet8.ts.snapshot/integ-lambda-dotnet-function.assets.json delete mode 100644 test/integ.function-dotnet8.ts.snapshot/integ-lambda-dotnet-function.template.json delete mode 100644 test/integ.function-dotnet8.ts.snapshot/integ.json delete mode 100644 test/integ.function-dotnet8.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets.json delete mode 100644 test/integ.function-dotnet8.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json delete mode 100644 test/integ.function-dotnet8.ts.snapshot/manifest.json delete mode 100644 test/integ.function-dotnet8.ts.snapshot/tree.json diff --git a/test/integ.function-dotnet8.ts.snapshot/cdk.out b/test/integ.function-dotnet8.ts.snapshot/cdk.out deleted file mode 100644 index 1f0068d..0000000 --- a/test/integ.function-dotnet8.ts.snapshot/cdk.out +++ /dev/null @@ -1 +0,0 @@ -{"version":"36.0.0"} \ No newline at end of file diff --git a/test/integ.function-dotnet8.ts.snapshot/integ-lambda-dotnet-function.assets.json b/test/integ.function-dotnet8.ts.snapshot/integ-lambda-dotnet-function.assets.json deleted file mode 100644 index 673ddf6..0000000 --- a/test/integ.function-dotnet8.ts.snapshot/integ-lambda-dotnet-function.assets.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": "36.0.0", - "files": { - "bd8c601776f4c6044a0380c89be54819d21f1bc9e16efc82057ae0d973d62728": { - "source": { - "path": "asset.bd8c601776f4c6044a0380c89be54819d21f1bc9e16efc82057ae0d973d62728", - "packaging": "zip" - }, - "destinations": { - "current_account-current_region": { - "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "bd8c601776f4c6044a0380c89be54819d21f1bc9e16efc82057ae0d973d62728.zip", - "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" - } - } - }, - "adad0d9e5c0084dae0c2a86618677cd602e7eaf8e354a9aa081cd42ed1241755": { - "source": { - "path": "integ-lambda-dotnet-function.template.json", - "packaging": "file" - }, - "destinations": { - "current_account-current_region": { - "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "adad0d9e5c0084dae0c2a86618677cd602e7eaf8e354a9aa081cd42ed1241755.json", - "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" - } - } - } - }, - "dockerImages": {} -} \ No newline at end of file diff --git a/test/integ.function-dotnet8.ts.snapshot/integ-lambda-dotnet-function.template.json b/test/integ.function-dotnet8.ts.snapshot/integ-lambda-dotnet-function.template.json deleted file mode 100644 index 919beb0..0000000 --- a/test/integ.function-dotnet8.ts.snapshot/integ-lambda-dotnet-function.template.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "Resources": { - "lambdahandlerServiceRoleA08D1FE8": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "lambda.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - }, - "ManagedPolicyArns": [ - { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" - ] - ] - } - ] - } - }, - "lambdahandler909F9205": { - "Type": "AWS::Lambda::Function", - "Properties": { - "Architectures": [ - "x86_64" - ], - "Code": { - "S3Bucket": { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "S3Key": "bd8c601776f4c6044a0380c89be54819d21f1bc9e16efc82057ae0d973d62728.zip" - }, - "Handler": "LambdaHandler::LambdaHandler.Function::FunctionHandler", - "Role": { - "Fn::GetAtt": [ - "lambdahandlerServiceRoleA08D1FE8", - "Arn" - ] - }, - "Runtime": "dotnet8" - }, - "DependsOn": [ - "lambdahandlerServiceRoleA08D1FE8" - ] - } - }, - "Outputs": { - "FunctionArn": { - "Value": { - "Fn::GetAtt": [ - "lambdahandler909F9205", - "Arn" - ] - } - }, - "ExportsOutputReflambdahandler909F920591EA4974": { - "Value": { - "Ref": "lambdahandler909F9205" - }, - "Export": { - "Name": "integ-lambda-dotnet-function:ExportsOutputReflambdahandler909F920591EA4974" - } - } - }, - "Parameters": { - "BootstrapVersion": { - "Type": "AWS::SSM::Parameter::Value", - "Default": "/cdk-bootstrap/hnb659fds/version", - "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" - } - }, - "Rules": { - "CheckBootstrapVersion": { - "Assertions": [ - { - "Assert": { - "Fn::Not": [ - { - "Fn::Contains": [ - [ - "1", - "2", - "3", - "4", - "5" - ], - { - "Ref": "BootstrapVersion" - } - ] - } - ] - }, - "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." - } - ] - } - } -} \ No newline at end of file diff --git a/test/integ.function-dotnet8.ts.snapshot/integ.json b/test/integ.function-dotnet8.ts.snapshot/integ.json deleted file mode 100644 index a83265d..0000000 --- a/test/integ.function-dotnet8.ts.snapshot/integ.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "version": "36.0.0", - "testCases": { - "lambda-dotnet-function/DefaultTest": { - "stacks": [ - "integ-lambda-dotnet-function" - ], - "stackUpdateWorkflow": false, - "assertionStack": "lambda-dotnet-function/DefaultTest/DeployAssert", - "assertionStackName": "lambdadotnetfunctionDefaultTestDeployAssert02A806B6" - } - } -} \ No newline at end of file diff --git a/test/integ.function-dotnet8.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets.json b/test/integ.function-dotnet8.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets.json deleted file mode 100644 index 6013c36..0000000 --- a/test/integ.function-dotnet8.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": "36.0.0", - "files": { - "ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5": { - "source": { - "path": "asset.ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5.bundle", - "packaging": "zip" - }, - "destinations": { - "current_account-current_region": { - "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5.zip", - "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" - } - } - }, - "09929a4dae29c37aea44009b8dd2ee255ca9b6e7451a414fc9dd5a51df3d65de": { - "source": { - "path": "lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json", - "packaging": "file" - }, - "destinations": { - "current_account-current_region": { - "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "09929a4dae29c37aea44009b8dd2ee255ca9b6e7451a414fc9dd5a51df3d65de.json", - "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" - } - } - } - }, - "dockerImages": {} -} \ No newline at end of file diff --git a/test/integ.function-dotnet8.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json b/test/integ.function-dotnet8.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json deleted file mode 100644 index 84f47d7..0000000 --- a/test/integ.function-dotnet8.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json +++ /dev/null @@ -1,187 +0,0 @@ -{ - "Resources": { - "LambdaInvokece74e9560f1fda89c7913fc5a3d498a1": { - "Type": "Custom::DeployAssert@SdkCallLambdainvoke", - "Properties": { - "ServiceToken": { - "Fn::GetAtt": [ - "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F", - "Arn" - ] - }, - "service": "Lambda", - "api": "invoke", - "expected": "{\"$ObjectLike\":{\"Payload\":\"\\\"Ok\\\"\"}}", - "parameters": { - "FunctionName": { - "Fn::Join": [ - "", - [ - "\"", - { - "Fn::ImportValue": "integ-lambda-dotnet-function:ExportsOutputReflambdahandler909F920591EA4974" - }, - "\"" - ] - ] - } - }, - "flattenResponse": "false", - "salt": "1708663569268" - }, - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete" - }, - "LambdaInvokece74e9560f1fda89c7913fc5a3d498a1InvokeB79DA780": { - "Type": "AWS::Lambda::Permission", - "Properties": { - "Action": "lambda:InvokeFunction", - "FunctionName": { - "Fn::ImportValue": "integ-lambda-dotnet-function:ExportsOutputReflambdahandler909F920591EA4974" - }, - "Principal": { - "Fn::GetAtt": [ - "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73", - "Arn" - ] - } - } - }, - "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Version": "2012-10-17", - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "lambda.amazonaws.com" - } - } - ] - }, - "ManagedPolicyArns": [ - { - "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" - } - ], - "Policies": [ - { - "PolicyName": "Inline", - "PolicyDocument": { - "Version": "2012-10-17", - "Statement": [ - { - "Action": [ - "lambda:Invoke" - ], - "Effect": "Allow", - "Resource": [ - "*" - ] - }, - { - "Action": [ - "lambda:InvokeFunction" - ], - "Effect": "Allow", - "Resource": [ - { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":lambda:", - { - "Ref": "AWS::Region" - }, - ":", - { - "Ref": "AWS::AccountId" - }, - ":function:", - { - "Fn::ImportValue": "integ-lambda-dotnet-function:ExportsOutputReflambdahandler909F920591EA4974" - } - ] - ] - } - ] - } - ] - } - } - ] - } - }, - "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F": { - "Type": "AWS::Lambda::Function", - "Properties": { - "Runtime": "nodejs18.x", - "Code": { - "S3Bucket": { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "S3Key": "ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5.zip" - }, - "Timeout": 120, - "Handler": "index.handler", - "Role": { - "Fn::GetAtt": [ - "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73", - "Arn" - ] - } - } - } - }, - "Outputs": { - "AssertionResultsLambdaInvokece74e9560f1fda89c7913fc5a3d498a1": { - "Value": { - "Fn::GetAtt": [ - "LambdaInvokece74e9560f1fda89c7913fc5a3d498a1", - "assertion" - ] - } - } - }, - "Parameters": { - "BootstrapVersion": { - "Type": "AWS::SSM::Parameter::Value", - "Default": "/cdk-bootstrap/hnb659fds/version", - "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" - } - }, - "Rules": { - "CheckBootstrapVersion": { - "Assertions": [ - { - "Assert": { - "Fn::Not": [ - { - "Fn::Contains": [ - [ - "1", - "2", - "3", - "4", - "5" - ], - { - "Ref": "BootstrapVersion" - } - ] - } - ] - }, - "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." - } - ] - } - } -} \ No newline at end of file diff --git a/test/integ.function-dotnet8.ts.snapshot/manifest.json b/test/integ.function-dotnet8.ts.snapshot/manifest.json deleted file mode 100644 index e396cf3..0000000 --- a/test/integ.function-dotnet8.ts.snapshot/manifest.json +++ /dev/null @@ -1,162 +0,0 @@ -{ - "version": "36.0.0", - "artifacts": { - "integ-lambda-dotnet-function.assets": { - "type": "cdk:asset-manifest", - "properties": { - "file": "integ-lambda-dotnet-function.assets.json", - "requiresBootstrapStackVersion": 6, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" - } - }, - "integ-lambda-dotnet-function": { - "type": "aws:cloudformation:stack", - "environment": "aws://unknown-account/unknown-region", - "properties": { - "templateFile": "integ-lambda-dotnet-function.template.json", - "terminationProtection": false, - "validateOnSynth": false, - "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", - "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/adad0d9e5c0084dae0c2a86618677cd602e7eaf8e354a9aa081cd42ed1241755.json", - "requiresBootstrapStackVersion": 6, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", - "additionalDependencies": [ - "integ-lambda-dotnet-function.assets" - ], - "lookupRole": { - "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", - "requiresBootstrapStackVersion": 8, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" - } - }, - "dependencies": [ - "integ-lambda-dotnet-function.assets" - ], - "metadata": { - "/integ-lambda-dotnet-function/lambda-handler/ServiceRole/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "lambdahandlerServiceRoleA08D1FE8" - } - ], - "/integ-lambda-dotnet-function/lambda-handler/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "lambdahandler909F9205" - } - ], - "/integ-lambda-dotnet-function/FunctionArn": [ - { - "type": "aws:cdk:logicalId", - "data": "FunctionArn" - } - ], - "/integ-lambda-dotnet-function/Exports/Output{\"Ref\":\"lambdahandler909F9205\"}": [ - { - "type": "aws:cdk:logicalId", - "data": "ExportsOutputReflambdahandler909F920591EA4974" - } - ], - "/integ-lambda-dotnet-function/BootstrapVersion": [ - { - "type": "aws:cdk:logicalId", - "data": "BootstrapVersion" - } - ], - "/integ-lambda-dotnet-function/CheckBootstrapVersion": [ - { - "type": "aws:cdk:logicalId", - "data": "CheckBootstrapVersion" - } - ] - }, - "displayName": "integ-lambda-dotnet-function" - }, - "lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets": { - "type": "cdk:asset-manifest", - "properties": { - "file": "lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets.json", - "requiresBootstrapStackVersion": 6, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" - } - }, - "lambdadotnetfunctionDefaultTestDeployAssert02A806B6": { - "type": "aws:cloudformation:stack", - "environment": "aws://unknown-account/unknown-region", - "properties": { - "templateFile": "lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json", - "terminationProtection": false, - "validateOnSynth": false, - "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", - "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/09929a4dae29c37aea44009b8dd2ee255ca9b6e7451a414fc9dd5a51df3d65de.json", - "requiresBootstrapStackVersion": 6, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", - "additionalDependencies": [ - "lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets" - ], - "lookupRole": { - "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", - "requiresBootstrapStackVersion": 8, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" - } - }, - "dependencies": [ - "integ-lambda-dotnet-function", - "lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets" - ], - "metadata": { - "/lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/Default/Default": [ - { - "type": "aws:cdk:logicalId", - "data": "LambdaInvokece74e9560f1fda89c7913fc5a3d498a1" - } - ], - "/lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/Invoke": [ - { - "type": "aws:cdk:logicalId", - "data": "LambdaInvokece74e9560f1fda89c7913fc5a3d498a1InvokeB79DA780" - } - ], - "/lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/AssertionResults": [ - { - "type": "aws:cdk:logicalId", - "data": "AssertionResultsLambdaInvokece74e9560f1fda89c7913fc5a3d498a1" - } - ], - "/lambda-dotnet-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role": [ - { - "type": "aws:cdk:logicalId", - "data": "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73" - } - ], - "/lambda-dotnet-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler": [ - { - "type": "aws:cdk:logicalId", - "data": "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F" - } - ], - "/lambda-dotnet-function/DefaultTest/DeployAssert/BootstrapVersion": [ - { - "type": "aws:cdk:logicalId", - "data": "BootstrapVersion" - } - ], - "/lambda-dotnet-function/DefaultTest/DeployAssert/CheckBootstrapVersion": [ - { - "type": "aws:cdk:logicalId", - "data": "CheckBootstrapVersion" - } - ] - }, - "displayName": "lambda-dotnet-function/DefaultTest/DeployAssert" - }, - "Tree": { - "type": "cdk:tree", - "properties": { - "file": "tree.json" - } - } - } -} \ No newline at end of file diff --git a/test/integ.function-dotnet8.ts.snapshot/tree.json b/test/integ.function-dotnet8.ts.snapshot/tree.json deleted file mode 100644 index e0dc419..0000000 --- a/test/integ.function-dotnet8.ts.snapshot/tree.json +++ /dev/null @@ -1,346 +0,0 @@ -{ - "version": "tree-0.1", - "tree": { - "id": "App", - "path": "", - "children": { - "integ-lambda-dotnet-function": { - "id": "integ-lambda-dotnet-function", - "path": "integ-lambda-dotnet-function", - "children": { - "lambda-handler": { - "id": "lambda-handler", - "path": "integ-lambda-dotnet-function/lambda-handler", - "children": { - "ServiceRole": { - "id": "ServiceRole", - "path": "integ-lambda-dotnet-function/lambda-handler/ServiceRole", - "children": { - "ImportServiceRole": { - "id": "ImportServiceRole", - "path": "integ-lambda-dotnet-function/lambda-handler/ServiceRole/ImportServiceRole", - "constructInfo": { - "fqn": "aws-cdk-lib.Resource", - "version": "2.129.0" - } - }, - "Resource": { - "id": "Resource", - "path": "integ-lambda-dotnet-function/lambda-handler/ServiceRole/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Role", - "aws:cdk:cloudformation:props": { - "assumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "lambda.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - }, - "managedPolicyArns": [ - { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" - ] - ] - } - ] - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_iam.CfnRole", - "version": "2.129.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_iam.Role", - "version": "2.129.0" - } - }, - "Code": { - "id": "Code", - "path": "integ-lambda-dotnet-function/lambda-handler/Code", - "children": { - "Stage": { - "id": "Stage", - "path": "integ-lambda-dotnet-function/lambda-handler/Code/Stage", - "constructInfo": { - "fqn": "aws-cdk-lib.AssetStaging", - "version": "2.129.0" - } - }, - "AssetBucket": { - "id": "AssetBucket", - "path": "integ-lambda-dotnet-function/lambda-handler/Code/AssetBucket", - "constructInfo": { - "fqn": "aws-cdk-lib.aws_s3.BucketBase", - "version": "2.129.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_s3_assets.Asset", - "version": "2.129.0" - } - }, - "Resource": { - "id": "Resource", - "path": "integ-lambda-dotnet-function/lambda-handler/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::Lambda::Function", - "aws:cdk:cloudformation:props": { - "architectures": [ - "x86_64" - ], - "code": { - "s3Bucket": { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "s3Key": "bd8c601776f4c6044a0380c89be54819d21f1bc9e16efc82057ae0d973d62728.zip" - }, - "handler": "LambdaHandler::LambdaHandler.Function::FunctionHandler", - "role": { - "Fn::GetAtt": [ - "lambdahandlerServiceRoleA08D1FE8", - "Arn" - ] - }, - "runtime": "dotnet8" - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_lambda.CfnFunction", - "version": "2.129.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_lambda.Function", - "version": "2.129.0" - } - }, - "FunctionArn": { - "id": "FunctionArn", - "path": "integ-lambda-dotnet-function/FunctionArn", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnOutput", - "version": "2.129.0" - } - }, - "Exports": { - "id": "Exports", - "path": "integ-lambda-dotnet-function/Exports", - "children": { - "Output{\"Ref\":\"lambdahandler909F9205\"}": { - "id": "Output{\"Ref\":\"lambdahandler909F9205\"}", - "path": "integ-lambda-dotnet-function/Exports/Output{\"Ref\":\"lambdahandler909F9205\"}", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnOutput", - "version": "2.129.0" - } - } - }, - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.0.5" - } - }, - "BootstrapVersion": { - "id": "BootstrapVersion", - "path": "integ-lambda-dotnet-function/BootstrapVersion", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnParameter", - "version": "2.129.0" - } - }, - "CheckBootstrapVersion": { - "id": "CheckBootstrapVersion", - "path": "integ-lambda-dotnet-function/CheckBootstrapVersion", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnRule", - "version": "2.129.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.Stack", - "version": "2.129.0" - } - }, - "lambda-dotnet-function": { - "id": "lambda-dotnet-function", - "path": "lambda-dotnet-function", - "children": { - "DefaultTest": { - "id": "DefaultTest", - "path": "lambda-dotnet-function/DefaultTest", - "children": { - "Default": { - "id": "Default", - "path": "lambda-dotnet-function/DefaultTest/Default", - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.0.5" - } - }, - "DeployAssert": { - "id": "DeployAssert", - "path": "lambda-dotnet-function/DefaultTest/DeployAssert", - "children": { - "LambdaInvokece74e9560f1fda89c7913fc5a3d498a1": { - "id": "LambdaInvokece74e9560f1fda89c7913fc5a3d498a1", - "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1", - "children": { - "SdkProvider": { - "id": "SdkProvider", - "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/SdkProvider", - "children": { - "AssertionsProvider": { - "id": "AssertionsProvider", - "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/SdkProvider/AssertionsProvider", - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.0.5" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/integ-tests-alpha.AssertionsProvider", - "version": "2.129.0-alpha.0" - } - }, - "Default": { - "id": "Default", - "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/Default", - "children": { - "Default": { - "id": "Default", - "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/Default/Default", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "2.129.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.CustomResource", - "version": "2.129.0" - } - }, - "Invoke": { - "id": "Invoke", - "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/Invoke", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "2.129.0" - } - }, - "AssertionResults": { - "id": "AssertionResults", - "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/AssertionResults", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnOutput", - "version": "2.129.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/integ-tests-alpha.LambdaInvokeFunction", - "version": "2.129.0-alpha.0" - } - }, - "SingletonFunction1488541a7b23466481b69b4408076b81": { - "id": "SingletonFunction1488541a7b23466481b69b4408076b81", - "path": "lambda-dotnet-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81", - "children": { - "Staging": { - "id": "Staging", - "path": "lambda-dotnet-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Staging", - "constructInfo": { - "fqn": "aws-cdk-lib.AssetStaging", - "version": "2.129.0" - } - }, - "Role": { - "id": "Role", - "path": "lambda-dotnet-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "2.129.0" - } - }, - "Handler": { - "id": "Handler", - "path": "lambda-dotnet-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "2.129.0" - } - } - }, - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.0.5" - } - }, - "BootstrapVersion": { - "id": "BootstrapVersion", - "path": "lambda-dotnet-function/DefaultTest/DeployAssert/BootstrapVersion", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnParameter", - "version": "2.129.0" - } - }, - "CheckBootstrapVersion": { - "id": "CheckBootstrapVersion", - "path": "lambda-dotnet-function/DefaultTest/DeployAssert/CheckBootstrapVersion", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnRule", - "version": "2.129.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.Stack", - "version": "2.129.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", - "version": "2.129.0-alpha.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", - "version": "2.129.0-alpha.0" - } - }, - "Tree": { - "id": "Tree", - "path": "Tree", - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.0.5" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.App", - "version": "2.129.0" - } - } -} \ No newline at end of file From a64b79419bf9f85f38c03563d431d9e01579443c Mon Sep 17 00:00:00 2001 From: Lasse Christiansen Date: Mon, 16 Sep 2024 21:56:18 +0200 Subject: [PATCH 5/9] Updated snapshots for 'integ.function-docker' and 'integ.function'. --- .../integ.function-docker.ts.snapshot/cdk.out | 2 +- .../integ-lambda-dotnet-docker.assets.json | 14 ++-- .../integ-lambda-dotnet-docker.template.json | 12 ++-- .../integ.json | 2 +- ...efaultTestDeployAssertA7C8A975.assets.json | 12 ++-- ...aultTestDeployAssertA7C8A975.template.json | 17 +++-- .../manifest.json | 8 ++- .../tree.json | 70 +++++++++---------- test/integ.function.ts.snapshot/cdk.out | 2 +- .../integ-lambda-dotnet-function.assets.json | 14 ++-- ...integ-lambda-dotnet-function.template.json | 12 ++-- test/integ.function.ts.snapshot/integ.json | 2 +- ...efaultTestDeployAssert02A806B6.assets.json | 12 ++-- ...aultTestDeployAssert02A806B6.template.json | 17 +++-- test/integ.function.ts.snapshot/manifest.json | 8 ++- test/integ.function.ts.snapshot/tree.json | 70 +++++++++---------- 16 files changed, 148 insertions(+), 126 deletions(-) diff --git a/test/integ.function-docker.ts.snapshot/cdk.out b/test/integ.function-docker.ts.snapshot/cdk.out index 7925065..1f0068d 100644 --- a/test/integ.function-docker.ts.snapshot/cdk.out +++ b/test/integ.function-docker.ts.snapshot/cdk.out @@ -1 +1 @@ -{"version":"31.0.0"} \ No newline at end of file +{"version":"36.0.0"} \ No newline at end of file diff --git a/test/integ.function-docker.ts.snapshot/integ-lambda-dotnet-docker.assets.json b/test/integ.function-docker.ts.snapshot/integ-lambda-dotnet-docker.assets.json index 5978825..dcd7d3f 100644 --- a/test/integ.function-docker.ts.snapshot/integ-lambda-dotnet-docker.assets.json +++ b/test/integ.function-docker.ts.snapshot/integ-lambda-dotnet-docker.assets.json @@ -1,20 +1,20 @@ { - "version": "31.0.0", + "version": "36.0.0", "files": { - "04e164e339ece400df4ffd0808141591b66fb3ad8177102affc7fe754d94cb71": { + "32d5e1811982e7cbba9f470a68015aab323d4f1281be621185b19104ee9e8f11": { "source": { - "path": "asset.04e164e339ece400df4ffd0808141591b66fb3ad8177102affc7fe754d94cb71", - "packaging": "zip" + "path": "asset.32d5e1811982e7cbba9f470a68015aab323d4f1281be621185b19104ee9e8f11.zip", + "packaging": "file" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "04e164e339ece400df4ffd0808141591b66fb3ad8177102affc7fe754d94cb71.zip", + "objectKey": "32d5e1811982e7cbba9f470a68015aab323d4f1281be621185b19104ee9e8f11.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "0043fff0c2c34c920dc983d1f18bea24316ef916bf37ef6043f0c00b90b2a6ca": { + "6f30954b237dcdf5be5a54c56f620649f90e238437ed90ec141140ef5a679f35": { "source": { "path": "integ-lambda-dotnet-docker.template.json", "packaging": "file" @@ -22,7 +22,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "0043fff0c2c34c920dc983d1f18bea24316ef916bf37ef6043f0c00b90b2a6ca.json", + "objectKey": "6f30954b237dcdf5be5a54c56f620649f90e238437ed90ec141140ef5a679f35.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/test/integ.function-docker.ts.snapshot/integ-lambda-dotnet-docker.template.json b/test/integ.function-docker.ts.snapshot/integ-lambda-dotnet-docker.template.json index aadeb69..b8eedfe 100644 --- a/test/integ.function-docker.ts.snapshot/integ-lambda-dotnet-docker.template.json +++ b/test/integ.function-docker.ts.snapshot/integ-lambda-dotnet-docker.template.json @@ -34,23 +34,23 @@ "lambdahandler909F9205": { "Type": "AWS::Lambda::Function", "Properties": { + "Architectures": [ + "x86_64" + ], "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "04e164e339ece400df4ffd0808141591b66fb3ad8177102affc7fe754d94cb71.zip" + "S3Key": "32d5e1811982e7cbba9f470a68015aab323d4f1281be621185b19104ee9e8f11.zip" }, + "Handler": "LambdaHandler::LambdaHandler.Function::FunctionHandler", "Role": { "Fn::GetAtt": [ "lambdahandlerServiceRoleA08D1FE8", "Arn" ] }, - "Architectures": [ - "x86_64" - ], - "Handler": "LambdaHandler::LambdaHandler.Function::FunctionHandler", - "Runtime": "dotnet6" + "Runtime": "dotnet8" }, "DependsOn": [ "lambdahandlerServiceRoleA08D1FE8" diff --git a/test/integ.function-docker.ts.snapshot/integ.json b/test/integ.function-docker.ts.snapshot/integ.json index c68104e..51ef895 100644 --- a/test/integ.function-docker.ts.snapshot/integ.json +++ b/test/integ.function-docker.ts.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "31.0.0", + "version": "36.0.0", "testCases": { "lambda-dotnet-docker/DefaultTest": { "stacks": [ diff --git a/test/integ.function-docker.ts.snapshot/lambdadotnetdockerDefaultTestDeployAssertA7C8A975.assets.json b/test/integ.function-docker.ts.snapshot/lambdadotnetdockerDefaultTestDeployAssertA7C8A975.assets.json index 57290f0..710c79d 100644 --- a/test/integ.function-docker.ts.snapshot/lambdadotnetdockerDefaultTestDeployAssertA7C8A975.assets.json +++ b/test/integ.function-docker.ts.snapshot/lambdadotnetdockerDefaultTestDeployAssertA7C8A975.assets.json @@ -1,20 +1,20 @@ { - "version": "31.0.0", + "version": "36.0.0", "files": { - "ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3": { + "ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5": { "source": { - "path": "asset.ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3.bundle", + "path": "asset.ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5.bundle", "packaging": "zip" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3.zip", + "objectKey": "ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "8c55ad51b368700d753e1e90180c9097c984bbed79b664d343212742b08a0e64": { + "e79e9f0b40c31f70dba25b0ca09b8e1a24c8a3182c6c3289cf90cb56bf59b8af": { "source": { "path": "lambdadotnetdockerDefaultTestDeployAssertA7C8A975.template.json", "packaging": "file" @@ -22,7 +22,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "8c55ad51b368700d753e1e90180c9097c984bbed79b664d343212742b08a0e64.json", + "objectKey": "e79e9f0b40c31f70dba25b0ca09b8e1a24c8a3182c6c3289cf90cb56bf59b8af.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/test/integ.function-docker.ts.snapshot/lambdadotnetdockerDefaultTestDeployAssertA7C8A975.template.json b/test/integ.function-docker.ts.snapshot/lambdadotnetdockerDefaultTestDeployAssertA7C8A975.template.json index bc58894..d069cf9 100644 --- a/test/integ.function-docker.ts.snapshot/lambdadotnetdockerDefaultTestDeployAssertA7C8A975.template.json +++ b/test/integ.function-docker.ts.snapshot/lambdadotnetdockerDefaultTestDeployAssertA7C8A975.template.json @@ -14,11 +14,20 @@ "expected": "{\"$ObjectLike\":{\"Payload\":\"\\\"Ok\\\"\"}}", "parameters": { "FunctionName": { - "Fn::ImportValue": "integ-lambda-dotnet-docker:ExportsOutputReflambdahandler909F920591EA4974" + "Fn::Join": [ + "", + [ + "\"", + { + "Fn::ImportValue": "integ-lambda-dotnet-docker:ExportsOutputReflambdahandler909F920591EA4974" + }, + "\"" + ] + ] } }, "flattenResponse": "false", - "salt": "1701534807403" + "salt": "1726516294141" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" @@ -113,12 +122,12 @@ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F": { "Type": "AWS::Lambda::Function", "Properties": { - "Runtime": "nodejs14.x", + "Runtime": "nodejs18.x", "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3.zip" + "S3Key": "ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5.zip" }, "Timeout": 120, "Handler": "index.handler", diff --git a/test/integ.function-docker.ts.snapshot/manifest.json b/test/integ.function-docker.ts.snapshot/manifest.json index f3c19b9..b9beb10 100644 --- a/test/integ.function-docker.ts.snapshot/manifest.json +++ b/test/integ.function-docker.ts.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "35.0.0", + "version": "36.0.24", "artifacts": { "integ-lambda-dotnet-docker.assets": { "type": "cdk:asset-manifest", @@ -14,10 +14,11 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "integ-lambda-dotnet-docker.template.json", + "terminationProtection": false, "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0043fff0c2c34c920dc983d1f18bea24316ef916bf37ef6043f0c00b90b2a6ca.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6f30954b237dcdf5be5a54c56f620649f90e238437ed90ec141140ef5a679f35.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -85,10 +86,11 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "lambdadotnetdockerDefaultTestDeployAssertA7C8A975.template.json", + "terminationProtection": false, "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/8c55ad51b368700d753e1e90180c9097c984bbed79b664d343212742b08a0e64.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e79e9f0b40c31f70dba25b0ca09b8e1a24c8a3182c6c3289cf90cb56bf59b8af.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/test/integ.function-docker.ts.snapshot/tree.json b/test/integ.function-docker.ts.snapshot/tree.json index f541e09..77bb4e4 100644 --- a/test/integ.function-docker.ts.snapshot/tree.json +++ b/test/integ.function-docker.ts.snapshot/tree.json @@ -21,7 +21,7 @@ "path": "integ-lambda-dotnet-docker/lambda-handler/ServiceRole/ImportServiceRole", "constructInfo": { "fqn": "aws-cdk-lib.Resource", - "version": "2.80.0" + "version": "2.129.0" } }, "Resource": { @@ -60,13 +60,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_iam.CfnRole", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.aws_iam.Role", - "version": "2.80.0" + "version": "2.129.0" } }, "Code": { @@ -78,7 +78,7 @@ "path": "integ-lambda-dotnet-docker/lambda-handler/Code/Stage", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", - "version": "2.80.0" + "version": "2.129.0" } }, "AssetBucket": { @@ -86,13 +86,13 @@ "path": "integ-lambda-dotnet-docker/lambda-handler/Code/AssetBucket", "constructInfo": { "fqn": "aws-cdk-lib.aws_s3.BucketBase", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.aws_s3_assets.Asset", - "version": "2.80.0" + "version": "2.129.0" } }, "Resource": { @@ -101,34 +101,34 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::Lambda::Function", "aws:cdk:cloudformation:props": { + "architectures": [ + "x86_64" + ], "code": { "s3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "s3Key": "04e164e339ece400df4ffd0808141591b66fb3ad8177102affc7fe754d94cb71.zip" + "s3Key": "32d5e1811982e7cbba9f470a68015aab323d4f1281be621185b19104ee9e8f11.zip" }, + "handler": "LambdaHandler::LambdaHandler.Function::FunctionHandler", "role": { "Fn::GetAtt": [ "lambdahandlerServiceRoleA08D1FE8", "Arn" ] }, - "architectures": [ - "x86_64" - ], - "handler": "LambdaHandler::LambdaHandler.Function::FunctionHandler", - "runtime": "dotnet6" + "runtime": "dotnet8" } }, "constructInfo": { "fqn": "aws-cdk-lib.aws_lambda.CfnFunction", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-lambda-dotnet.DotNetFunction", - "version": "0.0.0" + "fqn": "aws-cdk-lib.aws_lambda.Function", + "version": "2.129.0" } }, "FunctionArn": { @@ -136,7 +136,7 @@ "path": "integ-lambda-dotnet-docker/FunctionArn", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", - "version": "2.80.0" + "version": "2.129.0" } }, "Exports": { @@ -148,7 +148,7 @@ "path": "integ-lambda-dotnet-docker/Exports/Output{\"Ref\":\"lambdahandler909F9205\"}", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", - "version": "2.80.0" + "version": "2.129.0" } } }, @@ -162,7 +162,7 @@ "path": "integ-lambda-dotnet-docker/BootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", - "version": "2.80.0" + "version": "2.129.0" } }, "CheckBootstrapVersion": { @@ -170,13 +170,13 @@ "path": "integ-lambda-dotnet-docker/CheckBootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnRule", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.Stack", - "version": "2.80.0" + "version": "2.129.0" } }, "lambda-dotnet-docker": { @@ -218,7 +218,7 @@ }, "constructInfo": { "fqn": "@aws-cdk/integ-tests-alpha.AssertionsProvider", - "version": "2.80.0-alpha.0" + "version": "2.129.0-alpha.0" } }, "Default": { @@ -230,13 +230,13 @@ "path": "lambda-dotnet-docker/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/Default/Default", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.CustomResource", - "version": "2.80.0" + "version": "2.129.0" } }, "Invoke": { @@ -244,7 +244,7 @@ "path": "lambda-dotnet-docker/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/Invoke", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", - "version": "2.80.0" + "version": "2.129.0" } }, "AssertionResults": { @@ -252,13 +252,13 @@ "path": "lambda-dotnet-docker/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/AssertionResults", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "@aws-cdk/integ-tests-alpha.LambdaInvokeFunction", - "version": "2.80.0-alpha.0" + "version": "2.129.0-alpha.0" } }, "SingletonFunction1488541a7b23466481b69b4408076b81": { @@ -270,7 +270,7 @@ "path": "lambda-dotnet-docker/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Staging", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", - "version": "2.80.0" + "version": "2.129.0" } }, "Role": { @@ -278,7 +278,7 @@ "path": "lambda-dotnet-docker/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", - "version": "2.80.0" + "version": "2.129.0" } }, "Handler": { @@ -286,7 +286,7 @@ "path": "lambda-dotnet-docker/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", - "version": "2.80.0" + "version": "2.129.0" } } }, @@ -300,7 +300,7 @@ "path": "lambda-dotnet-docker/DefaultTest/DeployAssert/BootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", - "version": "2.80.0" + "version": "2.129.0" } }, "CheckBootstrapVersion": { @@ -308,25 +308,25 @@ "path": "lambda-dotnet-docker/DefaultTest/DeployAssert/CheckBootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnRule", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.Stack", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", - "version": "2.80.0-alpha.0" + "version": "2.129.0-alpha.0" } } }, "constructInfo": { "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", - "version": "2.80.0-alpha.0" + "version": "2.129.0-alpha.0" } }, "Tree": { @@ -340,7 +340,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.App", - "version": "2.80.0" + "version": "2.129.0" } } } \ No newline at end of file diff --git a/test/integ.function.ts.snapshot/cdk.out b/test/integ.function.ts.snapshot/cdk.out index 7925065..1f0068d 100644 --- a/test/integ.function.ts.snapshot/cdk.out +++ b/test/integ.function.ts.snapshot/cdk.out @@ -1 +1 @@ -{"version":"31.0.0"} \ No newline at end of file +{"version":"36.0.0"} \ No newline at end of file diff --git a/test/integ.function.ts.snapshot/integ-lambda-dotnet-function.assets.json b/test/integ.function.ts.snapshot/integ-lambda-dotnet-function.assets.json index 927faff..dda9b25 100644 --- a/test/integ.function.ts.snapshot/integ-lambda-dotnet-function.assets.json +++ b/test/integ.function.ts.snapshot/integ-lambda-dotnet-function.assets.json @@ -1,20 +1,20 @@ { - "version": "31.0.0", + "version": "36.0.0", "files": { - "a8cf4afc095cddadec8a6ad807c6bd458d3baca0dfa252ea2f39f6dfe00ec70f": { + "880faf7d469b3e864f4cddb11c44cc90c0dd86c2774dded5d4116afac6200cee": { "source": { - "path": "asset.a8cf4afc095cddadec8a6ad807c6bd458d3baca0dfa252ea2f39f6dfe00ec70f", - "packaging": "zip" + "path": "asset.880faf7d469b3e864f4cddb11c44cc90c0dd86c2774dded5d4116afac6200cee.zip", + "packaging": "file" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "a8cf4afc095cddadec8a6ad807c6bd458d3baca0dfa252ea2f39f6dfe00ec70f.zip", + "objectKey": "880faf7d469b3e864f4cddb11c44cc90c0dd86c2774dded5d4116afac6200cee.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "7ac93901ce077228cfa1cacd5dd59d61a6e73c19d3f45911d40a087df5303ef4": { + "61fd443e3b7682a829ce5ba5b02f21dc1711f15b70e914c09beac76c1db44be4": { "source": { "path": "integ-lambda-dotnet-function.template.json", "packaging": "file" @@ -22,7 +22,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "7ac93901ce077228cfa1cacd5dd59d61a6e73c19d3f45911d40a087df5303ef4.json", + "objectKey": "61fd443e3b7682a829ce5ba5b02f21dc1711f15b70e914c09beac76c1db44be4.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/test/integ.function.ts.snapshot/integ-lambda-dotnet-function.template.json b/test/integ.function.ts.snapshot/integ-lambda-dotnet-function.template.json index c251fc2..f093379 100644 --- a/test/integ.function.ts.snapshot/integ-lambda-dotnet-function.template.json +++ b/test/integ.function.ts.snapshot/integ-lambda-dotnet-function.template.json @@ -34,23 +34,23 @@ "lambdahandler909F9205": { "Type": "AWS::Lambda::Function", "Properties": { + "Architectures": [ + "x86_64" + ], "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "a8cf4afc095cddadec8a6ad807c6bd458d3baca0dfa252ea2f39f6dfe00ec70f.zip" + "S3Key": "880faf7d469b3e864f4cddb11c44cc90c0dd86c2774dded5d4116afac6200cee.zip" }, + "Handler": "LambdaHandler::LambdaHandler.Function::FunctionHandler", "Role": { "Fn::GetAtt": [ "lambdahandlerServiceRoleA08D1FE8", "Arn" ] }, - "Architectures": [ - "x86_64" - ], - "Handler": "LambdaHandler::LambdaHandler.Function::FunctionHandler", - "Runtime": "dotnet6" + "Runtime": "dotnet8" }, "DependsOn": [ "lambdahandlerServiceRoleA08D1FE8" diff --git a/test/integ.function.ts.snapshot/integ.json b/test/integ.function.ts.snapshot/integ.json index bdf127d..a83265d 100644 --- a/test/integ.function.ts.snapshot/integ.json +++ b/test/integ.function.ts.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "31.0.0", + "version": "36.0.0", "testCases": { "lambda-dotnet-function/DefaultTest": { "stacks": [ diff --git a/test/integ.function.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets.json b/test/integ.function.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets.json index 5659d42..3bd8dee 100644 --- a/test/integ.function.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets.json +++ b/test/integ.function.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets.json @@ -1,20 +1,20 @@ { - "version": "31.0.0", + "version": "36.0.0", "files": { - "ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3": { + "ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5": { "source": { - "path": "asset.ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3.bundle", + "path": "asset.ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5.bundle", "packaging": "zip" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3.zip", + "objectKey": "ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "7b800c8ad2e7f746f1bf0e070096d54dd1452db5ed12da30fb4be3e1442c4705": { + "59d6f94097a89ad656749a6b888995318e24f0f7483a7c4d8ed2b9967fbd1b74": { "source": { "path": "lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json", "packaging": "file" @@ -22,7 +22,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "7b800c8ad2e7f746f1bf0e070096d54dd1452db5ed12da30fb4be3e1442c4705.json", + "objectKey": "59d6f94097a89ad656749a6b888995318e24f0f7483a7c4d8ed2b9967fbd1b74.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/test/integ.function.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json b/test/integ.function.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json index 178aa0a..fef3407 100644 --- a/test/integ.function.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json +++ b/test/integ.function.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json @@ -14,11 +14,20 @@ "expected": "{\"$ObjectLike\":{\"Payload\":\"\\\"Ok\\\"\"}}", "parameters": { "FunctionName": { - "Fn::ImportValue": "integ-lambda-dotnet-function:ExportsOutputReflambdahandler909F920591EA4974" + "Fn::Join": [ + "", + [ + "\"", + { + "Fn::ImportValue": "integ-lambda-dotnet-function:ExportsOutputReflambdahandler909F920591EA4974" + }, + "\"" + ] + ] } }, "flattenResponse": "false", - "salt": "1701534786754" + "salt": "1726515887920" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" @@ -113,12 +122,12 @@ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F": { "Type": "AWS::Lambda::Function", "Properties": { - "Runtime": "nodejs14.x", + "Runtime": "nodejs18.x", "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3.zip" + "S3Key": "ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5.zip" }, "Timeout": 120, "Handler": "index.handler", diff --git a/test/integ.function.ts.snapshot/manifest.json b/test/integ.function.ts.snapshot/manifest.json index 04c9812..b449123 100644 --- a/test/integ.function.ts.snapshot/manifest.json +++ b/test/integ.function.ts.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "35.0.0", + "version": "36.0.24", "artifacts": { "integ-lambda-dotnet-function.assets": { "type": "cdk:asset-manifest", @@ -14,10 +14,11 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "integ-lambda-dotnet-function.template.json", + "terminationProtection": false, "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/7ac93901ce077228cfa1cacd5dd59d61a6e73c19d3f45911d40a087df5303ef4.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/61fd443e3b7682a829ce5ba5b02f21dc1711f15b70e914c09beac76c1db44be4.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -85,10 +86,11 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json", + "terminationProtection": false, "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/7b800c8ad2e7f746f1bf0e070096d54dd1452db5ed12da30fb4be3e1442c4705.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/59d6f94097a89ad656749a6b888995318e24f0f7483a7c4d8ed2b9967fbd1b74.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/test/integ.function.ts.snapshot/tree.json b/test/integ.function.ts.snapshot/tree.json index c1de224..a56d570 100644 --- a/test/integ.function.ts.snapshot/tree.json +++ b/test/integ.function.ts.snapshot/tree.json @@ -21,7 +21,7 @@ "path": "integ-lambda-dotnet-function/lambda-handler/ServiceRole/ImportServiceRole", "constructInfo": { "fqn": "aws-cdk-lib.Resource", - "version": "2.80.0" + "version": "2.129.0" } }, "Resource": { @@ -60,13 +60,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_iam.CfnRole", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.aws_iam.Role", - "version": "2.80.0" + "version": "2.129.0" } }, "Code": { @@ -78,7 +78,7 @@ "path": "integ-lambda-dotnet-function/lambda-handler/Code/Stage", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", - "version": "2.80.0" + "version": "2.129.0" } }, "AssetBucket": { @@ -86,13 +86,13 @@ "path": "integ-lambda-dotnet-function/lambda-handler/Code/AssetBucket", "constructInfo": { "fqn": "aws-cdk-lib.aws_s3.BucketBase", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.aws_s3_assets.Asset", - "version": "2.80.0" + "version": "2.129.0" } }, "Resource": { @@ -101,34 +101,34 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::Lambda::Function", "aws:cdk:cloudformation:props": { + "architectures": [ + "x86_64" + ], "code": { "s3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "s3Key": "a8cf4afc095cddadec8a6ad807c6bd458d3baca0dfa252ea2f39f6dfe00ec70f.zip" + "s3Key": "880faf7d469b3e864f4cddb11c44cc90c0dd86c2774dded5d4116afac6200cee.zip" }, + "handler": "LambdaHandler::LambdaHandler.Function::FunctionHandler", "role": { "Fn::GetAtt": [ "lambdahandlerServiceRoleA08D1FE8", "Arn" ] }, - "architectures": [ - "x86_64" - ], - "handler": "LambdaHandler::LambdaHandler.Function::FunctionHandler", - "runtime": "dotnet6" + "runtime": "dotnet8" } }, "constructInfo": { "fqn": "aws-cdk-lib.aws_lambda.CfnFunction", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-lambda-dotnet.DotNetFunction", - "version": "0.0.0" + "fqn": "aws-cdk-lib.aws_lambda.Function", + "version": "2.129.0" } }, "FunctionArn": { @@ -136,7 +136,7 @@ "path": "integ-lambda-dotnet-function/FunctionArn", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", - "version": "2.80.0" + "version": "2.129.0" } }, "Exports": { @@ -148,7 +148,7 @@ "path": "integ-lambda-dotnet-function/Exports/Output{\"Ref\":\"lambdahandler909F9205\"}", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", - "version": "2.80.0" + "version": "2.129.0" } } }, @@ -162,7 +162,7 @@ "path": "integ-lambda-dotnet-function/BootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", - "version": "2.80.0" + "version": "2.129.0" } }, "CheckBootstrapVersion": { @@ -170,13 +170,13 @@ "path": "integ-lambda-dotnet-function/CheckBootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnRule", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.Stack", - "version": "2.80.0" + "version": "2.129.0" } }, "lambda-dotnet-function": { @@ -218,7 +218,7 @@ }, "constructInfo": { "fqn": "@aws-cdk/integ-tests-alpha.AssertionsProvider", - "version": "2.80.0-alpha.0" + "version": "2.129.0-alpha.0" } }, "Default": { @@ -230,13 +230,13 @@ "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/Default/Default", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.CustomResource", - "version": "2.80.0" + "version": "2.129.0" } }, "Invoke": { @@ -244,7 +244,7 @@ "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/Invoke", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", - "version": "2.80.0" + "version": "2.129.0" } }, "AssertionResults": { @@ -252,13 +252,13 @@ "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/AssertionResults", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "@aws-cdk/integ-tests-alpha.LambdaInvokeFunction", - "version": "2.80.0-alpha.0" + "version": "2.129.0-alpha.0" } }, "SingletonFunction1488541a7b23466481b69b4408076b81": { @@ -270,7 +270,7 @@ "path": "lambda-dotnet-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Staging", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", - "version": "2.80.0" + "version": "2.129.0" } }, "Role": { @@ -278,7 +278,7 @@ "path": "lambda-dotnet-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", - "version": "2.80.0" + "version": "2.129.0" } }, "Handler": { @@ -286,7 +286,7 @@ "path": "lambda-dotnet-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", - "version": "2.80.0" + "version": "2.129.0" } } }, @@ -300,7 +300,7 @@ "path": "lambda-dotnet-function/DefaultTest/DeployAssert/BootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", - "version": "2.80.0" + "version": "2.129.0" } }, "CheckBootstrapVersion": { @@ -308,25 +308,25 @@ "path": "lambda-dotnet-function/DefaultTest/DeployAssert/CheckBootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnRule", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.Stack", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", - "version": "2.80.0-alpha.0" + "version": "2.129.0-alpha.0" } } }, "constructInfo": { "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", - "version": "2.80.0-alpha.0" + "version": "2.129.0-alpha.0" } }, "Tree": { @@ -340,7 +340,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.App", - "version": "2.80.0" + "version": "2.129.0" } } } \ No newline at end of file From 95f02cc4048652cd3343dc7961d706743084ef2a Mon Sep 17 00:00:00 2001 From: Lasse Christiansen Date: Mon, 16 Sep 2024 21:57:05 +0200 Subject: [PATCH 6/9] Added snapshot for 'integ.function-dotnet6'. --- .../cdk.out | 1 + .../integ-lambda-dotnet-function.assets.json | 32 ++ ...integ-lambda-dotnet-function.template.json | 112 ++++++ .../integ.json | 13 + ...efaultTestDeployAssert02A806B6.assets.json | 32 ++ ...aultTestDeployAssert02A806B6.template.json | 187 ++++++++++ .../manifest.json | 162 ++++++++ .../tree.json | 346 ++++++++++++++++++ 8 files changed, 885 insertions(+) create mode 100644 test/integ.function-dotnet6.ts.snapshot/cdk.out create mode 100644 test/integ.function-dotnet6.ts.snapshot/integ-lambda-dotnet-function.assets.json create mode 100644 test/integ.function-dotnet6.ts.snapshot/integ-lambda-dotnet-function.template.json create mode 100644 test/integ.function-dotnet6.ts.snapshot/integ.json create mode 100644 test/integ.function-dotnet6.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets.json create mode 100644 test/integ.function-dotnet6.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json create mode 100644 test/integ.function-dotnet6.ts.snapshot/manifest.json create mode 100644 test/integ.function-dotnet6.ts.snapshot/tree.json diff --git a/test/integ.function-dotnet6.ts.snapshot/cdk.out b/test/integ.function-dotnet6.ts.snapshot/cdk.out new file mode 100644 index 0000000..1f0068d --- /dev/null +++ b/test/integ.function-dotnet6.ts.snapshot/cdk.out @@ -0,0 +1 @@ +{"version":"36.0.0"} \ No newline at end of file diff --git a/test/integ.function-dotnet6.ts.snapshot/integ-lambda-dotnet-function.assets.json b/test/integ.function-dotnet6.ts.snapshot/integ-lambda-dotnet-function.assets.json new file mode 100644 index 0000000..a3b8ba3 --- /dev/null +++ b/test/integ.function-dotnet6.ts.snapshot/integ-lambda-dotnet-function.assets.json @@ -0,0 +1,32 @@ +{ + "version": "36.0.0", + "files": { + "7cd6170ac34e8169c98d47b2b9c45a9e73cc8bb98b36c753533be1a88991c36a": { + "source": { + "path": "asset.7cd6170ac34e8169c98d47b2b9c45a9e73cc8bb98b36c753533be1a88991c36a.zip", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "7cd6170ac34e8169c98d47b2b9c45a9e73cc8bb98b36c753533be1a88991c36a.zip", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + }, + "fdd2a61550feaa23a7c744b51e71da674403f4bc6c8e8c2b56ab1cd74a124568": { + "source": { + "path": "integ-lambda-dotnet-function.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "fdd2a61550feaa23a7c744b51e71da674403f4bc6c8e8c2b56ab1cd74a124568.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/test/integ.function-dotnet6.ts.snapshot/integ-lambda-dotnet-function.template.json b/test/integ.function-dotnet6.ts.snapshot/integ-lambda-dotnet-function.template.json new file mode 100644 index 0000000..f32c94a --- /dev/null +++ b/test/integ.function-dotnet6.ts.snapshot/integ-lambda-dotnet-function.template.json @@ -0,0 +1,112 @@ +{ + "Resources": { + "lambdahandlerServiceRoleA08D1FE8": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "lambdahandler909F9205": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Architectures": [ + "x86_64" + ], + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "7cd6170ac34e8169c98d47b2b9c45a9e73cc8bb98b36c753533be1a88991c36a.zip" + }, + "Handler": "LambdaHandler::LambdaHandler.Function::FunctionHandler", + "Role": { + "Fn::GetAtt": [ + "lambdahandlerServiceRoleA08D1FE8", + "Arn" + ] + }, + "Runtime": "dotnet6" + }, + "DependsOn": [ + "lambdahandlerServiceRoleA08D1FE8" + ] + } + }, + "Outputs": { + "FunctionArn": { + "Value": { + "Fn::GetAtt": [ + "lambdahandler909F9205", + "Arn" + ] + } + }, + "ExportsOutputReflambdahandler909F920591EA4974": { + "Value": { + "Ref": "lambdahandler909F9205" + }, + "Export": { + "Name": "integ-lambda-dotnet-function:ExportsOutputReflambdahandler909F920591EA4974" + } + } + }, + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/test/integ.function-dotnet6.ts.snapshot/integ.json b/test/integ.function-dotnet6.ts.snapshot/integ.json new file mode 100644 index 0000000..a83265d --- /dev/null +++ b/test/integ.function-dotnet6.ts.snapshot/integ.json @@ -0,0 +1,13 @@ +{ + "version": "36.0.0", + "testCases": { + "lambda-dotnet-function/DefaultTest": { + "stacks": [ + "integ-lambda-dotnet-function" + ], + "stackUpdateWorkflow": false, + "assertionStack": "lambda-dotnet-function/DefaultTest/DeployAssert", + "assertionStackName": "lambdadotnetfunctionDefaultTestDeployAssert02A806B6" + } + } +} \ No newline at end of file diff --git a/test/integ.function-dotnet6.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets.json b/test/integ.function-dotnet6.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets.json new file mode 100644 index 0000000..e806441 --- /dev/null +++ b/test/integ.function-dotnet6.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets.json @@ -0,0 +1,32 @@ +{ + "version": "36.0.0", + "files": { + "ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5": { + "source": { + "path": "asset.ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5.bundle", + "packaging": "zip" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5.zip", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + }, + "6c9f2811c961e5cd8a3288a17331f7b33726b8b63ad7a00bbf888fc00b5ca149": { + "source": { + "path": "lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "6c9f2811c961e5cd8a3288a17331f7b33726b8b63ad7a00bbf888fc00b5ca149.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/test/integ.function-dotnet6.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json b/test/integ.function-dotnet6.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json new file mode 100644 index 0000000..22acfa0 --- /dev/null +++ b/test/integ.function-dotnet6.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json @@ -0,0 +1,187 @@ +{ + "Resources": { + "LambdaInvokece74e9560f1fda89c7913fc5a3d498a1": { + "Type": "Custom::DeployAssert@SdkCallLambdainvoke", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F", + "Arn" + ] + }, + "service": "Lambda", + "api": "invoke", + "expected": "{\"$ObjectLike\":{\"Payload\":\"\\\"Ok\\\"\"}}", + "parameters": { + "FunctionName": { + "Fn::Join": [ + "", + [ + "\"", + { + "Fn::ImportValue": "integ-lambda-dotnet-function:ExportsOutputReflambdahandler909F920591EA4974" + }, + "\"" + ] + ] + } + }, + "flattenResponse": "false", + "salt": "1726516110217" + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, + "LambdaInvokece74e9560f1fda89c7913fc5a3d498a1InvokeB79DA780": { + "Type": "AWS::Lambda::Permission", + "Properties": { + "Action": "lambda:InvokeFunction", + "FunctionName": { + "Fn::ImportValue": "integ-lambda-dotnet-function:ExportsOutputReflambdahandler909F920591EA4974" + }, + "Principal": { + "Fn::GetAtt": [ + "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73", + "Arn" + ] + } + } + }, + "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ] + }, + "ManagedPolicyArns": [ + { + "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + } + ], + "Policies": [ + { + "PolicyName": "Inline", + "PolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": [ + "lambda:Invoke" + ], + "Effect": "Allow", + "Resource": [ + "*" + ] + }, + { + "Action": [ + "lambda:InvokeFunction" + ], + "Effect": "Allow", + "Resource": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":lambda:", + { + "Ref": "AWS::Region" + }, + ":", + { + "Ref": "AWS::AccountId" + }, + ":function:", + { + "Fn::ImportValue": "integ-lambda-dotnet-function:ExportsOutputReflambdahandler909F920591EA4974" + } + ] + ] + } + ] + } + ] + } + } + ] + } + }, + "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Runtime": "nodejs18.x", + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5.zip" + }, + "Timeout": 120, + "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73", + "Arn" + ] + } + } + } + }, + "Outputs": { + "AssertionResultsLambdaInvokece74e9560f1fda89c7913fc5a3d498a1": { + "Value": { + "Fn::GetAtt": [ + "LambdaInvokece74e9560f1fda89c7913fc5a3d498a1", + "assertion" + ] + } + } + }, + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/test/integ.function-dotnet6.ts.snapshot/manifest.json b/test/integ.function-dotnet6.ts.snapshot/manifest.json new file mode 100644 index 0000000..8208d7f --- /dev/null +++ b/test/integ.function-dotnet6.ts.snapshot/manifest.json @@ -0,0 +1,162 @@ +{ + "version": "36.0.24", + "artifacts": { + "integ-lambda-dotnet-function.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "integ-lambda-dotnet-function.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "integ-lambda-dotnet-function": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "integ-lambda-dotnet-function.template.json", + "terminationProtection": false, + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fdd2a61550feaa23a7c744b51e71da674403f4bc6c8e8c2b56ab1cd74a124568.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "integ-lambda-dotnet-function.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "integ-lambda-dotnet-function.assets" + ], + "metadata": { + "/integ-lambda-dotnet-function/lambda-handler/ServiceRole/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "lambdahandlerServiceRoleA08D1FE8" + } + ], + "/integ-lambda-dotnet-function/lambda-handler/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "lambdahandler909F9205" + } + ], + "/integ-lambda-dotnet-function/FunctionArn": [ + { + "type": "aws:cdk:logicalId", + "data": "FunctionArn" + } + ], + "/integ-lambda-dotnet-function/Exports/Output{\"Ref\":\"lambdahandler909F9205\"}": [ + { + "type": "aws:cdk:logicalId", + "data": "ExportsOutputReflambdahandler909F920591EA4974" + } + ], + "/integ-lambda-dotnet-function/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/integ-lambda-dotnet-function/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "integ-lambda-dotnet-function" + }, + "lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "lambdadotnetfunctionDefaultTestDeployAssert02A806B6": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json", + "terminationProtection": false, + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6c9f2811c961e5cd8a3288a17331f7b33726b8b63ad7a00bbf888fc00b5ca149.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "integ-lambda-dotnet-function", + "lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets" + ], + "metadata": { + "/lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/Default/Default": [ + { + "type": "aws:cdk:logicalId", + "data": "LambdaInvokece74e9560f1fda89c7913fc5a3d498a1" + } + ], + "/lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/Invoke": [ + { + "type": "aws:cdk:logicalId", + "data": "LambdaInvokece74e9560f1fda89c7913fc5a3d498a1InvokeB79DA780" + } + ], + "/lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/AssertionResults": [ + { + "type": "aws:cdk:logicalId", + "data": "AssertionResultsLambdaInvokece74e9560f1fda89c7913fc5a3d498a1" + } + ], + "/lambda-dotnet-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role": [ + { + "type": "aws:cdk:logicalId", + "data": "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73" + } + ], + "/lambda-dotnet-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler": [ + { + "type": "aws:cdk:logicalId", + "data": "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F" + } + ], + "/lambda-dotnet-function/DefaultTest/DeployAssert/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/lambda-dotnet-function/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "lambda-dotnet-function/DefaultTest/DeployAssert" + }, + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } + } + } +} \ No newline at end of file diff --git a/test/integ.function-dotnet6.ts.snapshot/tree.json b/test/integ.function-dotnet6.ts.snapshot/tree.json new file mode 100644 index 0000000..2a8acab --- /dev/null +++ b/test/integ.function-dotnet6.ts.snapshot/tree.json @@ -0,0 +1,346 @@ +{ + "version": "tree-0.1", + "tree": { + "id": "App", + "path": "", + "children": { + "integ-lambda-dotnet-function": { + "id": "integ-lambda-dotnet-function", + "path": "integ-lambda-dotnet-function", + "children": { + "lambda-handler": { + "id": "lambda-handler", + "path": "integ-lambda-dotnet-function/lambda-handler", + "children": { + "ServiceRole": { + "id": "ServiceRole", + "path": "integ-lambda-dotnet-function/lambda-handler/ServiceRole", + "children": { + "ImportServiceRole": { + "id": "ImportServiceRole", + "path": "integ-lambda-dotnet-function/lambda-handler/ServiceRole/ImportServiceRole", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "2.129.0" + } + }, + "Resource": { + "id": "Resource", + "path": "integ-lambda-dotnet-function/lambda-handler/ServiceRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "managedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iam.CfnRole", + "version": "2.129.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iam.Role", + "version": "2.129.0" + } + }, + "Code": { + "id": "Code", + "path": "integ-lambda-dotnet-function/lambda-handler/Code", + "children": { + "Stage": { + "id": "Stage", + "path": "integ-lambda-dotnet-function/lambda-handler/Code/Stage", + "constructInfo": { + "fqn": "aws-cdk-lib.AssetStaging", + "version": "2.129.0" + } + }, + "AssetBucket": { + "id": "AssetBucket", + "path": "integ-lambda-dotnet-function/lambda-handler/Code/AssetBucket", + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3.BucketBase", + "version": "2.129.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3_assets.Asset", + "version": "2.129.0" + } + }, + "Resource": { + "id": "Resource", + "path": "integ-lambda-dotnet-function/lambda-handler/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Lambda::Function", + "aws:cdk:cloudformation:props": { + "architectures": [ + "x86_64" + ], + "code": { + "s3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "s3Key": "7cd6170ac34e8169c98d47b2b9c45a9e73cc8bb98b36c753533be1a88991c36a.zip" + }, + "handler": "LambdaHandler::LambdaHandler.Function::FunctionHandler", + "role": { + "Fn::GetAtt": [ + "lambdahandlerServiceRoleA08D1FE8", + "Arn" + ] + }, + "runtime": "dotnet6" + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_lambda.CfnFunction", + "version": "2.129.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_lambda.Function", + "version": "2.129.0" + } + }, + "FunctionArn": { + "id": "FunctionArn", + "path": "integ-lambda-dotnet-function/FunctionArn", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnOutput", + "version": "2.129.0" + } + }, + "Exports": { + "id": "Exports", + "path": "integ-lambda-dotnet-function/Exports", + "children": { + "Output{\"Ref\":\"lambdahandler909F9205\"}": { + "id": "Output{\"Ref\":\"lambdahandler909F9205\"}", + "path": "integ-lambda-dotnet-function/Exports/Output{\"Ref\":\"lambdahandler909F9205\"}", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnOutput", + "version": "2.129.0" + } + } + }, + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.0.5" + } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "integ-lambda-dotnet-function/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "2.129.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "integ-lambda-dotnet-function/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "2.129.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.Stack", + "version": "2.129.0" + } + }, + "lambda-dotnet-function": { + "id": "lambda-dotnet-function", + "path": "lambda-dotnet-function", + "children": { + "DefaultTest": { + "id": "DefaultTest", + "path": "lambda-dotnet-function/DefaultTest", + "children": { + "Default": { + "id": "Default", + "path": "lambda-dotnet-function/DefaultTest/Default", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.0.5" + } + }, + "DeployAssert": { + "id": "DeployAssert", + "path": "lambda-dotnet-function/DefaultTest/DeployAssert", + "children": { + "LambdaInvokece74e9560f1fda89c7913fc5a3d498a1": { + "id": "LambdaInvokece74e9560f1fda89c7913fc5a3d498a1", + "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1", + "children": { + "SdkProvider": { + "id": "SdkProvider", + "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/SdkProvider", + "children": { + "AssertionsProvider": { + "id": "AssertionsProvider", + "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/SdkProvider/AssertionsProvider", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.0.5" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.AssertionsProvider", + "version": "2.129.0-alpha.0" + } + }, + "Default": { + "id": "Default", + "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/Default", + "children": { + "Default": { + "id": "Default", + "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/Default/Default", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnResource", + "version": "2.129.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.CustomResource", + "version": "2.129.0" + } + }, + "Invoke": { + "id": "Invoke", + "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/Invoke", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnResource", + "version": "2.129.0" + } + }, + "AssertionResults": { + "id": "AssertionResults", + "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/AssertionResults", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnOutput", + "version": "2.129.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.LambdaInvokeFunction", + "version": "2.129.0-alpha.0" + } + }, + "SingletonFunction1488541a7b23466481b69b4408076b81": { + "id": "SingletonFunction1488541a7b23466481b69b4408076b81", + "path": "lambda-dotnet-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81", + "children": { + "Staging": { + "id": "Staging", + "path": "lambda-dotnet-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Staging", + "constructInfo": { + "fqn": "aws-cdk-lib.AssetStaging", + "version": "2.129.0" + } + }, + "Role": { + "id": "Role", + "path": "lambda-dotnet-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnResource", + "version": "2.129.0" + } + }, + "Handler": { + "id": "Handler", + "path": "lambda-dotnet-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnResource", + "version": "2.129.0" + } + } + }, + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.0.5" + } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "lambda-dotnet-function/DefaultTest/DeployAssert/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "2.129.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "lambda-dotnet-function/DefaultTest/DeployAssert/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "2.129.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.Stack", + "version": "2.129.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", + "version": "2.129.0-alpha.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", + "version": "2.129.0-alpha.0" + } + }, + "Tree": { + "id": "Tree", + "path": "Tree", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.0.5" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.App", + "version": "2.129.0" + } + } +} \ No newline at end of file From 07ce7fd03836072f9dcb202133ee1c7f36e00b84 Mon Sep 17 00:00:00 2001 From: Lasse Christiansen Date: Mon, 16 Sep 2024 21:58:33 +0200 Subject: [PATCH 7/9] Updated the custom runtime for 'integ.function-aot' to Amazon Linux 2023 (PROVIDED_AL2023). --- test/integ.function-aot.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integ.function-aot.ts b/test/integ.function-aot.ts index 925a10e..d2a1751 100644 --- a/test/integ.function-aot.ts +++ b/test/integ.function-aot.ts @@ -16,7 +16,7 @@ class TestStack extends Stack { const fn = new dotnet.DotNetFunction(this, 'lambda-handler', { projectDir: 'lambda-handler-aot', - runtime: lambda.Runtime.PROVIDED_AL2, + runtime: lambda.Runtime.PROVIDED_AL2023, bundling: { msbuildParameters: ['/p:PublishAot=true'], }, From 0ebba44d3372390764429d499bc8e3583268b674 Mon Sep 17 00:00:00 2001 From: Lasse Christiansen Date: Mon, 16 Sep 2024 22:11:04 +0200 Subject: [PATCH 8/9] Disabled globalization support in 'lambda-handler-aot' to avoid having to take a dependency on libicu. --- test/lambda-handler-aot/LambdaHandler.csproj | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/lambda-handler-aot/LambdaHandler.csproj b/test/lambda-handler-aot/LambdaHandler.csproj index d1f26df..9107cae 100644 --- a/test/lambda-handler-aot/LambdaHandler.csproj +++ b/test/lambda-handler-aot/LambdaHandler.csproj @@ -17,11 +17,9 @@ partial + + true - - - - From 51fa98a9dcf96b1821a475c4587ccd54eeb8a2a0 Mon Sep 17 00:00:00 2001 From: Lasse Christiansen Date: Mon, 16 Sep 2024 22:20:18 +0200 Subject: [PATCH 9/9] Updated snapshot for 'integ.function-aot'. --- test/integ.function-aot.ts.snapshot/cdk.out | 2 +- .../integ-lambda-dotnet-function.assets.json | 14 ++-- ...integ-lambda-dotnet-function.template.json | 12 ++-- .../integ.function-aot.ts.snapshot/integ.json | 2 +- ...efaultTestDeployAssert02A806B6.assets.json | 12 ++-- ...aultTestDeployAssert02A806B6.template.json | 17 +++-- .../manifest.json | 8 ++- test/integ.function-aot.ts.snapshot/tree.json | 70 +++++++++---------- 8 files changed, 74 insertions(+), 63 deletions(-) diff --git a/test/integ.function-aot.ts.snapshot/cdk.out b/test/integ.function-aot.ts.snapshot/cdk.out index 7925065..1f0068d 100644 --- a/test/integ.function-aot.ts.snapshot/cdk.out +++ b/test/integ.function-aot.ts.snapshot/cdk.out @@ -1 +1 @@ -{"version":"31.0.0"} \ No newline at end of file +{"version":"36.0.0"} \ No newline at end of file diff --git a/test/integ.function-aot.ts.snapshot/integ-lambda-dotnet-function.assets.json b/test/integ.function-aot.ts.snapshot/integ-lambda-dotnet-function.assets.json index 4cea5a2..f9e4a81 100644 --- a/test/integ.function-aot.ts.snapshot/integ-lambda-dotnet-function.assets.json +++ b/test/integ.function-aot.ts.snapshot/integ-lambda-dotnet-function.assets.json @@ -1,20 +1,20 @@ { - "version": "31.0.0", + "version": "36.0.0", "files": { - "3afcdc2564c22c22f2e8c7c164709f382276a3bb3c0e5707193d96f9eb2be352": { + "c8d221fd3a68e77e0bb5a1a3a20632d82241bd8594240ed97a0c270b29d76fe1": { "source": { - "path": "asset.3afcdc2564c22c22f2e8c7c164709f382276a3bb3c0e5707193d96f9eb2be352", - "packaging": "zip" + "path": "asset.c8d221fd3a68e77e0bb5a1a3a20632d82241bd8594240ed97a0c270b29d76fe1.zip", + "packaging": "file" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "3afcdc2564c22c22f2e8c7c164709f382276a3bb3c0e5707193d96f9eb2be352.zip", + "objectKey": "c8d221fd3a68e77e0bb5a1a3a20632d82241bd8594240ed97a0c270b29d76fe1.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "8b32c683122f98f83f1bc6a677493b2056a3ed55fb6e2ec6870cb08a464fc142": { + "3cecd6ad73d70bef6c99834469a796514b0f55ac40e537f945370fd2fc4b597d": { "source": { "path": "integ-lambda-dotnet-function.template.json", "packaging": "file" @@ -22,7 +22,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "8b32c683122f98f83f1bc6a677493b2056a3ed55fb6e2ec6870cb08a464fc142.json", + "objectKey": "3cecd6ad73d70bef6c99834469a796514b0f55ac40e537f945370fd2fc4b597d.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/test/integ.function-aot.ts.snapshot/integ-lambda-dotnet-function.template.json b/test/integ.function-aot.ts.snapshot/integ-lambda-dotnet-function.template.json index e81e789..e2fff0c 100644 --- a/test/integ.function-aot.ts.snapshot/integ-lambda-dotnet-function.template.json +++ b/test/integ.function-aot.ts.snapshot/integ-lambda-dotnet-function.template.json @@ -34,23 +34,23 @@ "lambdahandler909F9205": { "Type": "AWS::Lambda::Function", "Properties": { + "Architectures": [ + "x86_64" + ], "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "3afcdc2564c22c22f2e8c7c164709f382276a3bb3c0e5707193d96f9eb2be352.zip" + "S3Key": "c8d221fd3a68e77e0bb5a1a3a20632d82241bd8594240ed97a0c270b29d76fe1.zip" }, + "Handler": "LambdaHandler", "Role": { "Fn::GetAtt": [ "lambdahandlerServiceRoleA08D1FE8", "Arn" ] }, - "Architectures": [ - "x86_64" - ], - "Handler": "LambdaHandler", - "Runtime": "provided.al2" + "Runtime": "provided.al2023" }, "DependsOn": [ "lambdahandlerServiceRoleA08D1FE8" diff --git a/test/integ.function-aot.ts.snapshot/integ.json b/test/integ.function-aot.ts.snapshot/integ.json index bdf127d..a83265d 100644 --- a/test/integ.function-aot.ts.snapshot/integ.json +++ b/test/integ.function-aot.ts.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "31.0.0", + "version": "36.0.0", "testCases": { "lambda-dotnet-function/DefaultTest": { "stacks": [ diff --git a/test/integ.function-aot.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets.json b/test/integ.function-aot.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets.json index c44b07d..75726bf 100644 --- a/test/integ.function-aot.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets.json +++ b/test/integ.function-aot.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.assets.json @@ -1,20 +1,20 @@ { - "version": "31.0.0", + "version": "36.0.0", "files": { - "ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3": { + "ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5": { "source": { - "path": "asset.ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3.bundle", + "path": "asset.ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5.bundle", "packaging": "zip" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3.zip", + "objectKey": "ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "13f2f2564450a40bf43d77018823605bcbfa7fdf49245d56c5e516d8d3192e9f": { + "c7af404054ae80514e6e730ee4f0244146e414182b036979f382594c6632acbd": { "source": { "path": "lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json", "packaging": "file" @@ -22,7 +22,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "13f2f2564450a40bf43d77018823605bcbfa7fdf49245d56c5e516d8d3192e9f.json", + "objectKey": "c7af404054ae80514e6e730ee4f0244146e414182b036979f382594c6632acbd.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/test/integ.function-aot.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json b/test/integ.function-aot.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json index 256afc9..78b44ba 100644 --- a/test/integ.function-aot.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json +++ b/test/integ.function-aot.ts.snapshot/lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json @@ -14,11 +14,20 @@ "expected": "{\"$ObjectLike\":{\"Payload\":\"\\\"Ok\\\"\"}}", "parameters": { "FunctionName": { - "Fn::ImportValue": "integ-lambda-dotnet-function:ExportsOutputReflambdahandler909F920591EA4974" + "Fn::Join": [ + "", + [ + "\"", + { + "Fn::ImportValue": "integ-lambda-dotnet-function:ExportsOutputReflambdahandler909F920591EA4974" + }, + "\"" + ] + ] } }, "flattenResponse": "false", - "salt": "1701536823208" + "salt": "1726517775923" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" @@ -113,12 +122,12 @@ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F": { "Type": "AWS::Lambda::Function", "Properties": { - "Runtime": "nodejs14.x", + "Runtime": "nodejs18.x", "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3.zip" + "S3Key": "ac51674cf5325b7a0e5444d6b7c1f88607c16a031b852bd51c375ac8c5c4fce5.zip" }, "Timeout": 120, "Handler": "index.handler", diff --git a/test/integ.function-aot.ts.snapshot/manifest.json b/test/integ.function-aot.ts.snapshot/manifest.json index 5690142..d5f64f1 100644 --- a/test/integ.function-aot.ts.snapshot/manifest.json +++ b/test/integ.function-aot.ts.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "35.0.0", + "version": "36.0.24", "artifacts": { "integ-lambda-dotnet-function.assets": { "type": "cdk:asset-manifest", @@ -14,10 +14,11 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "integ-lambda-dotnet-function.template.json", + "terminationProtection": false, "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/8b32c683122f98f83f1bc6a677493b2056a3ed55fb6e2ec6870cb08a464fc142.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/3cecd6ad73d70bef6c99834469a796514b0f55ac40e537f945370fd2fc4b597d.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -85,10 +86,11 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "lambdadotnetfunctionDefaultTestDeployAssert02A806B6.template.json", + "terminationProtection": false, "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/13f2f2564450a40bf43d77018823605bcbfa7fdf49245d56c5e516d8d3192e9f.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c7af404054ae80514e6e730ee4f0244146e414182b036979f382594c6632acbd.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/test/integ.function-aot.ts.snapshot/tree.json b/test/integ.function-aot.ts.snapshot/tree.json index 9cc7850..84719bd 100644 --- a/test/integ.function-aot.ts.snapshot/tree.json +++ b/test/integ.function-aot.ts.snapshot/tree.json @@ -21,7 +21,7 @@ "path": "integ-lambda-dotnet-function/lambda-handler/ServiceRole/ImportServiceRole", "constructInfo": { "fqn": "aws-cdk-lib.Resource", - "version": "2.80.0" + "version": "2.129.0" } }, "Resource": { @@ -60,13 +60,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_iam.CfnRole", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.aws_iam.Role", - "version": "2.80.0" + "version": "2.129.0" } }, "Code": { @@ -78,7 +78,7 @@ "path": "integ-lambda-dotnet-function/lambda-handler/Code/Stage", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", - "version": "2.80.0" + "version": "2.129.0" } }, "AssetBucket": { @@ -86,13 +86,13 @@ "path": "integ-lambda-dotnet-function/lambda-handler/Code/AssetBucket", "constructInfo": { "fqn": "aws-cdk-lib.aws_s3.BucketBase", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.aws_s3_assets.Asset", - "version": "2.80.0" + "version": "2.129.0" } }, "Resource": { @@ -101,34 +101,34 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::Lambda::Function", "aws:cdk:cloudformation:props": { + "architectures": [ + "x86_64" + ], "code": { "s3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "s3Key": "3afcdc2564c22c22f2e8c7c164709f382276a3bb3c0e5707193d96f9eb2be352.zip" + "s3Key": "c8d221fd3a68e77e0bb5a1a3a20632d82241bd8594240ed97a0c270b29d76fe1.zip" }, + "handler": "LambdaHandler", "role": { "Fn::GetAtt": [ "lambdahandlerServiceRoleA08D1FE8", "Arn" ] }, - "architectures": [ - "x86_64" - ], - "handler": "LambdaHandler", - "runtime": "provided.al2" + "runtime": "provided.al2023" } }, "constructInfo": { "fqn": "aws-cdk-lib.aws_lambda.CfnFunction", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-lambda-dotnet.DotNetFunction", - "version": "0.0.0" + "fqn": "aws-cdk-lib.aws_lambda.Function", + "version": "2.129.0" } }, "FunctionArn": { @@ -136,7 +136,7 @@ "path": "integ-lambda-dotnet-function/FunctionArn", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", - "version": "2.80.0" + "version": "2.129.0" } }, "Exports": { @@ -148,7 +148,7 @@ "path": "integ-lambda-dotnet-function/Exports/Output{\"Ref\":\"lambdahandler909F9205\"}", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", - "version": "2.80.0" + "version": "2.129.0" } } }, @@ -162,7 +162,7 @@ "path": "integ-lambda-dotnet-function/BootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", - "version": "2.80.0" + "version": "2.129.0" } }, "CheckBootstrapVersion": { @@ -170,13 +170,13 @@ "path": "integ-lambda-dotnet-function/CheckBootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnRule", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.Stack", - "version": "2.80.0" + "version": "2.129.0" } }, "lambda-dotnet-function": { @@ -218,7 +218,7 @@ }, "constructInfo": { "fqn": "@aws-cdk/integ-tests-alpha.AssertionsProvider", - "version": "2.80.0-alpha.0" + "version": "2.129.0-alpha.0" } }, "Default": { @@ -230,13 +230,13 @@ "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/Default/Default", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.CustomResource", - "version": "2.80.0" + "version": "2.129.0" } }, "Invoke": { @@ -244,7 +244,7 @@ "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/Invoke", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", - "version": "2.80.0" + "version": "2.129.0" } }, "AssertionResults": { @@ -252,13 +252,13 @@ "path": "lambda-dotnet-function/DefaultTest/DeployAssert/LambdaInvokece74e9560f1fda89c7913fc5a3d498a1/AssertionResults", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "@aws-cdk/integ-tests-alpha.LambdaInvokeFunction", - "version": "2.80.0-alpha.0" + "version": "2.129.0-alpha.0" } }, "SingletonFunction1488541a7b23466481b69b4408076b81": { @@ -270,7 +270,7 @@ "path": "lambda-dotnet-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Staging", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", - "version": "2.80.0" + "version": "2.129.0" } }, "Role": { @@ -278,7 +278,7 @@ "path": "lambda-dotnet-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", - "version": "2.80.0" + "version": "2.129.0" } }, "Handler": { @@ -286,7 +286,7 @@ "path": "lambda-dotnet-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", - "version": "2.80.0" + "version": "2.129.0" } } }, @@ -300,7 +300,7 @@ "path": "lambda-dotnet-function/DefaultTest/DeployAssert/BootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", - "version": "2.80.0" + "version": "2.129.0" } }, "CheckBootstrapVersion": { @@ -308,25 +308,25 @@ "path": "lambda-dotnet-function/DefaultTest/DeployAssert/CheckBootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnRule", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.Stack", - "version": "2.80.0" + "version": "2.129.0" } } }, "constructInfo": { "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", - "version": "2.80.0-alpha.0" + "version": "2.129.0-alpha.0" } } }, "constructInfo": { "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", - "version": "2.80.0-alpha.0" + "version": "2.129.0-alpha.0" } }, "Tree": { @@ -340,7 +340,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.App", - "version": "2.80.0" + "version": "2.129.0" } } } \ No newline at end of file