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

update titiler with timeout setting #8

Merged
merged 5 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/deploy-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
with:
stage: prod
url: https://console.modelmywatershed.org
fd-aws-tf-modules-version: v2.24.0
fd-aws-tf-modules-version: v2.27.0
2 changes: 1 addition & 1 deletion .github/workflows/deploy-staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
with:
stage: staging
url: https://console.staging.modelmywatershed.org
fd-aws-tf-modules-version: v2.24.0
fd-aws-tf-modules-version: v2.27.0
2 changes: 1 addition & 1 deletion .github/workflows/validate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Pre-commit CI
on: push

env:
fd-aws-tf-modules-version: v2.24.0
fd-aws-tf-modules-version: v2.27.0

jobs:
validate:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ plan.out
__pycache__
.vars
.secrets
tiles
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

## unreleased

### Changed

- Upgrade to filmdrop-aws-tf-modules v2.27.0

### Added

- Initial release for staging
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ The `bucket` name will be the value to be set for `TF_STATE_BUCKET`, e.g.,
Download the filmdrop-aws-tf-modules source:

```shell
./scripts/retrieve_tf_modules.sh v2.24.0
./scripts/retrieve_tf_modules.sh v2.27.0
```

Re-run this anytime you with to uptake a new `filmdrop-aws-tf-modules` release,
Expand Down
232 changes: 232 additions & 0 deletions mosaic.ipynb

Large diffs are not rendered by default.

29 changes: 15 additions & 14 deletions prod.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ s3_logs_archive_bucket = ""
deploy_vpc = true
deploy_vpc_search = false
deploy_log_archive = true
deploy_cirrus = false
deploy_alarms = false
deploy_stac_server_opensearch_serverless = false
deploy_stac_server = false
Expand All @@ -19,8 +20,6 @@ deploy_titiler = true
deploy_console_ui = true
deploy_cirrus_dashboard = false
deploy_local_stac_server_artifacts = false
deploy_sample_data_bucket = false


##### NETWORKING VARIABLES ####
# If left blank, the infrastructure will try to query the values from the control tower vpc
Expand All @@ -39,6 +38,7 @@ private_subnets_az_to_id_map = {
"us-west-2c" = "10.26.20.0/22"
}


##### ALARM VARIABLES ####
sns_topics_map = {}
cloudwatch_warning_alarms_map = {}
Expand All @@ -49,14 +49,15 @@ sns_critical_subscriptions_map = {}
##### APPLICATION VARIABLES ####

titiler_inputs = {
app_name = "titiler"
domain_alias = "tiler.modelmywatershed.org"
deploy_cloudfront = true
mosaic_titiler_release_tag = "v0.14.0-1.0.4"
stac_server_and_titiler_s3_arns = []
mosaic_titiler_waf_allowed_url = "https://api.impactobservatory.com/stac-aws/"
mosaic_titiler_host_header = "tiler.modelmywatershed.org"
web_acl_id = ""
app_name = "titiler"
domain_alias = "tiler.modelmywatershed.org"
deploy_cloudfront = true
version = "v0.14.0-1.0.5"
authorized_s3_arns = []
mosaic_titiler_waf_allowed_url = "https://api.impactobservatory.com/stac-aws/"
mosaic_titiler_host_header = "tiler.modelmywatershed.org"
mosaic_tile_timeout = 900
web_acl_id = ""
auth_function = {
cf_function_name = ""
cf_function_runtime = "cloudfront-js-2.0"
Expand All @@ -70,10 +71,10 @@ titiler_inputs = {
}

console_ui_inputs = {
app_name = "console"
filmdrop_ui_release = "v5.5.0"
deploy_cloudfront = true
domain_alias = "console.prod.modelmywatershed.org"
app_name = "console"
version = "v5.5.0"
deploy_cloudfront = true
domain_alias = "console.prod.modelmywatershed.org"
custom_error_response = [
{
error_caching_min_ttl = "10"
Expand Down
2 changes: 1 addition & 1 deletion scripts/retrieve_tf_modules.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -Eeuo pipefail
# set -x # print each command before executing
set -x # print each command before executing

FILMDROP_TERRAFORM_RELEASE=$1

Expand Down
28 changes: 15 additions & 13 deletions staging.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ s3_logs_archive_bucket = ""
deploy_vpc = true
deploy_vpc_search = false
deploy_log_archive = true
deploy_cirrus = false
deploy_alarms = false
deploy_stac_server_opensearch_serverless = false
deploy_stac_server = false
Expand All @@ -19,7 +20,6 @@ deploy_titiler = true
deploy_console_ui = true
deploy_cirrus_dashboard = false
deploy_local_stac_server_artifacts = false
deploy_sample_data_bucket = false

##### NETWORKING VARIABLES ####
# If left blank, the infrastructure will try to query the values from the control tower vpc
Expand All @@ -38,6 +38,7 @@ private_subnets_az_to_id_map = {
"us-west-2c" = "10.26.20.0/22"
}


##### ALARM VARIABLES ####
sns_topics_map = {}
cloudwatch_warning_alarms_map = {}
Expand All @@ -48,14 +49,15 @@ sns_critical_subscriptions_map = {}
##### APPLICATION VARIABLES ####

titiler_inputs = {
app_name = "titiler"
domain_alias = "tiler.staging.modelmywatershed.org"
deploy_cloudfront = true
mosaic_titiler_release_tag = "v0.14.0-1.0.4"
stac_server_and_titiler_s3_arns = []
mosaic_titiler_waf_allowed_url = "https://api.impactobservatory.com/stac-aws/"
mosaic_titiler_host_header = "tiler.staging.modelmywatershed.org"
web_acl_id = ""
app_name = "titiler"
domain_alias = "tiler.staging.modelmywatershed.org"
deploy_cloudfront = true
version = "v0.14.0-1.0.5"
authorized_s3_arns = []
mosaic_titiler_waf_allowed_url = "https://api.impactobservatory.com/stac-aws/"
mosaic_titiler_host_header = "tiler.staging.modelmywatershed.org"
mosaic_tile_timeout = 900
web_acl_id = ""
auth_function = {
cf_function_name = ""
cf_function_runtime = "cloudfront-js-2.0"
Expand All @@ -69,10 +71,10 @@ titiler_inputs = {
}

console_ui_inputs = {
app_name = "console"
filmdrop_ui_release = "v5.5.0"
deploy_cloudfront = true
domain_alias = "console.staging.modelmywatershed.org"
app_name = "console"
version = "v5.5.0"
deploy_cloudfront = true
domain_alias = "console.staging.modelmywatershed.org"
custom_error_response = [
{
error_caching_min_ttl = "10"
Expand Down