Merge branch 'release/1.16.0'

Author: maurizi

CHANGELOG.md

@@ -8,10 +8,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Added
+- Add color picker to reference layer flyout [#1150](https://github.com/PublicMapping/districtbuilder/pull/1150)
+- Add district type to project cards on 'My Maps' page [#1162](https://github.com/PublicMapping/districtbuilder/pull/1162)
+- Add Creation and Login Dates to User [#1159](https://github.com/PublicMapping/districtbuilder/pull/1159)
+- Allow admins to archive organization templates [#1164](https://github.com/PublicMapping/districtbuilder/pull/1164)
 
 ### Changed
+- Updated caching setup based on load testing [#1172](https://github.com/PublicMapping/districtbuilder/pull/1172)
 
 ### Fixed
+- Updated tippecanoe & fix process-geojson [#1173](https://github.com/PublicMapping/districtbuilder/pull/1173)
+- Fixed crash when loading regions, don't show inactive templates / templates w/ archived regions [#1185](https://github.com/PublicMapping/districtbuilder/pull/1185)
 
 ## [1.15.1] - 2022-03-03
 
@@ -460,7 +467,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.15.0...HEAD
+[unreleased]: https://github.com/publicmapping/districtbuilder/compare/1.15.1...HEAD
+[1.15.1]: https://github.com/publicmapping/districtbuilder/compare/1.15.0...1.15.1
 [1.15.0]: https://github.com/publicmapping/districtbuilder/compare/1.14.0...1.15.0
 [1.14.0]: https://github.com/publicmapping/districtbuilder/compare/1.13.0...1.14.0
 [1.13.0]: https://github.com/publicmapping/districtbuilder/compare/1.12.1...1.13.0

deployment/README.md

@@ -74,6 +74,7 @@ To deploy this project's core infrastructure, use the `infra` wrapper script to
 
 ```bash
 $ docker-compose -f docker-compose.ci.yml run --rm terraform
+$ export GIT_COMMIT= (an existing git hash of an image that has been published)
 $ ./scripts/infra plan
 ```
 
@@ -83,7 +84,7 @@ Once the plan has been assembled, and you agree with the changes, apply it:
 $ ./scripts/infra apply
 ```
 
-This will attempt to apply the plan assembled in the previous step using Amazon's APIs.
+This will attempt to apply the plan assembled in the previous step using Amazon's APIs.  If you want to change production you need to prepend DB_SETTINGS_BUCKET=districtbuilder-production-config-us-east-1 to the infra commands.
 
 ## Migrations
 

deployment/terraform/app.tf

@@ -202,37 +202,6 @@ resource "aws_ecs_service" "app" {
   ]
 }
 
-resource "aws_ecs_task_definition" "app_cli" {
-  family                   = "${var.environment}AppCLI"
-  network_mode             = "awsvpc"
-  requires_compatibilities = ["FARGATE"]
-  cpu                      = var.fargate_app_cli_cpu
-  memory                   = var.fargate_app_cli_memory
-
-  task_role_arn      = aws_iam_role.ecs_task_role.arn
-  execution_role_arn = aws_iam_role.ecs_task_execution_role.arn
-
-  container_definitions = templatefile("${path.module}/task-definitions/app_cli.json.tmpl", {
-    image = "${module.ecr_cli.repository_url}:${var.image_tag}"
-
-    postgres_host     = aws_route53_record.database.name
-    postgres_port     = module.database.port
-    postgres_user     = var.rds_database_username
-    postgres_password = var.rds_database_password
-    postgres_db       = var.rds_database_name
-
-    project     = var.project
-    environment = var.environment
-    aws_region  = var.aws_region
-  })
-
-  tags = {
-    Name        = "${var.environment}AppCLI",
-    Project     = var.project
-    Environment = var.environment
-  }
-}
-
 #
 # CloudWatch Resources
 #

deployment/terraform/container_service.tf

@@ -23,7 +23,9 @@ data "template_cloudinit_config" "container_instance_cloud_config" {
       # better than choosing an arbitrary constant.
       #
       # See: doc/DistrictBuilder_Memory_Usage_vs_Memory_Map_Areas.xlsx
-      vm_max_map_count = local.container_instance_app_memory * 3 + (8 * 1024)
+      #
+      # Edit 3-17-2022, doubled map count to account for new cache architecture
+      vm_max_map_count = local.container_instance_app_memory * 6 + (8 * 1024)
     })
   }
 }

deployment/terraform/storage.tf

@@ -28,10 +28,3 @@ module "ecr" {
   repository_name         = lower(var.project)
   attach_lifecycle_policy = true
 }
-
-module "ecr_cli" {
-  source = "github.com/azavea/terraform-aws-ecr-repository?ref=1.0.0"
-
-  repository_name         = "${lower(var.project)}-manage"
-  attach_lifecycle_policy = true
-}

deployment/terraform/variables.tf

@@ -253,7 +253,7 @@ variable "container_instance_asg_health_check_grace_period" {
 }
 
 variable "container_instance_reserved_memory" {
-  default = 4 * 1024
+  default = 2 * 1024
   type    = number
 }
 

docker-compose.ci.yml

@@ -1,17 +1,17 @@
 version: "2.4"
 services:
   server:
-    image: "districtbuilder:${GIT_COMMIT:-latest}"
+    image: "districtbuilder:${GIT_COMMIT}"
     volumes:
       - "/var/cache/district-builder-${EXECUTOR_NUMBER}-server-node-modules:/home/node/app/server/node_modules"
 
   client:
-    image: node:16-slim
+    image: node:16-bullseye-slim
     volumes:
       - "/var/cache/district-builder-${EXECUTOR_NUMBER}-client-node-modules:/home/node/app/node_modules"
 
   manage:
-    image: "districtbuilder-manage:${GIT_COMMIT:-latest}"
+    image: "districtbuilder-manage:${GIT_COMMIT}"
     volumes:
       - "/var/cache/district-builder-${EXECUTOR_NUMBER}-server-node-modules:/home/node/app/server/node_modules"
       - "/var/cache/district-builder-${EXECUTOR_NUMBER}-manage-node-modules:/home/node/app/manage/node_modules"
@@ -29,7 +29,7 @@ services:
       - $HOME/.aws:/root/.aws:ro
     environment:
       - AWS_PROFILE=${AWS_PROFILE:-district-builder}
-      - GIT_COMMIT=${GIT_COMMIT:-latest}
+      - GIT_COMMIT=${GIT_COMMIT}
       - DB_DEBUG=1
       - DB_SETTINGS_BUCKET=${DB_SETTINGS_BUCKET:-districtbuilder-staging-config-us-east-1}
       - DB_ROLLBAR_ACCESS_TOKEN

docker-compose.yml

@@ -44,6 +44,8 @@ services:
       database:
         condition: service_healthy
     command: start:dev
+    mem_limit: 12g
+    memswap_limit: 12g
 
   client:
     image:  node:16-bullseye-slim

load-tests/harness.js

@@ -8,33 +8,32 @@ export const options = {
   vus: 1,
   iterations: 1,
   discardResponseBodies: true,
-  verbose: true,
   maxRedirects: 0,
   thresholds: {
-    checks: [{ threshold: "rate==1", abortOnFail: true }],
-  },
+    checks: [{ threshold: "rate==1", abortOnFail: true }]
+  }
 };
 
 const har = JSON.parse(open(`./${__ENV.HAR_FILE}`));
 
 export function setup() {
   const requests = {};
 
-  har.log.entries.forEach((entry) => {
+  har.log.entries.forEach(entry => {
     const url = entry.request.url.replace(
       /(http|https):\/\/([^\/]+)\//,
       __ENV.REQ_ORIGIN ? `${__ENV.REQ_ORIGIN}/` : "$1://$2/"
     );
 
     const referer = entry.request.headers
-      .find((header) => header.name.toLowerCase() === "referer")
+      .find(header => header.name.toLowerCase() === "referer")
       .value.replace(
         /(http|https):\/\/([^\/]+)\//,
         __ENV.REQ_ORIGIN ? `${__ENV.REQ_ORIGIN}/` : "$1://$2/"
       );
 
     const authHeader = entry.request.headers.find(
-      (header) => header.name.toLowerCase() === "authorization"
+      header => header.name.toLowerCase() === "authorization"
     );
     const authorization = authHeader
       ? authHeader.value.replace(/^Bearer .*$/, `Bearer ${__ENV.JWT_AUTH_TOKEN}`)
@@ -60,12 +59,12 @@ export function setup() {
             "Content-Type": "application/json",
             authorization,
             // Without this referer, CloudFront will throw a 401
-            referer,
-          },
-        },
+            referer
+          }
+        }
       ]);
     } else {
-      __ENV.PROJECT_UUIDS.split(" ").forEach((uuid) => {
+      __ENV.PROJECT_UUIDS.split(" ").forEach(uuid => {
         requests[batchTime].push([
           entry.request.method,
           url.replace(
@@ -82,9 +81,9 @@ export function setup() {
               referer: referer.replace(
                 /[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}/i,
                 uuid
-              ),
-            },
-          },
+              )
+            }
+          }
         ]);
       });
     }
@@ -98,7 +97,7 @@ export function setup() {
   return [batches, requests];
 }
 
-export default (data) => {
+export default data => {
   const batches = data[0];
   const requests = data[1];
 
@@ -109,9 +108,14 @@ export default (data) => {
 
       const responses = http.batch(requests[batch]);
 
-      responses.forEach((res) => {
+      responses.forEach(res => {
         check(res, {
-          "is status 200": (r) => r.status === 200,
+          "is status 200": r => {
+            if (r.status !== 200) {
+              console.log(r.status);
+            }
+            return r.status === 200;
+          }
         });
       });