Skip to content

Commit

Permalink
Merge branch 'edge-api-sdk/logger' of https://github.com/reapit/ts-cd…
Browse files Browse the repository at this point in the history 
…k-constructs into edge-api-sdk/logger
  • Loading branch information
@joshbalfour
joshbalfour committed Jan 8, 2024
2 parents ea9160c + 9f5b098 commit ad14a2c
Show file tree
Hide file tree
Showing 21 changed files with 37 additions and 37 deletions.
Binary file renamed ...3cfd48e6c8c7d4933c25dc21ddd7815aee37e.zip → ...a408feb2dd1834f6998faad3792c49ca4099e.zip
View file
Binary file not shown.
0 ...933c25dc21ddd7815aee37e/host-forwarder.js → ...f6998faad3792c49ca4099e/host-forwarder.js
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...33c25dc21ddd7815aee37e/origin-selector.js → ...6998faad3792c49ca4099e/origin-selector.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ var handler = async (event) => {
value: domainName
}
];
middlewares.forEach((middleware) => {
for (const middleware of middlewares) {
try {
eval(middleware)(req, mapping);
await eval(middleware)(req, mapping);
} catch (e) {
console.error(e);
}
});
}
return req;
};
// Annotate the CommonJS export names for ESM import in node:
Expand Down
0 ...c21ddd7815aee37e/production-redirector.js → ...ad3792c49ca4099e/production-redirector.js
View file
File renamed without changes.
0 ...c7d4933c25dc21ddd7815aee37e/redirector.js → ...1834f6998faad3792c49ca4099e/redirector.js
View file
File renamed without changes.
0 ...c8c7d4933c25dc21ddd7815aee37e/rewriter.js → ...dd1834f6998faad3792c49ca4099e/rewriter.js
View file
File renamed without changes.
0 ...933c25dc21ddd7815aee37e/s3-qs-redirect.js → ...f6998faad3792c49ca4099e/s3-qs-redirect.js
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions ...constructs/edge-api/tests/integ.stack.dev.ts.snapshot/edge-api-test-stack-dev.assets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,29 +43,29 @@
}
}
},
"2ea0bec2e90021dc6ee51794fc23cfd48e6c8c7d4933c25dc21ddd7815aee37e": {
"03c4398d27bfe8ea8baafc234fca408feb2dd1834f6998faad3792c49ca4099e": {
"source": {
"path": "asset.2ea0bec2e90021dc6ee51794fc23cfd48e6c8c7d4933c25dc21ddd7815aee37e",
"path": "asset.03c4398d27bfe8ea8baafc234fca408feb2dd1834f6998faad3792c49ca4099e",
"packaging": "zip"
},
"destinations": {
"028446965111-eu-central-1": {
"bucketName": "cdk-hnb659fds-assets-028446965111-eu-central-1",
"objectKey": "2ea0bec2e90021dc6ee51794fc23cfd48e6c8c7d4933c25dc21ddd7815aee37e.zip",
"objectKey": "03c4398d27bfe8ea8baafc234fca408feb2dd1834f6998faad3792c49ca4099e.zip",
"region": "eu-central-1",
"assumeRoleArn": "arn:${AWS::Partition}:iam::028446965111:role/cdk-hnb659fds-file-publishing-role-028446965111-eu-central-1"
}
}
},
"fc0764270b6445a6918b260e3f091ab490cc231f01b77d73dbe61c526d9c2137": {
"ed225b4df5afedf88e9acc869df705eaf4c9c8466d6834df3139d5ee1cb6f670": {
"source": {
"path": "edge-api-test-stack-dev.template.json",
"packaging": "file"
},
"destinations": {
"028446965111-eu-central-1": {
"bucketName": "cdk-hnb659fds-assets-028446965111-eu-central-1",
"objectKey": "fc0764270b6445a6918b260e3f091ab490cc231f01b77d73dbe61c526d9c2137.json",
"objectKey": "ed225b4df5afedf88e9acc869df705eaf4c9c8466d6834df3139d5ee1cb6f670.json",
"region": "eu-central-1",
"assumeRoleArn": "arn:${AWS::Partition}:iam::028446965111:role/cdk-hnb659fds-file-publishing-role-028446965111-eu-central-1"
}
Expand Down
6 changes: 3 additions & 3 deletions ...nstructs/edge-api/tests/integ.stack.dev.ts.snapshot/edge-api-test-stack-dev.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@
"Properties": {
"Code": {
"S3Bucket": "cdk-hnb659fds-assets-028446965111-eu-central-1",
"S3Key": "2ea0bec2e90021dc6ee51794fc23cfd48e6c8c7d4933c25dc21ddd7815aee37e.zip"
"S3Key": "03c4398d27bfe8ea8baafc234fca408feb2dd1834f6998faad3792c49ca4099e.zip"
},
"Handler": "redirector.handler",
"Role": {
Expand All @@ -732,7 +732,7 @@
],
"Metadata": {
"aws:cdk:path": "edge-api-test-stack-dev/api/api/redirect/Resource",
"aws:asset:path": "asset.2ea0bec2e90021dc6ee51794fc23cfd48e6c8c7d4933c25dc21ddd7815aee37e",
"aws:asset:path": "asset.03c4398d27bfe8ea8baafc234fca408feb2dd1834f6998faad3792c49ca4099e",
"aws:asset:is-bundled": false,
"aws:asset:property": "Code"
}
Expand Down Expand Up @@ -1091,7 +1091,7 @@
"CDKMetadata": {
"Type": "AWS::CDK::Metadata",
"Properties": {
"Analytics": "v2:deflate64:H4sIAAAAAAAA/01S2WrDMBD8lrzLSuPS0rw1B6WFHsGBvoaNvHGV6DCSnBCM/71aOYfBMLOrYa9xztvplE9GcPKZKA+ZklvergOIAyvQ28YJZPFt0wp0Qe6kgIAaDFToeLu459hiZwZhx6CWVSQnOB/zqNyZpdUgzTfopJ3VkiB2qq7xF9S1NBVFHyZg5SBIaygsbEMlFehtCanYCp2W3tP7W2PEVTjkn3BG94suidaxsMJgb4qOSdC8LazCvkPElVVSnCnsWcf846YF7zF4PiNgJdbKnjWawOeNOGBY3hKk5m2fnYNH1lMqd2E93LsM4445WvIplpgVKKwr01iJrTF0HUsD0L3oRv0pNop23ER/hJJ8dvILJdPabNH4YPXNwVTqzn+aUDdx4OkzzzNQ9R/wh9Hr5RcYEw7duyjagYHvIdTkIGFv4cA/SibHEhtYGZcwtkS+9+Pj5IXHLx/tvZSZa0yQGnnR4z+kZqDQlAIAAA=="
"Analytics": "v2:deflate64:H4sIAAAAAAAA/01Sy07DMBD8lt7dhRaB6I0ShEDipVTiWi3ONpj6EdkbosryvyM7pc1pZtajtXfHS4irFSxmOIS5bPZzrb4gbhjlXtQUXO8lCRzCNkryrHZKIpNBiy15iNW5JqqdncgksFMtMg14+F1CrHb2wRlU9g1N8a47lWHD2P7rV+w6Zdusni1T65GVs1nWrs8tNZqvBkuzD/JGhZDPH3sr/41T/oIH8p/ki2mjbKuJ3cmRhEIDsXaaxhs0iQ+nlTxkObIkwtU2YgjEAdYZREOddgdDluG+l3vih1MhuyGO1XsMJEaa2x3ZCOdbpjoJn4e8voK4rkk635RnFbYhTkmUB+R95R2Nq9jqPOMWhyC1gvUQKq3K2KLqAztzSrC0OvP3nruek1jdwHKOuvtGuJzdHb/ARcZpekdHnAT4xNzlBDOOEU7yy8WSWGGTKFMS1jUEP+Hid3ELixVczn6CUnPfW1aGoB7xDwPK1X+UAgAA"
},
"Metadata": {
"aws:cdk:path": "edge-api-test-stack-dev/CDKMetadata/Default"
Expand Down
2 changes: 1 addition & 1 deletion packages/constructs/edge-api/tests/integ.stack.dev.ts.snapshot/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::028446965111:role/cdk-hnb659fds-deploy-role-028446965111-eu-central-1",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::028446965111:role/cdk-hnb659fds-cfn-exec-role-028446965111-eu-central-1",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-028446965111-eu-central-1/fc0764270b6445a6918b260e3f091ab490cc231f01b77d73dbe61c526d9c2137.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-028446965111-eu-central-1/ed225b4df5afedf88e9acc869df705eaf4c9c8466d6834df3139d5ee1cb6f670.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down
2 changes: 1 addition & 1 deletion packages/constructs/edge-api/tests/integ.stack.dev.ts.snapshot/tree.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1139,7 +1139,7 @@
"aws:cdk:cloudformation:props": {
"code": {
"s3Bucket": "cdk-hnb659fds-assets-028446965111-eu-central-1",
"s3Key": "2ea0bec2e90021dc6ee51794fc23cfd48e6c8c7d4933c25dc21ddd7815aee37e.zip"
"s3Key": "03c4398d27bfe8ea8baafc234fca408feb2dd1834f6998faad3792c49ca4099e.zip"
},
"handler": "redirector.handler",
"role": {
Expand Down
0 ...933c25dc21ddd7815aee37e/host-forwarder.js → ...f6998faad3792c49ca4099e/host-forwarder.js
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...33c25dc21ddd7815aee37e/origin-selector.js → ...6998faad3792c49ca4099e/origin-selector.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ var handler = async (event) => {
value: domainName
}
];
middlewares.forEach((middleware) => {
for (const middleware of middlewares) {
try {
eval(middleware)(req, mapping);
await eval(middleware)(req, mapping);
} catch (e) {
console.error(e);
}
});
}
return req;
};
// Annotate the CommonJS export names for ESM import in node:
Expand Down
0 ...c21ddd7815aee37e/production-redirector.js → ...ad3792c49ca4099e/production-redirector.js
View file
File renamed without changes.
0 ...c7d4933c25dc21ddd7815aee37e/redirector.js → ...1834f6998faad3792c49ca4099e/redirector.js
View file
File renamed without changes.
0 ...c8c7d4933c25dc21ddd7815aee37e/rewriter.js → ...dd1834f6998faad3792c49ca4099e/rewriter.js
View file
File renamed without changes.
0 ...933c25dc21ddd7815aee37e/s3-qs-redirect.js → ...f6998faad3792c49ca4099e/s3-qs-redirect.js
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions ...es/constructs/edge-api/tests/integ.stack.prod.ts.snapshot/edge-api-test-stack.assets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,29 +43,29 @@
}
}
},
"2ea0bec2e90021dc6ee51794fc23cfd48e6c8c7d4933c25dc21ddd7815aee37e": {
"03c4398d27bfe8ea8baafc234fca408feb2dd1834f6998faad3792c49ca4099e": {
"source": {
"path": "asset.2ea0bec2e90021dc6ee51794fc23cfd48e6c8c7d4933c25dc21ddd7815aee37e",
"path": "asset.03c4398d27bfe8ea8baafc234fca408feb2dd1834f6998faad3792c49ca4099e",
"packaging": "zip"
},
"destinations": {
"028446965111-us-east-1": {
"bucketName": "cdk-hnb659fds-assets-028446965111-us-east-1",
"objectKey": "2ea0bec2e90021dc6ee51794fc23cfd48e6c8c7d4933c25dc21ddd7815aee37e.zip",
"objectKey": "03c4398d27bfe8ea8baafc234fca408feb2dd1834f6998faad3792c49ca4099e.zip",
"region": "us-east-1",
"assumeRoleArn": "arn:${AWS::Partition}:iam::028446965111:role/cdk-hnb659fds-file-publishing-role-028446965111-us-east-1"
}
}
},
"0c3f270102a942d6d280e20e909d380749bc98b915d47b220ff3a3b2e724c1fc": {
"4b6348841f5217a1854a3ae4c31a258b546f82431aa035658f1336e6824e1048": {
"source": {
"path": "edge-api-test-stack.template.json",
"packaging": "file"
},
"destinations": {
"028446965111-us-east-1": {
"bucketName": "cdk-hnb659fds-assets-028446965111-us-east-1",
"objectKey": "0c3f270102a942d6d280e20e909d380749bc98b915d47b220ff3a3b2e724c1fc.json",
"objectKey": "4b6348841f5217a1854a3ae4c31a258b546f82431aa035658f1336e6824e1048.json",
"region": "us-east-1",
"assumeRoleArn": "arn:${AWS::Partition}:iam::028446965111:role/cdk-hnb659fds-file-publishing-role-028446965111-us-east-1"
}
Expand Down
18 changes: 9 additions & 9 deletions .../constructs/edge-api/tests/integ.stack.prod.ts.snapshot/edge-api-test-stack.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
{
"EventType": "origin-response",
"LambdaFunctionARN": {
"Ref": "apis3qsredirectCurrentVersion201EBAF5b65ee701a46fed9ee997a70695f73678"
"Ref": "apis3qsredirectCurrentVersion201EBAF5ee6e5695a3c69fe42abc3c5457c9312d"
}
}
],
Expand Down Expand Up @@ -363,7 +363,7 @@
"EventType": "origin-request",
"IncludeBody": true,
"LambdaFunctionARN": {
"Ref": "apiredirectmeredirectorCurrentVersionA5C47DBFf605f1cd2163e657066a2cebe4a8666f"
"Ref": "apiredirectmeredirectorCurrentVersionA5C47DBFae680f8ca3cdb946b8115b80d63e09e1"
}
}
],
Expand Down Expand Up @@ -762,7 +762,7 @@
"Properties": {
"Code": {
"S3Bucket": "cdk-hnb659fds-assets-028446965111-us-east-1",
"S3Key": "2ea0bec2e90021dc6ee51794fc23cfd48e6c8c7d4933c25dc21ddd7815aee37e.zip"
"S3Key": "03c4398d27bfe8ea8baafc234fca408feb2dd1834f6998faad3792c49ca4099e.zip"
},
"Handler": "s3-qs-redirect.handler",
"Role": {
Expand All @@ -778,12 +778,12 @@
],
"Metadata": {
"aws:cdk:path": "edge-api-test-stack/api/api/s3-qs-redirect/Resource",
"aws:asset:path": "asset.2ea0bec2e90021dc6ee51794fc23cfd48e6c8c7d4933c25dc21ddd7815aee37e",
"aws:asset:path": "asset.03c4398d27bfe8ea8baafc234fca408feb2dd1834f6998faad3792c49ca4099e",
"aws:asset:is-bundled": false,
"aws:asset:property": "Code"
}
},
"apis3qsredirectCurrentVersion201EBAF5b65ee701a46fed9ee997a70695f73678": {
"apis3qsredirectCurrentVersion201EBAF5ee6e5695a3c69fe42abc3c5457c9312d": {
"Type": "AWS::Lambda::Version",
"Properties": {
"FunctionName": {
Expand Down Expand Up @@ -954,7 +954,7 @@
"Properties": {
"Code": {
"S3Bucket": "cdk-hnb659fds-assets-028446965111-us-east-1",
"S3Key": "2ea0bec2e90021dc6ee51794fc23cfd48e6c8c7d4933c25dc21ddd7815aee37e.zip"
"S3Key": "03c4398d27bfe8ea8baafc234fca408feb2dd1834f6998faad3792c49ca4099e.zip"
},
"Handler": "production-redirector.handler",
"Role": {
Expand All @@ -970,12 +970,12 @@
],
"Metadata": {
"aws:cdk:path": "edge-api-test-stack/api/api/--redirect-me-redirector/Resource",
"aws:asset:path": "asset.2ea0bec2e90021dc6ee51794fc23cfd48e6c8c7d4933c25dc21ddd7815aee37e",
"aws:asset:path": "asset.03c4398d27bfe8ea8baafc234fca408feb2dd1834f6998faad3792c49ca4099e",
"aws:asset:is-bundled": false,
"aws:asset:property": "Code"
}
},
"apiredirectmeredirectorCurrentVersionA5C47DBFf605f1cd2163e657066a2cebe4a8666f": {
"apiredirectmeredirectorCurrentVersionA5C47DBFae680f8ca3cdb946b8115b80d63e09e1": {
"Type": "AWS::Lambda::Version",
"Properties": {
"FunctionName": {
Expand Down Expand Up @@ -1399,7 +1399,7 @@
"CDKMetadata": {
"Type": "AWS::CDK::Metadata",
"Properties": {
"Analytics": "v2:deflate64:H4sIAAAAAAAA/21SYUvDMBD9LX7PIiqCfpyVoaAoHfi1ZOltnkuTkrtMRul/99LWboJQuHd373Lpe7nW9/f66sJ808LW+4XDje7WbOxelUAhRQtKelVnITJu0RqGxnizg6i74lRTxdafpb2iG909JLsHzq0JjeE9OLTHU3nKx+TBkExbF1K9jcGz7t4i7tAvrQWi5xo8Iw/DReasMudfhly/DZ7gCUwNkU5L/288InHETWIMPrPO814502xqo7tV8vaXMeMPOWWqncEXc4T4m6/R7xxwmId6habRXRncIN0QT1cckYjI0G6nCarY0J50YZxbftMa4gHFnD+UwTqGV2M/0Q8Hn+e9goOII6wyTWslZquqzhCBdJY5qBpaF46NcPVoyuNc6FUMieFW3F2WYEOsR0kzWgP3vRqOkLXiyC73Xk3bZjhKWLksSyVPyjrU8h+Fw0EpVSTi0MyPbjRqxm+J2yTbfahBf9Hl4epOy3d98UWIi5jE8wZ0OcYfkjsecNQCAAA="
"Analytics": "v2:deflate64:H4sIAAAAAAAA/21SXW/bMAz8LX1XtGXFgOXRdVGsQIsONrBXg5EZl40sGSKVIBD03wd/1MmAPvGOPJLCUT/0bqe3d3DmjWmPG0t7nWoBc1QVso/BoIIzN8lgEDqQAcEeHHQYdCqvOVUe3A3Niu91eojmiDKWFjSHP96SuVzTC5/JAzBmZayP7SF4Jzq9BerIFcYg83OLTkim5nLUPI2aLxUV8uAd42+EFgNfl35deCSWQPso5N2ouuVZWej3Lej0FJ35VKz4LwZecjfwBS4YPnlNrrMofm3KiqDXqfJ2sm6K1yfOKCsWHA5LBzcCfGRdgrXFmWsMJzL4v2Q6neArmHdy0+BbnhWe0AnrVMVlbbTTqZoEzCisizGoFgfrLz060fNRHtdEVsFHwZ/3OhUVGh/a2dIR1Sg5q2lELdCR68baKwzDCGcLGzva0sCZjSVdnLm0NDmlysji+/XTzYda8VuUIUpWzreoP/jbaftLb3f6+90HE21CdEI96mqO/wA1l2vf1AIAAA=="
},
"Metadata": {
"aws:cdk:path": "edge-api-test-stack/CDKMetadata/Default"
Expand Down
6 changes: 3 additions & 3 deletions packages/constructs/edge-api/tests/integ.stack.prod.ts.snapshot/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::028446965111:role/cdk-hnb659fds-deploy-role-028446965111-us-east-1",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::028446965111:role/cdk-hnb659fds-cfn-exec-role-028446965111-us-east-1",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-028446965111-us-east-1/0c3f270102a942d6d280e20e909d380749bc98b915d47b220ff3a3b2e724c1fc.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-028446965111-us-east-1/4b6348841f5217a1854a3ae4c31a258b546f82431aa035658f1336e6824e1048.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down Expand Up @@ -145,7 +145,7 @@
"/edge-api-test-stack/api/api/s3-qs-redirect/CurrentVersion/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "apis3qsredirectCurrentVersion201EBAF5b65ee701a46fed9ee997a70695f73678"
"data": "apis3qsredirectCurrentVersion201EBAF5ee6e5695a3c69fe42abc3c5457c9312d"
}
],
"/edge-api-test-stack/api/api/--get--*-headers/Resource": [
Expand Down Expand Up @@ -193,7 +193,7 @@
"/edge-api-test-stack/api/api/--redirect-me-redirector/CurrentVersion/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "apiredirectmeredirectorCurrentVersionA5C47DBFf605f1cd2163e657066a2cebe4a8666f"
"data": "apiredirectmeredirectorCurrentVersionA5C47DBFae680f8ca3cdb946b8115b80d63e09e1"
}
],
"/edge-api-test-stack/arecord/Resource": [
Expand Down
8 changes: 4 additions & 4 deletions packages/constructs/edge-api/tests/integ.stack.prod.ts.snapshot/tree.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@
"lambdaFunctionAssociations": [
{
"lambdaFunctionArn": {
"Ref": "apis3qsredirectCurrentVersion201EBAF5b65ee701a46fed9ee997a70695f73678"
"Ref": "apis3qsredirectCurrentVersion201EBAF5ee6e5695a3c69fe42abc3c5457c9312d"
},
"eventType": "origin-response"
}
Expand Down Expand Up @@ -663,7 +663,7 @@
"lambdaFunctionAssociations": [
{
"lambdaFunctionArn": {
"Ref": "apiredirectmeredirectorCurrentVersionA5C47DBFf605f1cd2163e657066a2cebe4a8666f"
"Ref": "apiredirectmeredirectorCurrentVersionA5C47DBFae680f8ca3cdb946b8115b80d63e09e1"
},
"eventType": "origin-request",
"includeBody": true
Expand Down Expand Up @@ -1155,7 +1155,7 @@
"aws:cdk:cloudformation:props": {
"code": {
"s3Bucket": "cdk-hnb659fds-assets-028446965111-us-east-1",
"s3Key": "2ea0bec2e90021dc6ee51794fc23cfd48e6c8c7d4933c25dc21ddd7815aee37e.zip"
"s3Key": "03c4398d27bfe8ea8baafc234fca408feb2dd1834f6998faad3792c49ca4099e.zip"
},
"handler": "s3-qs-redirect.handler",
"role": {
Expand Down Expand Up @@ -1500,7 +1500,7 @@
"aws:cdk:cloudformation:props": {
"code": {
"s3Bucket": "cdk-hnb659fds-assets-028446965111-us-east-1",
"s3Key": "2ea0bec2e90021dc6ee51794fc23cfd48e6c8c7d4933c25dc21ddd7815aee37e.zip"
"s3Key": "03c4398d27bfe8ea8baafc234fca408feb2dd1834f6998faad3792c49ca4099e.zip"
},
"handler": "production-redirector.handler",
"role": {
Expand Down

0 comments on commit ad14a2c

Please sign in to comment.