From eb11b57abce8c9ac4f774469314a92f296b34cd1 Mon Sep 17 00:00:00 2001
From: Alex Steel <130377221+asteel-gsa@users.noreply.github.com>
Date: Wed, 9 Oct 2024 12:27:16 -0400
Subject: [PATCH] Modify memory usage for all envs to pull away from quota
 threshold

---
 backend/manifests/vars/vars-preview.yml   | 4 ++--
 backend/manifests/vars/vars-staging.yml   | 2 +-
 terraform/dev/dev.tf                      | 2 ++
 terraform/preview/preview.tf              | 4 +++-
 terraform/shared/modules/env/postgrest.tf | 2 +-
 terraform/shared/modules/env/variables.tf | 6 ++++++
 terraform/staging/staging.tf              | 2 ++
 7 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/backend/manifests/vars/vars-preview.yml b/backend/manifests/vars/vars-preview.yml
index 3b05988833..c834408894 100644
--- a/backend/manifests/vars/vars-preview.yml
+++ b/backend/manifests/vars/vars-preview.yml
@@ -1,7 +1,7 @@
 app_name: gsa-fac
-mem_amount: 4G
+mem_amount: 2G
 cf_env_name: PREVIEW
 env_name: preview
 service_name: preview
 endpoint: fac-preview.app.cloud.gov
-instances: 2
+instances: 1
diff --git a/backend/manifests/vars/vars-staging.yml b/backend/manifests/vars/vars-staging.yml
index a22428f51f..de419aaac4 100644
--- a/backend/manifests/vars/vars-staging.yml
+++ b/backend/manifests/vars/vars-staging.yml
@@ -1,5 +1,5 @@
 app_name: gsa-fac
-mem_amount: 4G
+mem_amount: 2G
 cf_env_name: STAGING
 env_name: staging
 service_name: staging
diff --git a/terraform/dev/dev.tf b/terraform/dev/dev.tf
index c2fd7cafa4..82a8b4915f 100644
--- a/terraform/dev/dev.tf
+++ b/terraform/dev/dev.tf
@@ -8,10 +8,12 @@ module "dev" {
 
   database_plan         = "medium-gp-psql"
   postgrest_instances   = 1
+  postgrest_memory      = 512
   swagger_instances     = 1
   https_proxy_instances = 1
   smtp_proxy_instances  = 1
   clamav_instances      = 1
+  clamav_memory         = 2048
   clamav_fs_instances   = 1
   recursive_delete      = true
   json_params = jsonencode(
diff --git a/terraform/preview/preview.tf b/terraform/preview/preview.tf
index 1fb6cd811e..5847c318fb 100644
--- a/terraform/preview/preview.tf
+++ b/terraform/preview/preview.tf
@@ -8,10 +8,12 @@ module "preview" {
 
   database_plan         = "medium-gp-psql"
   postgrest_instances   = 1
+  postgrest_memory      = 512
   swagger_instances     = 1
   https_proxy_instances = 1
   smtp_proxy_instances  = 1
-  clamav_instances      = 2
+  clamav_instances      = 1
+  clamav_memory         = 2048
   clamav_fs_instances   = 1
   recursive_delete      = true
   json_params = jsonencode(
diff --git a/terraform/shared/modules/env/postgrest.tf b/terraform/shared/modules/env/postgrest.tf
index 0d0c4d7b69..61d4725ed0 100644
--- a/terraform/shared/modules/env/postgrest.tf
+++ b/terraform/shared/modules/env/postgrest.tf
@@ -22,7 +22,7 @@ resource "cloudfoundry_app" "postgrest" {
   space        = data.cloudfoundry_space.apps.id
   docker_image = "ghcr.io/gsa-tts/fac/postgrest@${data.docker_registry_image.postgrest.sha256_digest}"
   timeout      = 180
-  memory       = 1024
+  memory       = var.postgrest_memory
   disk_quota   = 256
   instances    = var.postgrest_instances
   strategy     = "rolling"
diff --git a/terraform/shared/modules/env/variables.tf b/terraform/shared/modules/env/variables.tf
index ce7c4d29eb..bfad47f724 100644
--- a/terraform/shared/modules/env/variables.tf
+++ b/terraform/shared/modules/env/variables.tf
@@ -50,6 +50,12 @@ variable "postgrest_instances" {
   default     = 2
 }
 
+variable "postgrest_memory" {
+  type        = number
+  description = "the number of instances of the postgrest application to run (default: 2)"
+  default     = 1024
+}
+
 variable "swagger_instances" {
   type        = number
   description = "the number of instances of the swagger application to run (default: 2)"
diff --git a/terraform/staging/staging.tf b/terraform/staging/staging.tf
index 4627aec0bf..3b70097824 100644
--- a/terraform/staging/staging.tf
+++ b/terraform/staging/staging.tf
@@ -8,10 +8,12 @@ module "staging" {
 
   database_plan         = "medium-gp-psql"
   postgrest_instances   = 1
+  postgrest_memory      = 512
   swagger_instances     = 1
   https_proxy_instances = 1
   smtp_proxy_instances  = 1
   clamav_instances      = 1
+  clamav_memory         = 2048
   clamav_fs_instances   = 1
   recursive_delete      = true
   json_params = jsonencode(