fix ulid regex

Panaetius · Panaetius · commit dab2f8eddc75 · 2024-08-13T15:30:01.000+02:00
diff --git a/bases/renku_data_services/data_api/app.py b/bases/renku_data_services/data_api/app.py
@@ -26,7 +26,7 @@
 
 def register_all_handlers(app: Sanic, config: Config) -> Sanic:
     """Register all handlers on the application."""
-    app.router.register_pattern("ulid", ULID.from_str, r"^[0-9A-HJKMNP-TV-Z]{26}$")
+    app.router.register_pattern("ulid", ULID.from_str, r"^[0-7][0-9A-HJKMNP-TV-Z]{25}$")
     app.router.register_pattern("renku_slug", str, r"^[a-zA-Z0-9][a-zA-Z0-9\-_.]*$")
 
     url_prefix = "/api/data"
diff --git a/components/renku_data_services/connected_services/api.spec.yaml b/components/renku_data_services/connected_services/api.spec.yaml
@@ -309,7 +309,7 @@ components:
       type: string
       minLength: 26
       maxLength: 26
-      pattern: "^[A-Z0-9]{26}$"  # This is case-insensitive
+      pattern: "^[0-7][0-9A-HJKMNP-TV-Z]{25}$"  # This is case-insensitive
     ProviderId:
       description: ID of a OAuth2 provider, e.g. "gitlab.com".
       type: string
diff --git a/components/renku_data_services/connected_services/apispec.py b/components/renku_data_services/connected_services/apispec.py
@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  api.spec.yaml
-#   timestamp: 2024-08-06T05:55:35+00:00
+#   timestamp: 2024-08-13T13:29:50+00:00
 
 from __future__ import annotations
 
@@ -153,7 +153,7 @@ class Connection(BaseAPISpec):
         description="ULID identifier",
         max_length=26,
         min_length=26,
-        pattern="^[A-Z0-9]{26}$",
+        pattern="^[0-7][0-9A-HJKMNP-TV-Z]{25}$",
     )
     provider_id: str = Field(
         ...,
diff --git a/components/renku_data_services/crc/apispec.py b/components/renku_data_services/crc/apispec.py
@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  api.spec.yaml
-#   timestamp: 2024-08-07T07:12:13+00:00
+#   timestamp: 2024-08-13T13:29:45+00:00
 
 from __future__ import annotations
 
diff --git a/components/renku_data_services/namespace/api.spec.yaml b/components/renku_data_services/namespace/api.spec.yaml
@@ -365,7 +365,7 @@ components:
       type: string
       minLength: 26
       maxLength: 26
-      pattern: "^[A-Z0-9]{26}$"  # This is case-insensitive
+      pattern: "^[0-7][0-9A-HJKMNP-TV-Z]{25}$"  # This is case-insensitive
     NamespaceName:
       description: Renku group or namespace name
       type: string
diff --git a/components/renku_data_services/namespace/apispec.py b/components/renku_data_services/namespace/apispec.py
@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  api.spec.yaml
-#   timestamp: 2024-08-06T08:46:00+00:00
+#   timestamp: 2024-08-13T13:29:48+00:00
 
 from __future__ import annotations
 
@@ -29,7 +29,7 @@ class NamespaceResponse(BaseAPISpec):
         description="ULID identifier",
         max_length=26,
         min_length=26,
-        pattern="^[A-Z0-9]{26}$",
+        pattern="^[0-7][0-9A-HJKMNP-TV-Z]{25}$",
     )
     name: Optional[str] = Field(
         None,
@@ -93,7 +93,7 @@ class GroupResponse(BaseAPISpec):
         description="ULID identifier",
         max_length=26,
         min_length=26,
-        pattern="^[A-Z0-9]{26}$",
+        pattern="^[0-7][0-9A-HJKMNP-TV-Z]{25}$",
     )
     name: str = Field(
         ...,
diff --git a/components/renku_data_services/notebooks/apispec.py b/components/renku_data_services/notebooks/apispec.py
@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  api.spec.yaml
-#   timestamp: 2024-08-06T05:55:38+00:00
+#   timestamp: 2024-08-13T13:29:51+00:00
 
 from __future__ import annotations
 
diff --git a/components/renku_data_services/platform/apispec.py b/components/renku_data_services/platform/apispec.py
@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  api.spec.yaml
-#   timestamp: 2024-08-06T05:55:39+00:00
+#   timestamp: 2024-08-13T13:29:52+00:00
 
 from __future__ import annotations
 
diff --git a/components/renku_data_services/project/api.spec.yaml b/components/renku_data_services/project/api.spec.yaml
@@ -360,7 +360,7 @@ components:
       type: string
       minLength: 26
       maxLength: 26
-      pattern: "^[A-Z0-9]{26}$" # This is case-insensitive
+      pattern: "^[0-7][0-9A-HJKMNP-TV-Z]{25}$" # This is case-insensitive
     ProjectName:
       description: Renku project name
       type: string
diff --git a/components/renku_data_services/project/apispec.py b/components/renku_data_services/project/apispec.py
@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  api.spec.yaml
-#   timestamp: 2024-08-06T05:55:31+00:00
+#   timestamp: 2024-08-13T13:29:47+00:00
 
 from __future__ import annotations
 
@@ -112,7 +112,7 @@ class Project(BaseAPISpec):
         description="ULID identifier",
         max_length=26,
         min_length=26,
-        pattern="^[A-Z0-9]{26}$",
+        pattern="^[0-7][0-9A-HJKMNP-TV-Z]{25}$",
     )
     name: str = Field(
         ...,
diff --git a/components/renku_data_services/repositories/api.spec.yaml b/components/renku_data_services/repositories/api.spec.yaml
@@ -103,7 +103,7 @@ components:
       type: string
       minLength: 26
       maxLength: 26
-      pattern: "^[A-Z0-9]{26}$"  # This is case-insensitive
+      pattern: "^[0-7][0-9A-HJKMNP-TV-Z]{25}$"  # This is case-insensitive
     ProviderId:
       description: ID of a OAuth2 provider, e.g. "gitlab.com".
       type: string
diff --git a/components/renku_data_services/repositories/apispec.py b/components/renku_data_services/repositories/apispec.py
@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  api.spec.yaml
-#   timestamp: 2024-08-06T05:55:37+00:00
+#   timestamp: 2024-08-13T13:29:50+00:00
 
 from __future__ import annotations
 
@@ -61,6 +61,6 @@ class RepositoryProviderMatch(BaseAPISpec):
         description="ULID identifier",
         max_length=26,
         min_length=26,
-        pattern="^[A-Z0-9]{26}$",
+        pattern="^[0-7][0-9A-HJKMNP-TV-Z]{25}$",
     )
     repository_metadata: Optional[RepositoryMetadata] = None
diff --git a/components/renku_data_services/secrets/api.spec.yaml b/components/renku_data_services/secrets/api.spec.yaml
@@ -89,7 +89,7 @@ components:
       type: string
       minLength: 26
       maxLength: 26
-      pattern: "^[A-Z0-9]{26}$"  # This is case-insensitive
+      pattern: "^[0-7][0-9A-HJKMNP-TV-Z]{25}$"  # This is case-insensitive
     ErrorResponse:
       type: object
       properties:
diff --git a/components/renku_data_services/secrets/apispec.py b/components/renku_data_services/secrets/apispec.py
@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  api.spec.yaml
-#   timestamp: 2024-08-06T05:55:34+00:00
+#   timestamp: 2024-08-13T13:29:49+00:00
 
 from __future__ import annotations
 
@@ -20,7 +20,7 @@ class Ulid(RootModel[str]):
         description="ULID identifier",
         max_length=26,
         min_length=26,
-        pattern="^[A-Z0-9]{26}$",
+        pattern="^[0-7][0-9A-HJKMNP-TV-Z]{25}$",
     )
 
 
diff --git a/components/renku_data_services/session/api.spec.yaml b/components/renku_data_services/session/api.spec.yaml
@@ -430,7 +430,7 @@ components:
       type: string
       minLength: 26
       maxLength: 26
-      pattern: "^[A-Z0-9]{26}$" # This is case-insensitive
+      pattern: "^[0-7][0-9A-HJKMNP-TV-Z]{25}$" # This is case-insensitive
     SessionName:
       description: Renku session name
       type: string
diff --git a/components/renku_data_services/storage/apispec.py b/components/renku_data_services/storage/apispec.py
@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  api.spec.yaml
-#   timestamp: 2024-08-06T05:55:29+00:00
+#   timestamp: 2024-08-13T13:29:46+00:00
 
 from __future__ import annotations
 
diff --git a/components/renku_data_services/users/api.spec.yaml b/components/renku_data_services/users/api.spec.yaml
@@ -430,7 +430,7 @@ components:
       type: string
       minLength: 26
       maxLength: 26
-      pattern: "^[A-Z0-9]{26}$"  # This is case-insensitive
+      pattern: "^[0-7][0-9A-HJKMNP-TV-Z]{25}$"  # This is case-insensitive
     ModificationDate:
       description: The date and time the secret was created or modified (this is always in UTC)
       type: string
diff --git a/components/renku_data_services/users/apispec.py b/components/renku_data_services/users/apispec.py
@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  api.spec.yaml
-#   timestamp: 2024-08-06T11:43:01+00:00
+#   timestamp: 2024-08-13T13:29:47+00:00
 
 from __future__ import annotations
 
@@ -149,7 +149,7 @@ class SecretWithId(BaseAPISpec):
         description="ULID identifier",
         max_length=26,
         min_length=26,
-        pattern="^[A-Z0-9]{26}$",
+        pattern="^[0-7][0-9A-HJKMNP-TV-Z]{25}$",
     )
     name: str = Field(
         ...,
