diff --git a/client/wfnews-war/src/main/angular/src/assets/data/appConfig.json b/client/wfnews-war/src/main/angular/src/assets/data/appConfig.json
index 7613c7ba40..9c87f75bb0 100644
--- a/client/wfnews-war/src/main/angular/src/assets/data/appConfig.json
+++ b/client/wfnews-war/src/main/angular/src/assets/data/appConfig.json
@@ -125,7 +125,7 @@
},
"mapServices": {
- "openmapsBaseUrl": "https://test.openmaps.gov.bc.ca/geo/pub/ows",
+ "openmapsBaseUrl": "https://maps.dev.bcwildfireservices.com/geo/pub/ows",
"#openmapsBaseUrl": "https://openmaps.gov.bc.ca/geo/pub/ows",
"drivebcBaseUrl": "https://dev-maps.th.gov.bc.ca/geoV05/ows",
"#wfnews": "http://localhost:1338",
diff --git a/client/wfnews-war/src/main/angular/src/index.html b/client/wfnews-war/src/main/angular/src/index.html
index 2e14dbaea0..647a6d2855 100644
--- a/client/wfnews-war/src/main/angular/src/index.html
+++ b/client/wfnews-war/src/main/angular/src/index.html
@@ -16,7 +16,7 @@
-
+
diff --git a/client/wfnews-war/src/main/resources/application.properties b/client/wfnews-war/src/main/resources/application.properties
index c842d049cc..9a888f8871 100644
--- a/client/wfnews-war/src/main/resources/application.properties
+++ b/client/wfnews-war/src/main/resources/application.properties
@@ -6,7 +6,7 @@ check.token.url=checkToken.jsp
drivebc.url=https://dev-maps.th.gov.bc.ca/geoV05/ows
googlePlayUrl=https://play.google.com/store/apps/details?id=ca.bc.gov.WildfireInformation&hl=en_CA&gl=US
openmaps.internal.url=https://openmaps.gov.bc.ca/geo/pub/ows
-openmaps.url=https://test.openmaps.gov.bc.ca/geo/pub/ows
+openmaps.url=https://maps.dev.bcwildfireservices.com/geo/pub/ows
pointid.url=https://bcwsapi.nrs.gov.bc.ca/wfss-pointid-api
project.acronym=WFNEWS
siteminder.url.prefix=https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi?returl=
diff --git a/client/wfnews-war/src/main/resources/static.properties b/client/wfnews-war/src/main/resources/static.properties
index cd63930b68..2eb56e76a7 100644
--- a/client/wfnews-war/src/main/resources/static.properties
+++ b/client/wfnews-war/src/main/resources/static.properties
@@ -1,7 +1,7 @@
application.version=${project.version}
build.number=1
project.acronym=WFNEWS
-openmaps.url=https://test.openmaps.gov.bc.ca/geo/pub/ows
+openmaps.url=https://maps.dev.bcwildfireservices.com/geo/pub/ows
openmaps.internal.url=https://openmaps.gov.bc.ca/geo/pub/ows
drivebc.url=https://dev-maps.th.gov.bc.ca/geoV05/ows
siteminder.url.prefix=https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi?returl=
diff --git a/lambda/README.md b/lambda/README.md
deleted file mode 100644
index ae6d7474ee..0000000000
--- a/lambda/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Welcome to Bitbucket #
-
-To get started you will need to run these commands in your terminal.
-
-New to Git? Please read the [Application Delivery Tutorial](https://apps.nrs.gov.bc.ca/int/stash/projects/APPDEV/repos/git-tutorial/browse).
-
-### Configure Git for the first time ###
-
-```
-git config --global user.name "Last, First IIT:EX"
-git config --global user.email "First.Last@gov.bc.ca"
-```
-
-### Repository URL ###
-
-The url can be found by clicking the clone button in the top-left. Remember to add your account username and alter the url to start with bwa instead of apps. See the [tutorial](https://apps.nrs.gov.bc.ca/int/stash/projects/APPDEV/repos/git-tutorial/browse/bitbucket-addendum.md) for more information.
-
-### Working with your repository ###
-
-#### I just want to clone this repository ####
-
-If you want to simply clone this empty repository then run then run this command in your terminal.
-
-```
-git clone
-```
-
-Feel free to edit or delete this file.
-
-#### My code is ready to be pushed ####
-
-If you already have code ready to be pushed to this repository then run this in your terminal.
-
-```
-cd existing-project
-git init
-git add --all
-git commit -m "Initial Commit"
-git remote add origin
-git push -u origin master:
-```
-
-Branch permissions will pervent pushing to the master branch or a release branch. Please create a pull request to update these branches.
-
-#### My code is already tracked by Git ####
-
-If your code is already tracked by Git then set this repository as your "origin" to push to.
-
-```
-cd existing-project
-git remote set-url origin
-git push -u origin :
-```
diff --git a/lambda/cache-invalidator/template.yaml b/lambda/cache-invalidator/template.yaml
index 245b02b669..30d3a54ca0 100644
--- a/lambda/cache-invalidator/template.yaml
+++ b/lambda/cache-invalidator/template.yaml
@@ -25,12 +25,17 @@ Resources:
Properties:
Path: /wfnews-cache-invalidator
Method: get
+ ScheduleEvent:
+ Type: Schedule
+ Properties:
+ Schedule: rate(5 minute)
+ Input: '{"source": "scheduled"}'
Outputs:
# ServerlessRestApi is an implicit API created out of Events key under Serverless::Function
# Find out more about other implicit resources you can reference within SAM
# https://github.com/awslabs/serverless-application-model/blob/master/docs/internals/generated_resources.rst#api
- HelloWorldApi:
+ WFNEWSCacheInvalidatorApi:
Description: "Perimeter Monitor function"
Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/wfnews-cache-invalidator/"
WFNEWSCacheInvalidatorFunction:
diff --git a/lambda/cache-invalidator/wfnews-cache-invalidator/app.js b/lambda/cache-invalidator/wfnews-cache-invalidator/app.js
index 96638fe59d..41cc213b04 100644
--- a/lambda/cache-invalidator/wfnews-cache-invalidator/app.js
+++ b/lambda/cache-invalidator/wfnews-cache-invalidator/app.js
@@ -1,6 +1,7 @@
const AWS = require('aws-sdk');
-const distributionIds = ['ID1', 'ID2', 'ID3']; // fetch from app config. openmaps/agol sources only?
+const distributionIdsString = process.env.MAPS_CLOUDFRONT_DISTRIBUTION_IDS;
+const distributionIds = distributionIdsString.split(',');
/**
*
diff --git a/terraform/lambda.tf b/terraform/lambda.tf
index 68fd3c9dc3..65938a68b6 100644
--- a/terraform/lambda.tf
+++ b/terraform/lambda.tf
@@ -138,6 +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
}
}
vpc_config {
diff --git a/terraform/variables.tf b/terraform/variables.tf
index bfca7c472e..c7c656aa5c 100644
--- a/terraform/variables.tf
+++ b/terraform/variables.tf
@@ -741,6 +741,11 @@ variable "LAMBDA_LAYER_KEY" {
default = ""
}
+variable "MAPS_CLOUDFRONT_DISTRIBUTION_IDS" {
+ type = string
+ default = ""
+}
+
variable "UNIQUE_DEPLOY_ID" {