Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor #1

Merged
merged 4 commits into from
Jan 13, 2025
Merged

Refactor #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf536bb
Refactor calls to go through a router
tomchop Jan 11, 2025
b1bd371
Change keyword to not override lib
tomchop Jan 11, 2025
86dda64
Bugfix
tomchop Jan 11, 2025
15be0d1
typing
tomchop Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions tests/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def setUp(self):
@patch("yeti.api.requests.Session.post")
def test_auth_api_key(self, mock_post):
mock_response = MagicMock()
mock_response.text = '{"access_token": "fake_token"}'
mock_response.bytes = b'{"access_token": "fake_token"}'
mock_post.return_value = mock_response

self.api.auth_api_key("fake_apikey")
Expand All @@ -23,7 +23,7 @@ def test_auth_api_key(self, mock_post):
@patch("yeti.api.requests.Session.post")
def test_search_indicators(self, mock_post):
mock_response = MagicMock()
mock_response.json.return_value = {"indicators": [{"name": "test"}]}
mock_response.bytes = b'{"indicators": [{"name": "test"}]}'
mock_post.return_value = mock_response

result = self.api.search_indicators(name="test")
Expand All @@ -36,7 +36,7 @@ def test_search_indicators(self, mock_post):
@patch("yeti.api.requests.Session.post")
def test_search_entities(self, mock_post):
mock_response = MagicMock()
mock_response.json.return_value = {"entities": [{"name": "test_entity"}]}
mock_response.bytes = b'{"entities": [{"name": "test_entity"}]}'
mock_post.return_value = mock_response

result = self.api.search_entities(name="test_entity")
Expand All @@ -49,7 +49,7 @@ def test_search_entities(self, mock_post):
@patch("yeti.api.requests.Session.post")
def test_search_observables(self, mock_post):
mock_response = MagicMock()
mock_response.json.return_value = {"observables": [{"value": "test_value"}]}
mock_response.bytes = b'{"observables": [{"value": "test_value"}]}'
mock_post.return_value = mock_response

result = self.api.search_observables(value="test_value")
Expand All @@ -62,7 +62,8 @@ def test_search_observables(self, mock_post):
@patch("yeti.api.requests.Session.post")
def test_new_entity(self, mock_post):
mock_response = MagicMock()
mock_response.json.return_value = {"id": "new_entity"}
mock_response.bytes = b'{"id": "new_entity"}'
mock_response.bytes = b'{"id": "new_entity"}'
mock_post.return_value = mock_response

result = self.api.new_entity({"name": "test_entity"})
Expand All @@ -75,7 +76,7 @@ def test_new_entity(self, mock_post):
@patch("yeti.api.requests.Session.post")
def test_new_indicator(self, mock_post):
mock_response = MagicMock()
mock_response.json.return_value = {"id": "new_indicator"}
mock_response.bytes = b'{"id": "new_indicator"}'
mock_post.return_value = mock_response

result = self.api.new_indicator({"name": "test_indicator"})
Expand All @@ -88,7 +89,7 @@ def test_new_indicator(self, mock_post):
@patch("yeti.api.requests.Session.patch")
def test_patch_indicator(self, mock_patch):
mock_response = MagicMock()
mock_response.json.return_value = {"id": "patched_indicator"}
mock_response.bytes = b'{"id": "patched_indicator"}'
mock_patch.return_value = mock_response

result = self.api.patch_indicator(1, {"name": "patched_indicator"})
Expand All @@ -101,7 +102,7 @@ def test_patch_indicator(self, mock_patch):
@patch("yeti.api.requests.Session.post")
def test_search_dfiq(self, mock_post):
mock_response = MagicMock()
mock_response.json.return_value = {"dfiq": [{"name": "test_dfiq"}]}
mock_response.bytes = b'{"dfiq": [{"name": "test_dfiq"}]}'
mock_post.return_value = mock_response

result = self.api.search_dfiq(name="test_dfiq")
Expand All @@ -114,7 +115,7 @@ def test_search_dfiq(self, mock_post):
@patch("yeti.api.requests.Session.post")
def test_new_dfiq_from_yaml(self, mock_post):
mock_response = MagicMock()
mock_response.json.return_value = {"id": "new_dfiq"}
mock_response.bytes = b'{"id": "new_dfiq"}'
mock_post.return_value = mock_response

result = self.api.new_dfiq_from_yaml("type", "yaml_content")
Expand All @@ -131,7 +132,7 @@ def test_new_dfiq_from_yaml(self, mock_post):
@patch("yeti.api.requests.Session.patch")
def test_patch_dfiq_from_yaml(self, mock_patch):
mock_response = MagicMock()
mock_response.json.return_value = {"id": "patched_dfiq"}
mock_response.bytes = b'{"id": "patched_dfiq"}'
mock_patch.return_value = mock_response

result = self.api.patch_dfiq_from_yaml("type", "yaml_content", 1)
Expand Down Expand Up @@ -161,7 +162,7 @@ def test_download_dfiq_archive(self, mock_post):
@patch("yeti.api.requests.Session.post")
def test_upload_dfiq_archive(self, mock_post):
mock_response = MagicMock()
mock_response.json.return_value = {"uploaded": 1}
mock_response.bytes = b'{"uploaded": 1}'
mock_post.return_value = mock_response

with patch("builtins.open", unittest.mock.mock_open(read_data=b"data")):
Expand All @@ -171,14 +172,14 @@ def test_upload_dfiq_archive(self, mock_post):
mock_post.call_args[0][0], "http://fake-url/api/v2/dfiq/from_archive"
)
self.assertRegex(
mock_post.call_args[1]["extra_headers"]["Content-Type"],
mock_post.call_args[1]["headers"]["Content-Type"],
"multipart/form-data; boundary=[a-f0-9]{32}",
)

@patch("yeti.api.requests.Session.post")
def test_add_observable(self, mock_post):
mock_response = MagicMock()
mock_response.json.return_value = {"id": "new_observable"}
mock_response.bytes = b'{"id": "new_observable"}'
mock_post.return_value = mock_response

result = self.api.add_observable("value", "type")
Expand All @@ -191,7 +192,7 @@ def test_add_observable(self, mock_post):
@patch("yeti.api.requests.Session.post")
def test_add_observables_bulk(self, mock_post):
mock_response = MagicMock()
mock_response.json.return_value = {"added": [], "failed": []}
mock_response.bytes = b'{"added": [], "failed": []}'
mock_post.return_value = mock_response

result = self.api.add_observables_bulk([{"value": "value", "type": "type"}])
Expand All @@ -204,7 +205,7 @@ def test_add_observables_bulk(self, mock_post):
@patch("yeti.api.requests.Session.post")
def test_tag_object(self, mock_post):
mock_response = MagicMock()
mock_response.json.return_value = {"id": "tagged_object"}
mock_response.bytes = b'{"id": "tagged_object"}'
mock_post.return_value = mock_response

result = self.api.tag_object({"id": "1", "root_type": "indicator"}, ["tag1"])
Expand All @@ -217,7 +218,7 @@ def test_tag_object(self, mock_post):
@patch("yeti.api.requests.Session.post")
def test_link_objects(self, mock_post):
mock_response = MagicMock()
mock_response.json.return_value = {"id": "link"}
mock_response.bytes = b'{"id": "link"}'
mock_post.return_value = mock_response

result = self.api.link_objects(
Expand All @@ -239,7 +240,7 @@ def test_link_objects(self, mock_post):
@patch("yeti.api.requests.Session.post")
def test_search_graph(self, mock_post):
mock_response = MagicMock()
mock_response.json.return_value = {"graph": "data"}
mock_response.bytes = b'{"graph": "data"}'
mock_post.return_value = mock_response

result = self.api.search_graph("source", "graph", ["type"])
Expand Down
Loading
Loading