Skip to content

Use the new endpoint /directory with API key #229

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

Open
pawbu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use the new endpoint /directory with API key #229

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
15 changes: 11 additions & 4 deletions job_executor/adapter/datastore_api/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from urllib3 import Retry

from job_executor.adapter.datastore_api.models import (
DatastoreResponse,
Job,
JobQueryResult,
JobStatus,
Expand Down Expand Up @@ -132,9 +131,17 @@ def get_datastores() -> list[str]:


def get_datastore_directory(rdn: str) -> Path:
request_url = f"{DATASTORE_API_URL}/datastores/{rdn}"
response = execute_request("GET", request_url, True)
return Path(DatastoreResponse.model_validate(response.json()).directory)
request_url = f"{DATASTORE_API_URL}/datastores/{rdn}/directory"
response = execute_request(
"GET",
request_url,
True,
headers={
"X-API-Key": DATASTORE_API_SERVICE_KEY,
},
)
directory = response.json()
return Path(directory)


def post_public_key(datastore_rdn: str, public_key_pem: bytes) -> None:
Expand Down
9 changes: 0 additions & 9 deletions job_executor/adapter/datastore_api/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,6 @@
from job_executor.common.models import CamelModel


class DatastoreResponse(CamelModel):
datastore_id: int
name: str
rdn: str
description: str
directory: str
bump_enabled: bool


class MaintenanceStatus(CamelModel):
paused: bool
msg: str
Expand Down