Fixing failing integ tests

Signed-off-by: saimedhi <saimedhi@amazon.com>

Author: saimedhi

guides/plugins/security.md

@@ -45,7 +45,7 @@ print(response)
 user_name = "test-user"
 user_content = {"password": "test_password", "opendistro_security_roles": []}
 
-response = client.security.create_user(user_name, body=user_content)
+response = client.security.create_user(username=user_name, body=user_content)
 print(response)
 ```
 

samples/security/users.py

@@ -40,7 +40,7 @@ def main() -> None:
     user_name = "test-user"
     user_content = {"password": "opensearch@123", "opendistro_security_roles": []}
 
-    response = client.security.create_user(user_name, body=user_content)
+    response = client.security.create_user(username=user_name, body=user_content)
     print(response)
 
     # Get a User

test_opensearchpy/test_async/test_server/test_helpers/test_actions.py

@@ -73,15 +73,15 @@ class TestStreamingBulk:
     async def test_actions_remain_unchanged(self, async_client: Any) -> None:
         actions1 = [{"_id": 1}, {"_id": 2}]
         async for ok, _ in actions.async_streaming_bulk(
-            async_client, actions1, index="test-index"
+            client=async_client, actions=actions1, index="test-index"
         ):
             assert ok
         assert [{"_id": 1}, {"_id": 2}] == actions1
 
     async def test_all_documents_get_inserted(self, async_client: Any) -> None:
         docs = [{"answer": x, "_id": x} for x in range(100)]
         async for ok, _ in actions.async_streaming_bulk(
-            async_client, docs, index="test-index", refresh=True
+            client=async_client, actions=docs, index="test-index", refresh=True
         ):
             assert ok
 
@@ -128,8 +128,8 @@ async def test_all_errors_from_chunk_are_raised_on_failure(
         self, async_client: Any
     ) -> None:
         await async_client.indices.create(
-            "i",
-            {
+            index="i",
+            body={
                 "mappings": {"properties": {"a": {"type": "integer"}}},
                 "settings": {"number_of_shards": 1, "number_of_replicas": 0},
             },
@@ -154,7 +154,7 @@ async def test_different_op_types(self, async_client: Any) -> None:
             {"_op_type": "delete", "_index": "i", "_id": 45},
             {"_op_type": "update", "_index": "i", "_id": 42, "doc": {"answer": 42}},
         ]
-        async for ok, _ in actions.async_streaming_bulk(async_client, docs):
+        async for ok, _ in actions.async_streaming_bulk(client=async_client, actions=docs):
             assert ok
 
         assert not await async_client.exists(index="i", id=45)
@@ -172,8 +172,8 @@ async def test_transport_error_can_becaught(self, async_client: Any) -> None:
         results = [
             x
             async for x in actions.async_streaming_bulk(
-                failing_client,
-                docs,
+                client=failing_client,
+                actions=docs,
                 raise_on_exception=False,
                 raise_on_error=False,
                 chunk_size=1,
@@ -207,8 +207,8 @@ async def test_rejected_documents_are_retried(self, async_client: Any) -> None:
         results = [
             x
             async for x in actions.async_streaming_bulk(
-                failing_client,
-                docs,
+                client=failing_client,
+                actions=docs,
                 raise_on_exception=False,
                 raise_on_error=False,
                 chunk_size=1,
@@ -238,8 +238,8 @@ async def test_rejected_documents_are_retried_at_most_max_retries_times(
         results = [
             x
             async for x in actions.async_streaming_bulk(
-                failing_client,
-                docs,
+                client=failing_client,
+                actions=docs,
                 raise_on_exception=False,
                 raise_on_error=False,
                 chunk_size=1,
@@ -285,7 +285,7 @@ class TestBulk:
     async def test_bulk_works_with_single_item(self, async_client: Any) -> None:
         docs = [{"answer": 42, "_id": 1}]
         success, failed = await actions.async_bulk(
-            async_client, docs, index="test-index", refresh=True
+            client=async_client, actions=docs, index="test-index", refresh=True
         )
 
         assert 1 == success
@@ -298,7 +298,7 @@ async def test_bulk_works_with_single_item(self, async_client: Any) -> None:
     async def test_all_documents_get_inserted(self, async_client: Any) -> None:
         docs = [{"answer": x, "_id": x} for x in range(100)]
         success, failed = await actions.async_bulk(
-            async_client, docs, index="test-index", refresh=True
+            client=async_client, actions=docs, index="test-index", refresh=True
         )
 
         assert 100 == success
@@ -311,7 +311,7 @@ async def test_all_documents_get_inserted(self, async_client: Any) -> None:
     async def test_stats_only_reports_numbers(self, async_client: Any) -> None:
         docs = [{"answer": x} for x in range(100)]
         success, failed = await actions.async_bulk(
-            async_client, docs, index="test-index", refresh=True, stats_only=True
+            client=async_client, actions=docs, index="test-index", refresh=True, stats_only=True
         )
 
         assert 100 == success
@@ -320,8 +320,8 @@ async def test_stats_only_reports_numbers(self, async_client: Any) -> None:
 
     async def test_errors_are_reported_correctly(self, async_client: Any) -> None:
         await async_client.indices.create(
-            "i",
-            {
+            index="i",
+            body={
                 "mappings": {"properties": {"a": {"type": "integer"}}},
                 "settings": {"number_of_shards": 1, "number_of_replicas": 0},
             },
@@ -347,8 +347,8 @@ async def test_errors_are_reported_correctly(self, async_client: Any) -> None:
 
     async def test_error_is_raised(self, async_client: Any) -> None:
         await async_client.indices.create(
-            "i",
-            {
+            index="i",
+            body={
                 "mappings": {"properties": {"a": {"type": "integer"}}},
                 "settings": {"number_of_shards": 1, "number_of_replicas": 0},
             },
@@ -361,7 +361,7 @@ async def test_error_is_raised(self, async_client: Any) -> None:
     async def test_ignore_error_if_raised(self, async_client: Any) -> None:
         # ignore the status code 400 in tuple
         await actions.async_bulk(
-            async_client, [{"a": 42}, {"a": "c"}], index="i", ignore_status=(400,)
+            client=async_client, actions=[{"a": 42}, {"a": "c"}], index="i", ignore_status=(400,)
         )
 
         # ignore the status code 400 in list
@@ -393,8 +393,8 @@ async def test_ignore_error_if_raised(self, async_client: Any) -> None:
 
     async def test_errors_are_collected_properly(self, async_client: Any) -> None:
         await async_client.indices.create(
-            "i",
-            {
+            index="i",
+            body={
                 "mappings": {"properties": {"a": {"type": "integer"}}},
                 "settings": {"number_of_shards": 1, "number_of_replicas": 0},
             },
@@ -461,7 +461,7 @@ async def test_order_can_be_preserved(
         for x in range(100):
             bulk.append({"index": {"_index": "test_index", "_id": x}})
             bulk.append({"answer": x, "correct": x == 42})
-        await async_client.bulk(bulk, refresh=True)
+        await async_client.bulk(body=bulk, refresh=True)
 
         docs = [
             doc
@@ -484,7 +484,7 @@ async def test_all_documents_are_read(
         for x in range(100):
             bulk.append({"index": {"_index": "test_index", "_id": x}})
             bulk.append({"answer": x, "correct": x == 42})
-        await async_client.bulk(bulk, refresh=True)
+        await async_client.bulk(body=bulk, refresh=True)
 
         docs = [
             x
@@ -500,7 +500,7 @@ async def test_scroll_error(self, async_client: Any, scan_teardown: Any) -> None
         for x in range(4):
             bulk.append({"index": {"_index": "test_index"}})
             bulk.append({"value": x})
-        await async_client.bulk(bulk, refresh=True)
+        await async_client.bulk(body=bulk, refresh=True)
 
         with patch.object(async_client, "scroll", MockScroll()):
             data = [
@@ -608,7 +608,7 @@ async def test_logger(
         for x in range(4):
             bulk.append({"index": {"_index": "test_index"}})
             bulk.append({"value": x})
-        await async_client.bulk(bulk, refresh=True)
+        await async_client.bulk(body=bulk, refresh=True)
 
         with patch.object(async_client, "scroll", MockScroll()):
             _ = [
@@ -649,7 +649,7 @@ async def test_clear_scroll(self, async_client: Any, scan_teardown: Any) -> None
         for x in range(4):
             bulk.append({"index": {"_index": "test_index"}})
             bulk.append({"value": x})
-        await async_client.bulk(bulk, refresh=True)
+        await async_client.bulk(body=bulk, refresh=True)
 
         with patch.object(
             async_client, "clear_scroll", wraps=async_client.clear_scroll
@@ -820,7 +820,7 @@ async def reindex_setup(async_client: Any) -> Any:
                 "type": "answers" if x % 2 == 0 else "questions",
             }
         )
-    await async_client.bulk(bulk, refresh=True)
+    await async_client.bulk(body=bulk, refresh=True)
     yield
 
 
@@ -922,7 +922,7 @@ class TestParentChildReindex:
     async def test_children_are_reindexed_correctly(
         self, async_client: Any, parent_reindex_setup: Any
     ) -> None:
-        await actions.async_reindex(async_client, "test-index", "real-index")
+        await actions.async_reindex(client=async_client, source_index="test-index", target_index="real-index")
         assert {"question_answer": "question"} == (
             await async_client.get(index="real-index", id=42)
         )["_source"]

test_opensearchpy/test_async/test_server/test_helpers/test_index.py

@@ -48,7 +48,7 @@ async def test_index_template_works(write_client: Any) -> None:
 
 
 async def test_index_can_be_saved_even_with_settings(write_client: Any) -> None:
-    i = AsyncIndex("test-blog", using=write_client)
+    i = AsyncIndex(name="test-blog", using=write_client)
     i.settings(number_of_shards=3, number_of_replicas=0)
     await i.save()
     i.settings(number_of_replicas=1)
@@ -70,7 +70,7 @@ async def test_index_exists(data_client: Any) -> None:
 async def test_index_can_be_created_with_settings_and_mappings(
     write_client: Any,
 ) -> None:
-    i = AsyncIndex("test-blog", using=write_client)
+    i = AsyncIndex(name="test-blog", using=write_client)
     i.document(Post)
     i.settings(number_of_replicas=0, number_of_shards=1)
     await i.create()

test_opensearchpy/test_async/test_server/test_helpers/test_update_by_query.py

@@ -25,7 +25,7 @@ async def test_update_by_query_no_script(
 
     ubq = (
         AsyncUpdateByQuery(using=write_client)
-        .index(index)
+        .index(index=index)
         .filter(~Q("exists", field="is_public"))
     )
     response = await ubq.execute()
@@ -46,7 +46,7 @@ async def test_update_by_query_with_script(
 
     ubq = (
         AsyncUpdateByQuery(using=write_client)
-        .index(index)
+        .index(index=index)
         .filter(~Q("exists", field="parent_shas"))
         .script(source="ctx._source.is_public = false")
     )
@@ -65,7 +65,7 @@ async def test_delete_by_query_with_script(
 
     ubq = (
         AsyncUpdateByQuery(using=write_client)
-        .index(index)
+        .index(index=index)
         .filter(Q("match", parent_shas="1dd19210b5be92b960f7db6f66ae526288edccc3"))
         .script(source='ctx.op = "delete"')
     )

test_opensearchpy/test_async/test_server_secured/test_security_plugin.py

@@ -55,15 +55,15 @@ async def asyncTearDown(self) -> None:
     async def test_create_role(self) -> None:
         # Test to create role
         response = await self.client.security.create_role(
-            self.ROLE_NAME, body=self.ROLE_CONTENT
+            role=self.ROLE_NAME, body=self.ROLE_CONTENT
         )
 
         self.assertNotIn("errors", response)
         self.assertIn(response.get("status"), ["CREATED", "OK"])
 
     async def test_create_role_with_body_param_empty(self) -> None:
         try:
-            await self.client.security.create_role(self.ROLE_NAME, body="")
+            await self.client.security.create_role(role=self.ROLE_NAME, body="")
         except ValueError as error:
             assert str(error) == "Empty value passed for a required argument."
         else:
@@ -74,7 +74,7 @@ async def test_get_role(self) -> None:
         await self.test_create_role()
 
         # Test to fetch the role
-        response = await self.client.security.get_role(self.ROLE_NAME)
+        response = await self.client.security.get_role(role=self.ROLE_NAME)
 
         self.assertNotIn("errors", response)
         self.assertIn(self.ROLE_NAME, response)
@@ -88,7 +88,7 @@ async def test_update_role(self) -> None:
 
         # Test to update role
         response = await self.client.security.create_role(
-            self.ROLE_NAME, body=role_content
+            role=self.ROLE_NAME, body=role_content
         )
 
         self.assertNotIn("errors", response)
@@ -99,26 +99,26 @@ async def test_delete_role(self) -> None:
         await self.test_create_role()
 
         # Test to delete the role
-        response = await self.client.security.delete_role(self.ROLE_NAME)
+        response = await self.client.security.delete_role(role=self.ROLE_NAME)
 
         self.assertNotIn("errors", response)
 
         # Try fetching the role
         with self.assertRaises(NotFoundError):
-            response = await self.client.security.get_role(self.ROLE_NAME)
+            response = await self.client.security.get_role(role=self.ROLE_NAME)
 
     async def test_create_user(self) -> None:
         # Test to create user
         response = await self.client.security.create_user(
-            self.USER_NAME, body=self.USER_CONTENT
+            username=self.USER_NAME, body=self.USER_CONTENT
         )
 
         self.assertNotIn("errors", response)
         self.assertIn(response.get("status"), ["CREATED", "OK"])
 
     async def test_create_user_with_body_param_empty(self) -> None:
         try:
-            await self.client.security.create_user(self.USER_NAME, body="")
+            await self.client.security.create_user(username=self.USER_NAME, body="")
         except ValueError as error:
             assert str(error) == "Empty value passed for a required argument."
         else:
@@ -129,7 +129,7 @@ async def test_create_user_with_role(self) -> None:
 
         # Test to create user
         response = await self.client.security.create_user(
-            self.USER_NAME,
+            username=self.USER_NAME,
             body={
                 "password": "opensearchpy@123",
                 "opendistro_security_roles": [self.ROLE_NAME],
@@ -158,7 +158,7 @@ async def test_update_user(self) -> None:
 
         # Test to update user
         response = await self.client.security.create_user(
-            self.USER_NAME, body=user_content
+            username=self.USER_NAME, body=user_content
         )
 
         self.assertNotIn("errors", response)