DM-39989: Update dependencies

.pre-commit-config.yaml

@@ -15,25 +15,25 @@ repos:
         args: [--fix, --exit-non-zero-on-fix]
 
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 23.7.0
     hooks:
       - id: black
 
   - repo: https://github.com/adamchainz/blacken-docs
     rev: 1.15.0
     hooks:
       - id: blacken-docs
-        additional_dependencies: [black==23.3.0]
+        additional_dependencies: [black==23.7.0]
         args: [-l, '79', -t, py311]
 
   - repo: https://github.com/pre-commit/mirrors-eslint
     rev: v8.44.0
     hooks:
       - id: eslint
         additional_dependencies:
-          - '@babel/eslint-parser@7.21.8'
-          - '@babel/preset-react@7.18.6'
-          - eslint@8.41.0
+          - '@babel/eslint-parser@7.22.7'
+          - '@babel/preset-react@7.22.5'
+          - eslint@8.44.0
           - [email protected]
           - [email protected]
           - [email protected]

requirements/main.in

@@ -15,14 +15,14 @@ uvicorn[standard]
 asyncpg
 bonsai>=1.5.0
 cachetools
-click
+click!=8.1.4  # see https://github.com/pallets/click/issues/2558
 cryptography
 google-cloud-firestore
 httpx
 kopf
 kubernetes_asyncio
 jinja2
-pydantic
+pydantic<2
 PyJWT
 pyyaml
 redis>=4.2.0

src/gafaelfawr/dependencies/auth.py

@@ -223,7 +223,7 @@ async def __call__(
                 "Only required when authenticating with a cookie, such as via"
                 " the JavaScript UI."
             ),
-            example="OmNdVTtKKuK_VuJsGFdrqg",
+            examples=["OmNdVTtKKuK_VuJsGFdrqg"],
         ),
         context: RequestContext = Depends(context_dependency),
     ) -> TokenData:

src/gafaelfawr/dependencies/return_url.py

@@ -68,7 +68,7 @@ async def return_url(
         None,
         title="URL to return to",
         description="User is sent here after operation",
-        example="https://example.com/",
+        examples=["https://example.com/"],
     ),
     context: RequestContext = Depends(context_dependency),
 ) -> str | None:
@@ -99,13 +99,13 @@ async def return_url_with_header(
             "User is sent here after successful authentication. Overrides"
             " `X-Auth-Request-Redirect` if both are set."
         ),
-        example="https://example.com/",
+        examples=["https://example.com/"],
     ),
     x_auth_request_redirect: (str | None) = Header(
         None,
         title="URL to return to",
         description="User is sent here after successful authentication",
-        example="https://example.com/",
+        examples=["https://example.com/"],
     ),
     context: RequestContext = Depends(context_dependency),
 ) -> str | None:
@@ -137,7 +137,7 @@ async def parsed_redirect_uri(
         description=(
             "User is sent here after successful or failed authentication"
         ),
-        example="https://example.com/",
+        examples=["https://example.com/"],
     ),
     context: RequestContext = Depends(context_dependency),
 ) -> ParseResult:

src/gafaelfawr/handlers/analyze.py

@@ -124,7 +124,7 @@ async def post_analyze(
         ...,
         alias="token",
         title="Token to analyze",
-        example="gt-db59fbkT5LrGHvhLMglNWw.G3NEmhWZr8JwO8AQ8sIWpQ",
+        examples=["gt-db59fbkT5LrGHvhLMglNWw.G3NEmhWZr8JwO8AQ8sIWpQ"],
     ),
     context: RequestContext = Depends(context_dependency),
 ) -> dict[str, dict[str, Any]]:

src/gafaelfawr/handlers/api.py

@@ -124,10 +124,10 @@ async def delete_admin(
         ...,
         title="Administrator",
         description="Username of administrator to delete",
-        example="adminuser",
+        examples=["adminuser"],
         min_length=1,
         max_length=64,
-        regex=USERNAME_REGEX,
+        pattern=USERNAME_REGEX,
     ),
     auth_data: TokenData = Depends(authenticate_admin_write),
     context: RequestContext = Depends(context_dependency),
@@ -162,65 +162,65 @@ async def get_admin_token_change_history(
         None,
         title="Cursor",
         description="Pagination cursor",
-        example="1614985055_4234",
-        regex=CURSOR_REGEX,
+        examples=["1614985055_4234"],
+        pattern=CURSOR_REGEX,
     ),
     limit: (int | None) = Query(
         None,
         title="Row limit",
         description="Maximum number of entries to return",
-        example=500,
+        examples=[500],
         ge=1,
     ),
     since: (datetime | None) = Query(
         None,
         title="Not before",
         description="Only show entries at or after this time",
-        example="2021-03-05T14:59:52Z",
+        examples=["2021-03-05T14:59:52Z"],
     ),
     until: (datetime | None) = Query(
         None,
         title="Not after",
         description="Only show entries before or at this time",
-        example="2021-03-05T14:59:52Z",
+        examples=["2021-03-05T14:59:52Z"],
     ),
     username: (str | None) = Query(
         None,
         title="Username",
         description="Only show tokens for this user",
-        example="someuser",
+        examples=["someuser"],
         min_length=1,
         max_length=64,
-        regex=USERNAME_REGEX,
+        pattern=USERNAME_REGEX,
     ),
     actor: (str | None) = Query(
         None,
         title="Actor",
         description="Only show actions performed by this user",
-        example="adminuser",
+        examples=["adminuser"],
         min_length=1,
         max_length=64,
-        regex=ACTOR_REGEX,
+        pattern=ACTOR_REGEX,
     ),
     key: (str | None) = Query(
         None,
         title="Token",
         description="Only show changes for this token",
-        example="dDQg_NTNS51GxeEteqnkag",
+        examples=["dDQg_NTNS51GxeEteqnkag"],
         min_length=22,
         max_length=22,
     ),
     token_type: (TokenType | None) = Query(
         None,
         title="Token type",
         description="Only show tokens of this type",
-        example="user",
+        examples=["user"],
     ),
     ip_address: (str | None) = Query(
         None,
         title="IP or CIDR",
         description="Only show changes from this IP or CIDR block",
-        example="198.51.100.0/24",
+        examples=["198.51.100.0/24"],
     ),
     auth_data: TokenData = Depends(authenticate_admin_read),
     context: RequestContext = Depends(context_dependency),
@@ -384,56 +384,56 @@ async def get_user_token_change_history(
     username: str = Path(
         ...,
         title="Username",
-        example="someuser",
+        examples=["someuser"],
         min_length=1,
         max_length=64,
-        regex=USERNAME_REGEX,
+        pattern=USERNAME_REGEX,
     ),
     cursor: (str | None) = Query(
         None,
         title="Cursor",
         description="Pagination cursor",
-        example="1614985055_4234",
-        regex=CURSOR_REGEX,
+        examples=["1614985055_4234"],
+        pattern=CURSOR_REGEX,
     ),
     limit: (int | None) = Query(
         None,
         title="Row limit",
         description="Maximum number of entries to return",
-        example=500,
+        examples=[500],
         ge=1,
     ),
     since: (datetime | None) = Query(
         None,
         title="Not before",
         description="Only show entries at or after this time",
-        example="2021-03-05T14:59:52Z",
+        examples=["2021-03-05T14:59:52Z"],
     ),
     until: (datetime | None) = Query(
         None,
         title="Not after",
         description="Only show entries before or at this time",
-        example="2021-03-05T14:59:52Z",
+        examples=["2021-03-05T14:59:52Z"],
     ),
     key: (str | None) = Query(
         None,
         title="Token",
         description="Only show changes for this token",
-        example="dDQg_NTNS51GxeEteqnkag",
+        examples=["dDQg_NTNS51GxeEteqnkag"],
         min_length=22,
         max_length=22,
     ),
     token_type: (TokenType | None) = Query(
         None,
         title="Token type",
         description="Only show tokens of this type",
-        example="user",
+        examples=["user"],
     ),
     ip_address: (str | None) = Query(
         None,
         title="IP or CIDR",
         description="Only show changes from this IP or CIDR block",
-        example="198.51.100.0/24",
+        examples=["198.51.100.0/24"],
     ),
     auth_data: TokenData = Depends(authenticate_read),
     context: RequestContext = Depends(context_dependency),
@@ -468,10 +468,10 @@ async def get_tokens(
     username: str = Path(
         ...,
         title="Username",
-        example="someuser",
+        examples=["someuser"],
         min_length=1,
         max_length=64,
-        regex=USERNAME_REGEX,
+        pattern=USERNAME_REGEX,
     ),
     auth_data: TokenData = Depends(authenticate_read),
     context: RequestContext = Depends(context_dependency),
@@ -504,10 +504,10 @@ async def post_tokens(
     username: str = Path(
         ...,
         title="Username",
-        example="someuser",
+        examples=["someuser"],
         min_length=1,
         max_length=64,
-        regex=USERNAME_REGEX,
+        pattern=USERNAME_REGEX,
     ),
     auth_data: TokenData = Depends(authenticate_write),
     context: RequestContext = Depends(context_dependency),
@@ -539,15 +539,15 @@ async def get_token(
     username: str = Path(
         ...,
         title="Username",
-        example="someuser",
+        examples=["someuser"],
         min_length=1,
         max_length=64,
-        regex=USERNAME_REGEX,
+        pattern=USERNAME_REGEX,
     ),
     key: str = Path(
         ...,
         title="Token key",
-        example="GpbIL3_qhgZlpfGTFF",
+        examples=["GpbIL3_qhgZlpfGTFF"],
         min_length=22,
         max_length=22,
     ),
@@ -574,15 +574,15 @@ async def delete_token(
     username: str = Path(
         ...,
         title="Username",
-        example="someuser",
+        examples=["someuser"],
         min_length=1,
         max_length=64,
-        regex=USERNAME_REGEX,
+        pattern=USERNAME_REGEX,
     ),
     key: str = Path(
         ...,
         title="Token key",
-        example="GpbIL3_qhgZlpfGTFF",
+        examples=["GpbIL3_qhgZlpfGTFF"],
         min_length=22,
         max_length=22,
     ),
@@ -619,15 +619,15 @@ async def patch_token(
     username: str = Path(
         ...,
         title="Username",
-        example="someuser",
+        examples=["someuser"],
         min_length=1,
         max_length=64,
-        regex=USERNAME_REGEX,
+        pattern=USERNAME_REGEX,
     ),
     key: str = Path(
         ...,
         title="Token key",
-        example="GpbIL3_qhgZlpfGTFF",
+        examples=["GpbIL3_qhgZlpfGTFF"],
         min_length=22,
         max_length=22,
     ),
@@ -664,15 +664,15 @@ async def get_token_change_history(
     username: str = Path(
         ...,
         title="Username",
-        example="someuser",
+        examples=["someuser"],
         min_length=1,
         max_length=64,
-        regex=USERNAME_REGEX,
+        pattern=USERNAME_REGEX,
     ),
     key: str = Path(
         ...,
         title="Token key",
-        example="GpbIL3_qhgZlpfGTFF",
+        examples=["GpbIL3_qhgZlpfGTFF"],
         min_length=22,
         max_length=22,
     ),