From 2d9f8acbca030a12cebecf06125977ed475d4ab1 Mon Sep 17 00:00:00 2001 From: Chris Preston Date: Mon, 22 Apr 2024 16:52:23 -0700 Subject: [PATCH 1/2] Added caching URLs --- .github/workflows/android.yml | 3 +- .github/workflows/ios.yml | 3 +- load-testing/WFNEWS_Load_Test.jmx | 248 +++++++++--------- load-testing/WFNEWS_Load_Test_2.jmx | 248 +++++++++--------- .../WFNEWS_Load_Test_2_Cloudfront.jmx | 248 +++++++++--------- .../WFNEWS_Load_Test_2_No_Cloudfront.jmx | 222 ++++++++-------- terraform/cloudfront.tf | 138 ++++++++++ terraform/dns.tf | 28 ++ terraform/ecs.tf | 6 +- terraform/lambda.tf | 2 +- 10 files changed, 659 insertions(+), 487 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 6375af164c..2ff118d13a 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -115,7 +115,8 @@ jobs: # MAP_ICONS_SHADOW_SIZE: ${{ vars.MAP_ICONS_SHADOW_SIZE }} # MAP_ICONS_TOOLTIP_OFFSET: ${{ vars.MAP_ICONS_TOOLTIP_OFFSET }} MORE_INFORMATION_LINK: ${{ vars.MORE_INFORMATION_LINK }} - OPENMAPS_BASE_URL: ${{ vars.OPENMAPS_BASE_URL }} + OPENMAPS_BASE_URL: https://maps.${{ vars.TARGET_ENV }}.bcwildfireservices.com + SERVICES6_BASE_URL: https://services6.${{ vars.TARGET_ENV }}.bcwildfireservices.com POINT_ID_URL: ${{ vars.POINT_ID_URL }} PROJECT_VERSION: ${{ steps.version.outputs.info }} REPORT_A_WILDFIRE_PHONE_LINE: ${{ vars.REPORT_A_WILDFIRE_PHONE_LINE }} diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 2298efafd0..c9453bcd0b 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -98,7 +98,8 @@ jobs: # MAP_ICONS_SHADOW_SIZE: ${{ vars.MAP_ICONS_SHADOW_SIZE }} # MAP_ICONS_TOOLTIP_OFFSET: ${{ vars.MAP_ICONS_TOOLTIP_OFFSET }} MORE_INFORMATION_LINK: ${{ vars.MORE_INFORMATION_LINK }} - OPENMAPS_BASE_URL: ${{ vars.OPENMAPS_BASE_URL }} + OPENMAPS_BASE_URL: https://maps.${{ vars.TARGET_ENV }}.bcwildfireservices.com + SERVICES6_BASE_URL: ${{ vars.SERVICES6_BASE_URL }} POINT_ID_URL: ${{ vars.POINT_ID_URL }} PROJECT_VERSION: ${{ steps.version.outputs.info }} REPORT_A_WILDFIRE_PHONE_LINE: ${{ vars.REPORT_A_WILDFIRE_PHONE_LINE }} diff --git a/load-testing/WFNEWS_Load_Test.jmx b/load-testing/WFNEWS_Load_Test.jmx index 9098c68977..163cecd098 100644 --- a/load-testing/WFNEWS_Load_Test.jmx +++ b/load-testing/WFNEWS_Load_Test.jmx @@ -1547,7 +1547,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -1628,7 +1628,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -1786,7 +1786,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -2423,7 +2423,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -2643,7 +2643,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -2794,7 +2794,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -2945,7 +2945,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -3715,7 +3715,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -3862,7 +3862,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -4013,7 +4013,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -4164,7 +4164,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -4315,7 +4315,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -5817,7 +5817,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -6171,7 +6171,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6322,7 +6322,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6473,7 +6473,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6624,7 +6624,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6775,7 +6775,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6926,7 +6926,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -7636,7 +7636,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -7783,7 +7783,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -7934,7 +7934,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -8746,7 +8746,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -8893,7 +8893,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -9044,7 +9044,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -9195,7 +9195,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -9346,7 +9346,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -10434,7 +10434,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -10581,7 +10581,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -10732,7 +10732,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -10883,7 +10883,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -11034,7 +11034,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -12122,7 +12122,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -12269,7 +12269,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -12420,7 +12420,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -12571,7 +12571,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -12722,7 +12722,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -13810,7 +13810,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -14066,7 +14066,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -14322,7 +14322,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -14578,7 +14578,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -14834,7 +14834,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -15119,7 +15119,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -15270,7 +15270,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -16115,7 +16115,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -16262,7 +16262,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -16413,7 +16413,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -16564,7 +16564,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -16715,7 +16715,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -17004,7 +17004,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -17155,7 +17155,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -17963,7 +17963,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -18487,7 +18487,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -19055,7 +19055,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -19340,7 +19340,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -19560,7 +19560,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -19918,7 +19918,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -20069,7 +20069,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -20467,7 +20467,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -20614,7 +20614,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -20834,7 +20834,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -20985,7 +20985,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -21501,7 +21501,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -22349,7 +22349,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -23469,7 +23469,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -23725,7 +23725,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -24135,7 +24135,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -24258,7 +24258,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -25658,7 +25658,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -25812,7 +25812,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -27399,7 +27399,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -27898,7 +27898,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -28328,7 +28328,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -28998,7 +28998,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -29770,7 +29770,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30176,7 +30176,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30330,7 +30330,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30484,7 +30484,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30638,7 +30638,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30792,7 +30792,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -33682,7 +33682,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -34226,7 +34226,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34373,7 +34373,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34520,7 +34520,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34667,7 +34667,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34814,7 +34814,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34961,7 +34961,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35108,7 +35108,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35255,7 +35255,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35402,7 +35402,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35549,7 +35549,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35696,7 +35696,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35843,7 +35843,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36074,7 +36074,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36221,7 +36221,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36368,7 +36368,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36515,7 +36515,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36662,7 +36662,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36809,7 +36809,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36956,7 +36956,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37103,7 +37103,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37250,7 +37250,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37397,7 +37397,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37544,7 +37544,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37691,7 +37691,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37838,7 +37838,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37985,7 +37985,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -38132,7 +38132,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -38279,7 +38279,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -38426,7 +38426,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -38573,7 +38573,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -39923,7 +39923,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -40404,7 +40404,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -40540,7 +40540,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -40676,7 +40676,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -40812,7 +40812,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -40948,7 +40948,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41084,7 +41084,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41231,7 +41231,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41367,7 +41367,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41503,7 +41503,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41639,7 +41639,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41775,7 +41775,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41922,7 +41922,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 diff --git a/load-testing/WFNEWS_Load_Test_2.jmx b/load-testing/WFNEWS_Load_Test_2.jmx index ea8c9a2011..bbd29dd33f 100644 --- a/load-testing/WFNEWS_Load_Test_2.jmx +++ b/load-testing/WFNEWS_Load_Test_2.jmx @@ -1547,7 +1547,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -1628,7 +1628,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -1786,7 +1786,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -2423,7 +2423,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -2643,7 +2643,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -2794,7 +2794,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -2945,7 +2945,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -3715,7 +3715,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -3862,7 +3862,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -4013,7 +4013,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -4164,7 +4164,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -4315,7 +4315,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -5817,7 +5817,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -6171,7 +6171,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6322,7 +6322,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6473,7 +6473,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6624,7 +6624,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6775,7 +6775,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6926,7 +6926,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -7636,7 +7636,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -7783,7 +7783,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -7934,7 +7934,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -8746,7 +8746,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -8893,7 +8893,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -9044,7 +9044,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -9195,7 +9195,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -9346,7 +9346,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -10434,7 +10434,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -10581,7 +10581,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -10732,7 +10732,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -10883,7 +10883,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -11034,7 +11034,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -12122,7 +12122,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -12269,7 +12269,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -12420,7 +12420,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -12571,7 +12571,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -12722,7 +12722,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -13810,7 +13810,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -14066,7 +14066,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -14322,7 +14322,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -14578,7 +14578,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -14834,7 +14834,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -15119,7 +15119,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -15270,7 +15270,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -16115,7 +16115,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -16262,7 +16262,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -16413,7 +16413,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -16564,7 +16564,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -16715,7 +16715,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -17004,7 +17004,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -17155,7 +17155,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -17963,7 +17963,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -18487,7 +18487,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -19055,7 +19055,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -19340,7 +19340,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -19560,7 +19560,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -19918,7 +19918,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -20069,7 +20069,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -20467,7 +20467,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -20614,7 +20614,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -20834,7 +20834,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -20985,7 +20985,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -21501,7 +21501,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -22349,7 +22349,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -23469,7 +23469,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -23725,7 +23725,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -24135,7 +24135,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -24258,7 +24258,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -25658,7 +25658,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -25812,7 +25812,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -27408,7 +27408,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -27907,7 +27907,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -28337,7 +28337,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -29007,7 +29007,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -29779,7 +29779,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30185,7 +30185,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30339,7 +30339,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30493,7 +30493,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30647,7 +30647,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30801,7 +30801,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -33627,7 +33627,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -34171,7 +34171,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34318,7 +34318,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34465,7 +34465,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34612,7 +34612,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34759,7 +34759,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34906,7 +34906,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35053,7 +35053,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35200,7 +35200,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35347,7 +35347,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35494,7 +35494,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35641,7 +35641,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35788,7 +35788,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36019,7 +36019,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36166,7 +36166,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36313,7 +36313,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36460,7 +36460,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36607,7 +36607,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36754,7 +36754,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36901,7 +36901,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37048,7 +37048,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37195,7 +37195,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37342,7 +37342,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37489,7 +37489,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37636,7 +37636,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37783,7 +37783,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37930,7 +37930,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -38077,7 +38077,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -38224,7 +38224,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -38371,7 +38371,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -38518,7 +38518,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -39887,7 +39887,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -40383,7 +40383,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -40519,7 +40519,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -40655,7 +40655,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -40791,7 +40791,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -40927,7 +40927,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41063,7 +41063,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41210,7 +41210,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41346,7 +41346,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41482,7 +41482,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41618,7 +41618,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41754,7 +41754,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41901,7 +41901,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 diff --git a/load-testing/WFNEWS_Load_Test_2_Cloudfront.jmx b/load-testing/WFNEWS_Load_Test_2_Cloudfront.jmx index dacd9b298f..a99fd3e536 100644 --- a/load-testing/WFNEWS_Load_Test_2_Cloudfront.jmx +++ b/load-testing/WFNEWS_Load_Test_2_Cloudfront.jmx @@ -1547,7 +1547,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -1628,7 +1628,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -1786,7 +1786,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -2423,7 +2423,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -2643,7 +2643,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -2794,7 +2794,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -2945,7 +2945,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -3715,7 +3715,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -3862,7 +3862,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -4013,7 +4013,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -4164,7 +4164,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -4315,7 +4315,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -5817,7 +5817,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -6171,7 +6171,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6322,7 +6322,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6473,7 +6473,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6624,7 +6624,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6775,7 +6775,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6926,7 +6926,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -7636,7 +7636,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -7783,7 +7783,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -7934,7 +7934,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -8746,7 +8746,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -8893,7 +8893,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -9044,7 +9044,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -9195,7 +9195,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -9346,7 +9346,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -10434,7 +10434,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -10581,7 +10581,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -10732,7 +10732,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -10883,7 +10883,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -11034,7 +11034,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -12122,7 +12122,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -12269,7 +12269,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -12420,7 +12420,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -12571,7 +12571,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -12722,7 +12722,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -13810,7 +13810,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -14066,7 +14066,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -14322,7 +14322,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -14578,7 +14578,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -14834,7 +14834,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -15119,7 +15119,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -15270,7 +15270,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -16115,7 +16115,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -16262,7 +16262,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -16413,7 +16413,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -16564,7 +16564,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -16715,7 +16715,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -17004,7 +17004,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -17155,7 +17155,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -17963,7 +17963,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -18487,7 +18487,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -19055,7 +19055,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -19340,7 +19340,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -19560,7 +19560,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -19918,7 +19918,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -20069,7 +20069,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -20467,7 +20467,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -20614,7 +20614,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -20834,7 +20834,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -20985,7 +20985,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -21501,7 +21501,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -22349,7 +22349,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -23469,7 +23469,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -23725,7 +23725,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -24135,7 +24135,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -24258,7 +24258,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -25658,7 +25658,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -25812,7 +25812,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -27408,7 +27408,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -27907,7 +27907,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -28337,7 +28337,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -29007,7 +29007,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -29779,7 +29779,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30185,7 +30185,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30339,7 +30339,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30493,7 +30493,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30647,7 +30647,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30801,7 +30801,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -33627,7 +33627,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -34171,7 +34171,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34318,7 +34318,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34465,7 +34465,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34612,7 +34612,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34759,7 +34759,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34906,7 +34906,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35053,7 +35053,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35200,7 +35200,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35347,7 +35347,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35494,7 +35494,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35641,7 +35641,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35788,7 +35788,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36019,7 +36019,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36166,7 +36166,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36313,7 +36313,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36460,7 +36460,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36607,7 +36607,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36754,7 +36754,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36901,7 +36901,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37048,7 +37048,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37195,7 +37195,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37342,7 +37342,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37489,7 +37489,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37636,7 +37636,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37783,7 +37783,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37930,7 +37930,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -38077,7 +38077,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -38224,7 +38224,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -38371,7 +38371,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -38518,7 +38518,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -39887,7 +39887,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -40383,7 +40383,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -40519,7 +40519,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -40655,7 +40655,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -40791,7 +40791,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -40927,7 +40927,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41063,7 +41063,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41210,7 +41210,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41346,7 +41346,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41482,7 +41482,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41618,7 +41618,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41754,7 +41754,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -41901,7 +41901,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 diff --git a/load-testing/WFNEWS_Load_Test_2_No_Cloudfront.jmx b/load-testing/WFNEWS_Load_Test_2_No_Cloudfront.jmx index dd6a98603b..6cd0947ba7 100644 --- a/load-testing/WFNEWS_Load_Test_2_No_Cloudfront.jmx +++ b/load-testing/WFNEWS_Load_Test_2_No_Cloudfront.jmx @@ -1547,7 +1547,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -1628,7 +1628,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -1786,7 +1786,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -2423,7 +2423,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -2643,7 +2643,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -2794,7 +2794,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -2945,7 +2945,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 UTF-8 @@ -3715,7 +3715,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -3862,7 +3862,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -4013,7 +4013,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -4164,7 +4164,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -4315,7 +4315,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -5817,7 +5817,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -6171,7 +6171,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6322,7 +6322,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6473,7 +6473,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6624,7 +6624,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6775,7 +6775,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -6926,7 +6926,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -7636,7 +7636,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -7783,7 +7783,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -7934,7 +7934,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -8746,7 +8746,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -8893,7 +8893,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -9044,7 +9044,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -9195,7 +9195,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -9346,7 +9346,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -10434,7 +10434,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -10581,7 +10581,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -10732,7 +10732,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -10883,7 +10883,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -11034,7 +11034,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -12122,7 +12122,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -12269,7 +12269,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -12420,7 +12420,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -12571,7 +12571,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -12722,7 +12722,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -13810,7 +13810,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -14066,7 +14066,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -14322,7 +14322,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -14578,7 +14578,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -14834,7 +14834,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -15119,7 +15119,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -15270,7 +15270,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -16115,7 +16115,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -16262,7 +16262,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -16413,7 +16413,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -16564,7 +16564,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -16715,7 +16715,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -17004,7 +17004,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -17155,7 +17155,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -17963,7 +17963,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -18487,7 +18487,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -19055,7 +19055,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -19340,7 +19340,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -19560,7 +19560,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -19918,7 +19918,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -20069,7 +20069,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -20467,7 +20467,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -20614,7 +20614,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -20834,7 +20834,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -20985,7 +20985,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -21501,7 +21501,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -22349,7 +22349,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -23469,7 +23469,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -23725,7 +23725,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -24135,7 +24135,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -24258,7 +24258,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -25658,7 +25658,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -25812,7 +25812,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -27408,7 +27408,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -27907,7 +27907,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -28337,7 +28337,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -29007,7 +29007,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -29779,7 +29779,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30185,7 +30185,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30339,7 +30339,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30493,7 +30493,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30647,7 +30647,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -30801,7 +30801,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -33627,7 +33627,7 @@ - services6.arcgis.com + services6.${url_suffix} 443 utf-8 @@ -34171,7 +34171,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34318,7 +34318,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34465,7 +34465,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34612,7 +34612,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34759,7 +34759,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -34906,7 +34906,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35053,7 +35053,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35200,7 +35200,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35347,7 +35347,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35494,7 +35494,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35641,7 +35641,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -35788,7 +35788,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36019,7 +36019,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36166,7 +36166,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36313,7 +36313,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36460,7 +36460,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36607,7 +36607,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36754,7 +36754,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -36901,7 +36901,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37048,7 +37048,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37195,7 +37195,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37342,7 +37342,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37489,7 +37489,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37636,7 +37636,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37783,7 +37783,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -37930,7 +37930,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -38077,7 +38077,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -38224,7 +38224,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -38371,7 +38371,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 @@ -38518,7 +38518,7 @@ - test.openmaps.gov.bc.ca + maps.${url_suffix} 443 UTF-8 diff --git a/terraform/cloudfront.tf b/terraform/cloudfront.tf index b4a3dea006..c921a2f09d 100644 --- a/terraform/cloudfront.tf +++ b/terraform/cloudfront.tf @@ -873,6 +873,144 @@ resource "aws_cloudfront_distribution" "wfnews_redirect_receiver" { } } +resource "aws_cloudfront_distribution" "wfnews_openmaps_cache" { + #NOTE: This points at the government openmaps service + + count = var.cloudfront ? 1 : 0 + + aliases = ["maps.${var.target_env}.bcwildfireservices.com"] + + origin { + custom_origin_config { + http_port = 80 + https_port = 443 + origin_protocol_policy = "https-only" + origin_ssl_protocols = [ + "TLSv1.2" + ] + } + + domain_name = var.target_env == "prod" ? "openmaps.gov.bc.ca" : "test.openmaps.gov.bc.ca" + origin_id = "wfnews_openmaps_cache_${var.target_env}" + + } + + enabled = true + is_ipv6_enabled = true + + default_cache_behavior { + allowed_methods = [ + "GET", + "HEAD", + "OPTIONS" + ] + cached_methods = ["GET", "HEAD"] + + target_origin_id = "wfnews_openmaps_cache_${var.target_env}" + + forwarded_values { + query_string = true + headers = ["Origin", "Authorization"] + + cookies { + forward = "all" + } + } + + response_headers_policy_id = aws_cloudfront_response_headers_policy.cache_control_reponse_headers.id + + viewer_protocol_policy = "redirect-to-https" + min_ttl = 0 + default_ttl = 300 + max_ttl = 300 + } + + price_class = "PriceClass_100" + + restrictions { + geo_restriction { + restriction_type = var.target_env == "prod" ? "none" : "whitelist" + locations = var.target_env == "prod" ? [] : ["CA", "US", "AR"] + } + } + + tags = local.common_tags + + viewer_certificate { + acm_certificate_arn = var.certificate_arn + ssl_support_method = "sni-only" + } +} + +resource "aws_cloudfront_distribution" "wfnews_services6_cache" { + #NOTE: This points at the government openmaps service + + count = var.cloudfront ? 1 : 0 + + aliases = ["maps.${var.target_env}.bcwildfireservices.com"] + + origin { + custom_origin_config { + http_port = 80 + https_port = 443 + origin_protocol_policy = "https-only" + origin_ssl_protocols = [ + "TLSv1.2" + ] + } + + domain_name = "services6.arcgis.com" + origin_id = "wfnews_services6_cache_${var.target_env}" + + } + + enabled = true + is_ipv6_enabled = true + + default_cache_behavior { + allowed_methods = [ + "GET", + "HEAD", + "OPTIONS" + ] + cached_methods = ["GET", "HEAD"] + + target_origin_id = "wfnews_services6_cache_${var.target_env}" + + forwarded_values { + query_string = true + headers = ["Origin", "Authorization"] + + cookies { + forward = "all" + } + } + + response_headers_policy_id = aws_cloudfront_response_headers_policy.cache_control_reponse_headers.id + + viewer_protocol_policy = "redirect-to-https" + min_ttl = 0 + default_ttl = 300 + max_ttl = 300 + } + + price_class = "PriceClass_100" + + restrictions { + geo_restriction { + restriction_type = var.target_env == "prod" ? "none" : "whitelist" + locations = var.target_env == "prod" ? [] : ["CA", "US", "AR"] + } + } + + tags = local.common_tags + + viewer_certificate { + acm_certificate_arn = var.certificate_arn + ssl_support_method = "sni-only" + } +} + output "wfnews_cloudfront_client_url" { value = "https://${aws_cloudfront_distribution.wfnews_geofencing_client[0].domain_name}" } diff --git a/terraform/dns.tf b/terraform/dns.tf index 1d5ee58d00..c6b424472a 100644 --- a/terraform/dns.tf +++ b/terraform/dns.tf @@ -87,3 +87,31 @@ resource "aws_route53_record" "wfone-notifications-api" { evaluate_target_health = true } } + +resource "aws_route53_record" "wfnews_openmaps_cache" { + //We will eventually phase out old URLs, but use them for now + //count = var.target_env == "prod" ? 0 : 1 + + zone_id = data.aws_route53_zone.zone.id + name = "maps.${var.target_env}.bcwildfireservices.com" + type = "A" + alias { + name = aws_cloudfront_distribution.wfnews_openmaps_cache[0].domain_name + zone_id = aws_cloudfront_distribution.wfnews_openmaps_cache[0].hosted_zone_id + evaluate_target_health = true + } +} + +resource "aws_route53_record" "wfnews_services6_cache" { + //We will eventually phase out old URLs, but use them for now + //count = var.target_env == "prod" ? 0 : 1 + + zone_id = data.aws_route53_zone.zone.id + name = "services6.${var.target_env}.bcwildfireservices.com" + type = "A" + alias { + name = aws_cloudfront_distribution.wfnews_services6_cache[0].domain_name + zone_id = aws_cloudfront_distribution.wfnews_services6_cache[0].hosted_zone_id + evaluate_target_health = true + } +} \ No newline at end of file diff --git a/terraform/ecs.tf b/terraform/ecs.tf index cc8aa758f6..0b04e3c43c 100644 --- a/terraform/ecs.tf +++ b/terraform/ecs.tf @@ -382,7 +382,11 @@ resource "aws_ecs_task_definition" "wfnews_client" { }, { name = "OPENMAPS_BASE_URL", - value = var.openmapsBaseUrl + value = "https://${aws_route53_record.wfnews_openmaps_cache.name}" + }, + { + name = "SERVICES6_BASE_URL", + value = "https://${aws_route53_record.wfnews_services6_cache.name}" }, { name = "SITEMINDER_URL_PREFIX", diff --git a/terraform/lambda.tf b/terraform/lambda.tf index 65938a68b6..77bb9c96df 100644 --- a/terraform/lambda.tf +++ b/terraform/lambda.tf @@ -138,7 +138,7 @@ resource "aws_lambda_function" "wfnews-cache-invalidator" { variables = { S3_BUCKET = aws_s3_bucket.wfnews-monitor-queue-bucket.id SECRET_NAME = var.SECRET_NAME - DISTRIBUTION_IDS = var.MAPS_CLOUDFRONT_DISTRIBUTION_IDS + DISTRIBUTION_IDS = "${aws_cloudfront_distribution.wfnews_openmaps_cache.id},${aws_cloudfront_distribution.wfnews_services6_cache.id}" } } vpc_config { From 40e9b36001406a9fe5fb3d0c6a804207e6ecf571 Mon Sep 17 00:00:00 2001 From: Chris Preston Date: Mon, 22 Apr 2024 17:43:06 -0700 Subject: [PATCH 2/2] Add steps and terraform components for cache invalidator --- .github/workflows/ios.yml | 2 +- .github/workflows/lambda-zip.yml | 16 ++++++++++++++++ terraform/lambda.tf | 9 +++++++-- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index c9453bcd0b..ecee9e03bc 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -99,7 +99,7 @@ jobs: # MAP_ICONS_TOOLTIP_OFFSET: ${{ vars.MAP_ICONS_TOOLTIP_OFFSET }} MORE_INFORMATION_LINK: ${{ vars.MORE_INFORMATION_LINK }} OPENMAPS_BASE_URL: https://maps.${{ vars.TARGET_ENV }}.bcwildfireservices.com - SERVICES6_BASE_URL: ${{ vars.SERVICES6_BASE_URL }} + SERVICES6_BASE_URL: https://services6.${{ vars.TARGET_ENV }}.bcwildfireservices.com POINT_ID_URL: ${{ vars.POINT_ID_URL }} PROJECT_VERSION: ${{ steps.version.outputs.info }} REPORT_A_WILDFIRE_PHONE_LINE: ${{ vars.REPORT_A_WILDFIRE_PHONE_LINE }} diff --git a/.github/workflows/lambda-zip.yml b/.github/workflows/lambda-zip.yml index 56239bc6c7..5826b407d7 100644 --- a/.github/workflows/lambda-zip.yml +++ b/.github/workflows/lambda-zip.yml @@ -37,10 +37,24 @@ jobs: with: args: zip -qq -r -j bans-and-prohibitions-monitor.zip lambda/bans-and-prohibitions-monitor/bans-and-prohibitions + - uses: montudor/action-zip@v1 with: args: zip -qq -r -j evacuation-orders-monitor.zip lambda/evacuation-orders-monitor/evacuation-orders + - uses: actions/setup-node@v4 + with: + node-version: 14 + + - name: run npm install for cache invalidator + run: | + cd lambda/cache-invalidator/wfnews-cache-invalidator + npm install + + - uses: montudor/action-zip@v1 + with: + args: zip -qq -r -j wfnews-cache-invalidator.zip lambda/cache-invalidator/wfnews-cache-invalidator + - name: Make staging directory, copy files run: | mkdir staging @@ -48,11 +62,13 @@ jobs: echo ${{hashFiles('**/area-restrictions-monitor.zip')}} >> staging/area-restrictions-monitor-hash.txt echo ${{hashFiles('**/bans-and-prohibitions-monitor.zip')}} >> staging/bans-and-prohibitions-monitor-hash.txt echo ${{hashFiles('**/evacuation-orders-monitor.zip')}} >> staging/evacuation-orders-monitor-hash.txt + echo ${{hashFiles('**/wfnews-cache-invalidator.zip')}} >> staging/wfnews-cache-invalidator-hash.txt echo ${{hashFiles('**/python.zip')}} >> staging/python-hash cp active-fire-monitor.zip staging/active-fire-monitor.zip cp area-restrictions-monitor.zip staging/area-restrictions-monitor.zip cp bans-and-prohibitions-monitor.zip staging/bans-and-prohibitions-monitor.zip cp evacuation-orders-monitor.zip staging/evacuation-orders-monitor.zip + cp wfnews-cache-invalidator.zip staging/wfnews-cache-invalidator.zip cp lambda/lambda-layer/python.zip staging/python.zip - name: Configure AWS Credentials diff --git a/terraform/lambda.tf b/terraform/lambda.tf index 77bb9c96df..023c379778 100644 --- a/terraform/lambda.tf +++ b/terraform/lambda.tf @@ -25,6 +25,11 @@ data "aws_s3_object" "evacuation_orders_monitor_hash" { key = "evacuation-orders-monitor-hash.txt" } +data "aws_s3_object" "wfnews_cache_invalidator_hash" { + bucket = data.aws_s3_bucket.wfnews_lambda.bucket + key = "wfnews-cache-invalidator-hash.txt" +} + resource "aws_lambda_function" "monitor-bans-prohibitions" { function_name = "wfnews-monitor-bans-${var.target_env}" s3_bucket = data.aws_s3_bucket.wfnews_lambda.bucket @@ -129,7 +134,7 @@ resource "aws_lambda_function" "wfnews-cache-invalidator" { function_name = "wfnews-cache-invalidator-${var.target_env}" s3_bucket = data.aws_s3_bucket.wfnews_lambda.bucket s3_key = "wfnews-cache-invalidator.zip" - source_code_hash = data.aws_s3_object.wfnews-cache-invalidator_hash.body + source_code_hash = data.aws_s3_object.wfnews_cache_invalidator_hash.body role = aws_iam_role.lambda_iam_role.arn handler = "app.lambda_handler" runtime = "nodejs18.x" @@ -138,7 +143,7 @@ resource "aws_lambda_function" "wfnews-cache-invalidator" { variables = { S3_BUCKET = aws_s3_bucket.wfnews-monitor-queue-bucket.id SECRET_NAME = var.SECRET_NAME - DISTRIBUTION_IDS = "${aws_cloudfront_distribution.wfnews_openmaps_cache.id},${aws_cloudfront_distribution.wfnews_services6_cache.id}" + DISTRIBUTION_IDS = "${aws_cloudfront_distribution.wfnews_openmaps_cache[0].id},${aws_cloudfront_distribution.wfnews_services6_cache[0].id}" } } vpc_config {