diff --git a/app/connectors_service/connectors/es/management_client.py b/app/connectors_service/connectors/es/management_client.py index 75ff8753a..1de30a99c 100644 --- a/app/connectors_service/connectors/es/management_client.py +++ b/app/connectors_service/connectors/es/management_client.py @@ -211,16 +211,6 @@ async def yield_existing_documents_metadata(self, index): yield doc_id, timestamp - async def get_connector_secret(self, connector_secret_id): - secret = await self._retrier.execute_with_retry( - partial( - self.client.perform_request, - "GET", - f"/_connector/_secret/{connector_secret_id}", - ) - ) - return secret.get("value") - async def create_connector_secret(self, secret_value): secret = await self._retrier.execute_with_retry( partial( diff --git a/app/connectors_service/connectors/protocol/connectors.py b/app/connectors_service/connectors/protocol/connectors.py index e40a29704..a4d4ff353 100644 --- a/app/connectors_service/connectors/protocol/connectors.py +++ b/app/connectors_service/connectors/protocol/connectors.py @@ -638,10 +638,6 @@ def last_sync_scheduled_at_by_job_type(self, job_type): def sync_cursor(self): return self.get("sync_cursor") - @property - def api_key_secret_id(self): - return self.get("api_key_secret_id") - async def heartbeat(self, interval, force=False): if ( force diff --git a/app/connectors_service/connectors/sync_job_runner.py b/app/connectors_service/connectors/sync_job_runner.py index 34f77b1ec..5978b4144 100644 --- a/app/connectors_service/connectors/sync_job_runner.py +++ b/app/connectors_service/connectors/sync_job_runner.py @@ -87,10 +87,6 @@ def __init__(self, job_id, status): ) -class ApiKeyNotFoundError(Exception): - pass - - class SyncJobRunner: """The class to run a sync job. diff --git a/app/connectors_service/tests/es/test_management_client.py b/app/connectors_service/tests/es/test_management_client.py index c8cbca5f9..53c6c4913 100644 --- a/app/connectors_service/tests/es/test_management_client.py +++ b/app/connectors_service/tests/es/test_management_client.py @@ -216,40 +216,6 @@ async def test_yield_existing_documents_metadata_when_source_id_differs_from_id( assert ids == ["1", "2"] - @pytest.mark.asyncio - async def test_get_connector_secret(self, es_management_client, mock_responses): - secret_id = "secret-id" - - es_management_client.client.perform_request = AsyncMock( - return_value={"id": secret_id, "value": "secret-value"} - ) - - secret = await es_management_client.get_connector_secret(secret_id) - assert secret == "secret-value" - es_management_client.client.perform_request.assert_awaited_with( - "GET", f"/_connector/_secret/{secret_id}" - ) - - @pytest.mark.asyncio - async def test_get_connector_secret_when_secret_does_not_exist( - self, es_management_client, mock_responses - ): - secret_id = "secret-id" - - error_meta = Mock() - error_meta.status = 404 - es_management_client.client.perform_request = AsyncMock( - side_effect=ElasticNotFoundError( - "resource_not_found_exception", - error_meta, - f"No secret with id [{secret_id}]", - ) - ) - - with pytest.raises(ElasticNotFoundError): - secret = await es_management_client.get_connector_secret(secret_id) - assert secret is None - @pytest.mark.asyncio async def test_create_connector_secret(self, es_management_client, mock_responses): secret_id = "secret-id" diff --git a/app/connectors_service/tests/protocol/test_connectors.py b/app/connectors_service/tests/protocol/test_connectors.py index b3714c208..e5b397249 100644 --- a/app/connectors_service/tests/protocol/test_connectors.py +++ b/app/connectors_service/tests/protocol/test_connectors.py @@ -325,7 +325,6 @@ async def test_connector_properties(): connector_src = { "_id": "test", "_source": { - "api_key_secret_id": "api-key-secret-id", "service_type": "test", "index_name": "search-some-index", "configuration": {}, @@ -365,7 +364,6 @@ async def test_connector_properties(): assert connector.incremental_sync_scheduling["enabled"] assert connector.incremental_sync_scheduling["interval"] == "* * * * *" assert connector.sync_cursor == SYNC_CURSOR - assert connector.api_key_secret_id == "api-key-secret-id" assert isinstance(connector.last_seen, datetime) assert isinstance(connector.filtering, Filtering) assert isinstance(connector.pipeline, Pipeline) diff --git a/app/connectors_service/tests/test_sync_job_runner.py b/app/connectors_service/tests/test_sync_job_runner.py index 28f8d28b2..a1435e5eb 100644 --- a/app/connectors_service/tests/test_sync_job_runner.py +++ b/app/connectors_service/tests/test_sync_job_runner.py @@ -38,7 +38,6 @@ def mock_connector(): connector.last_sync_status = JobStatus.COMPLETED connector.features.sync_rules_enabled.return_value = True connector.features.incremental_sync_enabled.return_value = True - connector.features.native_connector_api_keys_enabled.return_value = False connector.sync_cursor = SYNC_CURSOR connector.document_count = AsyncMock(return_value=TOTAL_DOCUMENT_COUNT) connector.sync_starts = AsyncMock(return_value=True) diff --git a/libs/connectors_sdk/connectors_sdk/utils.py b/libs/connectors_sdk/connectors_sdk/utils.py index a9843ee09..f426f97e1 100644 --- a/libs/connectors_sdk/connectors_sdk/utils.py +++ b/libs/connectors_sdk/connectors_sdk/utils.py @@ -170,8 +170,6 @@ class Features: BASIC_RULES_OLD = "basic_rules_old" ADVANCED_RULES_OLD = "advanced_rules_old" - NATIVE_CONNECTOR_API_KEYS = "native_connector_api_keys" - def __init__(self, features=None): if features is None: features = {} @@ -188,11 +186,6 @@ def document_level_security_enabled(self): self.features, ["document_level_security", "enabled"], default=False ) - def native_connector_api_keys_enabled(self): - return nested_get_from_dict( - self.features, ["native_connector_api_keys", "enabled"], default=True - ) - def sync_rules_enabled(self): return any( [