Merge branch 'main' into 2734-acct-access-page

Enterprise-CMCS · Jan 14, 2025 · 31b7ff9 · 31b7ff9
2 parents 9465d5b + 12199b7
commit 31b7ff9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/solution/backend/cmcs_regulations/settings/deploy.py b/solution/backend/cmcs_regulations/settings/deploy.py
@@ -14,7 +14,7 @@
         **default_database_values,
         'NAME': os.environ.get('DB_NAME', 'eregs'),
         'OPTIONS': {
-            'connect_timeout': 20,
+            'connect_timeout': 10,
         },
     },
     'postgres': {

diff --git a/solution/backend/serverless.yml b/solution/backend/serverless.yml
@@ -251,6 +251,7 @@ resources:
         Family: aurora-postgresql15
         Parameters:
           rds.force_ssl: 1
+          statement_timeout: 10000  # Required for ATO compliance
 
     AuroraRDSInstanceParameter15:
       Type: AWS::RDS::DBParameterGroup
@@ -272,7 +273,7 @@ resources:
           random_page_cost: 1
           track_activity_query_size: 16384
           idle_in_transaction_session_timeout: 7200000
-          statement_timeout: 20000
+          statement_timeout: 10000  # Required for ATO compliance
           search_path: '"$user",public'
           log_hostname: 1
           pgaudit.role: "rds_pgaudit"
@@ -292,7 +293,7 @@ resources:
         DBSubnetGroupName:
           Ref: DBSubnetGroup
         Engine: aurora-postgresql
-        EngineVersion: "15.2"
+        EngineVersion: "15.8"
         DatabaseName: 'eregs'
         BackupRetentionPeriod: 7
         DBClusterParameterGroupName:
@@ -306,7 +307,7 @@ resources:
         DBInstanceClass: db.r6g.large
         StorageEncrypted: true
         Engine: aurora-postgresql
-        EngineVersion: "15.2"
+        EngineVersion: "15.8"
         PubliclyAccessible: false
         DBParameterGroupName:
           Ref: AuroraRDSInstanceParameter15