diff --git a/src/__tests__/__snapshots__/construct-hub.test.ts.snap b/src/__tests__/__snapshots__/construct-hub.test.ts.snap index 57e1b4134..17e82e5a6 100644 --- a/src/__tests__/__snapshots__/construct-hub.test.ts.snap +++ b/src/__tests__/__snapshots__/construct-hub.test.ts.snap @@ -81,6 +81,18 @@ Object { "Description": "S3 key for asset version \\"3416b6d1c6347fa47603d8898795de205b2bd6b5dc24a30b7839eea2cb5f8903\\"", "Type": "String", }, + "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fArtifactHash1B9B2A76": Object { + "Description": "Artifact hash for asset \\"36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337f\\"", + "Type": "String", + }, + "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3BucketC24BE0E2": Object { + "Description": "S3 bucket for asset \\"36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337f\\"", + "Type": "String", + }, + "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3VersionKey6F60C4B3": Object { + "Description": "S3 key for asset version \\"36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337f\\"", + "Type": "String", + }, "AssetParameters4eca4d1b52b162aade7fdea6c9ba1f3b01eb5bd746b76ee41b9994d2b16d84a1ArtifactHash61E29678": Object { "Description": "Artifact hash for asset \\"4eca4d1b52b162aade7fdea6c9ba1f3b01eb5bd746b76ee41b9994d2b16d84a1\\"", "Type": "String", @@ -201,18 +213,6 @@ Object { "Description": "S3 key for asset version \\"a06653c0fddc078791490ec0803bda19cf4effd0b9a7ecbb8b4ba1d52a74286b\\"", "Type": "String", }, - "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebArtifactHash233CDC52": Object { - "Description": "Artifact hash for asset \\"a081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7eb\\"", - "Type": "String", - }, - "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3Bucket365F97A0": Object { - "Description": "S3 bucket for asset \\"a081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7eb\\"", - "Type": "String", - }, - "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3VersionKeyC005F9D4": Object { - "Description": "S3 key for asset version \\"a081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7eb\\"", - "Type": "String", - }, "AssetParametersa3058ccb468d757ebb89df5363a1c20f5307c6911136f29d00e1a68c9b2aa7e8ArtifactHash238275D6": Object { "Description": "Artifact hash for asset \\"a3058ccb468d757ebb89df5363a1c20f5307c6911136f29d00e1a68c9b2aa7e8\\"", "Type": "String", @@ -1685,7 +1685,7 @@ def submit_response(event: dict, context, response_status: str, error_message: s "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3Bucket365F97A0", + "Ref": "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3BucketC24BE0E2", }, "S3Key": Object { "Fn::Join": Array [ @@ -1698,7 +1698,7 @@ def submit_response(event: dict, context, response_status: str, error_message: s "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3VersionKeyC005F9D4", + "Ref": "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3VersionKey6F60C4B3", }, ], }, @@ -1711,7 +1711,7 @@ def submit_response(event: dict, context, response_status: str, error_message: s "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3VersionKeyC005F9D4", + "Ref": "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3VersionKey6F60C4B3", }, ], }, @@ -10130,6 +10130,18 @@ Object { "Description": "S3 key for asset version \\"3416b6d1c6347fa47603d8898795de205b2bd6b5dc24a30b7839eea2cb5f8903\\"", "Type": "String", }, + "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fArtifactHash1B9B2A76": Object { + "Description": "Artifact hash for asset \\"36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337f\\"", + "Type": "String", + }, + "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3BucketC24BE0E2": Object { + "Description": "S3 bucket for asset \\"36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337f\\"", + "Type": "String", + }, + "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3VersionKey6F60C4B3": Object { + "Description": "S3 key for asset version \\"36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337f\\"", + "Type": "String", + }, "AssetParameters4074092ab8b435c90a773e082601fa36def54c91cadfae59451bd0beda547cbcArtifactHashF236251A": Object { "Description": "Artifact hash for asset \\"4074092ab8b435c90a773e082601fa36def54c91cadfae59451bd0beda547cbc\\"", "Type": "String", @@ -10262,18 +10274,6 @@ Object { "Description": "S3 key for asset version \\"a06653c0fddc078791490ec0803bda19cf4effd0b9a7ecbb8b4ba1d52a74286b\\"", "Type": "String", }, - "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebArtifactHash233CDC52": Object { - "Description": "Artifact hash for asset \\"a081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7eb\\"", - "Type": "String", - }, - "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3Bucket365F97A0": Object { - "Description": "S3 bucket for asset \\"a081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7eb\\"", - "Type": "String", - }, - "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3VersionKeyC005F9D4": Object { - "Description": "S3 key for asset version \\"a081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7eb\\"", - "Type": "String", - }, "AssetParametersa3058ccb468d757ebb89df5363a1c20f5307c6911136f29d00e1a68c9b2aa7e8ArtifactHash238275D6": Object { "Description": "Artifact hash for asset \\"a3058ccb468d757ebb89df5363a1c20f5307c6911136f29d00e1a68c9b2aa7e8\\"", "Type": "String", @@ -12035,7 +12035,7 @@ def submit_response(event: dict, context, response_status: str, error_message: s "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3Bucket365F97A0", + "Ref": "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3BucketC24BE0E2", }, "S3Key": Object { "Fn::Join": Array [ @@ -12048,7 +12048,7 @@ def submit_response(event: dict, context, response_status: str, error_message: s "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3VersionKeyC005F9D4", + "Ref": "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3VersionKey6F60C4B3", }, ], }, @@ -12061,7 +12061,7 @@ def submit_response(event: dict, context, response_status: str, error_message: s "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3VersionKeyC005F9D4", + "Ref": "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3VersionKey6F60C4B3", }, ], }, @@ -20651,6 +20651,18 @@ Object { "Description": "S3 key for asset version \\"3416b6d1c6347fa47603d8898795de205b2bd6b5dc24a30b7839eea2cb5f8903\\"", "Type": "String", }, + "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fArtifactHash1B9B2A76": Object { + "Description": "Artifact hash for asset \\"36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337f\\"", + "Type": "String", + }, + "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3BucketC24BE0E2": Object { + "Description": "S3 bucket for asset \\"36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337f\\"", + "Type": "String", + }, + "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3VersionKey6F60C4B3": Object { + "Description": "S3 key for asset version \\"36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337f\\"", + "Type": "String", + }, "AssetParameters4eca4d1b52b162aade7fdea6c9ba1f3b01eb5bd746b76ee41b9994d2b16d84a1ArtifactHash61E29678": Object { "Description": "Artifact hash for asset \\"4eca4d1b52b162aade7fdea6c9ba1f3b01eb5bd746b76ee41b9994d2b16d84a1\\"", "Type": "String", @@ -20771,18 +20783,6 @@ Object { "Description": "S3 key for asset version \\"a06653c0fddc078791490ec0803bda19cf4effd0b9a7ecbb8b4ba1d52a74286b\\"", "Type": "String", }, - "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebArtifactHash233CDC52": Object { - "Description": "Artifact hash for asset \\"a081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7eb\\"", - "Type": "String", - }, - "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3Bucket365F97A0": Object { - "Description": "S3 bucket for asset \\"a081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7eb\\"", - "Type": "String", - }, - "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3VersionKeyC005F9D4": Object { - "Description": "S3 key for asset version \\"a081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7eb\\"", - "Type": "String", - }, "AssetParametersa3058ccb468d757ebb89df5363a1c20f5307c6911136f29d00e1a68c9b2aa7e8ArtifactHash238275D6": Object { "Description": "Artifact hash for asset \\"a3058ccb468d757ebb89df5363a1c20f5307c6911136f29d00e1a68c9b2aa7e8\\"", "Type": "String", @@ -22255,7 +22255,7 @@ def submit_response(event: dict, context, response_status: str, error_message: s "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3Bucket365F97A0", + "Ref": "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3BucketC24BE0E2", }, "S3Key": Object { "Fn::Join": Array [ @@ -22268,7 +22268,7 @@ def submit_response(event: dict, context, response_status: str, error_message: s "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3VersionKeyC005F9D4", + "Ref": "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3VersionKey6F60C4B3", }, ], }, @@ -22281,7 +22281,7 @@ def submit_response(event: dict, context, response_status: str, error_message: s "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3VersionKeyC005F9D4", + "Ref": "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3VersionKey6F60C4B3", }, ], }, @@ -30710,6 +30710,18 @@ Object { "Description": "S3 key for asset version \\"3416b6d1c6347fa47603d8898795de205b2bd6b5dc24a30b7839eea2cb5f8903\\"", "Type": "String", }, + "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fArtifactHash1B9B2A76": Object { + "Description": "Artifact hash for asset \\"36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337f\\"", + "Type": "String", + }, + "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3BucketC24BE0E2": Object { + "Description": "S3 bucket for asset \\"36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337f\\"", + "Type": "String", + }, + "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3VersionKey6F60C4B3": Object { + "Description": "S3 key for asset version \\"36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337f\\"", + "Type": "String", + }, "AssetParameters4eca4d1b52b162aade7fdea6c9ba1f3b01eb5bd746b76ee41b9994d2b16d84a1ArtifactHash61E29678": Object { "Description": "Artifact hash for asset \\"4eca4d1b52b162aade7fdea6c9ba1f3b01eb5bd746b76ee41b9994d2b16d84a1\\"", "Type": "String", @@ -30854,18 +30866,6 @@ Object { "Description": "S3 key for asset version \\"a06653c0fddc078791490ec0803bda19cf4effd0b9a7ecbb8b4ba1d52a74286b\\"", "Type": "String", }, - "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebArtifactHash233CDC52": Object { - "Description": "Artifact hash for asset \\"a081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7eb\\"", - "Type": "String", - }, - "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3Bucket365F97A0": Object { - "Description": "S3 bucket for asset \\"a081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7eb\\"", - "Type": "String", - }, - "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3VersionKeyC005F9D4": Object { - "Description": "S3 key for asset version \\"a081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7eb\\"", - "Type": "String", - }, "AssetParametersa3058ccb468d757ebb89df5363a1c20f5307c6911136f29d00e1a68c9b2aa7e8ArtifactHash238275D6": Object { "Description": "Artifact hash for asset \\"a3058ccb468d757ebb89df5363a1c20f5307c6911136f29d00e1a68c9b2aa7e8\\"", "Type": "String", @@ -32487,7 +32487,7 @@ def submit_response(event: dict, context, response_status: str, error_message: s "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3Bucket365F97A0", + "Ref": "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3BucketC24BE0E2", }, "S3Key": Object { "Fn::Join": Array [ @@ -32500,7 +32500,7 @@ def submit_response(event: dict, context, response_status: str, error_message: s "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3VersionKeyC005F9D4", + "Ref": "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3VersionKey6F60C4B3", }, ], }, @@ -32513,7 +32513,7 @@ def submit_response(event: dict, context, response_status: str, error_message: s "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3VersionKeyC005F9D4", + "Ref": "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3VersionKey6F60C4B3", }, ], }, @@ -41220,6 +41220,18 @@ Object { "Description": "S3 key for asset version \\"3416b6d1c6347fa47603d8898795de205b2bd6b5dc24a30b7839eea2cb5f8903\\"", "Type": "String", }, + "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fArtifactHash1B9B2A76": Object { + "Description": "Artifact hash for asset \\"36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337f\\"", + "Type": "String", + }, + "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3BucketC24BE0E2": Object { + "Description": "S3 bucket for asset \\"36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337f\\"", + "Type": "String", + }, + "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3VersionKey6F60C4B3": Object { + "Description": "S3 key for asset version \\"36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337f\\"", + "Type": "String", + }, "AssetParameters4074092ab8b435c90a773e082601fa36def54c91cadfae59451bd0beda547cbcArtifactHashF236251A": Object { "Description": "Artifact hash for asset \\"4074092ab8b435c90a773e082601fa36def54c91cadfae59451bd0beda547cbc\\"", "Type": "String", @@ -41352,18 +41364,6 @@ Object { "Description": "S3 key for asset version \\"a06653c0fddc078791490ec0803bda19cf4effd0b9a7ecbb8b4ba1d52a74286b\\"", "Type": "String", }, - "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebArtifactHash233CDC52": Object { - "Description": "Artifact hash for asset \\"a081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7eb\\"", - "Type": "String", - }, - "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3Bucket365F97A0": Object { - "Description": "S3 bucket for asset \\"a081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7eb\\"", - "Type": "String", - }, - "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3VersionKeyC005F9D4": Object { - "Description": "S3 key for asset version \\"a081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7eb\\"", - "Type": "String", - }, "AssetParametersa3058ccb468d757ebb89df5363a1c20f5307c6911136f29d00e1a68c9b2aa7e8ArtifactHash238275D6": Object { "Description": "Artifact hash for asset \\"a3058ccb468d757ebb89df5363a1c20f5307c6911136f29d00e1a68c9b2aa7e8\\"", "Type": "String", @@ -42945,7 +42945,7 @@ def submit_response(event: dict, context, response_status: str, error_message: s "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3Bucket365F97A0", + "Ref": "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3BucketC24BE0E2", }, "S3Key": Object { "Fn::Join": Array [ @@ -42958,7 +42958,7 @@ def submit_response(event: dict, context, response_status: str, error_message: s "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3VersionKeyC005F9D4", + "Ref": "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3VersionKey6F60C4B3", }, ], }, @@ -42971,7 +42971,7 @@ def submit_response(event: dict, context, response_status: str, error_message: s "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3VersionKeyC005F9D4", + "Ref": "AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3VersionKey6F60C4B3", }, ], }, diff --git a/src/__tests__/backend/ingestion/ingestion.lambda.test.ts b/src/__tests__/backend/ingestion/ingestion.lambda.test.ts index 8f95387ed..1e18007a8 100644 --- a/src/__tests__/backend/ingestion/ingestion.lambda.test.ts +++ b/src/__tests__/backend/ingestion/ingestion.lambda.test.ts @@ -1865,14 +1865,18 @@ class FakeStream extends EventEmitter { } function assertAssembly(expected: string, actual: string | undefined) { - const expectedAssembly = JSON.parse(expected); - const actualAssembly = JSON.parse(actual ?? '{}'); + const expectedAssembly: Assembly = JSON.parse(expected); + const actualAssembly: Assembly = JSON.parse(actual ?? '{}'); // sanity: we have 2 types in the fake assembly - expect(Object.keys(expectedAssembly.types).length).toBe(2); + expect(expectedAssembly.types).toBeDefined(); + expect(expectedAssembly.readme).toBeDefined(); + expect(expectedAssembly.dependencyClosure).toBeDefined(); - // service deletes "types" from the assembly to reduce size + // handler deletes these fields from the assembly to reduce size delete expectedAssembly.types; + delete expectedAssembly.readme; + delete expectedAssembly.dependencyClosure; expect(actualAssembly).toStrictEqual(expectedAssembly); } @@ -1887,6 +1891,12 @@ function fakeAssembly(name: string, version: string, license: string): Assembly repository: { url: 'ssh://localhost.fake/repository.git', type: 'git' }, author: { name: 'ACME', email: 'test@acme', organization: true, roles: ['author'] }, description: 'This is a fake package assembly', + readme: { markdown: 'Foo Bar ReadMe' }, + dependencyClosure: { + 'foo-boo': { + readme: { markdown: 'hey' }, + }, + }, jsiiVersion: '0.0.0+head', fingerprint: 'NOPE', types: { diff --git a/src/__tests__/devapp/__snapshots__/snapshot.test.ts.snap b/src/__tests__/devapp/__snapshots__/snapshot.test.ts.snap index 3ff3a1738..210e832ff 100644 --- a/src/__tests__/devapp/__snapshots__/snapshot.test.ts.snap +++ b/src/__tests__/devapp/__snapshots__/snapshot.test.ts.snap @@ -4037,7 +4037,7 @@ Resources: Properties: Code: S3Bucket: - Ref: AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3Bucket365F97A0 + Ref: AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3BucketC24BE0E2 S3Key: Fn::Join: - "" @@ -4045,12 +4045,12 @@ Resources: - 0 - Fn::Split: - "||" - - Ref: AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3VersionKeyC005F9D4 + - Ref: AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3VersionKey6F60C4B3 - Fn::Select: - 1 - Fn::Split: - "||" - - Ref: AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3VersionKeyC005F9D4 + - Ref: AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3VersionKey6F60C4B3 Role: Fn::GetAtt: - ConstructHubIngestionServiceRole6380BAB6 @@ -7186,18 +7186,18 @@ Parameters: Type: String Description: Artifact hash for asset "b69f8e77829ba765ee3a37c088671f56d5982ab8e2a57c2f3103bea15181e67b" - AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3Bucket365F97A0: + AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3BucketC24BE0E2: Type: String Description: S3 bucket for asset - "a081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7eb" - AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebS3VersionKeyC005F9D4: + "36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337f" + AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fS3VersionKey6F60C4B3: Type: String Description: S3 key for asset version - "a081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7eb" - AssetParametersa081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7ebArtifactHash233CDC52: + "36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337f" + AssetParameters36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337fArtifactHash1B9B2A76: Type: String Description: Artifact hash for asset - "a081b67b87124b85f46cd17382d0fb9a04917b3eb8529396b928f4ae2d79d7eb" + "36fdff7194ab7151b2c9746ada7c14f23c6458aae01f87fd1ed875481b7d337f" AssetParameters6539334465145d138a2ca35862ccb798cddf768799e264b5ec811f9b33c18c3cS3Bucket674182B9: Type: String Description: S3 bucket for asset diff --git a/src/backend/ingestion/ingestion.lambda.ts b/src/backend/ingestion/ingestion.lambda.ts index 7bde4cd06..f0018baaf 100644 --- a/src/backend/ingestion/ingestion.lambda.ts +++ b/src/backend/ingestion/ingestion.lambda.ts @@ -101,15 +101,19 @@ export const handler = metricScope( try { parsedAssembly = validateAssembly(JSON.parse(dotJsii.toString('utf-8'))); - // "types" is huge and not needed downstream because doc generation happens in the backend, - // so we drop it. See https://github.com/cdklabs/construct-hub-webapp/issues/691 - delete parsedAssembly.types; - + // needs `dependencyClosure` constructFramework = detectConstructFramework(parsedAssembly); const { license, name, version } = parsedAssembly; packageLicense = license; packageName = name; packageVersion = version; + + // Delete some fields not used by the client to reduce the size of the assembly. + // See https://github.com/cdklabs/construct-hub-webapp/issues/691 + delete parsedAssembly.types; + delete parsedAssembly.readme; + delete parsedAssembly.dependencyClosure; + metrics.putMetric(MetricName.INVALID_ASSEMBLY, 0, Unit.Count); } catch (ex) { console.error(