RDBC-954 RemoveConnectionStringByNameOperation

Author: yh-0

ravendb/documents/operations/connection_string/remove_connection_string_by_name_operation.py

@@ -0,0 +1,57 @@
+import json
+import urllib
+from typing import Dict
+
+import requests
+
+from ravendb import RavenCommand, RaftCommand, ServerNode
+from ravendb.documents.operations.definitions import MaintenanceOperation
+from ravendb.util.util import RaftIdGenerator
+from ravendb.serverwide.server_operation_executor import ConnectionStringType
+
+
+class RemoveConnectionStringByNameResult:
+    def __init__(self, raft_command_index: int = None):
+        self.raft_command_index = raft_command_index
+
+    def to_json(self) -> Dict:
+        return {"RaftCommandIndex": self.raft_command_index}
+
+    @classmethod
+    def from_json(cls, json_dict: Dict) -> "RemoveConnectionStringResult":
+        return cls(json_dict["RaftCommandIndex"])
+
+
+class RemoveConnectionStringByNameOperation(MaintenanceOperation[RemoveConnectionStringByNameResult]):
+    def __init__(self, connection_string_name: str, connection_string_type: ConnectionStringType):
+        self._connection_string_name = connection_string_name
+        self._connection_string_type = connection_string_type
+
+    def get_command(self, conventions: "DocumentConventions") -> "RavenCommand[RemoveConnectionStringResult]":
+        return self.RemoveConnectionStringCommand(self._connection_string_name, self._connection_string_type)
+
+    class RemoveConnectionStringCommand(RavenCommand[RemoveConnectionStringByNameResult], RaftCommand):
+        def __init__(self, connection_string_name: str, connection_string_type: ConnectionStringType):
+            super().__init__(RemoveConnectionStringByNameResult)
+            self._connection_string_name = connection_string_name
+            self._connection_string_type = connection_string_type
+
+        def is_read_request(self) -> bool:
+            return False
+
+        def create_request(self, node: ServerNode) -> requests.Request:
+            url = f"{node.url}/databases/{node.database}/admin/connection-strings?connectionString={urllib.parse.quote(self._connection_string_name)}&type={self._connection_string_type.value}"
+
+            request = requests.Request("DELETE")
+            request.url = url
+
+            return request
+
+        def set_response(self, response: str, from_cache: bool) -> None:
+            if response is None:
+                self._throw_invalid_response()
+
+            self.result = RemoveConnectionStringByNameResult.from_json(json.loads(response))
+
+        def get_raft_unique_request_id(self) -> str:
+            return RaftIdGenerator.new_id()

ravendb/documents/operations/connection_string/remove_connection_string_operation.py

@@ -4,7 +4,7 @@
 
 import requests
 
-from ravendb import RavenCommand, RaftCommand, ServerNode
+from ravendb import RavenCommand, RaftCommand, ConnectionString, ServerNode
 from ravendb.documents.operations.definitions import MaintenanceOperation
 from ravendb.util.util import RaftIdGenerator
 from ravendb.serverwide.server_operation_executor import ConnectionStringType
@@ -23,24 +23,22 @@ def from_json(cls, json_dict: Dict) -> "RemoveConnectionStringResult":
 
 
 class RemoveConnectionStringOperation(MaintenanceOperation[RemoveConnectionStringResult]):
-    def __init__(self, connection_string_name: str, connection_string_type: ConnectionStringType):
-        self._connection_string_name = connection_string_name
-        self._connection_string_type = connection_string_type
+    def __init__(self, connection_string: ConnectionString = None):
+        self._connection_string = connection_string
 
     def get_command(self, conventions: "DocumentConventions") -> "RavenCommand[RemoveConnectionStringResult]":
-        return self.RemoveConnectionStringCommand(self._connection_string_name, self._connection_string_type)
+        return self.RemoveConnectionStringCommand(self._connection_string)
 
     class RemoveConnectionStringCommand(RavenCommand[RemoveConnectionStringResult], RaftCommand):
-        def __init__(self, connection_string_name: str, connection_string_type: ConnectionStringType):
+        def __init__(self, connection_string: ConnectionString = None):
             super().__init__(RemoveConnectionStringResult)
-            self._connection_string_name = connection_string_name
-            self._connection_string_type = connection_string_type
+            self._connection_string = connection_string
 
         def is_read_request(self) -> bool:
             return False
 
         def create_request(self, node: ServerNode) -> requests.Request:
-            url = f"{node.url}/databases/{node.database}/admin/connection-strings?connectionString={urllib.parse.quote(self._connection_string_name)}&type={self._connection_string_type.value}"
+            url = f"{node.url}/databases/{node.database}/admin/connection-strings?connectionString={urllib.parse.quote(self._connection_string.name)}&type={self._connection_string.get_type}"
 
             request = requests.Request("DELETE")
             request.url = url

ravendb/tests/jvm_migrated_tests/client_tests/documents_tests/operations_tests/test_connection_string.py

@@ -18,6 +18,9 @@
 from ravendb.documents.operations.connection_string.put_connection_string_operation import (
     PutConnectionStringOperation,
 )
+from ravendb.documents.operations.connection_string.remove_connection_string_by_name_operation import (
+    RemoveConnectionStringByNameOperation,
+)
 from ravendb.documents.operations.connection_string.remove_connection_string_operation import (
     RemoveConnectionStringOperation,
 )
@@ -83,9 +86,7 @@ def test_full_lifecycle_for_all_connection_string_types(self):
         self.assertEqual(1, len(raven_get_result.raven_connection_strings))
 
         # 3. Delete
-        remove_result = self.store.maintenance.send(
-            RemoveConnectionStringOperation("raven1", ConnectionStringType.RAVEN)
-        )
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(raven_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # 4. Get and Assert None
@@ -103,7 +104,7 @@ def test_full_lifecycle_for_all_connection_string_types(self):
         self.assertEqual(1, len(sql_get_result.sql_connection_strings))
 
         # 3. Delete
-        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation("sql1", ConnectionStringType.SQL))
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(sql_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # 4. Get and Assert None
@@ -121,7 +122,7 @@ def test_full_lifecycle_for_all_connection_string_types(self):
         self.assertEqual(1, len(olap_get_result.olap_connection_strings))
 
         # 3. Delete
-        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation("olap1", ConnectionStringType.OLAP))
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(olap_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # 4. Get and Assert None
@@ -140,9 +141,7 @@ def test_full_lifecycle_for_all_connection_string_types(self):
         self.assertEqual(1, len(elastic_get_result.elastic_search_connection_strings))
 
         # 3. Delete
-        remove_result = self.store.maintenance.send(
-            RemoveConnectionStringOperation("elastic1", ConnectionStringType.ELASTIC_SEARCH)
-        )
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(elastic_search_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # 4. Get and Assert None
@@ -164,9 +163,7 @@ def test_full_lifecycle_for_all_connection_string_types(self):
         self.assertEqual(1, len(queue_get_result.queue_connection_strings))
 
         # 3. Delete
-        remove_result = self.store.maintenance.send(
-            RemoveConnectionStringOperation("queue1", ConnectionStringType.QUEUE)
-        )
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(queue_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # 4. Get and Assert None
@@ -186,9 +183,7 @@ def test_full_lifecycle_for_all_connection_string_types(self):
         self.assertEqual(1, len(snowflake_get_result.snowflake_connection_strings))
 
         # 3. Delete
-        remove_result = self.store.maintenance.send(
-            RemoveConnectionStringOperation("snowflake1", ConnectionStringType.SNOWFLAKE)
-        )
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(snowflake_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # 4. Get and Assert None
@@ -208,7 +203,7 @@ def test_full_lifecycle_for_all_connection_string_types(self):
         self.assertEqual(1, len(ai_get_result.ai_connection_strings))
 
         # 3. Delete
-        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation("ai1", ConnectionStringType.AI))
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(ai_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # 4. Get and Assert None
@@ -237,9 +232,7 @@ def test_all_possible_fields_for_each_connection_string_type(self):
         self.assertEqual(raven_connection_string.topology_discovery_urls, retrieved.topology_discovery_urls)
 
         # Delete
-        remove_result = self.store.maintenance.send(
-            RemoveConnectionStringOperation("raven_all_fields", ConnectionStringType.RAVEN)
-        )
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(raven_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # Get and Assert None
@@ -271,9 +264,7 @@ def test_all_possible_fields_for_each_connection_string_type(self):
         self.assertEqual(sql_connection_string.factory_name, retrieved.factory_name)
 
         # Delete
-        remove_result = self.store.maintenance.send(
-            RemoveConnectionStringOperation("sql_all_fields", ConnectionStringType.SQL)
-        )
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(sql_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # Get and Assert None
@@ -467,9 +458,7 @@ def test_all_possible_fields_for_each_connection_string_type(self):
         )
 
         # Delete
-        remove_result = self.store.maintenance.send(
-            RemoveConnectionStringOperation("olap_all_fields", ConnectionStringType.OLAP)
-        )
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(olap_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # Get and Assert None
@@ -518,9 +507,7 @@ def test_all_possible_fields_for_each_connection_string_type(self):
         self.assertEqual(openai_chat_settings.dimensions, retrieved.openai_settings.dimensions)
 
         # Delete
-        remove_result = self.store.maintenance.send(
-            RemoveConnectionStringOperation("ai_openai_chat", ConnectionStringType.AI)
-        )
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(ai_openai_chat_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # Get and Assert None
@@ -570,7 +557,7 @@ def test_all_possible_fields_for_each_connection_string_type(self):
 
         # Delete
         remove_result = self.store.maintenance.send(
-            RemoveConnectionStringOperation("ai_openai_embeddings", ConnectionStringType.AI)
+            RemoveConnectionStringOperation(ai_openai_embeddings_connection_string)
         )
         self.assertGreater(remove_result.raft_command_index, 0)
 
@@ -618,9 +605,7 @@ def test_all_possible_fields_for_each_connection_string_type(self):
         self.assertEqual(azure_openai_settings.dimensions, retrieved.azure_openai_settings.dimensions)
 
         # Delete
-        remove_result = self.store.maintenance.send(
-            RemoveConnectionStringOperation("ai_azure_openai", ConnectionStringType.AI)
-        )
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(ai_azure_openai_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # Get and Assert None
@@ -661,9 +646,7 @@ def test_all_possible_fields_for_each_connection_string_type(self):
         self.assertEqual(ollama_settings.think, retrieved.ollama_settings.think)
 
         # Delete
-        remove_result = self.store.maintenance.send(
-            RemoveConnectionStringOperation("ai_ollama", ConnectionStringType.AI)
-        )
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(ai_ollama_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # Get and Assert None
@@ -694,9 +677,7 @@ def test_all_possible_fields_for_each_connection_string_type(self):
         self.assertIsNotNone(retrieved.embedded_settings)
 
         # Delete
-        remove_result = self.store.maintenance.send(
-            RemoveConnectionStringOperation("ai_embedded", ConnectionStringType.AI)
-        )
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(ai_embedded_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # Get and Assert None
@@ -732,9 +713,7 @@ def test_all_possible_fields_for_each_connection_string_type(self):
         self.assertEqual(google_settings.dimensions, retrieved.google_settings.dimensions)
 
         # Delete
-        remove_result = self.store.maintenance.send(
-            RemoveConnectionStringOperation("ai_google", ConnectionStringType.AI)
-        )
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(ai_google_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # Get and Assert None
@@ -774,9 +753,7 @@ def test_all_possible_fields_for_each_connection_string_type(self):
         self.assertEqual(huggingface_settings.endpoint, retrieved.huggingface_settings.endpoint)
 
         # Delete
-        remove_result = self.store.maintenance.send(
-            RemoveConnectionStringOperation("ai_huggingface", ConnectionStringType.AI)
-        )
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(ai_huggingface_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # Get and Assert None
@@ -814,9 +791,7 @@ def test_all_possible_fields_for_each_connection_string_type(self):
         self.assertEqual(mistral_ai_settings.endpoint, retrieved.mistral_ai_settings.endpoint)
 
         # Delete
-        remove_result = self.store.maintenance.send(
-            RemoveConnectionStringOperation("ai_mistral", ConnectionStringType.AI)
-        )
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(ai_mistral_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # Get and Assert None
@@ -881,9 +856,7 @@ def test_all_possible_fields_for_each_connection_string_type(self):
         )
 
         # Delete
-        remove_result = self.store.maintenance.send(
-            RemoveConnectionStringOperation("elastic_all_fields", ConnectionStringType.ELASTIC_SEARCH)
-        )
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(elastic_search_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # Get and Assert None
@@ -1016,9 +989,7 @@ def test_all_possible_fields_for_each_connection_string_type(self):
         )
 
         # Delete
-        remove_result = self.store.maintenance.send(
-            RemoveConnectionStringOperation("queue_all_fields", ConnectionStringType.QUEUE)
-        )
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(queue_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # Get and Assert None
@@ -1048,13 +1019,31 @@ def test_all_possible_fields_for_each_connection_string_type(self):
         self.assertEqual(snowflake_connection_string.connection_string, retrieved.connection_string)
 
         # Delete
-        remove_result = self.store.maintenance.send(
-            RemoveConnectionStringOperation("snowflake_all_fields", ConnectionStringType.SNOWFLAKE)
-        )
+        remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(snowflake_connection_string))
         self.assertGreater(remove_result.raft_command_index, 0)
 
         # Get and Assert None
         after_delete = self.store.maintenance.send(
             GetConnectionStringsOperation("snowflake_all_fields", ConnectionStringType.SNOWFLAKE)
         )
         self.assertIsNone(after_delete.snowflake_connection_strings)
+
+    def test_remove_connection_string_by_name_operation(self):
+        raven_connection_string = RavenConnectionString("raven1", self.store.database, self.store.urls)
+
+        put_result = self.store.maintenance.send(PutConnectionStringOperation(raven_connection_string))
+        self.assertGreater(put_result.raft_command_index, 0)
+
+        raven_get_result = self.store.maintenance.send(
+            GetConnectionStringsOperation("raven1", ConnectionStringType.RAVEN)
+        )
+        self.assertIn("raven1", raven_get_result.raven_connection_strings)
+        self.assertEqual(1, len(raven_get_result.raven_connection_strings))
+
+        remove_result = self.store.maintenance.send(
+            RemoveConnectionStringByNameOperation("raven1", ConnectionStringType.RAVEN)
+        )
+        self.assertGreater(remove_result.raft_command_index, 0)
+
+        after_delete = self.store.maintenance.send(GetConnectionStringsOperation("raven1", ConnectionStringType.RAVEN))
+        self.assertIsNone(after_delete.raven_connection_strings)