Skip to content

Application TTL in minutes. #266

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

Draft
vadim-zabolotniy wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Application TTL in minutes. #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdf5697
Application TTL in minutes.
vadim-zabolotniy Feb 1, 2023
b689c51
Fixed bug in setting application TTL API endpoint.
vadim-zabolotniy Feb 2, 2023
9bf74ad
changed hours to minutes for application ttl
ATomkivEX Feb 2, 2023
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
8 changes: 4 additions & 4 deletions application/api/v1/endpoints/applications.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ async def install_application(
}
else:
organization_settings = SettingsSchema.from_organization(user.organization)
if body.ttl and body.ttl.hours:
delta = timedelta(hours=body.ttl.hours)
if body.ttl and body.ttl.minutes:
delta = timedelta(minutes=body.ttl.minutes)
await application_manager.set_ttl(install_result, delta)
elif organization_settings.application_ttl:
delta = timedelta(minutes=organization_settings.application_ttl)
Expand Down Expand Up @@ -197,10 +197,10 @@ async def set_application_ttl(
application_manager: ApplicationManager = Depends(get_application_manager),
):
"""
Sets application deadline reaching which application will be deleted(TTL - time to live).
Sets application deadline after reaching which application will be deleted(TTL - time to live).
"""
application = await application_manager.get_organization_application(application_id, user.organization)
delta = timedelta(hours=body.hours)
delta = timedelta(minutes=body.minutes)

await application_manager.set_ttl(application, delta)

Expand Down
2 changes: 1 addition & 1 deletion application/api/v1/schemas/applications.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class ApplicationTTLSchema(BaseModel):
"""
Body of request for setting applicatoin TTL.
"""
hours: NonNegativeInt = Field(description='Time to live in hours. If 0 pass, TTL will be removed.')
minutes: NonNegativeInt = Field(description='Time to live in hours. If 0 pass, TTL will not be set.')


class InstallRequestBodySchema(BaseModel):
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/app/main/applications/ApplicationTtl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,17 @@ const ApplicationTtl = ({ openTtlModal, setOpenTtlModal, parameters }) => {
const selectedUnixTimestamp = selectedDateUnix.getTime();
const timestamp = Date.now();

let hours = {};
let minutes = {};
if (selectedUnixTimestamp) {
hours = { hours: Math.round((selectedUnixTimestamp - timestamp) / 1000 / 3600) };
minutes = { minutes: Math.round((selectedUnixTimestamp - timestamp) / 1000 / 60) };
}

await requestForApplicationTll(id, hours);
await requestForApplicationTll(id, minutes);
};

const handleUnsetApplicationTtl = async () => {
const hours = { hours: 0 };
await requestForApplicationTll(id, hours);
const minutes = { minutes: 0 };
await requestForApplicationTll(id, minutes);
};

return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/main/applications/ApplicationsModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const ApplicationsModal = ({ openModal, setOpenModal, kubernetesConfiguration, t
inputs: templateFormData,
context_name: context_name.value,
ttl: {
hours: 0,
minutes: 0,
},
namespace,
dry_run: false,
Expand Down