Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00
Code Issues Releases Activity

feat(dataservices): unify access methods and abstract away redundant code [EE-5628] (#9115)

Browse source
This commit is contained in:
andres-portainer 2023-06-22 18:28:07 -03:00 • committed by GitHub
parent 4c6bbe9a2f
commit 4cc96b4b30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
171 changed files with 714 additions and 1590 deletions
Download patch file Download diff file Expand all files Collapse all files

4
api/http/handler/teams/team_delete.go
View file

@ -30,14 +30,14 @@ func (handler *Handler) teamDelete(w http.ResponseWriter, r *http.Request) *http
return httperror.BadRequest("Invalid team identifier route variable", err)
}
_, err = handler.DataStore.Team().Team(portainer.TeamID(teamID))
_, err = handler.DataStore.Team().Read(portainer.TeamID(teamID))
if handler.DataStore.IsErrObjectNotFound(err) {
return httperror.NotFound("Unable to find a team with the specified identifier inside the database", err)
} else if err != nil {
return httperror.InternalServerError("Unable to find a team with the specified identifier inside the database", err)
}
err = handler.DataStore.Team().DeleteTeam(portainer.TeamID(teamID))
err = handler.DataStore.Team().Delete(portainer.TeamID(teamID))
if err != nil {
return httperror.InternalServerError("Unable to delete the team from the database", err)
}

2
api/http/handler/teams/team_inspect.go
View file

@ -42,7 +42,7 @@ func (handler *Handler) teamInspect(w http.ResponseWriter, r *http.Request) *htt
return httperror.Forbidden("Access denied to team", errors.ErrResourceAccessDenied)
}
team, err := handler.DataStore.Team().Team(portainer.TeamID(teamID))
team, err := handler.DataStore.Team().Read(portainer.TeamID(teamID))
if handler.DataStore.IsErrObjectNotFound(err) {
return httperror.NotFound("Unable to find a team with the specified identifier inside the database", err)
} else if err != nil {

4
api/http/handler/teams/team_list.go
View file

@ -24,7 +24,7 @@ import (
// @failure 500 "Server error"
// @router /teams [get]
func (handler *Handler) teamList(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
teams, err := handler.DataStore.Team().Teams()
teams, err := handler.DataStore.Team().ReadAll()
if err != nil {
return httperror.InternalServerError("Unable to retrieve teams from the database", err)
}
@ -54,7 +54,7 @@ func (handler *Handler) teamList(w http.ResponseWriter, r *http.Request) *httper
return httperror.InternalServerError("Unable to retrieve endpoint from the database", err)
}
endpointGroup, err := handler.DataStore.EndpointGroup().EndpointGroup(endpoint.GroupID)
endpointGroup, err := handler.DataStore.EndpointGroup().Read(endpoint.GroupID)
if err != nil {
return httperror.InternalServerError("Unable to retrieve environment groups from the database", err)
}

4
api/http/handler/teams/team_update.go
View file

@ -48,7 +48,7 @@ func (handler *Handler) teamUpdate(w http.ResponseWriter, r *http.Request) *http
return httperror.BadRequest("Invalid request payload", err)
}
team, err := handler.DataStore.Team().Team(portainer.TeamID(teamID))
team, err := handler.DataStore.Team().Read(portainer.TeamID(teamID))
if handler.DataStore.IsErrObjectNotFound(err) {
return httperror.NotFound("Unable to find a team with the specified identifier inside the database", err)
} else if err != nil {
@ -59,7 +59,7 @@ func (handler *Handler) teamUpdate(w http.ResponseWriter, r *http.Request) *http
team.Name = payload.Name
}
err = handler.DataStore.Team().UpdateTeam(team.ID, team)
err = handler.DataStore.Team().Update(team.ID, team)
if err != nil {
return httperror.NotFound("Unable to persist team changes inside the database", err)
}