Skip to content

skip duration validation for lease transfer #206

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
bennyz merged 1 commit into from
Dec 31, 2025
Merged

skip duration validation for lease transfer #206

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
56 changes: 31 additions & 25 deletions internal/service/client/v1/client_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,31 +222,35 @@ func (s *ClientService) UpdateLease(ctx context.Context, req *cpb.UpdateLeaseReq
}

original := kclient.MergeFrom(jlease.DeepCopy())
desired, err := jumpstarterdevv1alpha1.LeaseFromProtobuf(req.Lease, *key,
corev1.LocalObjectReference{
Name: jclient.Name,
},
)
if err != nil {
return nil, err
}

// BeginTime can only be updated before lease starts; only if explicitly provided
if req.Lease.BeginTime != nil {
if jlease.Status.ExporterRef != nil {
if jlease.Spec.BeginTime == nil || !jlease.Spec.BeginTime.Equal(desired.Spec.BeginTime) {
return nil, fmt.Errorf("cannot update BeginTime: lease has already started")
// Only parse time fields from protobuf if any are being updated
if req.Lease.BeginTime != nil || req.Lease.Duration != nil || req.Lease.EndTime != nil {
desired, err := jumpstarterdevv1alpha1.LeaseFromProtobuf(req.Lease, *key,
corev1.LocalObjectReference{
Name: jclient.Name,
},
)
if err != nil {
return nil, err
}

// BeginTime can only be updated before lease starts; only if explicitly provided
if req.Lease.BeginTime != nil {
if jlease.Status.ExporterRef != nil {
if jlease.Spec.BeginTime == nil || !jlease.Spec.BeginTime.Equal(desired.Spec.BeginTime) {
return nil, fmt.Errorf("cannot update BeginTime: lease has already started")
}
}
jlease.Spec.BeginTime = desired.Spec.BeginTime
}
// Update Duration only if provided; preserve existing otherwise
if req.Lease.Duration != nil {
jlease.Spec.Duration = desired.Spec.Duration
}
// Update EndTime only if provided; preserve existing otherwise
if req.Lease.EndTime != nil {
jlease.Spec.EndTime = desired.Spec.EndTime
}
jlease.Spec.BeginTime = desired.Spec.BeginTime
}
// Update Duration only if provided; preserve existing otherwise
if req.Lease.Duration != nil {
jlease.Spec.Duration = desired.Spec.Duration
}
// Update EndTime only if provided; preserve existing otherwise
if req.Lease.EndTime != nil {
jlease.Spec.EndTime = desired.Spec.EndTime
}

// Transfer lease to a new client if specified
Expand All @@ -272,9 +276,11 @@ func (s *ClientService) UpdateLease(ctx context.Context, req *cpb.UpdateLeaseReq
jlease.Spec.ClientRef.Name = newClientKey.Name
}

// Recalculate missing field or validate consistency
if err := jumpstarterdevv1alpha1.ReconcileLeaseTimeFields(&jlease.Spec.BeginTime, &jlease.Spec.EndTime, &jlease.Spec.Duration); err != nil {
return nil, err
// Recalculate missing field or validate consistency (only if time fields were updated)
if req.Lease.BeginTime != nil || req.Lease.Duration != nil || req.Lease.EndTime != nil {
if err := jumpstarterdevv1alpha1.ReconcileLeaseTimeFields(&jlease.Spec.BeginTime, &jlease.Spec.EndTime, &jlease.Spec.Duration); err != nil {
return nil, err
}
}

if err := s.Patch(ctx, &jlease, original); err != nil {
Expand Down
Loading