Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 11 additions & 9 deletions cloud_pipelines_backend/api_server_sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -1236,7 +1236,8 @@ class SecretInfoResponse:
secret_name: str
created_at: datetime.datetime
updated_at: datetime.datetime
expires_at: datetime.datetime | None = None
# Expiry is not enforced, so it is neither returned nor accepted; the column stays.
# expires_at: datetime.datetime | None = None
description: str | None = None

@classmethod
Expand All @@ -1245,7 +1246,7 @@ def from_db(cls, secret_row: bts.Secret) -> "SecretInfoResponse":
secret_name=secret_row.secret_name,
created_at=secret_row.created_at,
updated_at=secret_row.updated_at,
expires_at=secret_row.expires_at,
# expires_at=secret_row.expires_at,
description=secret_row.description,
)

Expand All @@ -1264,7 +1265,8 @@ def create_secret(
secret_name: str,
secret_value: str,
description: str | None = None,
expires_at: datetime.datetime | None = None,
# A client that still sends expires_at gets 200; FastAPI ignores unknown query parameters.
# expires_at: datetime.datetime | None = None,
) -> SecretInfoResponse:
secret_name = secret_name.strip()
if not secret_name:
Expand All @@ -1275,7 +1277,7 @@ def create_secret(
secret_name=secret_name,
secret_value=secret_value,
description=description,
expires_at=expires_at,
# expires_at=expires_at,
raise_if_exists=True,
)

Expand All @@ -1287,15 +1289,15 @@ def update_secret(
secret_name: str,
secret_value: str,
description: str | None = None,
expires_at: datetime.datetime | None = None,
# expires_at: datetime.datetime | None = None,
) -> SecretInfoResponse:
return self._create_or_update_secret(
session=session,
user_id=user_id,
secret_name=secret_name,
secret_value=secret_value,
description=description,
expires_at=expires_at,
# expires_at=expires_at,
raise_if_not_exists=True,
)

Expand All @@ -1307,7 +1309,7 @@ def _create_or_update_secret(
secret_name: str,
secret_value: str,
description: str | None = None,
expires_at: datetime.datetime | None = None,
# expires_at: datetime.datetime | None = None,
raise_if_not_exists: bool = False,
raise_if_exists: bool = False,
) -> SecretInfoResponse:
Expand Down Expand Up @@ -1335,8 +1337,8 @@ def _create_or_update_secret(
session.add(secret)
if description:
secret.description = description
if expires_at:
secret.expires_at = expires_at
# if expires_at:
# secret.expires_at = expires_at
response = SecretInfoResponse.from_db(secret)
session.commit()
return response
Expand Down
1 change: 1 addition & 0 deletions tests/test_secrets.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ def test_running_pipeline_with_secrets():
)
assert list_secrets_response.secrets
assert list_secrets_response.secrets[0].secret_name == secret_name
assert not hasattr(list_secrets_response.secrets[0], "expires_at")

pipeline_runs_service.create(
session=session_factory(),
Expand Down
Loading