Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ TAG := $(shell git rev-list --tags --max-count=1)
VERSION := $(shell git describe --tags ${TAG})
.PHONY: build check fmt lint test test-race vet test-cover-html help install proto admin-app compose-up-dev
.DEFAULT_GOAL := build
PROTON_COMMIT := "9c069b5e749972014da7784f5c3802745a6e903e"
PROTON_COMMIT := "f51485d9a328b15f0a8d0dc14fcb405438e7ba93"

admin-app:
@echo " > generating admin build"
Expand Down
2 changes: 1 addition & 1 deletion cmd/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ func buildAPIDependencies(
metaschemaService := metaschema.NewService(metaschemaRepository)
projectRepository := postgres.NewProjectRepository(dbc)
projectService := project.NewService(projectRepository, relationService, userService, policyService,
authnService, serviceUserService, groupService)
authnService, serviceUserService, groupService, roleService)

resourcePGRepository := postgres.NewResourceRepository(dbc)
resourceService := resource.NewService(
Expand Down
13 changes: 8 additions & 5 deletions core/project/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ package project
import "errors"

var (
ErrNotExist = errors.New("project or its relations doesn't exist")
ErrInvalidUUID = errors.New("invalid syntax of uuid")
ErrInvalidID = errors.New("project id is invalid")
ErrConflict = errors.New("project already exist")
ErrInvalidDetail = errors.New("invalid project detail")
ErrNotExist = errors.New("project or its relations doesn't exist")
ErrInvalidUUID = errors.New("invalid syntax of uuid")
ErrInvalidID = errors.New("project id is invalid")
ErrConflict = errors.New("project already exist")
ErrInvalidDetail = errors.New("invalid project detail")
ErrInvalidProjectRole = errors.New("role is not valid for project scope")
ErrNotOrgMember = errors.New("user is not a member of the organization")
ErrInvalidPrincipalType = errors.New("invalid principal type")
)
57 changes: 57 additions & 0 deletions core/project/mocks/group_service.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 47 additions & 0 deletions core/project/mocks/policy_service.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

95 changes: 95 additions & 0 deletions core/project/mocks/role_service.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 57 additions & 0 deletions core/project/mocks/serviceuser_service.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading