Skip to content

prevent deletion of the only deployment revision #718

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
merged 1 commit into from
Sep 1, 2022
Merged

prevent deletion of the only deployment revision #718

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
12 changes: 9 additions & 3 deletions server/registry/actions_deployment_revisions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,11 +239,17 @@ func TestDeleteApiDeploymentRevision(t *testing.T) {
t.Fatalf("Setup/Seeding: Failed to seed registry: %s", err)
}

t.Run("only remaining revision", func(t *testing.T) {
t.Skip("not yet supported")
getReq := &rpc.GetApiDeploymentRequest{
Name: "projects/my-project/locations/global/apis/my-api/deployments/d",
}
firstRevision, err := server.GetApiDeployment(ctx, getReq)
if err != nil {
t.Fatalf("Setup: GetApiSpecRequest(%+v) returned error: %s", getReq, err)
}

t.Run("only remaining revision", func(t *testing.T) {
req := &rpc.DeleteApiDeploymentRevisionRequest{
Name: "projects/my-project/locations/global/apis/my-api/deployments/d",
Name: fmt.Sprintf("projects/my-project/locations/global/apis/my-api/deployments/d@%s", firstRevision.GetRevisionId()),
}

if _, err := server.DeleteApiDeploymentRevision(ctx, req); status.Code(err) != codes.FailedPrecondition {
Expand Down
13 changes: 13 additions & 0 deletions server/registry/internal/storage/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,19 @@ func (c *Client) DeleteDeploymentRevision(ctx context.Context, name names.Deploy
}
}

// if we deleted the last revision, return an error to cancel the transaction
op := c.db.WithContext(ctx).
Where("project_id = ?", name.ProjectID).
Where("api_id = ?", name.ApiID).
Where("deployment_id = ?", name.DeploymentID).
Order("revision_create_time desc")
v := new(models.Deployment)
if err := op.First(v).Error; err == gorm.ErrRecordNotFound {
return status.Errorf(codes.FailedPrecondition, "cannot delete the only revision: %s", name)
} else if err != nil {
return grpcErrorForDBError(ctx, err)
}

return nil
}

Expand Down