Use proper endpoint to retrive the online storage connector

logicalclocks · Dec 9, 2020 · cf91299 · cf91299
1 parent 5ed9d60
commit cf91299
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/java/src/main/java/com/logicalclocks/hsfs/metadata/StorageConnectorApi.java b/java/src/main/java/com/logicalclocks/hsfs/metadata/StorageConnectorApi.java
@@ -26,15 +26,13 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.util.Arrays;
 
 public class StorageConnectorApi {
 
   private static final String CONNECTOR_PATH = "/storageconnectors";
   private static final String CONNECTOR_TYPE_PATH =
       CONNECTOR_PATH + "{/connType}{/name}{?temporaryCredentials}";
   private static final String ONLINE_CONNECTOR_PATH = CONNECTOR_PATH + "/onlinefeaturestore";
-  private static final String ONLINE_FEATURE_STORE_CONNECTOR_SUFFIX = "_onlinefeaturestore";
 
   private static final Logger LOGGER = LoggerFactory.getLogger(StorageConnectorApi.class);
 
@@ -62,17 +60,14 @@ public StorageConnector getOnlineStorageConnector(FeatureStore featureStore)
     HopsworksClient hopsworksClient = HopsworksClient.getInstance();
     String pathTemplate = HopsworksClient.PROJECT_PATH
         + FeatureStoreApi.FEATURE_STORE_PATH
-        + CONNECTOR_PATH;
+        + ONLINE_CONNECTOR_PATH;
 
     String uri = UriTemplate.fromTemplate(pathTemplate)
         .set("projectId", featureStore.getProjectId())
         .set("fsId", featureStore.getId())
         .expand();
 
     LOGGER.info("Sending metadata request: " + uri);
-    StorageConnector[] storageConnectors = hopsworksClient.handleRequest(new HttpGet(uri), StorageConnector[].class);
-    return Arrays.stream(storageConnectors).filter(s -> s.getName().contains(ONLINE_FEATURE_STORE_CONNECTOR_SUFFIX))
-        .findFirst()
-        .orElseThrow(() -> new FeatureStoreException("Could not find online storage connector"));
+    return hopsworksClient.handleRequest(new HttpGet(uri), StorageConnector.class);
   }
 }
diff --git a/python/hsfs/core/storage_connector_api.py b/python/hsfs/core/storage_connector_api.py
@@ -56,15 +56,9 @@ def get_online_connector(self):
             "featurestores",
             self._feature_store_id,
             "storageconnectors",
+            "onlinefeaturestore",
         ]
 
-        result = [
-            conn
-            for conn in _client._send_request("GET", path_params)
-            if self.CONST_ONLINE_FEATURE_STORE_CONNECTOR_SUFFIX in conn["name"]
-        ]
-
-        if len(result) > 0:
-            return storage_connector.StorageConnector.from_response_json(result[0])
-        else:
-            raise Exception("Could not find online storage connector")
+        return storage_connector.StorageConnector.from_response_json(
+            _client._send_request("GET", path_params)
+        )