From 03ffaed8ac026eaf730967e0157a46c56d868b0a Mon Sep 17 00:00:00 2001 From: Brijesh Vora Date: Mon, 18 Mar 2024 16:13:56 -0500 Subject: [PATCH 1/2] SAASMLOPS-1208 fix hashlib md5 errors in FIPS for python 3.9+ Signed-off-by: Brijesh Vora --- sdk/python/feast/usage.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/sdk/python/feast/usage.py b/sdk/python/feast/usage.py index 18bb497182c..867f195646e 100644 --- a/sdk/python/feast/usage.py +++ b/sdk/python/feast/usage.py @@ -40,6 +40,20 @@ _is_enabled = os.getenv(FEAST_USAGE, default=DEFAULT_FEAST_USAGE_VALUE) == "True" +if sys.version_info >= (3, 9): + _md5 = hashlib.md5( + ",".join( + sorted([k for k in os.environ.keys() if not k.startswith("FEAST")]) + ).encode(), + usedforsecurity=False, + ).hexdigest() +else: + _md5 = hashlib.md5( + ",".join( + sorted([k for k in os.environ.keys() if not k.startswith("FEAST")]) + ).encode() + ).hexdigest() + _constant_attributes = { "project_id": "", "session_id": str(uuid.uuid4()), @@ -47,11 +61,7 @@ "version": get_version(), "python_version": platform.python_version(), "platform": platform.platform(), - "env_signature": hashlib.md5( - ",".join( - sorted([k for k in os.environ.keys() if not k.startswith("FEAST")]) - ).encode() - ).hexdigest(), + "env_signature": _md5, } APPLICATION_NAME = "feast-dev/feast" From e6b527b271e85f12661f4415aab91b402e60461e Mon Sep 17 00:00:00 2001 From: Brijesh Vora Date: Tue, 19 Mar 2024 08:41:38 -0500 Subject: [PATCH 2/2] SAASMLOPS-1208 drop the version check Signed-off-by: Brijesh Vora --- sdk/python/feast/usage.py | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/sdk/python/feast/usage.py b/sdk/python/feast/usage.py index 867f195646e..c6919eed4cb 100644 --- a/sdk/python/feast/usage.py +++ b/sdk/python/feast/usage.py @@ -40,20 +40,6 @@ _is_enabled = os.getenv(FEAST_USAGE, default=DEFAULT_FEAST_USAGE_VALUE) == "True" -if sys.version_info >= (3, 9): - _md5 = hashlib.md5( - ",".join( - sorted([k for k in os.environ.keys() if not k.startswith("FEAST")]) - ).encode(), - usedforsecurity=False, - ).hexdigest() -else: - _md5 = hashlib.md5( - ",".join( - sorted([k for k in os.environ.keys() if not k.startswith("FEAST")]) - ).encode() - ).hexdigest() - _constant_attributes = { "project_id": "", "session_id": str(uuid.uuid4()), @@ -61,7 +47,12 @@ "version": get_version(), "python_version": platform.python_version(), "platform": platform.platform(), - "env_signature": _md5, + "env_signature": hashlib.md5( + ",".join( + sorted([k for k in os.environ.keys() if not k.startswith("FEAST")]) + ).encode(), + usedforsecurity=False, + ).hexdigest(), } APPLICATION_NAME = "feast-dev/feast"