Merge branch 'main' into PLT-1112

Author: christopher-maboh

scripts/prewarm.sql

@@ -25,6 +25,7 @@ CREATE TEMP TABLE warmrels AS
   JOIN pg_user u ON u.usesysid = c.relowner
   WHERE u.usename NOT IN ('rdsadmin', 'rdsrepladmin', ' pg_signal_backend', 'rds_superuser', 'rds_replication')
   AND c.relkind NOT IN ('v', 'I', 'p')
+  AND c.relpages > 0
   ORDER BY c.relpages ASC;
 SELECT * FROM warmrels;
 

terraform/modules/firewall/variables.tf

@@ -8,11 +8,11 @@ variable "app" {
 }
 
 variable "env" {
-  description = "The application environment (dev, test, sbx, prod)"
+  description = "The application environment (dev, test, sbx, sandbox, prod)"
   type        = string
   validation {
-    condition     = contains(["dev", "test", "sbx", "prod"], var.env)
-    error_message = "Valid value for env is dev, test, sbx, or prod."
+    condition     = contains(["dev", "test", "sbx", "sandbox", "prod"], var.env)
+    error_message = "Valid value for env is dev, test, sbx, sandbox, or prod."
   }
 }