From 976a55d76adabc51cd70c030daada381775182c7 Mon Sep 17 00:00:00 2001 From: Elad Ben-Israel Date: Thu, 11 Feb 2021 16:14:24 +0200 Subject: [PATCH] fix(lambda-python): asset hash is non-deterministic When a Python handler uses external dependencies, the hash calculated on the output is non-determinstic due to the fact that it includes timestamps. To resolve that, change the asset hash strategy to `SOURCE` which means that the bundle will only be re-created if one of the source files changes. Fixes #12770 Fixes #12684 --- .../aws-lambda-python/lib/bundling.ts | 5 +- .../test/integ.function.expected.json | 18 +++---- .../test/integ.function.pipenv.expected.json | 54 +++++++++---------- .../test/integ.function.poetry.expected.json | 54 +++++++++---------- .../test/integ.function.project.expected.json | 36 ++++++------- .../test/integ.function.py38.expected.json | 18 +++---- ...unction.requirements.removed.expected.json | 18 +++---- .../test/integ.function.vpc.expected.json | 18 +++---- 8 files changed, 112 insertions(+), 109 deletions(-) diff --git a/packages/@aws-cdk/aws-lambda-python/lib/bundling.ts b/packages/@aws-cdk/aws-lambda-python/lib/bundling.ts index d5747e169abb2..6fe439f403a8f 100644 --- a/packages/@aws-cdk/aws-lambda-python/lib/bundling.ts +++ b/packages/@aws-cdk/aws-lambda-python/lib/bundling.ts @@ -62,7 +62,10 @@ export function bundle(options: BundlingOptions): lambda.AssetCode { }); return lambda.Code.fromAsset(entry, { - assetHashType: cdk.AssetHashType.BUNDLE, + // pip adds timestamps and other non-determinstic values in the bundle, so + // we want to calculate hash against the pure source and not against the + // output. + assetHashType: cdk.AssetHashType.SOURCE, exclude: DEPENDENCY_EXCLUDES, bundling: { image, diff --git a/packages/@aws-cdk/aws-lambda-python/test/integ.function.expected.json b/packages/@aws-cdk/aws-lambda-python/test/integ.function.expected.json index 3690005685439..ce035262d3d6f 100644 --- a/packages/@aws-cdk/aws-lambda-python/test/integ.function.expected.json +++ b/packages/@aws-cdk/aws-lambda-python/test/integ.function.expected.json @@ -36,7 +36,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters4ee6ce8b6ee4bd51743dc0c39d6e52baebaeafff9c9dfea0ff84de98d1dbf353S3Bucket414E0E30" + "Ref": "AssetParametersed5616d1abebc600ce62f84a44dd1516b397ab3a0aca2ecb055f66099c5ab83dS3BucketA91ECDDD" }, "S3Key": { "Fn::Join": [ @@ -49,7 +49,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters4ee6ce8b6ee4bd51743dc0c39d6e52baebaeafff9c9dfea0ff84de98d1dbf353S3VersionKey5ABC9098" + "Ref": "AssetParametersed5616d1abebc600ce62f84a44dd1516b397ab3a0aca2ecb055f66099c5ab83dS3VersionKey1C8E9E07" } ] } @@ -62,7 +62,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters4ee6ce8b6ee4bd51743dc0c39d6e52baebaeafff9c9dfea0ff84de98d1dbf353S3VersionKey5ABC9098" + "Ref": "AssetParametersed5616d1abebc600ce62f84a44dd1516b397ab3a0aca2ecb055f66099c5ab83dS3VersionKey1C8E9E07" } ] } @@ -87,17 +87,17 @@ } }, "Parameters": { - "AssetParameters4ee6ce8b6ee4bd51743dc0c39d6e52baebaeafff9c9dfea0ff84de98d1dbf353S3Bucket414E0E30": { + "AssetParametersed5616d1abebc600ce62f84a44dd1516b397ab3a0aca2ecb055f66099c5ab83dS3BucketA91ECDDD": { "Type": "String", - "Description": "S3 bucket for asset \"4ee6ce8b6ee4bd51743dc0c39d6e52baebaeafff9c9dfea0ff84de98d1dbf353\"" + "Description": "S3 bucket for asset \"ed5616d1abebc600ce62f84a44dd1516b397ab3a0aca2ecb055f66099c5ab83d\"" }, - "AssetParameters4ee6ce8b6ee4bd51743dc0c39d6e52baebaeafff9c9dfea0ff84de98d1dbf353S3VersionKey5ABC9098": { + "AssetParametersed5616d1abebc600ce62f84a44dd1516b397ab3a0aca2ecb055f66099c5ab83dS3VersionKey1C8E9E07": { "Type": "String", - "Description": "S3 key for asset version \"4ee6ce8b6ee4bd51743dc0c39d6e52baebaeafff9c9dfea0ff84de98d1dbf353\"" + "Description": "S3 key for asset version \"ed5616d1abebc600ce62f84a44dd1516b397ab3a0aca2ecb055f66099c5ab83d\"" }, - "AssetParameters4ee6ce8b6ee4bd51743dc0c39d6e52baebaeafff9c9dfea0ff84de98d1dbf353ArtifactHashECA6C88C": { + "AssetParametersed5616d1abebc600ce62f84a44dd1516b397ab3a0aca2ecb055f66099c5ab83dArtifactHashA06A8B3C": { "Type": "String", - "Description": "Artifact hash for asset \"4ee6ce8b6ee4bd51743dc0c39d6e52baebaeafff9c9dfea0ff84de98d1dbf353\"" + "Description": "Artifact hash for asset \"ed5616d1abebc600ce62f84a44dd1516b397ab3a0aca2ecb055f66099c5ab83d\"" } }, "Outputs": { diff --git a/packages/@aws-cdk/aws-lambda-python/test/integ.function.pipenv.expected.json b/packages/@aws-cdk/aws-lambda-python/test/integ.function.pipenv.expected.json index ef1f355e528c3..81c58819178ac 100644 --- a/packages/@aws-cdk/aws-lambda-python/test/integ.function.pipenv.expected.json +++ b/packages/@aws-cdk/aws-lambda-python/test/integ.function.pipenv.expected.json @@ -36,7 +36,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters94972df8a01484c56b50bec3793ac6c4302bc044db29d3502007bdc0f83db45cS3BucketA501FC08" + "Ref": "AssetParametersacd13e247cbbccbc76932c1ca67a79937008de70b9162840d93793dbb7a14fa9S3Bucket4DABA1C5" }, "S3Key": { "Fn::Join": [ @@ -49,7 +49,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters94972df8a01484c56b50bec3793ac6c4302bc044db29d3502007bdc0f83db45cS3VersionKey1C3AFB39" + "Ref": "AssetParametersacd13e247cbbccbc76932c1ca67a79937008de70b9162840d93793dbb7a14fa9S3VersionKey9F011EB5" } ] } @@ -62,7 +62,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters94972df8a01484c56b50bec3793ac6c4302bc044db29d3502007bdc0f83db45cS3VersionKey1C3AFB39" + "Ref": "AssetParametersacd13e247cbbccbc76932c1ca67a79937008de70b9162840d93793dbb7a14fa9S3VersionKey9F011EB5" } ] } @@ -121,7 +121,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters3b0b0f3cd46ea1490006d6cefca359385ec059bb00a0fbee4de2eecf48038e28S3Bucket7DE4D4D5" + "Ref": "AssetParametersa84be40cec7782d58185cb52b8b9c6774bfb62616da2ae910c897b22f835dd9bS3Bucket2E59B11C" }, "S3Key": { "Fn::Join": [ @@ -134,7 +134,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters3b0b0f3cd46ea1490006d6cefca359385ec059bb00a0fbee4de2eecf48038e28S3VersionKeyAEB67E87" + "Ref": "AssetParametersa84be40cec7782d58185cb52b8b9c6774bfb62616da2ae910c897b22f835dd9bS3VersionKey9C301B46" } ] } @@ -147,7 +147,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters3b0b0f3cd46ea1490006d6cefca359385ec059bb00a0fbee4de2eecf48038e28S3VersionKeyAEB67E87" + "Ref": "AssetParametersa84be40cec7782d58185cb52b8b9c6774bfb62616da2ae910c897b22f835dd9bS3VersionKey9C301B46" } ] } @@ -206,7 +206,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters876959f777c5a23bf4408991959c55c91810329d159608feb7ede69418b35009S3BucketA66E9035" + "Ref": "AssetParametersaf6fb15e9f79a336cd75a8fb343021a8d465682a22a2fa7b1032d6aebdc062c7S3Bucket5F203E07" }, "S3Key": { "Fn::Join": [ @@ -219,7 +219,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters876959f777c5a23bf4408991959c55c91810329d159608feb7ede69418b35009S3VersionKeyAFEB5FDA" + "Ref": "AssetParametersaf6fb15e9f79a336cd75a8fb343021a8d465682a22a2fa7b1032d6aebdc062c7S3VersionKey1E1B70CF" } ] } @@ -232,7 +232,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters876959f777c5a23bf4408991959c55c91810329d159608feb7ede69418b35009S3VersionKeyAFEB5FDA" + "Ref": "AssetParametersaf6fb15e9f79a336cd75a8fb343021a8d465682a22a2fa7b1032d6aebdc062c7S3VersionKey1E1B70CF" } ] } @@ -257,41 +257,41 @@ } }, "Parameters": { - "AssetParameters94972df8a01484c56b50bec3793ac6c4302bc044db29d3502007bdc0f83db45cS3BucketA501FC08": { + "AssetParametersacd13e247cbbccbc76932c1ca67a79937008de70b9162840d93793dbb7a14fa9S3Bucket4DABA1C5": { "Type": "String", - "Description": "S3 bucket for asset \"94972df8a01484c56b50bec3793ac6c4302bc044db29d3502007bdc0f83db45c\"" + "Description": "S3 bucket for asset \"acd13e247cbbccbc76932c1ca67a79937008de70b9162840d93793dbb7a14fa9\"" }, - "AssetParameters94972df8a01484c56b50bec3793ac6c4302bc044db29d3502007bdc0f83db45cS3VersionKey1C3AFB39": { + "AssetParametersacd13e247cbbccbc76932c1ca67a79937008de70b9162840d93793dbb7a14fa9S3VersionKey9F011EB5": { "Type": "String", - "Description": "S3 key for asset version \"94972df8a01484c56b50bec3793ac6c4302bc044db29d3502007bdc0f83db45c\"" + "Description": "S3 key for asset version \"acd13e247cbbccbc76932c1ca67a79937008de70b9162840d93793dbb7a14fa9\"" }, - "AssetParameters94972df8a01484c56b50bec3793ac6c4302bc044db29d3502007bdc0f83db45cArtifactHash99DC751A": { + "AssetParametersacd13e247cbbccbc76932c1ca67a79937008de70b9162840d93793dbb7a14fa9ArtifactHashA015B7B1": { "Type": "String", - "Description": "Artifact hash for asset \"94972df8a01484c56b50bec3793ac6c4302bc044db29d3502007bdc0f83db45c\"" + "Description": "Artifact hash for asset \"acd13e247cbbccbc76932c1ca67a79937008de70b9162840d93793dbb7a14fa9\"" }, - "AssetParameters3b0b0f3cd46ea1490006d6cefca359385ec059bb00a0fbee4de2eecf48038e28S3Bucket7DE4D4D5": { + "AssetParametersa84be40cec7782d58185cb52b8b9c6774bfb62616da2ae910c897b22f835dd9bS3Bucket2E59B11C": { "Type": "String", - "Description": "S3 bucket for asset \"3b0b0f3cd46ea1490006d6cefca359385ec059bb00a0fbee4de2eecf48038e28\"" + "Description": "S3 bucket for asset \"a84be40cec7782d58185cb52b8b9c6774bfb62616da2ae910c897b22f835dd9b\"" }, - "AssetParameters3b0b0f3cd46ea1490006d6cefca359385ec059bb00a0fbee4de2eecf48038e28S3VersionKeyAEB67E87": { + "AssetParametersa84be40cec7782d58185cb52b8b9c6774bfb62616da2ae910c897b22f835dd9bS3VersionKey9C301B46": { "Type": "String", - "Description": "S3 key for asset version \"3b0b0f3cd46ea1490006d6cefca359385ec059bb00a0fbee4de2eecf48038e28\"" + "Description": "S3 key for asset version \"a84be40cec7782d58185cb52b8b9c6774bfb62616da2ae910c897b22f835dd9b\"" }, - "AssetParameters3b0b0f3cd46ea1490006d6cefca359385ec059bb00a0fbee4de2eecf48038e28ArtifactHashE51CE860": { + "AssetParametersa84be40cec7782d58185cb52b8b9c6774bfb62616da2ae910c897b22f835dd9bArtifactHash83B1E10E": { "Type": "String", - "Description": "Artifact hash for asset \"3b0b0f3cd46ea1490006d6cefca359385ec059bb00a0fbee4de2eecf48038e28\"" + "Description": "Artifact hash for asset \"a84be40cec7782d58185cb52b8b9c6774bfb62616da2ae910c897b22f835dd9b\"" }, - "AssetParameters876959f777c5a23bf4408991959c55c91810329d159608feb7ede69418b35009S3BucketA66E9035": { + "AssetParametersaf6fb15e9f79a336cd75a8fb343021a8d465682a22a2fa7b1032d6aebdc062c7S3Bucket5F203E07": { "Type": "String", - "Description": "S3 bucket for asset \"876959f777c5a23bf4408991959c55c91810329d159608feb7ede69418b35009\"" + "Description": "S3 bucket for asset \"af6fb15e9f79a336cd75a8fb343021a8d465682a22a2fa7b1032d6aebdc062c7\"" }, - "AssetParameters876959f777c5a23bf4408991959c55c91810329d159608feb7ede69418b35009S3VersionKeyAFEB5FDA": { + "AssetParametersaf6fb15e9f79a336cd75a8fb343021a8d465682a22a2fa7b1032d6aebdc062c7S3VersionKey1E1B70CF": { "Type": "String", - "Description": "S3 key for asset version \"876959f777c5a23bf4408991959c55c91810329d159608feb7ede69418b35009\"" + "Description": "S3 key for asset version \"af6fb15e9f79a336cd75a8fb343021a8d465682a22a2fa7b1032d6aebdc062c7\"" }, - "AssetParameters876959f777c5a23bf4408991959c55c91810329d159608feb7ede69418b35009ArtifactHashB9A1080D": { + "AssetParametersaf6fb15e9f79a336cd75a8fb343021a8d465682a22a2fa7b1032d6aebdc062c7ArtifactHash892B22BE": { "Type": "String", - "Description": "Artifact hash for asset \"876959f777c5a23bf4408991959c55c91810329d159608feb7ede69418b35009\"" + "Description": "Artifact hash for asset \"af6fb15e9f79a336cd75a8fb343021a8d465682a22a2fa7b1032d6aebdc062c7\"" } }, "Outputs": { diff --git a/packages/@aws-cdk/aws-lambda-python/test/integ.function.poetry.expected.json b/packages/@aws-cdk/aws-lambda-python/test/integ.function.poetry.expected.json index 5ea17bca31920..5b29ceb24a2f6 100644 --- a/packages/@aws-cdk/aws-lambda-python/test/integ.function.poetry.expected.json +++ b/packages/@aws-cdk/aws-lambda-python/test/integ.function.poetry.expected.json @@ -36,7 +36,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters61d8d26f10d1d73dee2732bec7ed381d2c987fc2912a339f2f119f3b0ea175efS3BucketD53ED9C5" + "Ref": "AssetParameters7ce3c07d0472588786467c436de4fb6be7d5a397831809f676b8ab5e63556fd4S3BucketA3E8EBA1" }, "S3Key": { "Fn::Join": [ @@ -49,7 +49,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters61d8d26f10d1d73dee2732bec7ed381d2c987fc2912a339f2f119f3b0ea175efS3VersionKey3C218A3E" + "Ref": "AssetParameters7ce3c07d0472588786467c436de4fb6be7d5a397831809f676b8ab5e63556fd4S3VersionKey0907781F" } ] } @@ -62,7 +62,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters61d8d26f10d1d73dee2732bec7ed381d2c987fc2912a339f2f119f3b0ea175efS3VersionKey3C218A3E" + "Ref": "AssetParameters7ce3c07d0472588786467c436de4fb6be7d5a397831809f676b8ab5e63556fd4S3VersionKey0907781F" } ] } @@ -121,7 +121,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters1d66b06c3b3ee86b3126fb58d7a06ff055d366d8aeeb4dfbaf28d40f0930956dS3BucketFDE171D0" + "Ref": "AssetParameters9b23e36650c4fc32f8f632a0c9d952d31e604865d71f026dc40692df112fb743S3Bucket4EF476C4" }, "S3Key": { "Fn::Join": [ @@ -134,7 +134,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters1d66b06c3b3ee86b3126fb58d7a06ff055d366d8aeeb4dfbaf28d40f0930956dS3VersionKey6209E240" + "Ref": "AssetParameters9b23e36650c4fc32f8f632a0c9d952d31e604865d71f026dc40692df112fb743S3VersionKey5F43AD39" } ] } @@ -147,7 +147,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters1d66b06c3b3ee86b3126fb58d7a06ff055d366d8aeeb4dfbaf28d40f0930956dS3VersionKey6209E240" + "Ref": "AssetParameters9b23e36650c4fc32f8f632a0c9d952d31e604865d71f026dc40692df112fb743S3VersionKey5F43AD39" } ] } @@ -206,7 +206,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters96a447e468bf9d3b52d13213757160cd43f28737a29b8682c281fde388762e68S3BucketA23E6312" + "Ref": "AssetParameters3c758b02f050a0b95282c1bb4a081efa4ef0ae7054dec28c23ab50b5c6fb0a75S3Bucket252C89F4" }, "S3Key": { "Fn::Join": [ @@ -219,7 +219,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters96a447e468bf9d3b52d13213757160cd43f28737a29b8682c281fde388762e68S3VersionKey1E21AF83" + "Ref": "AssetParameters3c758b02f050a0b95282c1bb4a081efa4ef0ae7054dec28c23ab50b5c6fb0a75S3VersionKeyC82C6D6B" } ] } @@ -232,7 +232,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters96a447e468bf9d3b52d13213757160cd43f28737a29b8682c281fde388762e68S3VersionKey1E21AF83" + "Ref": "AssetParameters3c758b02f050a0b95282c1bb4a081efa4ef0ae7054dec28c23ab50b5c6fb0a75S3VersionKeyC82C6D6B" } ] } @@ -257,41 +257,41 @@ } }, "Parameters": { - "AssetParameters61d8d26f10d1d73dee2732bec7ed381d2c987fc2912a339f2f119f3b0ea175efS3BucketD53ED9C5": { + "AssetParameters7ce3c07d0472588786467c436de4fb6be7d5a397831809f676b8ab5e63556fd4S3BucketA3E8EBA1": { "Type": "String", - "Description": "S3 bucket for asset \"61d8d26f10d1d73dee2732bec7ed381d2c987fc2912a339f2f119f3b0ea175ef\"" + "Description": "S3 bucket for asset \"7ce3c07d0472588786467c436de4fb6be7d5a397831809f676b8ab5e63556fd4\"" }, - "AssetParameters61d8d26f10d1d73dee2732bec7ed381d2c987fc2912a339f2f119f3b0ea175efS3VersionKey3C218A3E": { + "AssetParameters7ce3c07d0472588786467c436de4fb6be7d5a397831809f676b8ab5e63556fd4S3VersionKey0907781F": { "Type": "String", - "Description": "S3 key for asset version \"61d8d26f10d1d73dee2732bec7ed381d2c987fc2912a339f2f119f3b0ea175ef\"" + "Description": "S3 key for asset version \"7ce3c07d0472588786467c436de4fb6be7d5a397831809f676b8ab5e63556fd4\"" }, - "AssetParameters61d8d26f10d1d73dee2732bec7ed381d2c987fc2912a339f2f119f3b0ea175efArtifactHash6A1881A8": { + "AssetParameters7ce3c07d0472588786467c436de4fb6be7d5a397831809f676b8ab5e63556fd4ArtifactHashA74EACA2": { "Type": "String", - "Description": "Artifact hash for asset \"61d8d26f10d1d73dee2732bec7ed381d2c987fc2912a339f2f119f3b0ea175ef\"" + "Description": "Artifact hash for asset \"7ce3c07d0472588786467c436de4fb6be7d5a397831809f676b8ab5e63556fd4\"" }, - "AssetParameters1d66b06c3b3ee86b3126fb58d7a06ff055d366d8aeeb4dfbaf28d40f0930956dS3BucketFDE171D0": { + "AssetParameters9b23e36650c4fc32f8f632a0c9d952d31e604865d71f026dc40692df112fb743S3Bucket4EF476C4": { "Type": "String", - "Description": "S3 bucket for asset \"1d66b06c3b3ee86b3126fb58d7a06ff055d366d8aeeb4dfbaf28d40f0930956d\"" + "Description": "S3 bucket for asset \"9b23e36650c4fc32f8f632a0c9d952d31e604865d71f026dc40692df112fb743\"" }, - "AssetParameters1d66b06c3b3ee86b3126fb58d7a06ff055d366d8aeeb4dfbaf28d40f0930956dS3VersionKey6209E240": { + "AssetParameters9b23e36650c4fc32f8f632a0c9d952d31e604865d71f026dc40692df112fb743S3VersionKey5F43AD39": { "Type": "String", - "Description": "S3 key for asset version \"1d66b06c3b3ee86b3126fb58d7a06ff055d366d8aeeb4dfbaf28d40f0930956d\"" + "Description": "S3 key for asset version \"9b23e36650c4fc32f8f632a0c9d952d31e604865d71f026dc40692df112fb743\"" }, - "AssetParameters1d66b06c3b3ee86b3126fb58d7a06ff055d366d8aeeb4dfbaf28d40f0930956dArtifactHash02B929EC": { + "AssetParameters9b23e36650c4fc32f8f632a0c9d952d31e604865d71f026dc40692df112fb743ArtifactHashF216A82F": { "Type": "String", - "Description": "Artifact hash for asset \"1d66b06c3b3ee86b3126fb58d7a06ff055d366d8aeeb4dfbaf28d40f0930956d\"" + "Description": "Artifact hash for asset \"9b23e36650c4fc32f8f632a0c9d952d31e604865d71f026dc40692df112fb743\"" }, - "AssetParameters96a447e468bf9d3b52d13213757160cd43f28737a29b8682c281fde388762e68S3BucketA23E6312": { + "AssetParameters3c758b02f050a0b95282c1bb4a081efa4ef0ae7054dec28c23ab50b5c6fb0a75S3Bucket252C89F4": { "Type": "String", - "Description": "S3 bucket for asset \"96a447e468bf9d3b52d13213757160cd43f28737a29b8682c281fde388762e68\"" + "Description": "S3 bucket for asset \"3c758b02f050a0b95282c1bb4a081efa4ef0ae7054dec28c23ab50b5c6fb0a75\"" }, - "AssetParameters96a447e468bf9d3b52d13213757160cd43f28737a29b8682c281fde388762e68S3VersionKey1E21AF83": { + "AssetParameters3c758b02f050a0b95282c1bb4a081efa4ef0ae7054dec28c23ab50b5c6fb0a75S3VersionKeyC82C6D6B": { "Type": "String", - "Description": "S3 key for asset version \"96a447e468bf9d3b52d13213757160cd43f28737a29b8682c281fde388762e68\"" + "Description": "S3 key for asset version \"3c758b02f050a0b95282c1bb4a081efa4ef0ae7054dec28c23ab50b5c6fb0a75\"" }, - "AssetParameters96a447e468bf9d3b52d13213757160cd43f28737a29b8682c281fde388762e68ArtifactHash0043D2A0": { + "AssetParameters3c758b02f050a0b95282c1bb4a081efa4ef0ae7054dec28c23ab50b5c6fb0a75ArtifactHashBFCAE690": { "Type": "String", - "Description": "Artifact hash for asset \"96a447e468bf9d3b52d13213757160cd43f28737a29b8682c281fde388762e68\"" + "Description": "Artifact hash for asset \"3c758b02f050a0b95282c1bb4a081efa4ef0ae7054dec28c23ab50b5c6fb0a75\"" } }, "Outputs": { diff --git a/packages/@aws-cdk/aws-lambda-python/test/integ.function.project.expected.json b/packages/@aws-cdk/aws-lambda-python/test/integ.function.project.expected.json index 9a81c901d7451..9fb0416c9680c 100644 --- a/packages/@aws-cdk/aws-lambda-python/test/integ.function.project.expected.json +++ b/packages/@aws-cdk/aws-lambda-python/test/integ.function.project.expected.json @@ -5,7 +5,7 @@ "Properties": { "Content": { "S3Bucket": { - "Ref": "AssetParameters6a4b9ce26d3228c4effd7b46ed51ab439e79a530934ad9bde7d77d7f6b6ebd4aS3BucketCCD07444" + "Ref": "AssetParametersbdefaf3eb78c5c0e534147face527d2531118eac87a95215ec839e7d002b9b9aS3BucketDC0CD06C" }, "S3Key": { "Fn::Join": [ @@ -18,7 +18,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters6a4b9ce26d3228c4effd7b46ed51ab439e79a530934ad9bde7d77d7f6b6ebd4aS3VersionKeyA8B74284" + "Ref": "AssetParametersbdefaf3eb78c5c0e534147face527d2531118eac87a95215ec839e7d002b9b9aS3VersionKey8D5C8F22" } ] } @@ -31,7 +31,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters6a4b9ce26d3228c4effd7b46ed51ab439e79a530934ad9bde7d77d7f6b6ebd4aS3VersionKeyA8B74284" + "Ref": "AssetParametersbdefaf3eb78c5c0e534147face527d2531118eac87a95215ec839e7d002b9b9aS3VersionKey8D5C8F22" } ] } @@ -82,7 +82,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters71de8786d26e9f9205375b6cea9342e92d8a622a97d01d7e7d2f7661f056f218S3Bucket89C9DB12" + "Ref": "AssetParameters771b66c34fa8839b080a5ddacd6b789dfe945c60ec021f903f0cd18c9426dc12S3BucketD3A824DE" }, "S3Key": { "Fn::Join": [ @@ -95,7 +95,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters71de8786d26e9f9205375b6cea9342e92d8a622a97d01d7e7d2f7661f056f218S3VersionKey435DAD55" + "Ref": "AssetParameters771b66c34fa8839b080a5ddacd6b789dfe945c60ec021f903f0cd18c9426dc12S3VersionKey19621826" } ] } @@ -108,7 +108,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters71de8786d26e9f9205375b6cea9342e92d8a622a97d01d7e7d2f7661f056f218S3VersionKey435DAD55" + "Ref": "AssetParameters771b66c34fa8839b080a5ddacd6b789dfe945c60ec021f903f0cd18c9426dc12S3VersionKey19621826" } ] } @@ -138,29 +138,29 @@ } }, "Parameters": { - "AssetParameters6a4b9ce26d3228c4effd7b46ed51ab439e79a530934ad9bde7d77d7f6b6ebd4aS3BucketCCD07444": { + "AssetParametersbdefaf3eb78c5c0e534147face527d2531118eac87a95215ec839e7d002b9b9aS3BucketDC0CD06C": { "Type": "String", - "Description": "S3 bucket for asset \"6a4b9ce26d3228c4effd7b46ed51ab439e79a530934ad9bde7d77d7f6b6ebd4a\"" + "Description": "S3 bucket for asset \"bdefaf3eb78c5c0e534147face527d2531118eac87a95215ec839e7d002b9b9a\"" }, - "AssetParameters6a4b9ce26d3228c4effd7b46ed51ab439e79a530934ad9bde7d77d7f6b6ebd4aS3VersionKeyA8B74284": { + "AssetParametersbdefaf3eb78c5c0e534147face527d2531118eac87a95215ec839e7d002b9b9aS3VersionKey8D5C8F22": { "Type": "String", - "Description": "S3 key for asset version \"6a4b9ce26d3228c4effd7b46ed51ab439e79a530934ad9bde7d77d7f6b6ebd4a\"" + "Description": "S3 key for asset version \"bdefaf3eb78c5c0e534147face527d2531118eac87a95215ec839e7d002b9b9a\"" }, - "AssetParameters6a4b9ce26d3228c4effd7b46ed51ab439e79a530934ad9bde7d77d7f6b6ebd4aArtifactHashB3093591": { + "AssetParametersbdefaf3eb78c5c0e534147face527d2531118eac87a95215ec839e7d002b9b9aArtifactHash0CC23B39": { "Type": "String", - "Description": "Artifact hash for asset \"6a4b9ce26d3228c4effd7b46ed51ab439e79a530934ad9bde7d77d7f6b6ebd4a\"" + "Description": "Artifact hash for asset \"bdefaf3eb78c5c0e534147face527d2531118eac87a95215ec839e7d002b9b9a\"" }, - "AssetParameters71de8786d26e9f9205375b6cea9342e92d8a622a97d01d7e7d2f7661f056f218S3Bucket89C9DB12": { + "AssetParameters771b66c34fa8839b080a5ddacd6b789dfe945c60ec021f903f0cd18c9426dc12S3BucketD3A824DE": { "Type": "String", - "Description": "S3 bucket for asset \"71de8786d26e9f9205375b6cea9342e92d8a622a97d01d7e7d2f7661f056f218\"" + "Description": "S3 bucket for asset \"771b66c34fa8839b080a5ddacd6b789dfe945c60ec021f903f0cd18c9426dc12\"" }, - "AssetParameters71de8786d26e9f9205375b6cea9342e92d8a622a97d01d7e7d2f7661f056f218S3VersionKey435DAD55": { + "AssetParameters771b66c34fa8839b080a5ddacd6b789dfe945c60ec021f903f0cd18c9426dc12S3VersionKey19621826": { "Type": "String", - "Description": "S3 key for asset version \"71de8786d26e9f9205375b6cea9342e92d8a622a97d01d7e7d2f7661f056f218\"" + "Description": "S3 key for asset version \"771b66c34fa8839b080a5ddacd6b789dfe945c60ec021f903f0cd18c9426dc12\"" }, - "AssetParameters71de8786d26e9f9205375b6cea9342e92d8a622a97d01d7e7d2f7661f056f218ArtifactHash0EDF3CD0": { + "AssetParameters771b66c34fa8839b080a5ddacd6b789dfe945c60ec021f903f0cd18c9426dc12ArtifactHash1999AD64": { "Type": "String", - "Description": "Artifact hash for asset \"71de8786d26e9f9205375b6cea9342e92d8a622a97d01d7e7d2f7661f056f218\"" + "Description": "Artifact hash for asset \"771b66c34fa8839b080a5ddacd6b789dfe945c60ec021f903f0cd18c9426dc12\"" } }, "Outputs": { diff --git a/packages/@aws-cdk/aws-lambda-python/test/integ.function.py38.expected.json b/packages/@aws-cdk/aws-lambda-python/test/integ.function.py38.expected.json index b5b137205752f..1c509f81eadfc 100644 --- a/packages/@aws-cdk/aws-lambda-python/test/integ.function.py38.expected.json +++ b/packages/@aws-cdk/aws-lambda-python/test/integ.function.py38.expected.json @@ -36,7 +36,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters1482f01217b8bed41000ca172724dc762f68208d3faa315bd6e8e07bbea148adS3BucketA9379638" + "Ref": "AssetParameters00a28c1e9e9df5ad0651b763fa3fb46a1254ccbbb977838507fccd156b0bfdd2S3BucketCDDA1691" }, "S3Key": { "Fn::Join": [ @@ -49,7 +49,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters1482f01217b8bed41000ca172724dc762f68208d3faa315bd6e8e07bbea148adS3VersionKey4376B462" + "Ref": "AssetParameters00a28c1e9e9df5ad0651b763fa3fb46a1254ccbbb977838507fccd156b0bfdd2S3VersionKey65613A9A" } ] } @@ -62,7 +62,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters1482f01217b8bed41000ca172724dc762f68208d3faa315bd6e8e07bbea148adS3VersionKey4376B462" + "Ref": "AssetParameters00a28c1e9e9df5ad0651b763fa3fb46a1254ccbbb977838507fccd156b0bfdd2S3VersionKey65613A9A" } ] } @@ -87,17 +87,17 @@ } }, "Parameters": { - "AssetParameters1482f01217b8bed41000ca172724dc762f68208d3faa315bd6e8e07bbea148adS3BucketA9379638": { + "AssetParameters00a28c1e9e9df5ad0651b763fa3fb46a1254ccbbb977838507fccd156b0bfdd2S3BucketCDDA1691": { "Type": "String", - "Description": "S3 bucket for asset \"1482f01217b8bed41000ca172724dc762f68208d3faa315bd6e8e07bbea148ad\"" + "Description": "S3 bucket for asset \"00a28c1e9e9df5ad0651b763fa3fb46a1254ccbbb977838507fccd156b0bfdd2\"" }, - "AssetParameters1482f01217b8bed41000ca172724dc762f68208d3faa315bd6e8e07bbea148adS3VersionKey4376B462": { + "AssetParameters00a28c1e9e9df5ad0651b763fa3fb46a1254ccbbb977838507fccd156b0bfdd2S3VersionKey65613A9A": { "Type": "String", - "Description": "S3 key for asset version \"1482f01217b8bed41000ca172724dc762f68208d3faa315bd6e8e07bbea148ad\"" + "Description": "S3 key for asset version \"00a28c1e9e9df5ad0651b763fa3fb46a1254ccbbb977838507fccd156b0bfdd2\"" }, - "AssetParameters1482f01217b8bed41000ca172724dc762f68208d3faa315bd6e8e07bbea148adArtifactHashB9B928DC": { + "AssetParameters00a28c1e9e9df5ad0651b763fa3fb46a1254ccbbb977838507fccd156b0bfdd2ArtifactHash1EED218F": { "Type": "String", - "Description": "Artifact hash for asset \"1482f01217b8bed41000ca172724dc762f68208d3faa315bd6e8e07bbea148ad\"" + "Description": "Artifact hash for asset \"00a28c1e9e9df5ad0651b763fa3fb46a1254ccbbb977838507fccd156b0bfdd2\"" } }, "Outputs": { diff --git a/packages/@aws-cdk/aws-lambda-python/test/integ.function.requirements.removed.expected.json b/packages/@aws-cdk/aws-lambda-python/test/integ.function.requirements.removed.expected.json index 6b3b8230c2874..82d8a17b01c61 100644 --- a/packages/@aws-cdk/aws-lambda-python/test/integ.function.requirements.removed.expected.json +++ b/packages/@aws-cdk/aws-lambda-python/test/integ.function.requirements.removed.expected.json @@ -36,7 +36,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParametersaf41a5381eff9302e9acdfeb9c3bcf160b56a97091242b2d599ed5a861af966aS3BucketEE202B67" + "Ref": "AssetParametersf71cd482e809adf27b296b1a6c4ec6373255e740474a8ea2fc0a1a3c4745bb26S3Bucket4A702840" }, "S3Key": { "Fn::Join": [ @@ -49,7 +49,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersaf41a5381eff9302e9acdfeb9c3bcf160b56a97091242b2d599ed5a861af966aS3VersionKey8097C675" + "Ref": "AssetParametersf71cd482e809adf27b296b1a6c4ec6373255e740474a8ea2fc0a1a3c4745bb26S3VersionKeyB566B469" } ] } @@ -62,7 +62,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersaf41a5381eff9302e9acdfeb9c3bcf160b56a97091242b2d599ed5a861af966aS3VersionKey8097C675" + "Ref": "AssetParametersf71cd482e809adf27b296b1a6c4ec6373255e740474a8ea2fc0a1a3c4745bb26S3VersionKeyB566B469" } ] } @@ -87,17 +87,17 @@ } }, "Parameters": { - "AssetParametersaf41a5381eff9302e9acdfeb9c3bcf160b56a97091242b2d599ed5a861af966aS3BucketEE202B67": { + "AssetParametersf71cd482e809adf27b296b1a6c4ec6373255e740474a8ea2fc0a1a3c4745bb26S3Bucket4A702840": { "Type": "String", - "Description": "S3 bucket for asset \"af41a5381eff9302e9acdfeb9c3bcf160b56a97091242b2d599ed5a861af966a\"" + "Description": "S3 bucket for asset \"f71cd482e809adf27b296b1a6c4ec6373255e740474a8ea2fc0a1a3c4745bb26\"" }, - "AssetParametersaf41a5381eff9302e9acdfeb9c3bcf160b56a97091242b2d599ed5a861af966aS3VersionKey8097C675": { + "AssetParametersf71cd482e809adf27b296b1a6c4ec6373255e740474a8ea2fc0a1a3c4745bb26S3VersionKeyB566B469": { "Type": "String", - "Description": "S3 key for asset version \"af41a5381eff9302e9acdfeb9c3bcf160b56a97091242b2d599ed5a861af966a\"" + "Description": "S3 key for asset version \"f71cd482e809adf27b296b1a6c4ec6373255e740474a8ea2fc0a1a3c4745bb26\"" }, - "AssetParametersaf41a5381eff9302e9acdfeb9c3bcf160b56a97091242b2d599ed5a861af966aArtifactHash3E92B1F8": { + "AssetParametersf71cd482e809adf27b296b1a6c4ec6373255e740474a8ea2fc0a1a3c4745bb26ArtifactHashD1B68CBD": { "Type": "String", - "Description": "Artifact hash for asset \"af41a5381eff9302e9acdfeb9c3bcf160b56a97091242b2d599ed5a861af966a\"" + "Description": "Artifact hash for asset \"f71cd482e809adf27b296b1a6c4ec6373255e740474a8ea2fc0a1a3c4745bb26\"" } }, "Outputs": { diff --git a/packages/@aws-cdk/aws-lambda-python/test/integ.function.vpc.expected.json b/packages/@aws-cdk/aws-lambda-python/test/integ.function.vpc.expected.json index 63fad4c61de14..c33a623e815d1 100644 --- a/packages/@aws-cdk/aws-lambda-python/test/integ.function.vpc.expected.json +++ b/packages/@aws-cdk/aws-lambda-python/test/integ.function.vpc.expected.json @@ -296,7 +296,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters4ee6ce8b6ee4bd51743dc0c39d6e52baebaeafff9c9dfea0ff84de98d1dbf353S3Bucket414E0E30" + "Ref": "AssetParametersed5616d1abebc600ce62f84a44dd1516b397ab3a0aca2ecb055f66099c5ab83dS3BucketA91ECDDD" }, "S3Key": { "Fn::Join": [ @@ -309,7 +309,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters4ee6ce8b6ee4bd51743dc0c39d6e52baebaeafff9c9dfea0ff84de98d1dbf353S3VersionKey5ABC9098" + "Ref": "AssetParametersed5616d1abebc600ce62f84a44dd1516b397ab3a0aca2ecb055f66099c5ab83dS3VersionKey1C8E9E07" } ] } @@ -322,7 +322,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters4ee6ce8b6ee4bd51743dc0c39d6e52baebaeafff9c9dfea0ff84de98d1dbf353S3VersionKey5ABC9098" + "Ref": "AssetParametersed5616d1abebc600ce62f84a44dd1516b397ab3a0aca2ecb055f66099c5ab83dS3VersionKey1C8E9E07" } ] } @@ -368,17 +368,17 @@ } }, "Parameters": { - "AssetParameters4ee6ce8b6ee4bd51743dc0c39d6e52baebaeafff9c9dfea0ff84de98d1dbf353S3Bucket414E0E30": { + "AssetParametersed5616d1abebc600ce62f84a44dd1516b397ab3a0aca2ecb055f66099c5ab83dS3BucketA91ECDDD": { "Type": "String", - "Description": "S3 bucket for asset \"4ee6ce8b6ee4bd51743dc0c39d6e52baebaeafff9c9dfea0ff84de98d1dbf353\"" + "Description": "S3 bucket for asset \"ed5616d1abebc600ce62f84a44dd1516b397ab3a0aca2ecb055f66099c5ab83d\"" }, - "AssetParameters4ee6ce8b6ee4bd51743dc0c39d6e52baebaeafff9c9dfea0ff84de98d1dbf353S3VersionKey5ABC9098": { + "AssetParametersed5616d1abebc600ce62f84a44dd1516b397ab3a0aca2ecb055f66099c5ab83dS3VersionKey1C8E9E07": { "Type": "String", - "Description": "S3 key for asset version \"4ee6ce8b6ee4bd51743dc0c39d6e52baebaeafff9c9dfea0ff84de98d1dbf353\"" + "Description": "S3 key for asset version \"ed5616d1abebc600ce62f84a44dd1516b397ab3a0aca2ecb055f66099c5ab83d\"" }, - "AssetParameters4ee6ce8b6ee4bd51743dc0c39d6e52baebaeafff9c9dfea0ff84de98d1dbf353ArtifactHashECA6C88C": { + "AssetParametersed5616d1abebc600ce62f84a44dd1516b397ab3a0aca2ecb055f66099c5ab83dArtifactHashA06A8B3C": { "Type": "String", - "Description": "Artifact hash for asset \"4ee6ce8b6ee4bd51743dc0c39d6e52baebaeafff9c9dfea0ff84de98d1dbf353\"" + "Description": "Artifact hash for asset \"ed5616d1abebc600ce62f84a44dd1516b397ab3a0aca2ecb055f66099c5ab83d\"" } }, "Outputs": {