Skip to content

Commit 3813f28

Browse files
authored
Merge pull request #17 from reapit/construct/entra-app
construct: add EntraIDApplication
2 parents 130b791 + 4fe0714 commit 3813f28

37 files changed

Lines changed: 952 additions & 48 deletions

packages/constructs/edge-api/tests/integ.stack.dev.ts.snapshot/asset.0f4c1084359ae06a7ede8c4134bc004f2f6bf7e40aa54a8ba73f846c88b98ee4/host-forwarder.js renamed to packages/constructs/edge-api/tests/integ.stack.dev.ts.snapshot/asset.e568ed14759e05024fa779a0a128447c7c6adf222da22882dd3fd471ba571039/host-forwarder.js

File renamed without changes.

packages/constructs/edge-api/tests/integ.stack.dev.ts.snapshot/asset.0f4c1084359ae06a7ede8c4134bc004f2f6bf7e40aa54a8ba73f846c88b98ee4/origin-selector.js renamed to packages/constructs/edge-api/tests/integ.stack.dev.ts.snapshot/asset.e568ed14759e05024fa779a0a128447c7c6adf222da22882dd3fd471ba571039/origin-selector.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,20 @@ var handler = async (event) => {
5555
if (!mapping) {
5656
throw new Error(`no domain mapping found for host ${host}`);
5757
}
58+
let domainName = typeof mapping === "string" ? mapping : mapping.destination;
59+
if (domainName.includes("//")) {
60+
domainName = domainName.split("//")[1].split("/")[0];
61+
}
5862
req.origin = {
5963
custom: {
6064
...req.origin.custom,
61-
domainName: mapping.domain
65+
domainName
6266
}
6367
};
6468
req.headers["host"] = [
6569
{
6670
key: "host",
67-
value: mapping.domain
71+
value: domainName
6872
}
6973
];
7074
middlewares.forEach((middleware) => {

packages/constructs/edge-api/tests/integ.stack.dev.ts.snapshot/asset.0f4c1084359ae06a7ede8c4134bc004f2f6bf7e40aa54a8ba73f846c88b98ee4/redirector.js renamed to packages/constructs/edge-api/tests/integ.stack.dev.ts.snapshot/asset.e568ed14759e05024fa779a0a128447c7c6adf222da22882dd3fd471ba571039/redirector.js

File renamed without changes.

packages/constructs/edge-api/tests/integ.stack.dev.ts.snapshot/asset.0f4c1084359ae06a7ede8c4134bc004f2f6bf7e40aa54a8ba73f846c88b98ee4/rewriter.js renamed to packages/constructs/edge-api/tests/integ.stack.dev.ts.snapshot/asset.e568ed14759e05024fa779a0a128447c7c6adf222da22882dd3fd471ba571039/rewriter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var middlewares = [];
3838
var rewriteLocationHeader = (location, host2) => {
3939
try {
4040
const url = new URL(location);
41-
if (url.hostname !== host2 && domains.find((domain) => url.hostname.endsWith(domain))) {
41+
if (url.hostname !== host2 && domains.find((domain) => url.hostname.endsWith(domain.includes("//") ? new URL(domain).hostname : domain))) {
4242
url.hostname = host2;
4343
}
4444
return url.toString();

packages/constructs/edge-api/tests/integ.stack.dev.ts.snapshot/asset.0f4c1084359ae06a7ede8c4134bc004f2f6bf7e40aa54a8ba73f846c88b98ee4/s3-qs-redirect.js renamed to packages/constructs/edge-api/tests/integ.stack.dev.ts.snapshot/asset.e568ed14759e05024fa779a0a128447c7c6adf222da22882dd3fd471ba571039/s3-qs-redirect.js

File renamed without changes.

packages/constructs/edge-api/tests/integ.stack.dev.ts.snapshot/edge-api-test-stack-dev.assets.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,29 +43,29 @@
4343
}
4444
}
4545
},
46-
"0f4c1084359ae06a7ede8c4134bc004f2f6bf7e40aa54a8ba73f846c88b98ee4": {
46+
"e568ed14759e05024fa779a0a128447c7c6adf222da22882dd3fd471ba571039": {
4747
"source": {
48-
"path": "asset.0f4c1084359ae06a7ede8c4134bc004f2f6bf7e40aa54a8ba73f846c88b98ee4",
48+
"path": "asset.e568ed14759e05024fa779a0a128447c7c6adf222da22882dd3fd471ba571039",
4949
"packaging": "zip"
5050
},
5151
"destinations": {
5252
"028446965111-eu-central-1": {
5353
"bucketName": "cdk-hnb659fds-assets-028446965111-eu-central-1",
54-
"objectKey": "0f4c1084359ae06a7ede8c4134bc004f2f6bf7e40aa54a8ba73f846c88b98ee4.zip",
54+
"objectKey": "e568ed14759e05024fa779a0a128447c7c6adf222da22882dd3fd471ba571039.zip",
5555
"region": "eu-central-1",
5656
"assumeRoleArn": "arn:${AWS::Partition}:iam::028446965111:role/cdk-hnb659fds-file-publishing-role-028446965111-eu-central-1"
5757
}
5858
}
5959
},
60-
"98012992a7b8061681d5eca60cdf9ca75a3c205f296f40bf8e1a79fba1490fa4": {
60+
"c7e4fd4b5953cf90cfa743ee60a5d3a3d2b043a5db3e19a203577ab7890f222b": {
6161
"source": {
6262
"path": "edge-api-test-stack-dev.template.json",
6363
"packaging": "file"
6464
},
6565
"destinations": {
6666
"028446965111-eu-central-1": {
6767
"bucketName": "cdk-hnb659fds-assets-028446965111-eu-central-1",
68-
"objectKey": "98012992a7b8061681d5eca60cdf9ca75a3c205f296f40bf8e1a79fba1490fa4.json",
68+
"objectKey": "c7e4fd4b5953cf90cfa743ee60a5d3a3d2b043a5db3e19a203577ab7890f222b.json",
6969
"region": "eu-central-1",
7070
"assumeRoleArn": "arn:${AWS::Partition}:iam::028446965111:role/cdk-hnb659fds-file-publishing-role-028446965111-eu-central-1"
7171
}

packages/constructs/edge-api/tests/integ.stack.dev.ts.snapshot/edge-api-test-stack-dev.template.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@
561561
"Properties": {
562562
"Code": {
563563
"S3Bucket": "cdk-hnb659fds-assets-028446965111-eu-central-1",
564-
"S3Key": "0f4c1084359ae06a7ede8c4134bc004f2f6bf7e40aa54a8ba73f846c88b98ee4.zip"
564+
"S3Key": "e568ed14759e05024fa779a0a128447c7c6adf222da22882dd3fd471ba571039.zip"
565565
},
566566
"Handler": "redirector.handler",
567567
"Role": {
@@ -577,7 +577,7 @@
577577
],
578578
"Metadata": {
579579
"aws:cdk:path": "edge-api-test-stack-dev/api/api/redirect/Resource",
580-
"aws:asset:path": "asset.0f4c1084359ae06a7ede8c4134bc004f2f6bf7e40aa54a8ba73f846c88b98ee4",
580+
"aws:asset:path": "asset.e568ed14759e05024fa779a0a128447c7c6adf222da22882dd3fd471ba571039",
581581
"aws:asset:is-bundled": false,
582582
"aws:asset:property": "Code"
583583
}

packages/constructs/edge-api/tests/integ.stack.dev.ts.snapshot/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"validateOnSynth": false,
1919
"assumeRoleArn": "arn:${AWS::Partition}:iam::028446965111:role/cdk-hnb659fds-deploy-role-028446965111-eu-central-1",
2020
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::028446965111:role/cdk-hnb659fds-cfn-exec-role-028446965111-eu-central-1",
21-
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-028446965111-eu-central-1/98012992a7b8061681d5eca60cdf9ca75a3c205f296f40bf8e1a79fba1490fa4.json",
21+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-028446965111-eu-central-1/c7e4fd4b5953cf90cfa743ee60a5d3a3d2b043a5db3e19a203577ab7890f222b.json",
2222
"requiresBootstrapStackVersion": 6,
2323
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
2424
"additionalDependencies": [

0 commit comments

Comments
 (0)