Skip to content

[9.4] chore: remove unused native connector secrets code (#4524) #4576

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

Merged
Jan-Kazlouski-elastic merged 1 commit into from
Oct 7, 2026
Merged

[9.4] chore: remove unused native connector secrets code (#4524) #4576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 0 additions & 10 deletions app/connectors_service/connectors/es/management_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 0 additions & 4 deletions app/connectors_service/connectors/protocol/connectors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions app/connectors_service/connectors/sync_job_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,6 @@ def __init__(self, job_id, status):
)


class ApiKeyNotFoundError(Exception):
pass


class SyncJobRunner:
"""The class to run a sync job.

Expand Down
34 changes: 0 additions & 34 deletions app/connectors_service/tests/es/test_management_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions app/connectors_service/tests/protocol/test_connectors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion app/connectors_service/tests/test_sync_job_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 0 additions & 7 deletions libs/connectors_sdk/connectors_sdk/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {}
Expand All @@ -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(
[
Expand Down