Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RELEASE 2024-02-26 #1667

Merged
merged 232 commits into from
Feb 28, 2024
Merged
Changes from 1 commit
Commits
Show all changes
232 commits
Select commit Hold shift + click to select a range
175db7d
fix(api): wip
Orta21 Jan 12, 2024
46bdca8
fix(api): wip
Orta21 Jan 12, 2024
5fc7b36
fix(api): merge from 1363
Orta21 Jan 13, 2024
815a3f0
Merge branch '1363-init-dq-doc-query' into 1413-cq-doc-retrieval
Orta21 Jan 16, 2024
1c484f2
Merge branch 'develop' into 1413-cq-doc-retrieval
Orta21 Jan 16, 2024
d8ba93f
fix(api): update ihe gateway schemas
Orta21 Jan 16, 2024
e704984
fix(api): update flow to convert and store in fhir
Orta21 Jan 17, 2024
dc627af
feat(mtls): trust store and mtls
jonahkaye Jan 18, 2024
46ae449
feat(mtls): refactoring to use apigatway v2 since no ownership cert i…
jonahkaye Jan 19, 2024
ca3f52e
feat(mtls): apigateway v2 refactor and ownership cert
jonahkaye Jan 19, 2024
a6a83c3
feat(mtls): fix
jonahkaye Jan 19, 2024
796bff8
feat(mtls): aligning aws cdk versions
jonahkaye Jan 19, 2024
05571d0
feat(mtls): deploying so cfn deletes a record
jonahkaye Jan 19, 2024
96814a5
fix(api): handle merge conlficts
Orta21 Jan 19, 2024
145754e
fix(api): merge new schemas
Orta21 Jan 25, 2024
f5fd256
feat(mtls): merging develop to branch and pd bug
jonahkaye Jan 26, 2024
0e57448
build: add AsyncLocalStorage and update logs +
leite08 Jan 28, 2024
dc965a0
build: remove docRefMapping if fails to download docRef
leite08 Jan 28, 2024
1dad674
feat(mtls): commenting out most of ihe stack so we can branch and cfn…
jonahkaye Jan 28, 2024
fa60e4b
feat(mtls): adding gateway code back
jonahkaye Jan 28, 2024
e173600
Merge branch 'develop' into 1377-mutual-tls
jonahkaye Jan 29, 2024
f73d169
feat(mtls): adding waf
jonahkaye Jan 29, 2024
2fd0135
feat(mtls): fixing arn formatting
jonahkaye Jan 29, 2024
e5114d5
feat(mtls): bye bye waf http doesnt support you
jonahkaye Jan 29, 2024
1ea53f1
build: remove deprecated updateDocQuery +
leite08 Jan 28, 2024
2a46891
fix(api): split the update progress into two
Orta21 Jan 30, 2024
0837412
fix(api): samll nit
Orta21 Jan 30, 2024
3d42ce1
fix(api): handle merge conflict
Orta21 Jan 30, 2024
f46bb29
fix(api): add webhooksent to doc progress
Orta21 Jan 30, 2024
35cfa4f
fix(api): update tests
Orta21 Jan 30, 2024
5d18bf7
Merge branch 'develop' into 1455-fix-dq-status
Orta21 Jan 30, 2024
e5d27e1
Merge branch 'develop' into 1455-fix-dq-status
Orta21 Jan 30, 2024
6da97a8
fix(api): move update outside create webhook
Orta21 Jan 30, 2024
1342f33
t p:wq
Orta21 Jan 30, 2024
845bfc8
fix(api): fix import issue
Orta21 Jan 30, 2024
d026f3c
Merge branch 'develop' into 1455-fix-dq-status
Orta21 Jan 30, 2024
1413833
fix(api): fix patient being passed
Orta21 Jan 30, 2024
0a9ca39
Merge branch 'develop' into 1455-fix-dq-status
Orta21 Jan 30, 2024
2cec06d
fix(api): update log name
Orta21 Jan 30, 2024
c5493fd
fix(api): hanlde merge conflict form develop
Orta21 Jan 30, 2024
1a4aed1
fix(api): merge 1455 into this branch
Orta21 Jan 30, 2024
3dee7e0
fix(api): fix merge conflicts in infra
Orta21 Jan 30, 2024
6806f37
fix(api): import from shared
Orta21 Jan 31, 2024
c4adec6
fix(api): import from shared
Orta21 Jan 31, 2024
df46a94
fix(api): import from shared
Orta21 Jan 31, 2024
196f461
fix(api): do not wait for retrieval lalmbdas
Orta21 Jan 31, 2024
d3f7315
fix(api): remove unnecesary comments
Orta21 Jan 31, 2024
4912e23
fix(api): remove unnecesary comments
Orta21 Jan 31, 2024
93458c8
feat(infra): move sandbox updates to daily
Goncharo Jan 30, 2024
5f0be3f
feat(infra): temporarily remove backup plan
Goncharo Jan 30, 2024
1c573b0
chore(infra): test backup plan on staging
Goncharo Jan 30, 2024
f963afa
chore(infra): test backup plan on staging
Goncharo Jan 31, 2024
b8550c1
chore(infra): test backup plan on staging
Goncharo Jan 31, 2024
0ff25cb
feat(infra): update backup comment typo
Goncharo Jan 31, 2024
f328e50
feat(infra): update backup comment typo
Goncharo Jan 31, 2024
3dfbcc6
feat(infra): shorten backup names
Goncharo Jan 31, 2024
ca96784
fix(api): merge backup changes from develop
Orta21 Jan 31, 2024
7a5a413
fix(api): remove unnessary comment
Orta21 Feb 1, 2024
f8b4818
fix(api): send extra fields from mirth
Orta21 Feb 1, 2024
86c78fb
fix(api): remove unused file
Orta21 Feb 1, 2024
bcb3f72
feat(mtls): merging develop to branch
jonahkaye Feb 1, 2024
9b04550
feat(mtls): nit
jonahkaye Feb 1, 2024
dd667c3
fix(api): remove handlewebhook
Orta21 Feb 1, 2024
708ddc8
fix(api): remove unused var
Orta21 Feb 2, 2024
61a6ee5
fix(api): update conversion test to remove undefined
Orta21 Feb 2, 2024
7ffc6ec
fix(api): move race control to shared
Orta21 Feb 2, 2024
b880f13
fix(api-sdk): updated cq directory handling code
RamilGaripov Feb 5, 2024
0309437
fix(api-sdk): removed cw from cq xcpd
RamilGaripov Feb 6, 2024
d16a847
fix(api-sdk): merged develop and fixed some conflicts
RamilGaripov Feb 7, 2024
504d00d
fix(api-sdk): improved oid normalization
RamilGaripov Feb 8, 2024
ff96bf1
chore(release): publish
RamilGaripov Feb 8, 2024
de5c05c
chore(release): publish
RamilGaripov Feb 8, 2024
7dda4f2
fix(api-sdk): fixed a bug in tests
RamilGaripov Feb 8, 2024
401a9ad
fix(api): refactor process doc query webhook back to how it was
Orta21 Feb 8, 2024
65826e8
fix(api): remove handle webhook from tests
Orta21 Feb 8, 2024
a4eddfd
fix(api): update patient data cw
Orta21 Feb 8, 2024
191c08f
fix(api): merge develop into branch
Orta21 Feb 9, 2024
867f685
fix(api): remove with source from functions
Orta21 Feb 9, 2024
9c95860
fix(api): fix filenames
Orta21 Feb 9, 2024
57dcd32
fix(api): merge dq fix pr changes into the branch
Orta21 Feb 9, 2024
446ed47
fix(api): update file names ihe instead of results
Orta21 Feb 9, 2024
2a42a2d
fix(api): handle merge conflicsts
Orta21 Feb 10, 2024
de426df
fix(api): merge develop into branch
Orta21 Feb 10, 2024
b5a3bdd
fix(api): handle raf comments
Orta21 Feb 11, 2024
b91d2dc
fix(api): handle dima comments
Orta21 Feb 11, 2024
1a4686a
fix(api): update lamdba names
Orta21 Feb 11, 2024
f61dcee
fix(api): update catch for lambda invoke
Orta21 Feb 11, 2024
5fd114a
fix(api): control timeout for gw results 15 minutes
Orta21 Feb 11, 2024
1ef6e1b
fix(api): add env to test
Orta21 Feb 11, 2024
2b99e07
fix(api): rename existential docs
Orta21 Feb 12, 2024
68c128c
feat(api): updated cq ignore list and other logic
RamilGaripov Feb 12, 2024
48e1582
feat(api): merged develop
RamilGaripov Feb 12, 2024
8628853
feat(api): fixed error in example config
RamilGaripov Feb 12, 2024
24b174f
feat(api): added attribute 'active' to cq orgs
RamilGaripov Feb 12, 2024
5f0c8c4
feat(api): added retries with exponential backoff to carequality sdk
RamilGaripov Feb 13, 2024
892d610
feat(api): unit testing for regex oids
jonahkaye Feb 13, 2024
7b65e49
feat(api): fixed some nits
RamilGaripov Feb 13, 2024
452fa14
Merge branch '1350-cq-directory-upd' of https://github.com/metriport/…
RamilGaripov Feb 13, 2024
2e4bf5a
fix(api): rename inbound and outbound
Orta21 Feb 15, 2024
5c88b13
fix(carequality-sdk): merged develop and resolved conflicts
RamilGaripov Feb 19, 2024
a553cd8
fix(carequality-sdk): removed unnecessary test cases
RamilGaripov Feb 19, 2024
4884de1
fix(api): query s3 with execute async
Orta21 Feb 20, 2024
d1005d9
fix(api): merge 1455 into branch
Orta21 Feb 20, 2024
7f34491
fix(carequality-sdk): updates based on comments
RamilGaripov Feb 20, 2024
c84ebd8
fix(api): remove generic from polling resulst
Orta21 Feb 21, 2024
931bfb8
fix(carequality-sdk): fixed an error
RamilGaripov Feb 21, 2024
c3b97b4
fix(carequality-sdk): small change to keep improve format consistency
RamilGaripov Feb 21, 2024
83bc577
fix(api): remove ihe to external gw from env test
Orta21 Feb 21, 2024
0de8b51
chore(release): publish
Orta21 Feb 21, 2024
c9923e4
fix(carequality-sdk): added managing organizations id column
RamilGaripov Feb 22, 2024
c964a96
feat(api): improved cq organization create/update methods
RamilGaripov Feb 22, 2024
f9a4e3e
Merge branch 'develop' into 1413-cq-doc-retrieval
Orta21 Feb 22, 2024
ff09da9
fix(carequality-api): added a todo into cq api
RamilGaripov Feb 23, 2024
d9284f3
fix(api): address rafs comments
Orta21 Feb 23, 2024
fbb4443
fix(api): bad import issues
Orta21 Feb 23, 2024
5549cd7
chore(release): publish
RamilGaripov Feb 23, 2024
5718ba1
chore(release): publish
RamilGaripov Feb 23, 2024
05d01d2
Merge branch 'develop' into 1413-cq-doc-retrieval
Orta21 Feb 23, 2024
c69cddc
fix(api): update with latest raf comments
Orta21 Feb 23, 2024
f75eb8e
fix(api): flatmap and convert iheresults
Orta21 Feb 23, 2024
390a9c3
fix(api): update fhir error mapping
Orta21 Feb 23, 2024
7c091be
fix(api): remove unused var
Orta21 Feb 23, 2024
5dc83ac
fix(api): update env.test
Orta21 Feb 23, 2024
8104852
fix(carequality-api): improved logic for gateway identification and u…
RamilGaripov Feb 23, 2024
a7d4d5b
fix(api): make cq docref content creation more clear
Orta21 Feb 23, 2024
5ffa5ad
fix(api): remove unused var
Orta21 Feb 23, 2024
2ef1713
fix(carequality-api): adjusted the cq url exclusion logic
RamilGaripov Feb 23, 2024
34c4964
fix(api): update variable names
Orta21 Feb 23, 2024
03c17c4
fix(api): merged develop and resolved conflicts
RamilGaripov Feb 23, 2024
1516dc0
Merge pull request #1575 from metriport/1350-cq-directory-upd
RamilGaripov Feb 23, 2024
881727e
fix(api): add doc status to cq to fhir doc ref
Orta21 Feb 23, 2024
1e2e5f0
fix(api): merge develop
Orta21 Feb 23, 2024
3271012
fix(api): merged develop and resolved conflicts
RamilGaripov Feb 23, 2024
b25520a
fix(api): minor change
Orta21 Feb 23, 2024
cc0bb03
Merge pull request #1437 from metriport/1413-cq-doc-retrieval
Orta21 Feb 23, 2024
b1dbe77
fix(api): resolved conflicts
RamilGaripov Feb 23, 2024
0ffe217
fix(api): remove src from import
Orta21 Feb 23, 2024
f43eefa
Merge pull request #1650 from metriport/1413-cq-doc-retrieval
Orta21 Feb 23, 2024
9386963
build: add API_BASE_ADDRESS to IHE GW
leite08 Feb 23, 2024
336c591
build: add v1 prefix to IHE API GW
leite08 Feb 23, 2024
118ecbe
Merge pull request #1651 from metriport/1377-add-api-address-to-ihe-gw
leite08 Feb 23, 2024
2d4816f
fix(ihe): fix mirth dq channel to send message to api
Orta21 Feb 24, 2024
9634045
fix(api): removed cq org details env var and fixed other issues
RamilGaripov Feb 24, 2024
3a483bb
fix(api): merged develop and resolved conflicts
RamilGaripov Feb 24, 2024
93b13f6
fix(ihe): make url dynamic
Orta21 Feb 24, 2024
2c94748
fix(ihe): fix mirth dq channel to send message to api
Orta21 Feb 24, 2024
07d40d8
fix(ihe): fix mirth dq channel to send message to api
Orta21 Feb 24, 2024
075ae75
Merge pull request #1652 from metriport/1377-mirth-dq-api
Orta21 Feb 24, 2024
43be393
build: check CQ direct FF and IHE GW API on PD, DQ, DR
leite08 Feb 24, 2024
8bcbd68
build: remove API mode from IHE SDK
leite08 Feb 24, 2024
898012f
build: synchronous PD to IHE GW
leite08 Feb 24, 2024
c52d109
build: add patient.destroy to error handling code
leite08 Feb 24, 2024
8fa5767
build: dont DQ @ CQ if no patient link data
leite08 Feb 24, 2024
f95f301
fix(ihe): fix mirth dr channel to send message to api
Orta21 Feb 24, 2024
a3658a2
fix(ihe): address dima comments
Orta21 Feb 24, 2024
7ffaa3f
Merge pull request #1656 from metriport/1377-mirth-dr-api
Orta21 Feb 24, 2024
c073faa
Merge pull request #1655 from metriport/1377-ihe-gw-piping
leite08 Feb 24, 2024
767b36e
fix(ihe): pipe dq and dr errors to right channel
Goncharo Feb 24, 2024
1d32c72
Merge pull request #1657 from metriport/1377-mirth-fix3
Goncharo Feb 24, 2024
dbfe340
build: fix local debug
leite08 Feb 24, 2024
01d8914
build: run app w/ node instead of ts-node
leite08 Feb 24, 2024
d9881fa
Merge pull request #1641 from metriport/1350-cq-org-registration-upd
RamilGaripov Feb 24, 2024
1d9c07c
fix(ihe): update dr to send message to s3 and api
Orta21 Feb 24, 2024
2952893
fix(ihe): write to s3 common
Orta21 Feb 24, 2024
356f460
fix(ihe): able to b64 in the common write
Orta21 Feb 24, 2024
13e55d8
build: fix API env vars names for IHE GW
leite08 Feb 24, 2024
65a4eb2
Merge pull request #1658 from metriport/1040-fix-local-env
leite08 Feb 24, 2024
5ea6a9c
Merge pull request #1660 from metriport/1377-fix-env-vars
leite08 Feb 24, 2024
4034da9
fix(api): allow getCQOrgUrls return undefined
RamilGaripov Feb 24, 2024
df227ab
build: fix api config for IHE GW
leite08 Feb 25, 2024
095e9b6
Merge pull request #1664 from metriport/1377-fix-api-config-for-ihe-gw
leite08 Feb 25, 2024
74909f2
build: add CQ PD to patient update
leite08 Feb 24, 2024
32b6496
build: fix PD response schema
leite08 Feb 24, 2024
2e10e24
build: fix PD processing and response schema
leite08 Feb 25, 2024
7d9e99f
build: rename inbound IHE GW functions
leite08 Feb 25, 2024
9dd53ac
Merge pull request #1661 from metriport/1350-trigger-dq-on-patient-ud…
leite08 Feb 25, 2024
d512c56
build: finish rename inbound IHE GW functions
leite08 Feb 25, 2024
2735409
build: simplify getPDResultStatus
leite08 Feb 25, 2024
3b68bba
chore(release): publish
leite08 Feb 25, 2024
0169990
Merge pull request #1663 from metriport/1350-trigger-dq-on-patient-ud…
leite08 Feb 25, 2024
a2bb599
fix(ihe): able to updalod file with correct exteension
Orta21 Feb 25, 2024
a10bc92
fix(ihe): remove unnecessary log
Orta21 Feb 25, 2024
26770cc
feat(mtls): merging changes
jonahkaye Feb 26, 2024
5781081
feat(mtls): cdk version
jonahkaye Feb 26, 2024
bc17a57
Merge branch 'develop' into 1377-mirth-dr-api
Goncharo Feb 26, 2024
899e9dd
feat(mtls): slash
jonahkaye Feb 26, 2024
958efef
feat(mtls): back to searching for bucket
jonahkaye Feb 26, 2024
6011021
feat(mtls): ownership cert through cdk
jonahkaye Feb 26, 2024
c57eace
fix(ihe): revert configuration map changes
Goncharo Feb 26, 2024
f9a2a71
Merge pull request #1659 from metriport/1377-mirth-dr-api
Goncharo Feb 26, 2024
ce8cbd1
build: prod cicd for ihe gw
leite08 Feb 9, 2024
0c1010e
build: adjust ihe gw CICD for prod
leite08 Feb 25, 2024
9a84a0f
build: fix commented out conditional on deploy prod
leite08 Feb 26, 2024
db8ecc7
build: rename/split ihe gw outbound result functions
leite08 Feb 26, 2024
5836771
build: finish renaming ihe gw outbound result functions
leite08 Feb 26, 2024
5026935
build: cq DQ local implementation
leite08 Feb 26, 2024
1e176e6
build: fix PD resp from IHE GW, externalGatewayPatient
leite08 Feb 26, 2024
7507b94
feat(mtls): no need for ownership certificate arn
jonahkaye Feb 26, 2024
140d17d
build: fix DQ/DR piping to/from IHE GW
leite08 Feb 26, 2024
2fec54d
build: update infra to use bulk ports
leite08 Feb 26, 2024
fef34cd
fix(ihe): add metriport id to filename
Orta21 Feb 26, 2024
4b13009
Merge branch 'develop' into 1377-mirth-dr-api
Orta21 Feb 26, 2024
5510e98
fix(ihe): update dev check to equal development
Orta21 Feb 26, 2024
66428d4
Merge pull request #1430 from metriport/1377-mutual-tls
jonahkaye Feb 26, 2024
c1a483c
Merge branch 'develop' into 1377-mirth-dr-api
Orta21 Feb 26, 2024
08ca55f
fix(ihe): revert dev name
Orta21 Feb 26, 2024
dcc3adc
Merge pull request #1591 from metriport/1377-move-ihe-gw-infra_7
leite08 Feb 26, 2024
9d5294c
Merge pull request #1665 from metriport/1350-fix-PD
leite08 Feb 26, 2024
a135bdc
Merge pull request #1666 from metriport/1377-mirth-dr-api
Orta21 Feb 26, 2024
be4bf49
fix(api): fixed passing incorrect managing org for cq dir registration
RamilGaripov Feb 26, 2024
9b8fd7a
Merge pull request #1668 from metriport/1350-managing-org-fix
RamilGaripov Feb 26, 2024
b859319
fix(ihe-gateway-sdk): made the documentReference field nullish for th…
RamilGaripov Feb 26, 2024
f1fa1f3
fix(ihe-gateway-sdk): made the dr fault schema accept undefined docRef
RamilGaripov Feb 26, 2024
3addec1
fix(ihe-gateway-sdk): made the dq fault schema accept undefined docRef
RamilGaripov Feb 26, 2024
95a3ec9
fix(ihe-gateway-sdk): updated processOutboundDocumentRetrievalResps
RamilGaripov Feb 26, 2024
4d3937c
chore(release): publish
RamilGaripov Feb 26, 2024
d2bb707
Merge pull request #1669 from metriport/1413-fix-dr-fail-schema
leite08 Feb 26, 2024
b30aae7
fix(ihe): send doc retreival url in request to mirth
Orta21 Feb 26, 2024
7a239a7
build: log mem info on IHE GW startup
leite08 Feb 26, 2024
5701b47
build: adjust IHE GW channel settings for performance
leite08 Feb 27, 2024
b5d2ea4
Merge pull request #1670 from metriport/1350-ihe-gw-perf
leite08 Feb 27, 2024
8dcf8df
fix(api): reordered and deduplicated orgs for xcpd
RamilGaripov Feb 27, 2024
31a633f
build: fix IHE GW init.sh script
leite08 Feb 27, 2024
6c1537c
Merge pull request #1672 from metriport/1350-reorder-and-dedup-org-se…
RamilGaripov Feb 27, 2024
ab7d55e
build: minor DX updates
leite08 Feb 27, 2024
542e676
Merge pull request #1662 from metriport/1350-cq-org-registration-upd
RamilGaripov Feb 27, 2024
e2a0adf
build: perf adj on IHE GW configs
leite08 Feb 27, 2024
cd48488
build: fix outbound DR resp processing
leite08 Feb 28, 2024
fbd139e
build: fix doc filter and decrease polling time for DQ/DR
leite08 Feb 28, 2024
d4fb3cc
Merge pull request #1674 from metriport/1350-ihe-gw-perf_2
leite08 Feb 28, 2024
b0a50de
Merge pull request #1675 from metriport/master
Orta21 Feb 28, 2024
8c8068c
chore(release): publish
leite08 Feb 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat(mtls): adding waf
Refs: #1377
  • Loading branch information
jonahkaye committed Jan 29, 2024
commit f73d169e1c259b588be6022b13d2dcd97f2bbc1b
32 changes: 29 additions & 3 deletions packages/infra/lib/ihe-stack.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Stack, StackProps } from "aws-cdk-lib";
import { CfnOutput } from "aws-cdk-lib";
import * as s3 from "aws-cdk-lib/aws-s3";
import * as cert from "aws-cdk-lib/aws-certificatemanager";
import { SnsAction } from "aws-cdk-lib/aws-cloudwatch-actions";
import * as ec2 from "aws-cdk-lib/aws-ec2";
Expand All @@ -10,11 +9,14 @@ import * as sns from "aws-cdk-lib/aws-sns";
import { Construct } from "constructs";
import { EnvConfig } from "../config/env-config";
import { createLambda } from "./shared/lambda";
import { setupLambdasLayers } from "./shared/lambda-layers";
import { LambdaLayers } from "./shared/lambda-layers";
import * as apigwv2 from "aws-cdk-lib/aws-apigatewayv2";
import { HttpLambdaIntegration } from "aws-cdk-lib/aws-apigatewayv2-integrations";
import { Function as Lambda } from "aws-cdk-lib/aws-lambda";
import { LambdaLayers, setupLambdasLayers } from "./shared/lambda-layers";
import * as s3 from "aws-cdk-lib/aws-s3";
import { aws_wafv2 as wafv2 } from "aws-cdk-lib";
import { wafRules } from "./shared/waf-rules";
import * as cdk from "aws-cdk-lib";

interface IHEStackProps extends StackProps {
config: EnvConfig;
Expand Down Expand Up @@ -86,6 +88,18 @@ export class IHEStack extends Stack {
securityPolicy: apigwv2.SecurityPolicy.TLS_1_2,
});

const waf = new wafv2.CfnWebACL(this, "IHEGatewayWAF", {
defaultAction: { allow: {} },
scope: "REGIONAL",
name: `IHEGatewayWAF`,
rules: wafRules,
visibilityConfig: {
cloudWatchMetricsEnabled: true,
metricName: `IHEGatewayWAF-Metric`,
sampledRequestsEnabled: false,
},
});

const apigw2 = new apigwv2.HttpApi(this, "IHEAPIGatewayv2", {
defaultDomainMapping: {
domainName: domainName,
Expand All @@ -97,6 +111,18 @@ export class IHEStack extends Stack {
disableExecuteApiEndpoint: true,
});

const apiGatewayArn = cdk.Stack.of(this).formatArn({
service: "apigateway",
resource: apigw2.apiId,
region: cdk.Stack.of(this).region,
account: cdk.Stack.of(this).account,
});

new wafv2.CfnWebACLAssociation(this, "APIWAFAssociation", {
resourceArn: apiGatewayArn,
webAclArn: waf.attrArn,
});

// commenting out so CFN deletes
new r53.ARecord(this, "IHEAPIDomainRecordv2", {
recordName: iheApiUrl,
Expand Down
Loading