Portainer
/
portainer
mirror of https://github.com/portainer/portainer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(endpointgroups): fix a nil pointer dereference error in deleteEndpointGroup BE-12510 (#1599)

pull/13072/head
andres-portainer 2026-01-02 15:17:51 -03:00 committed by GitHub
parent 935f3b8754
commit 36ff24c301
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
api/http/handler/endpointgroups/endpointgroup_delete.go
View File

@ -49,8 +49,7 @@ func (handler *Handler) deleteEndpointGroup(tx dataservices.DataStoreTx, endpoin
return httperror.InternalServerError("Unable to find an environment group with the specified identifier inside the database", err)
}
err = tx.EndpointGroup().Delete(endpointGroupID)
if err != nil {
if err := tx.EndpointGroup().Delete(endpointGroupID); err != nil {
return httperror.InternalServerError("Unable to remove the environment group from the database", err)
}
@ -60,30 +59,29 @@ func (handler *Handler) deleteEndpointGroup(tx dataservices.DataStoreTx, endpoin
}
for _, endpoint := range endpoints {
if endpoint.GroupID == endpointGroupID {
endpoint.GroupID = portainer.EndpointGroupID(1)
err = tx.Endpoint().UpdateEndpoint(endpoint.ID, &endpoint)
if err != nil {
return httperror.InternalServerError("Unable to update environment", err)
}
if endpoint.GroupID != endpointGroupID {
continue
}
err = handler.updateEndpointRelations(tx, &endpoint, nil)
if err != nil {
return httperror.InternalServerError("Unable to persist environment relations changes inside the database", err)
}
endpoint.GroupID = portainer.EndpointGroupID(1)
if err := tx.Endpoint().UpdateEndpoint(endpoint.ID, &endpoint); err != nil {
return httperror.InternalServerError("Unable to update environment", err)
}
if err := handler.updateEndpointRelations(tx, &endpoint, nil); err != nil {
return httperror.InternalServerError("Unable to persist environment relations changes inside the database", err)
}
}
for _, tagID := range endpointGroup.TagIDs {
tag, err := tx.Tag().Read(tagID)
if tx.IsErrObjectNotFound(err) {
if err != nil {
return httperror.InternalServerError("Unable to find a tag inside the database", err)
}
delete(tag.EndpointGroups, endpointGroup.ID)
err = tx.Tag().Update(tagID, tag)
if err != nil {
if err := tx.Tag().Update(tagID, tag); err != nil {
return httperror.InternalServerError("Unable to persist tag changes inside the database", err)
}
}