Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 07:49:41 +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

2
api/http/handler/webhooks/webhook_delete.go
View file

@ -37,7 +37,7 @@ func (handler *Handler) webhookDelete(w http.ResponseWriter, r *http.Request) *h
return httperror.Forbidden("Not authorized to delete a webhook", errors.New("not authorized to delete a webhook"))
}
err = handler.DataStore.Webhook().DeleteWebhook(portainer.WebhookID(id))
err = handler.DataStore.Webhook().Delete(portainer.WebhookID(id))
if err != nil {
return httperror.InternalServerError("Unable to remove the webhook from the database", err)
}

2
api/http/handler/webhooks/webhook_execute.go
View file

@ -100,7 +100,7 @@ func (handler *Handler) executeServiceWebhook(
}
if registryID != 0 {
registry, err := handler.DataStore.Registry().Registry(registryID)
registry, err := handler.DataStore.Registry().Read(registryID)
if err != nil {
return httperror.InternalServerError("Error getting registry", err)
}

2
api/http/handler/webhooks/webhook_list.go
View file

@ -43,7 +43,7 @@ func (handler *Handler) webhookList(w http.ResponseWriter, r *http.Request) *htt
return response.JSON(w, []portainer.Webhook{})
}
webhooks, err := handler.DataStore.Webhook().Webhooks()
webhooks, err := handler.DataStore.Webhook().ReadAll()
if err != nil {
return httperror.InternalServerError("Unable to retrieve webhooks from the database", err)
}

4
api/http/handler/webhooks/webhook_update.go
View file

@ -48,7 +48,7 @@ func (handler *Handler) webhookUpdate(w http.ResponseWriter, r *http.Request) *h
return httperror.BadRequest("Invalid request payload", err)
}
webhook, err := handler.DataStore.Webhook().Webhook(webhookID)
webhook, err := handler.DataStore.Webhook().Read(webhookID)
if handler.DataStore.IsErrObjectNotFound(err) {
return httperror.NotFound("Unable to find a webhooks with the specified identifier inside the database", err)
} else if err != nil {
@ -78,7 +78,7 @@ func (handler *Handler) webhookUpdate(w http.ResponseWriter, r *http.Request) *h
webhook.RegistryID = payload.RegistryID
err = handler.DataStore.Webhook().UpdateWebhook(portainer.WebhookID(id), webhook)
err = handler.DataStore.Webhook().Update(portainer.WebhookID(id), webhook)
if err != nil {
return httperror.InternalServerError("Unable to persist the webhook inside the database", err)
}