Skip to content

Fix project delete error handling #8

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix project delete error handling #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c4194d
Fix project delete error handling
rdnt May 26, 2023
6a237dd
Cleanup
rdnt May 26, 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
24 changes: 12 additions & 12 deletions application/artifact.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,53 +7,53 @@ import (
)

// ProjectArtifactCreate creates a new artifact and copies src to the internal storage.
func (s *application) ProjectArtifactCreate(projectID uuid.UUID, artifactID string, src string, size int) (err error) {
func (a *application) ProjectArtifactCreate(projectID uuid.UUID, artifactID string, src string, size int) (err error) {
defer errz.Recover(&err)

exists, err := s.ProjectArtifactExists(projectID, artifactID)
exists, err := a.ProjectArtifactExists(projectID, artifactID)
errz.Fatal(err)

if exists {
return ErrArtifactAlreadyExists
}

err = s.projects.CreateArtifact(projectID, artifactID, src, size)
err = a.projects.CreateArtifact(projectID, artifactID, src, size)
errz.Fatal(err)

return nil
}

// ProjectArtifactDelete deletes a artifact from database and s3 storage, does nothing if artifact does not exists
func (s *application) ProjectArtifactDelete(projectID uuid.UUID, artifactID string) (err error) {
func (a *application) ProjectArtifactDelete(projectID uuid.UUID, artifactID string) (err error) {
defer errz.Recover(&err)

_, err = s.Project(projectID)
_, err = a.Project(projectID)
errz.Fatal(err)

err = s.projects.ProjectArtifactDelete(projectID, artifactID)
err = a.projects.ProjectArtifactDelete(projectID, artifactID)
errz.Fatal(err)

return nil
}

func (s *application) ProjectArtifactExists(projectID uuid.UUID, artifactID string) (_ bool, err error) {
func (a *application) ProjectArtifactExists(projectID uuid.UUID, artifactID string) (_ bool, err error) {
defer errz.Recover(&err)

_, err = s.Project(projectID)
_, err = a.Project(projectID)
if err != nil {
return false, err
}

return s.projects.ProjectArtifactExists(projectID, artifactID)
return a.projects.ProjectArtifactExists(projectID, artifactID)
}

func (s *application) ProjectArtifact(projectID uuid.UUID, artifactID string) (_ *artifact.A, err error) {
func (a *application) ProjectArtifact(projectID uuid.UUID, artifactID string) (_ *artifact.A, err error) {
defer errz.Recover(&err)

_, err = s.Project(projectID)
_, err = a.Project(projectID)
errz.Fatal(err)

artifact, err := s.projects.ProjectArtifact(projectID, artifactID)
artifact, err := a.projects.ProjectArtifact(projectID, artifactID)
errz.Fatal(err)

return artifact, nil
Expand Down
41 changes: 17 additions & 24 deletions application/project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,15 @@ import (
"github.com/google/uuid"
)

func (s *application) ProjectCreate(name, description string) (_ *project.P, err error) {
func (a *application) ProjectCreate(name, description string) (_ *project.P, err error) {
defer errz.Recover(&err)

if !s.projectNameValid(name) {
if !a.projectNameValid(name) {
return nil, ErrInvalidProjectName
}

//_, err = s.projects.ProjectByName(name)
//if err == nil {
// return nil, ErrProjectAlreadyExists
//} else if !errors.Is(err, projectrepo.ErrNotFound) {
// errz.Fatal(err)
//}

p := project.New(name, description)
err = s.projects.CreateOrUpdate(p)
err = a.projects.CreateOrUpdate(p)
errz.Fatal(err)

return p, nil
Expand All @@ -37,17 +30,17 @@ func (s *application) ProjectCreate(name, description string) (_ *project.P, err
// codepoints. The names `.` and `..` are not allowed.
//
// Ref: https://github.com/dead-claudia/github-limits#repository-names
func (s *application) projectNameValid(name string) bool {
func (a *application) projectNameValid(name string) bool {
// alphanumerics, hyphens, periods, underscores. length 1-100 codepoints
rex := regexp.MustCompile(`^[A-Za-z0-9-_.]{1,100}$`)

return rex.MatchString(name) && name != "." && name != ".."
}

func (s *application) Project(id uuid.UUID) (_ *project.P, err error) {
func (a *application) Project(id uuid.UUID) (_ *project.P, err error) {
defer errz.Recover(&err)

p, err := s.projects.Project(id)
p, err := a.projects.Project(id)
if errors.Is(err, projectrepo.ErrNotFound) {
return nil, ErrProjectNotFound
} else if err != nil {
Expand All @@ -57,16 +50,16 @@ func (s *application) Project(id uuid.UUID) (_ *project.P, err error) {
return p, nil
}

func (s *application) Projects() (_ []*project.P, err error) {
func (a *application) Projects() (_ []*project.P, err error) {
defer errz.Recover(&err)

return s.projects.Projects()
return a.projects.Projects()
}

func (s *application) ProjectByName(name string) (_ *project.P, err error) {
func (a *application) ProjectByName(name string) (_ *project.P, err error) {
defer errz.Recover(&err)

p, err := s.projects.ProjectByName(name)
p, err := a.projects.ProjectByName(name)
if errors.Is(err, projectrepo.ErrNotFound) {
return nil, ErrProjectNotFound
} else if err != nil {
Expand All @@ -76,10 +69,10 @@ func (s *application) ProjectByName(name string) (_ *project.P, err error) {
return p, nil
}

func (s *application) ProjectExists(name string) (exists bool, err error) {
func (a *application) ProjectExists(name string) (exists bool, err error) {
defer errz.Recover(&err)

_, err = s.projects.ProjectByName(name)
_, err = a.projects.ProjectByName(name)
if err == nil {
exists = true
} else {
Expand All @@ -93,14 +86,14 @@ func (s *application) ProjectExists(name string) (exists bool, err error) {
return exists, nil
}

func (s *application) ProjectDelete(projectID uuid.UUID) (err error) {
func (a *application) ProjectDelete(projectID uuid.UUID) (err error) {
defer errz.Recover(&err)

_, err = s.projects.Project(projectID)
errz.Fatal(err)

// Delete from database
err = s.projects.ProjectDelete(projectID)
err = a.projects.ProjectDelete(projectID)
if errors.Is(err, projectrepo.ErrNotFound) {
return ErrProjectNotFound
}
errz.Fatal(err)

return nil
Expand Down
2 changes: 1 addition & 1 deletion bob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project: bob.build/benchkram/bobc
version: 0.8.0
version: 0.8.2
nixpkgs: https://github.com/NixOS/nixpkgs/archive/refs/tags/22.05.tar.gz

variables:
Expand Down
2 changes: 1 addition & 1 deletion example/bob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project: localhost:8100/benchkram/bobc-example
version: 0.8.0
version: 0.8.2
nixpkgs: https://github.com/NixOS/nixpkgs/archive/refs/tags/22.05.tar.gz

build:
Expand Down
3 changes: 1 addition & 2 deletions restserver/project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"strconv"

"github.com/benchkram/bobc/application"
projectRepo "github.com/benchkram/bobc/pkg/projectrepo"
"github.com/benchkram/bobc/restserver/generated"
"github.com/benchkram/errz"
"github.com/google/uuid"
Expand Down Expand Up @@ -114,7 +113,7 @@ func (s *S) DeleteProject(ctx echo.Context, projectId string) (err error) {

p, err := s.app.Project(pid)
if err != nil {
if errors.Is(err, projectRepo.ErrNotFound) {
if errors.Is(err, application.ErrProjectNotFound) {
return ctx.JSON(http.StatusNotFound, nil)
} else {
errz.Log(err)
Expand Down