From 93b838ff7cdc51773a26d4e6ec848820c64a560c Mon Sep 17 00:00:00 2001
From: Aleksey Veresov <aleksey@veresov.pro>
Date: Wed, 17 Jul 2024 18:07:03 +0200
Subject: [PATCH] Create aliases for variable_api

---
 python/hopsworks/core/variable_api.py        | 24 +++++++
 python/hopsworks_common/client/exceptions.py |  1 -
 python/hopsworks_common/core/variable_api.py |  5 +-
 python/hsfs/core/variable_api.py             | 68 ++------------------
 4 files changed, 34 insertions(+), 64 deletions(-)
 create mode 100644 python/hopsworks/core/variable_api.py

diff --git a/python/hopsworks/core/variable_api.py b/python/hopsworks/core/variable_api.py
new file mode 100644
index 000000000..9d6e9765f
--- /dev/null
+++ b/python/hopsworks/core/variable_api.py
@@ -0,0 +1,24 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+from hopsworks_common.core.variable_api import (
+    VariableApi,
+)
+
+
+__all__ = [
+    VariableApi,
+]
diff --git a/python/hopsworks_common/client/exceptions.py b/python/hopsworks_common/client/exceptions.py
index 454b0c025..4e8ba9b08 100644
--- a/python/hopsworks_common/client/exceptions.py
+++ b/python/hopsworks_common/client/exceptions.py
@@ -14,7 +14,6 @@
 #   limitations under the License.
 #
 
-
 from __future__ import annotations
 
 from enum import Enum
diff --git a/python/hopsworks_common/core/variable_api.py b/python/hopsworks_common/core/variable_api.py
index d4e8d188c..7b3c74575 100644
--- a/python/hopsworks_common/core/variable_api.py
+++ b/python/hopsworks_common/core/variable_api.py
@@ -13,13 +13,14 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
+
 from __future__ import annotations
 
 import re
 from typing import Optional, Tuple
 
-from hopsworks import client
-from hopsworks.client.exceptions import RestAPIError
+from hopsworks_common import client
+from hopsworks_common.client.exceptions import RestAPIError
 
 
 class VariableApi:
diff --git a/python/hsfs/core/variable_api.py b/python/hsfs/core/variable_api.py
index b499bd9b4..9d6e9765f 100644
--- a/python/hsfs/core/variable_api.py
+++ b/python/hsfs/core/variable_api.py
@@ -1,5 +1,5 @@
 #
-#   Copyright 2022 Hopsworks AB
+#   Copyright 2024 Hopsworks AB
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -13,66 +13,12 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
-from __future__ import annotations
 
-import re
+from hopsworks_common.core.variable_api import (
+    VariableApi,
+)
 
-from hsfs import client
-from hsfs.client.exceptions import RestAPIError
 
-
-class VariableApi:
-    def get_version(self, software: str):
-        _client = client.get_instance()
-        path_params = [
-            "variables",
-            "versions",
-        ]
-
-        resp = _client._send_request("GET", path_params)
-        for entry in resp:
-            if entry["software"] == software:
-                return entry["version"]
-        return None
-
-    def parse_major_and_minor(self, backend_version):
-        version_pattern = r"(\d+)\.(\d+)"
-        matches = re.match(version_pattern, backend_version)
-
-        return matches.group(1), matches.group(2)
-
-    def get_flyingduck_enabled(self):
-        _client = client.get_instance()
-        path_params = [
-            "variables",
-            "enable_flyingduck",
-        ]
-
-        resp = _client._send_request("GET", path_params)
-        return resp["successMessage"] == "true"
-
-    def get_loadbalancer_external_domain(self):
-        _client = client.get_instance()
-        path_params = [
-            "variables",
-            "loadbalancer_external_domain",
-        ]
-
-        try:
-            resp = _client._send_request("GET", path_params)
-            return resp["successMessage"]
-        except RestAPIError:
-            return ""
-
-    def get_service_discovery_domain(self):
-        _client = client.get_instance()
-        path_params = [
-            "variables",
-            "service_discovery_domain",
-        ]
-
-        try:
-            resp = _client._send_request("GET", path_params)
-            return resp["successMessage"]
-        except RestAPIError:
-            return ""
+__all__ = [
+    VariableApi,
+]