Merge branch 'qa' into feature/MUWM-5233

Dockerfile

@@ -1,4 +1,4 @@
-ARG DJANGO_CONTAINER_VERSION=2.0.5
+ARG DJANGO_CONTAINER_VERSION=2.0.8
 FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-container:${DJANGO_CONTAINER_VERSION} AS app-prewebpack-container
 
 USER root

docker/prod-values.yml

@@ -1,15 +1,15 @@
 autoscaling:
   enabled: true
-  minReplicas: 4
-  maxReplicas: 150
+  minReplicas: 30
+  maxReplicas: 200
 targetAverageUtilization: 100
 resources:
   limits:
     cpu: 1.0
-    memory: 1.0Gi
+    memory: 1152Mi
   requests:
-    cpu: 256m
-    memory: 0.6Gi
+    cpu: 384m
+    memory: 768Mi
 affinity:
    podsSpanNodes: true
 ingress:
@@ -238,7 +238,7 @@ environmentVariables:
   - name: CANVAS_TIMEOUT
     value: "60"
   - name: CANVAS_POOL_SIZE
-    value: "15"
+    value: "25"
 
   - name: CODA_ENV
     value: PROD
@@ -266,21 +266,21 @@ environmentVariables:
   - name: GWS_TIMEOUT
     value: "5"
   - name: GWS_POOL_SIZE
-    value: "30"
+    value: "50"
 
   - name: HFS_ENV
     value: PROD
   - name: HFS_TIMEOUT
     value: "5"
   - name: HFS_POOL_SIZE
-    value: "30"
+    value: "40"
 
   - name: IASYSTEM_UW_ENV
     value: PROD
   - name: IASYSTEM_UW_TIMEOUT
     value: "10"
   - name: IASYSTEM_UW_POOL_SIZE
-    value: "20"
+    value: "25"
 
   - name: IASYSTEM_UWB_ENV
     value: PROD
@@ -313,16 +313,16 @@ environmentVariables:
   - name: LIBCURRICS_ENV
     value: PROD
   - name: LIBCURRICS_POOL_SIZE
-    value: "20"
+    value: "30"
   - name: LIBCURRICS_TIMEOUT
-    value: "7"
+    value: "5"
 
   - name: LIBRARIES_ENV
     value: PROD
   - name: LIBRARIES_POOL_SIZE
     value: "30"
   - name: LIBRARIES_TIMEOUT
-    value: "7"
+    value: "5"
 
   - name: MAILMAN_ENV
     value: PROD
@@ -343,16 +343,16 @@ environmentVariables:
   - name: PWS_ENV
     value: PROD
   - name: PWS_TIMEOUT
-    value: "10"
+    value: "7"
   - name: PWS_POOL_SIZE
-    value: "30"
+    value: "50"
 
   - name: SDBMYUW_ENV
     value: PROD
   - name: SDBMYUW_POOL_SIZE
-    value: "20"
+    value: "30"
   - name: SDBMYUW_TIMEOUT
-    value: "15"
+    value: "5"
 
   - name: SWS_ENV
     value: PROD
@@ -369,14 +369,14 @@ environmentVariables:
   - name: UPASS_TIMEOUT
     value: "10"
   - name: UPASS_POOL_SIZE
-    value: "20"
+    value: "30"
 
   - name: UWNETID_ENV
     value: PROD
   - name: UWNETID_POOL_SIZE
-    value: "30"
+    value: "40"
   - name: UWNETID_TIMEOUT
-    value: "10"
+    value: "7"
 
   - name: UWIDP_ENV
     value: PROD

docker/settings.py

@@ -1,4 +1,4 @@
-# Copyright 2024 UW-IT, University of Washington
+# Copyright 2025 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from .base_settings import *

docker/test-values.yml

@@ -160,12 +160,12 @@ environmentVariables:
   - name: BOOKSTORE_ENV
     value: PROD
   - name: BOOK_TIMEOUT
-    value: "30"
+    value: "45"
 
   - name: CALENDAR_ENV
     value: PROD
   - name: CALENDAR_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: CANVAS_ENV
     value: PROD
@@ -175,7 +175,7 @@ environmentVariables:
   - name: CODA_ENV
     value: PROD
   - name: CODA_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: GRAD_ENV
     value: PROD
@@ -185,54 +185,54 @@ environmentVariables:
   - name: GRADEPAGE_ENV
     value: PROD
   - name: GRADEPAGE_TIMEOUT
-    value: "5"
+    value: "10"
 
   - name: GWS_ENV
     value: PROD
   - name: GWS_TIMEOUT
-    value: "5"
+    value: "10"
 
   - name: HFS_ENV
     value: PROD
   - name: HFS_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: IASYSTEM_UW_ENV
     value: PROD
   - name: IASYSTEM_UW_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: IASYSTEM_UWB_ENV
     value: PROD
   - name: IASYSTEM_UWB_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: IASYSTEM_UWT_ENV
     value: PROD
   - name: IASYSTEM_UWT_POOL_SIZE
     value: "10"
   - name: IASYSTEM_UWT_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: IASYSTEM_UWEO_AP_ENV
     value: PROD
   - name: IASYSTEM_UWEO_AP_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: IASYSTEM_UWEO_IELP_ENV
     value: PROD
   - name: IASYSTEM_UWEO_IELP_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: LIBCURRICS_ENV
     value: PROD
   - name: LIBCURRICS_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: LIBRARIES_ENV
     value: PROD
   - name: LIBRARIES_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: MAILMAN_ENV
     value: EVAL
@@ -251,19 +251,19 @@ environmentVariables:
   - name: PWS_POOL_SIZE
     value: "20"
   - name: PWS_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: SDBMYUW_ENV
     value: PROD
   - name: SDBMYUW_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: SWS_ENV
     value: EVAL
   - name: SWS_POOL_SIZE
     value: "20"
   - name: SWS_TIMEOUT
-    value: "5"
+    value: "45"
 
   - name: SPACE_ENV
     value: EVAL
@@ -278,7 +278,7 @@ environmentVariables:
   - name: UWNETID_ENV
     value: PROD
   - name: UWNETID_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: UWIDP_ENV
     value: PROD

docker/urls.py

@@ -1,4 +1,4 @@
-# Copyright 2024 UW-IT, University of Washington
+# Copyright 2025 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from .base_urls import *

myuw/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2024 UW-IT, University of Washington
+# Copyright 2025 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 default_app_config = 'myuw.apps.MyUWConfig'

myuw/apps.py

@@ -1,4 +1,4 @@
-# Copyright 2024 UW-IT, University of Washington
+# Copyright 2025 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from __future__ import unicode_literals

myuw/authorization.py

@@ -1,4 +1,4 @@
-# Copyright 2024 UW-IT, University of Washington
+# Copyright 2025 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import re

myuw/context_processors.py

@@ -1,4 +1,4 @@
-# Copyright 2024 UW-IT, University of Washington
+# Copyright 2025 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 # Determins if the requesting device is a native hybrid app (android/ios)

myuw/dao/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2024 UW-IT, University of Washington
+# Copyright 2025 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging
@@ -81,5 +81,5 @@ def _get_file_path(settings_key, filename):
 def log_err(logger, msg_str, stacktrace, request):
     logger.error(
         {**get_userids(request=request),
-         **{'at': msg_str,
-            'err': stacktrace.format_exc(chain=False).splitlines()}})
+         **{'Msg': msg_str,
+            'Err': stacktrace.format_exc(chain=False).splitlines()}})

myuw/dao/admin.py

@@ -1,4 +1,4 @@
-# Copyright 2024 UW-IT, University of Washington
+# Copyright 2025 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging

myuw/dao/adviser.py

@@ -1,4 +1,4 @@
-# Copyright 2024 UW-IT, University of Washington
+# Copyright 2025 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

myuw/dao/affiliation.py

@@ -1,4 +1,4 @@
-# Copyright 2024 UW-IT, University of Washington
+# Copyright 2025 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """
@@ -111,7 +111,7 @@ def get_all_affiliations(request):
             "hxt_viewer": is_hxt_viewer,
             "alum_asso": is_alum_asso(request),
             "alumni": is_alumni(request) and not_major_affi,
-            "retiree": is_retiree(request) and not_major_affi,
+            "retiree": is_retiree(request),
             "past_employee": is_prior_employee(request) and not_major_affi,
             "past_stud": is_prior_student(request) and not_major_affi,
             "no_1st_class_affi": not_major_affi,

myuw/dao/affiliation_data.py

@@ -1,4 +1,4 @@
-# Copyright 2024 UW-IT, University of Washington
+# Copyright 2025 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import os

myuw/dao/applications.py

@@ -1,15 +1,24 @@
-# Copyright 2024 UW-IT, University of Washington
+# Copyright 2025 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging
+from restclients_core.exceptions import DataFailureException
 from uw_sdbmyuw import get_app_status
-from myuw.dao import get_userids
-from myuw.dao.pws import get_student_system_key_of_current_user
+from myuw.dao import get_userids, is_using_file_dao
+from myuw.dao.pws import (
+  get_netid_of_current_user, get_student_system_key_of_current_user)
 
 logger = logging.getLogger(__name__)
 
 
 def get_applications(request):
+    if is_using_file_dao:
+        netid = get_netid_of_current_user(request)
+        if netid == 'jerror':
+            raise DataFailureException(
+                "/sdb_MyUW/appstatus.asp",
+                500, "mock 500 error")
+
     response = []
     system_key = get_student_system_key_of_current_user(request)
     if system_key is not None:

myuw/dao/calendar.py

@@ -1,4 +1,4 @@
-# Copyright 2024 UW-IT, University of Washington
+# Copyright 2025 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import re

myuw/dao/calendar_mapping.py

@@ -1,4 +1,4 @@
-# Copyright 2024 UW-IT, University of Washington
+# Copyright 2025 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import csv

myuw/dao/campus_building.py

@@ -1,4 +1,4 @@
-# Copyright 2024 UW-IT, University of Washington
+# Copyright 2025 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging