Merge branch 'release/1.19.2'

Author: KlaasH

CHANGELOG.md

@@ -12,6 +12,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+## [1.19.2]
+### Changed
+
+- Updated database Terraform module to use the 'max_allocated_storage' param [#1312](https://github.com/PublicMapping/districtbuilder/pull/1312)
+- Made TopologyService check 'archived' status and refuse to load archived layers [#1315](https://github.com/PublicMapping/districtbuilder/pull/1315)
+
 ## [1.19.1]
 ### Changed
 - Deduplicate CloudWatch alarms [#1283](https://github.com/PublicMapping/districtbuilder/pull/1283)
@@ -547,7 +553,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release.
 
-[Unreleased]: https://github.com/publicmapping/districtbuilder/compare/1.19.1...HEAD
+[Unreleased]: https://github.com/publicmapping/districtbuilder/compare/1.19.2...HEAD
+[1.19.2]: https://github.com/publicmapping/districtbuilder/compare/1.19.1...1.19.2
 [1.19.1]: https://github.com/publicmapping/districtbuilder/compare/1.19.0...1.19.1
 [1.19.0]: https://github.com/publicmapping/districtbuilder/compare/1.18.1...1.19.0
 [1.18.1]: https://github.com/publicmapping/districtbuilder/compare/1.18.0...1.18.1

deployment/terraform/database.tf

@@ -75,14 +75,17 @@ resource "aws_db_parameter_group" "default" {
 }
 
 module "database" {
-  source = "github.com/azavea/terraform-aws-postgresql-rds?ref=3.0.0"
+  # TODO (#1316): go back to github.com/azavea/terraform-aws-postgresql-rds once it's updated
+  # (see https://github.com/azavea/terraform-aws-postgresql-rds/pull/48)
+  source = "github.com/KlaasH/terraform-aws-postgresql-rds?ref=max-allocated-storage"
 
   vpc_id                     = module.vpc.id
   allocated_storage          = var.rds_allocated_storage
+  max_allocated_storage      = var.rds_max_allocated_storage
   engine_version             = var.rds_engine_version
   instance_type              = var.rds_instance_type
   storage_type               = var.rds_storage_type
-  iops                       = var.rds_storage_type == "io1" ? var.rds_iops : null
+  iops                       = var.rds_iops
   database_identifier        = var.rds_database_identifier
   database_name              = var.rds_database_name
   database_username          = var.rds_database_username

deployment/terraform/variables.tf

@@ -58,6 +58,11 @@ variable "rds_allocated_storage" {
   type    = string
 }
 
+variable "rds_max_allocated_storage" {
+  default = 0
+  type    = string
+}
+
 variable "rds_engine_version" {
   default = "12.4"
   type    = string

src/server/src/districts/services/topology.service.ts

@@ -76,6 +76,10 @@ export class TopologyService {
     if (!this._layers) {
       return;
     }
+    if (regionConfig.archived) {
+      this.logger.error(`Tried to load archived RegionConfig ${regionConfig.id}`);
+      return undefined;
+    }
     if (!(regionConfig.s3URI in this._layers)) {
       // If we encounter a new layer (i.e. one added after the service has started),
       // then store the results in the `_layers` object.