Merge pull request #791 from uw-it-aca/feature/msca-shared-drive-delete

python 3.12, django-container 3.0, bump dependencies

Author: mikeseibel

Dockerfile

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

docker/prod-values.yml

@@ -109,6 +109,8 @@ environmentVariables:
     value: PROD
   - name: UWNETID_ENV
     value: PROD
+  - name: MSCA_ENV
+    value: PROD
   - name: MSCA_TIMEOUT
     value: "60"
   - name: AUTH

docker/test-values.yml

@@ -105,7 +105,7 @@ environmentVariables:
   - name: UWNETID_ENV
     value: EVAL
   - name: MSCA_ENV
-    value: PROD
+    value: EVAL
   - name: MSCA_TIMEOUT
     value: "60"
   - name: AUTH

endorsement/resources/pws/file/identity/v2/person/jfaculty/full.json

@@ -23,16 +23,24 @@
     "EmployeePersonAffiliation":{
         "EmployeeID":"100000002",
         "EmployeeWhitePages":{
-            "Addresses":["237 Denny, C-3175, 4333 Brooklyn Ave NE, Seattle, WA 98195"],
-            "Departments": ["University Computing Services"],
-            "EmailAddresses": ["jfaculty@uw.edu"],
-            "Faxes": ["+1 206 123-4321"],
-            "Name":"JAMES FACULTY",
-            "Phones": ["+1 206 123-1234", "+1 206 543-1234"],
-            "PublishInDirectory":false,
-            "Positions": ["Systems Engineer"],
-            "TouchDials":[],
-            "VoiceMails":[]},
+          "Name": "Faculty, James",
+          "Positions": [
+            {"EWPDept":"Family Medicine",
+             "EWPTitle":"Associate Professor",
+             "Primary":true},
+            {"EWPDept":"Family Medicine",
+             "EWPTitle":"Associate Professor - Non Salaried",
+             "Primary":false}],
+          "VoiceMails": ["+1 425 222-2222"],
+          "EmailAddresses": ["jfaculty@uw.edu"],
+          "PublishInDirectory": true,
+          "Pagers": [],
+          "Faxes": ["+1 425 111-1111"],
+          "Addresses": ["Seattle, WA 98105"],
+          "Phones": ["+1 206 333-3333",
+                     "+1 425 555-1236"],
+          "Mobiles": ["+1 425 666-6666"]
+        },
         "HomeDepartment":"CSE",
         "MailStop":"359540"}
     }

endorsement/resources/pws/file/identity/v2/person/jstaff/full.json

@@ -14,16 +14,21 @@
         "EmployeePersonAffiliation": {
             "EmployeeID": "100000001",
             "EmployeeWhitePages": {
+                "Name": "Staff, James",
+                "Positions": [
+                    {"EWPDept":"University Computing Services",
+                     "EWPTitle":"Systems Engineer",
+                     "Primary":true}],
+                "EmailAddresses": ["jstaff@washington.edu"],
+                "VoiceMails": ["+1 425 222-2222"],
                 "Addresses": ["237 Denny, C-3175, 4333 Brooklyn Ave NE, Seattle, WA 98195"],
-                "Departments": ["University Computing Services"],
-                "EmailAddresses": ["jstaff@uw.edu"],
-                "Faxes": ["+1 206 123-4321"],
-                "Name": "JAMES STAFF",
-                "Phones": ["+1 206 123-1234", "+1 206 543-1234"],
-                "PublishInDirectory": false,
-                "Positions": ["Systems Engineer"],
-                "TouchDials": [],
-                "VoiceMails": []
+                "PublishInDirectory": true,
+                "Pagers": [],
+                "Faxes": ["+1 425 111-1111"],
+                "Addresses": ["Seattle, WA 98105"],
+                "Phones": ["+1 206 333-3333",
+                           "+1 425 555-1236"],
+                "Mobiles": ["+1 425 666-6666"]
             },
             "HomeDepartment": "OVP OF UW IT",
             "MailStop": "359540"

endorsement/services/__init__.py

@@ -147,7 +147,7 @@ def valid_supported_role(self, resource):
         try:
             roles = self.shared_params['roles']
             return (roles == '*' or (
-                type(roles) == list and resource.role in roles))
+                type(roles) is list and resource.role in roles))
         except KeyError:
             return False
 
@@ -163,7 +163,7 @@ def valid_supported_type(self, resource):
         try:
             types = self.shared_params['types']
             return (types == '*' or (
-                type(types) == list
+                type(types) is list
                 and resource.netid_type
                 and resource.netid_type in types
                 and len(resource.netid_type) <= max_length))
@@ -176,7 +176,7 @@ def invalid_supported_category(self, supported):
         # shared clinical netids are uniformly disallowed by policy
         try:
             types = self.shared_params['types']
-            if ((types == '*' or (type(types) == list and 'shared' in types))
+            if ((types == '*' or (type(types) is list and 'shared' in types))
                     and supported.netid_type == 'shared'):
                 categories += [Category.ALTID_SHARED_CLINICAL_1]
         except KeyError:

endorsement/test/api/__init__.py

@@ -35,14 +35,14 @@
 }
 standard_test_override = override_settings(
     DEBUG=True,
-    MIDDLEWARE_CLASSES=(Session,
-                        Common,
-                        CsrfView,
-                        Auth,
-                        RemoteUser,
-                        Message,
-                        XFrame,
-                        UserService,),
+    MIDDLEWARE=(Session,
+                Common,
+                CsrfView,
+                Auth,
+                RemoteUser,
+                Message,
+                XFrame,
+                UserService,),
     AUTHENTICATION_BACKENDS=(AUTH_BACKEND,))
 
 
@@ -81,5 +81,5 @@ def set_userservice_override(self, username):
 
             resp = self.client.post(reverse("userservice_override"),
                                     {"override_as": username})
-            self.assertEquals(resp.status_code, 200)
+            self.assertEqual(resp.status_code, 200)
             self.process_request()

endorsement/test/api/test_accept.py

@@ -34,7 +34,7 @@ def test_acceptance(self):
 
         response = self.client.post(url, data, content_type='application/json')
 
-        self.assertEquals(response.status_code, 200)
+        self.assertEqual(response.status_code, 200)
         data = json.loads(response.content)
         self.assertEqual(data['accept_id'], endorsement.accept_id)
         self.assertEqual(data['service_tag'], 'o365')

endorsement/test/api/test_endorse.py

@@ -26,7 +26,7 @@ def test_invalid_endorser(self):
 
         response = self.client.post(
             url, json.dumps(endorse_data), content_type='application/json')
-        self.assertEquals(response.status_code, 401)
+        self.assertEqual(response.status_code, 401)
 
     def test_invalid_endorsee(self):
         self.set_user('jstaff')
@@ -47,7 +47,7 @@ def test_invalid_endorsee(self):
 
         response = self.client.post(
             url, json.dumps(endorse_data), content_type='application/json')
-        self.assertEquals(response.status_code, 200)
+        self.assertEqual(response.status_code, 200)
         data = json.loads(response.content)
         self.assertTrue('error' in data['endorsed']['endorsee99'])
 
@@ -70,7 +70,7 @@ def test_invalid_service(self):
 
         response = self.client.post(
             url, json.dumps(endorse_data), content_type='application/json')
-        self.assertEquals(response.status_code, 200)
+        self.assertEqual(response.status_code, 200)
         data = json.loads(response.content)
         self.assertFalse('mumble' in data['endorsed']['endorsee2'])
 
@@ -96,7 +96,7 @@ def test_valid_override(self):
 
         response = self.client.post(
             url, json.dumps(endorse_data), content_type='application/json')
-        self.assertEquals(response.status_code, 200)
+        self.assertEqual(response.status_code, 200)
 
 
 class TestEndorsementSupportEndorseAPI(EndorsementApiTest):
@@ -124,4 +124,4 @@ def test_valid_override(self):
 
         response = self.client.post(
             url, json.dumps(endorse_data), content_type='application/json')
-        self.assertEquals(response.status_code, 401)
+        self.assertEqual(response.status_code, 401)

endorsement/test/api/test_endorsed.py

@@ -11,6 +11,6 @@ def test_none_endorsed(self):
         self.set_user('jfaculty')
         url = reverse('endorsed_api')
         response = self.client.get(url)
-        self.assertEquals(response.status_code, 200)
+        self.assertEqual(response.status_code, 200)
         data = json.loads(response.content)
         self.assertEqual(len(data['endorsed']), 0)