Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
otaviomacedo authored Nov 19, 2021
2 parents 568c08c + 79a674e commit 06b835a
Show file tree
Hide file tree
Showing 22 changed files with 182 additions and 163 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.8",
"jest-junit": "^13.0.0",
"jsii-diff": "^1.44.1",
"jsii-pacmak": "^1.44.1",
"jsii-reflect": "^1.44.1",
"jsii-rosetta": "^1.44.1",
"jsii-diff": "^1.45.0",
"jsii-pacmak": "^1.45.0",
"jsii-reflect": "^1.45.0",
"jsii-rosetta": "^1.45.0",
"lerna": "^4.0.0",
"patch-package": "^6.4.7",
"standard-version": "^9.3.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
"Properties": {
"Code": {
"S3Bucket": {
"Ref": "AssetParameters9f18fc058c44780b1e001e16aaf1d5e9797bfddf5dfb1bd80d975d17d666cd39S3BucketD79B53B5"
"Ref": "AssetParameters7f2fe4e4fa40a84f0f773203f5c5fdaac31c80ce42c5185ed2659a049db03043S3BucketC7E46972"
},
"S3Key": {
"Fn::Join": [
Expand All @@ -222,7 +222,7 @@
"Fn::Split": [
"||",
{
"Ref": "AssetParameters9f18fc058c44780b1e001e16aaf1d5e9797bfddf5dfb1bd80d975d17d666cd39S3VersionKeyBD4EB73A"
"Ref": "AssetParameters7f2fe4e4fa40a84f0f773203f5c5fdaac31c80ce42c5185ed2659a049db03043S3VersionKeyA8ECA032"
}
]
}
Expand All @@ -235,7 +235,7 @@
"Fn::Split": [
"||",
{
"Ref": "AssetParameters9f18fc058c44780b1e001e16aaf1d5e9797bfddf5dfb1bd80d975d17d666cd39S3VersionKeyBD4EB73A"
"Ref": "AssetParameters7f2fe4e4fa40a84f0f773203f5c5fdaac31c80ce42c5185ed2659a049db03043S3VersionKeyA8ECA032"
}
]
}
Expand Down Expand Up @@ -294,7 +294,7 @@
"Properties": {
"Code": {
"S3Bucket": {
"Ref": "AssetParameters6aa0cc1f9a795a53023fe252d5a37a9c14f6d951ac9c11e8de6fa1a97e4e089cS3Bucket4210957A"
"Ref": "AssetParameters1fd1c15cb7d5e2e36a11745fd10b4b7c3ca8eb30642b41954630413d2b913cdaS3Bucket2E6D85D3"
},
"S3Key": {
"Fn::Join": [
Expand All @@ -307,7 +307,7 @@
"Fn::Split": [
"||",
{
"Ref": "AssetParameters6aa0cc1f9a795a53023fe252d5a37a9c14f6d951ac9c11e8de6fa1a97e4e089cS3VersionKey42ACAC36"
"Ref": "AssetParameters1fd1c15cb7d5e2e36a11745fd10b4b7c3ca8eb30642b41954630413d2b913cdaS3VersionKey22B8E7C6"
}
]
}
Expand All @@ -320,7 +320,7 @@
"Fn::Split": [
"||",
{
"Ref": "AssetParameters6aa0cc1f9a795a53023fe252d5a37a9c14f6d951ac9c11e8de6fa1a97e4e089cS3VersionKey42ACAC36"
"Ref": "AssetParameters1fd1c15cb7d5e2e36a11745fd10b4b7c3ca8eb30642b41954630413d2b913cdaS3VersionKey22B8E7C6"
}
]
}
Expand All @@ -345,29 +345,29 @@
}
},
"Parameters": {
"AssetParameters9f18fc058c44780b1e001e16aaf1d5e9797bfddf5dfb1bd80d975d17d666cd39S3BucketD79B53B5": {
"AssetParameters7f2fe4e4fa40a84f0f773203f5c5fdaac31c80ce42c5185ed2659a049db03043S3BucketC7E46972": {
"Type": "String",
"Description": "S3 bucket for asset \"9f18fc058c44780b1e001e16aaf1d5e9797bfddf5dfb1bd80d975d17d666cd39\""
"Description": "S3 bucket for asset \"7f2fe4e4fa40a84f0f773203f5c5fdaac31c80ce42c5185ed2659a049db03043\""
},
"AssetParameters9f18fc058c44780b1e001e16aaf1d5e9797bfddf5dfb1bd80d975d17d666cd39S3VersionKeyBD4EB73A": {
"AssetParameters7f2fe4e4fa40a84f0f773203f5c5fdaac31c80ce42c5185ed2659a049db03043S3VersionKeyA8ECA032": {
"Type": "String",
"Description": "S3 key for asset version \"9f18fc058c44780b1e001e16aaf1d5e9797bfddf5dfb1bd80d975d17d666cd39\""
"Description": "S3 key for asset version \"7f2fe4e4fa40a84f0f773203f5c5fdaac31c80ce42c5185ed2659a049db03043\""
},
"AssetParameters9f18fc058c44780b1e001e16aaf1d5e9797bfddf5dfb1bd80d975d17d666cd39ArtifactHashFB7CD208": {
"AssetParameters7f2fe4e4fa40a84f0f773203f5c5fdaac31c80ce42c5185ed2659a049db03043ArtifactHashE679D99A": {
"Type": "String",
"Description": "Artifact hash for asset \"9f18fc058c44780b1e001e16aaf1d5e9797bfddf5dfb1bd80d975d17d666cd39\""
"Description": "Artifact hash for asset \"7f2fe4e4fa40a84f0f773203f5c5fdaac31c80ce42c5185ed2659a049db03043\""
},
"AssetParameters6aa0cc1f9a795a53023fe252d5a37a9c14f6d951ac9c11e8de6fa1a97e4e089cS3Bucket4210957A": {
"AssetParameters1fd1c15cb7d5e2e36a11745fd10b4b7c3ca8eb30642b41954630413d2b913cdaS3Bucket2E6D85D3": {
"Type": "String",
"Description": "S3 bucket for asset \"6aa0cc1f9a795a53023fe252d5a37a9c14f6d951ac9c11e8de6fa1a97e4e089c\""
"Description": "S3 bucket for asset \"1fd1c15cb7d5e2e36a11745fd10b4b7c3ca8eb30642b41954630413d2b913cda\""
},
"AssetParameters6aa0cc1f9a795a53023fe252d5a37a9c14f6d951ac9c11e8de6fa1a97e4e089cS3VersionKey42ACAC36": {
"AssetParameters1fd1c15cb7d5e2e36a11745fd10b4b7c3ca8eb30642b41954630413d2b913cdaS3VersionKey22B8E7C6": {
"Type": "String",
"Description": "S3 key for asset version \"6aa0cc1f9a795a53023fe252d5a37a9c14f6d951ac9c11e8de6fa1a97e4e089c\""
"Description": "S3 key for asset version \"1fd1c15cb7d5e2e36a11745fd10b4b7c3ca8eb30642b41954630413d2b913cda\""
},
"AssetParameters6aa0cc1f9a795a53023fe252d5a37a9c14f6d951ac9c11e8de6fa1a97e4e089cArtifactHashE248EC43": {
"AssetParameters1fd1c15cb7d5e2e36a11745fd10b4b7c3ca8eb30642b41954630413d2b913cdaArtifactHash82A279EA": {
"Type": "String",
"Description": "Artifact hash for asset \"6aa0cc1f9a795a53023fe252d5a37a9c14f6d951ac9c11e8de6fa1a97e4e089c\""
"Description": "Artifact hash for asset \"1fd1c15cb7d5e2e36a11745fd10b4b7c3ca8eb30642b41954630413d2b913cda\""
}
},
"Outputs": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"Properties": {
"Code": {
"S3Bucket": {
"Ref": "AssetParameters7f065c53b92e23c0a149eb8701886b4d0441ec6466ba3161a0d15b4dfc4792bfS3Bucket9FF853D7"
"Ref": "AssetParameters45b7ed524ce2b119dd4f2b8642ae8bfaf0df45bc6bd705072ae4ee6d1a999241S3BucketF1BC72A7"
},
"S3Key": {
"Fn::Join": [
Expand All @@ -89,7 +89,7 @@
"Fn::Split": [
"||",
{
"Ref": "AssetParameters7f065c53b92e23c0a149eb8701886b4d0441ec6466ba3161a0d15b4dfc4792bfS3VersionKey4BEE50BC"
"Ref": "AssetParameters45b7ed524ce2b119dd4f2b8642ae8bfaf0df45bc6bd705072ae4ee6d1a999241S3VersionKey7AD83AC7"
}
]
}
Expand All @@ -102,7 +102,7 @@
"Fn::Split": [
"||",
{
"Ref": "AssetParameters7f065c53b92e23c0a149eb8701886b4d0441ec6466ba3161a0d15b4dfc4792bfS3VersionKey4BEE50BC"
"Ref": "AssetParameters45b7ed524ce2b119dd4f2b8642ae8bfaf0df45bc6bd705072ae4ee6d1a999241S3VersionKey7AD83AC7"
}
]
}
Expand Down Expand Up @@ -190,17 +190,17 @@
}
},
"Parameters": {
"AssetParameters7f065c53b92e23c0a149eb8701886b4d0441ec6466ba3161a0d15b4dfc4792bfS3Bucket9FF853D7": {
"AssetParameters45b7ed524ce2b119dd4f2b8642ae8bfaf0df45bc6bd705072ae4ee6d1a999241S3BucketF1BC72A7": {
"Type": "String",
"Description": "S3 bucket for asset \"7f065c53b92e23c0a149eb8701886b4d0441ec6466ba3161a0d15b4dfc4792bf\""
"Description": "S3 bucket for asset \"45b7ed524ce2b119dd4f2b8642ae8bfaf0df45bc6bd705072ae4ee6d1a999241\""
},
"AssetParameters7f065c53b92e23c0a149eb8701886b4d0441ec6466ba3161a0d15b4dfc4792bfS3VersionKey4BEE50BC": {
"AssetParameters45b7ed524ce2b119dd4f2b8642ae8bfaf0df45bc6bd705072ae4ee6d1a999241S3VersionKey7AD83AC7": {
"Type": "String",
"Description": "S3 key for asset version \"7f065c53b92e23c0a149eb8701886b4d0441ec6466ba3161a0d15b4dfc4792bf\""
"Description": "S3 key for asset version \"45b7ed524ce2b119dd4f2b8642ae8bfaf0df45bc6bd705072ae4ee6d1a999241\""
},
"AssetParameters7f065c53b92e23c0a149eb8701886b4d0441ec6466ba3161a0d15b4dfc4792bfArtifactHashC1818967": {
"AssetParameters45b7ed524ce2b119dd4f2b8642ae8bfaf0df45bc6bd705072ae4ee6d1a999241ArtifactHash1B3D1B80": {
"Type": "String",
"Description": "Artifact hash for asset \"7f065c53b92e23c0a149eb8701886b4d0441ec6466ba3161a0d15b4dfc4792bf\""
"Description": "Artifact hash for asset \"45b7ed524ce2b119dd4f2b8642ae8bfaf0df45bc6bd705072ae4ee6d1a999241\""
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"Properties": {
"Code": {
"S3Bucket": {
"Ref": "AssetParameters9b34c7f68953d0ebc328b23f247f8f5024879b10672161aac8f31a1cb2438fc0S3Bucket42D993A5"
"Ref": "AssetParametersbb3ce11d35aa60dce674523850f7a4a038127a6c48af335699cff4cc55cb0957S3Bucket60FDAA05"
},
"S3Key": {
"Fn::Join": [
Expand All @@ -96,7 +96,7 @@
"Fn::Split": [
"||",
{
"Ref": "AssetParameters9b34c7f68953d0ebc328b23f247f8f5024879b10672161aac8f31a1cb2438fc0S3VersionKey62046ED0"
"Ref": "AssetParametersbb3ce11d35aa60dce674523850f7a4a038127a6c48af335699cff4cc55cb0957S3VersionKeyF2886582"
}
]
}
Expand All @@ -109,7 +109,7 @@
"Fn::Split": [
"||",
{
"Ref": "AssetParameters9b34c7f68953d0ebc328b23f247f8f5024879b10672161aac8f31a1cb2438fc0S3VersionKey62046ED0"
"Ref": "AssetParametersbb3ce11d35aa60dce674523850f7a4a038127a6c48af335699cff4cc55cb0957S3VersionKeyF2886582"
}
]
}
Expand Down Expand Up @@ -596,17 +596,17 @@
}
},
"Parameters": {
"AssetParameters9b34c7f68953d0ebc328b23f247f8f5024879b10672161aac8f31a1cb2438fc0S3Bucket42D993A5": {
"AssetParametersbb3ce11d35aa60dce674523850f7a4a038127a6c48af335699cff4cc55cb0957S3Bucket60FDAA05": {
"Type": "String",
"Description": "S3 bucket for asset \"9b34c7f68953d0ebc328b23f247f8f5024879b10672161aac8f31a1cb2438fc0\""
"Description": "S3 bucket for asset \"bb3ce11d35aa60dce674523850f7a4a038127a6c48af335699cff4cc55cb0957\""
},
"AssetParameters9b34c7f68953d0ebc328b23f247f8f5024879b10672161aac8f31a1cb2438fc0S3VersionKey62046ED0": {
"AssetParametersbb3ce11d35aa60dce674523850f7a4a038127a6c48af335699cff4cc55cb0957S3VersionKeyF2886582": {
"Type": "String",
"Description": "S3 key for asset version \"9b34c7f68953d0ebc328b23f247f8f5024879b10672161aac8f31a1cb2438fc0\""
"Description": "S3 key for asset version \"bb3ce11d35aa60dce674523850f7a4a038127a6c48af335699cff4cc55cb0957\""
},
"AssetParameters9b34c7f68953d0ebc328b23f247f8f5024879b10672161aac8f31a1cb2438fc0ArtifactHash0E56C963": {
"AssetParametersbb3ce11d35aa60dce674523850f7a4a038127a6c48af335699cff4cc55cb0957ArtifactHashF17C10B6": {
"Type": "String",
"Description": "Artifact hash for asset \"9b34c7f68953d0ebc328b23f247f8f5024879b10672161aac8f31a1cb2438fc0\""
"Description": "Artifact hash for asset \"bb3ce11d35aa60dce674523850f7a4a038127a6c48af335699cff4cc55cb0957\""
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ urllib3==1.25.11
# Requests used by this lambda
requests==2.23.0
# Pillow 6.x so that python 2.7 and 3.x can both use this fixture
pillow==6.2.2
pillow==8.3.2
8 changes: 4 additions & 4 deletions packages/@aws-cdk/aws-lambda/test/code.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ describe('code', () => {
{ Ref: 'AWS::Region' },
'.',
{ Ref: 'AWS::URLSuffix' },
'/aws-cdk/assets:cea95822039f89359d77f8faf5d6da116d1da130ce61a5972190455528ce30d5',
'/aws-cdk/assets:f0fe8a410cb4b860a25f6f3e09237abf69cd38ab59f9ef2441597c75f598c634',
]],
},
},
Expand Down Expand Up @@ -383,7 +383,7 @@ describe('code', () => {
// then
expect(stack).toHaveResource('AWS::Lambda::Function', {
Metadata: {
[cxapi.ASSET_RESOURCE_METADATA_PATH_KEY]: 'asset.5a6c1c61bba06af5a86b69c75eaeb9cb1a0dd5d8089ef5b0a4591d17e19960cb',
[cxapi.ASSET_RESOURCE_METADATA_PATH_KEY]: 'asset.650a009a909c30e767a843a84ff7812616447251d245e0ab65d9bfb37f413e32',
[cxapi.ASSET_RESOURCE_METADATA_DOCKERFILE_PATH_KEY]: dockerfilePath,
[cxapi.ASSET_RESOURCE_METADATA_DOCKER_BUILD_ARGS_KEY]: dockerBuildArgs,
[cxapi.ASSET_RESOURCE_METADATA_DOCKER_BUILD_TARGET_KEY]: dockerBuildTarget,
Expand All @@ -407,7 +407,7 @@ describe('code', () => {
// then
expect(stack).toHaveResource('AWS::Lambda::Function', {
Metadata: {
[cxapi.ASSET_RESOURCE_METADATA_PATH_KEY]: 'asset.7ea503e14740780eadd69ea2bacef1de3386f5ac53ea146ea36e28cef5da8b51',
[cxapi.ASSET_RESOURCE_METADATA_PATH_KEY]: 'asset.a3cc4528c34874616814d9b3436ff0e5d01514c1d563ed8899657ca00982f308',
[cxapi.ASSET_RESOURCE_METADATA_DOCKERFILE_PATH_KEY]: 'Dockerfile',
[cxapi.ASSET_RESOURCE_METADATA_PROPERTY_KEY]: 'Code.ImageUri',
},
Expand Down Expand Up @@ -471,7 +471,7 @@ describe('code', () => {
// then
expect(stack).toHaveResource('AWS::Lambda::Function', {
Metadata: {
[cxapi.ASSET_RESOURCE_METADATA_PATH_KEY]: 'asset.b401831f7a9d2f7f299ff312037585cd1760c0c9e148260be2fd8ea8a40066bb',
[cxapi.ASSET_RESOURCE_METADATA_PATH_KEY]: 'asset.fbafdbb9ae8d1bae0def415b791a93c486d18ebc63270c748abecc3ac0ab9533',
[cxapi.ASSET_RESOURCE_METADATA_PROPERTY_KEY]: 'Code',
},
}, ResourcePart.CompleteDefinition);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"Properties": {
"Code": {
"S3Bucket": {
"Ref": "AssetParameters2c3d4ba820450268bfd466c8523551b82edf1f6b13b095f7982e49bea95748d7S3Bucket37F776CF"
"Ref": "AssetParameters8811a2632ac5564a08fd269e159298f7e497f259578b0dc5e927a1f48ab24d34S3BucketB47CCF1E"
},
"S3Key": {
"Fn::Join": [
Expand All @@ -49,7 +49,7 @@
"Fn::Split": [
"||",
{
"Ref": "AssetParameters2c3d4ba820450268bfd466c8523551b82edf1f6b13b095f7982e49bea95748d7S3VersionKeyD363CF1A"
"Ref": "AssetParameters8811a2632ac5564a08fd269e159298f7e497f259578b0dc5e927a1f48ab24d34S3VersionKey80D7B84B"
}
]
}
Expand All @@ -62,7 +62,7 @@
"Fn::Split": [
"||",
{
"Ref": "AssetParameters2c3d4ba820450268bfd466c8523551b82edf1f6b13b095f7982e49bea95748d7S3VersionKeyD363CF1A"
"Ref": "AssetParameters8811a2632ac5564a08fd269e159298f7e497f259578b0dc5e927a1f48ab24d34S3VersionKey80D7B84B"
}
]
}
Expand All @@ -72,20 +72,20 @@
]
}
},
"Handler": "index.main",
"Role": {
"Fn::GetAtt": [
"MyLambdaServiceRole4539ECB6",
"Arn"
]
},
"Handler": "index.main",
"Runtime": "python3.8"
},
"DependsOn": [
"MyLambdaServiceRole4539ECB6"
]
},
"MyLambdaCurrentVersionE7A382CC448bacfa5fd3f35c88c0313cba35c2d5": {
"MyLambdaCurrentVersionE7A382CC132baf6493c3210af4c8c0e36b416660": {
"Type": "AWS::Lambda::Version",
"Properties": {
"FunctionName": {
Expand All @@ -103,7 +103,7 @@
},
"Qualifier": {
"Fn::GetAtt": [
"MyLambdaCurrentVersionE7A382CC448bacfa5fd3f35c88c0313cba35c2d5",
"MyLambdaCurrentVersionE7A382CC132baf6493c3210af4c8c0e36b416660",
"Version"
]
},
Expand All @@ -118,7 +118,7 @@
},
"FunctionVersion": {
"Fn::GetAtt": [
"MyLambdaCurrentVersionE7A382CC448bacfa5fd3f35c88c0313cba35c2d5",
"MyLambdaCurrentVersionE7A382CC132baf6493c3210af4c8c0e36b416660",
"Version"
]
},
Expand All @@ -127,17 +127,17 @@
}
},
"Parameters": {
"AssetParameters2c3d4ba820450268bfd466c8523551b82edf1f6b13b095f7982e49bea95748d7S3Bucket37F776CF": {
"AssetParameters8811a2632ac5564a08fd269e159298f7e497f259578b0dc5e927a1f48ab24d34S3BucketB47CCF1E": {
"Type": "String",
"Description": "S3 bucket for asset \"2c3d4ba820450268bfd466c8523551b82edf1f6b13b095f7982e49bea95748d7\""
"Description": "S3 bucket for asset \"8811a2632ac5564a08fd269e159298f7e497f259578b0dc5e927a1f48ab24d34\""
},
"AssetParameters2c3d4ba820450268bfd466c8523551b82edf1f6b13b095f7982e49bea95748d7S3VersionKeyD363CF1A": {
"AssetParameters8811a2632ac5564a08fd269e159298f7e497f259578b0dc5e927a1f48ab24d34S3VersionKey80D7B84B": {
"Type": "String",
"Description": "S3 key for asset version \"2c3d4ba820450268bfd466c8523551b82edf1f6b13b095f7982e49bea95748d7\""
"Description": "S3 key for asset version \"8811a2632ac5564a08fd269e159298f7e497f259578b0dc5e927a1f48ab24d34\""
},
"AssetParameters2c3d4ba820450268bfd466c8523551b82edf1f6b13b095f7982e49bea95748d7ArtifactHashEB01AC40": {
"AssetParameters8811a2632ac5564a08fd269e159298f7e497f259578b0dc5e927a1f48ab24d34ArtifactHash70E274C4": {
"Type": "String",
"Description": "Artifact hash for asset \"2c3d4ba820450268bfd466c8523551b82edf1f6b13b095f7982e49bea95748d7\""
"Description": "Artifact hash for asset \"8811a2632ac5564a08fd269e159298f7e497f259578b0dc5e927a1f48ab24d34\""
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
{
"Ref": "AWS::URLSuffix"
},
"/aws-cdk/assets:cea95822039f89359d77f8faf5d6da116d1da130ce61a5972190455528ce30d5"
"/aws-cdk/assets:f0fe8a410cb4b860a25f6f3e09237abf69cd38ab59f9ef2441597c75f598c634"
]
]
}
Expand Down
Loading

0 comments on commit 06b835a

Please sign in to comment.