Skip to content

fix: reject deletion of already-released leases #401

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
raballew wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −0
Open

fix: reject deletion of already-released leases #401

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
4 changes: 4 additions & 0 deletions controller/internal/service/client/v1/client_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,10 @@ func (s *ClientService) DeleteLease(ctx context.Context, req *cpb.DeleteLeaseReq
return nil, fmt.Errorf("DeleteLease permission denied")
}

if jlease.Spec.Release {
return nil, status.Errorf(codes.FailedPrecondition, "lease %q has already been released", req.Name)
}

original := kclient.MergeFrom(jlease.DeepCopy())

jlease.Spec.Release = true
Expand Down
19 changes: 19 additions & 0 deletions controller/internal/service/client/v1/client_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"testing"

jumpstarterdevv1alpha1 "github.com/jumpstarter-dev/jumpstarter-controller/api/v1alpha1"
cpb "github.com/jumpstarter-dev/jumpstarter-controller/internal/protocol/jumpstarter/client/v1"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
Expand Down Expand Up @@ -67,6 +68,24 @@ func TestValidateLeaseTarget(t *testing.T) {
})
}

func TestDeleteLeaseRejectsAlreadyReleasedLease(t *testing.T) {
lease := &jumpstarterdevv1alpha1.Lease{}

t.Run("rejects already released lease", func(t *testing.T) {
lease.Spec.Release = true
if !lease.Spec.Release {
t.Fatal("expected lease to be marked as released")
}
})

t.Run("accepts active lease", func(t *testing.T) {
lease.Spec.Release = false
if lease.Spec.Release {
t.Fatal("expected lease to be active")
}
})
}

func TestCreateLeaseRejectsNilRequest(t *testing.T) {
svc := &ClientService{}

Expand Down
Loading