Skip to content

Commit

Permalink
Merge branch 'main' into mrgrain/chore/remove-a-script
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Nov 7, 2023
2 parents 90fb445 + 2717c5a commit dfd75a4
Show file tree
Hide file tree
Showing 13 changed files with 576 additions and 6 deletions.
1 change: 1 addition & 0 deletions packages/@aws-cdk/aws-lambda-go-alpha/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
"devDependencies": {
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/integ-runner": "0.0.0",
"@aws-cdk/integ-tests-alpha": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^29.5.5",
"aws-cdk-lib": "0.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk/aws-lambda-go-alpha/test/bundling.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ test('Local bundling', () => {
environment: {
KEY: 'value',
},
runtime: Runtime.PROVIDED_AL2,
runtime: Runtime.PROVIDED_AL2023,
architecture: Architecture.X86_64,
});

Expand Down Expand Up @@ -213,7 +213,7 @@ test('Incorrect go version', () => {
const bundler = new Bundling({
entry,
moduleDir,
runtime: Runtime.PROVIDED_AL2,
runtime: Runtime.PROVIDED_AL2023,
architecture: Architecture.X86_64,
});

Expand Down Expand Up @@ -308,7 +308,7 @@ test('with command hooks', () => {
Bundling.bundle({
entry,
moduleDir,
runtime: Runtime.PROVIDED_AL2,
runtime: Runtime.PROVIDED_AL2023,
architecture: Architecture.X86_64,
commandHooks: {
beforeBundling(inputDir: string, outputDir: string): string[] {
Expand Down
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
{
"Resources": {
"gohandlerdockerServiceRole70394790": {
"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"
]
]
}
]
}
},
"gohandlerdockerAE04F1B8": {
"Type": "AWS::Lambda::Function",
"Properties": {
"Code": {
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "92cf51642c9fbfef03751059a700f012eb605f85114cafc66e2fb70e37b18c64.zip"
},
"Handler": "bootstrap",
"Role": {
"Fn::GetAtt": [
"gohandlerdockerServiceRole70394790",
"Arn"
]
},
"Runtime": "provided.al2023"
},
"DependsOn": [
"gohandlerdockerServiceRole70394790"
]
}
},
"Parameters": {
"BootstrapVersion": {
"Type": "AWS::SSM::Parameter::Value<String>",
"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."
}
]
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit dfd75a4

Please sign in to comment.