Merge branch 'feast-dev:master' into auth_k8s

dmartinol · Nov 26, 2024 · cff7521 · cff7521
2 parents 6fba0f9 + d2ba4ef
commit cff7521
Show file tree

Hide file tree

Showing 15 changed files with 276 additions and 251 deletions.
diff --git a/sdk/python/feast/driver_test_data.py b/sdk/python/feast/driver_test_data.py
@@ -2,10 +2,10 @@
 import itertools
 from datetime import timedelta, timezone
 from enum import Enum
+from zoneinfo import ZoneInfo
 
 import numpy as np
 import pandas as pd
-from zoneinfo import ZoneInfo
 
 from feast.infra.offline_stores.offline_utils import (
     DEFAULT_ENTITY_DF_EVENT_TIMESTAMP_COL,

diff --git a/sdk/python/feast/infra/offline_stores/contrib/trino_offline_store/trino.py b/sdk/python/feast/infra/offline_stores/contrib/trino_offline_store/trino.py
@@ -65,8 +65,8 @@ class JWTAuthModel(FeastConfigBaseModel):
 
 
 class CertificateAuthModel(FeastConfigBaseModel):
-    cert: FilePath = Field(default=None, alias="cert-file")
-    key: FilePath = Field(default=None, alias="key-file")
+    cert: Optional[FilePath] = Field(default=None, alias="cert-file")
+    key: Optional[FilePath] = Field(default=None, alias="key-file")
 
 
 CLASSES_BY_AUTH_TYPE = {

diff --git a/sdk/python/feast/registry_server.py b/sdk/python/feast/registry_server.py
@@ -792,9 +792,10 @@ def start_server(
     reflection.enable_server_reflection(service_names_available_for_reflection, server)
 
     if tls_cert_path and tls_key_path:
-        with open(tls_cert_path, "rb") as cert_file, open(
-            tls_key_path, "rb"
-        ) as key_file:
+        with (
+            open(tls_cert_path, "rb") as cert_file,
+            open(tls_key_path, "rb") as key_file,
+        ):
             certificate_chain = cert_file.read()
             private_key = key_file.read()
             server_credentials = grpc.ssl_server_credentials(