Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-30 10:49:40 +02:00
Code Issues Releases Activity

fix(pending-action): pending action data format [EE-7064] (#11794)

Browse source 
Co-authored-by: Prabhat Khera <91852476+prabhat-portainer@users.noreply.github.com>
This commit is contained in:
Matt Hook 2024-05-09 08:15:37 +12:00 • committed by GitHub
parent b920c542dd
commit 65060725df
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 151 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
api/pendingactions/pendingactions.go
View file

@ -117,12 +117,18 @@ func (service *PendingActionsService) executePendingAction(pendingAction portain
switch pendingAction.Action {
case actions.CleanNAPWithOverridePolicies:
if (pendingAction.ActionData == nil) || (pendingAction.ActionData.(portainer.EndpointGroupID) == 0) {
pendingActionData, err := actions.ConvertCleanNAPWithOverridePoliciesPayload(pendingAction.ActionData)
if err != nil {
return fmt.Errorf("failed to parse pendingActionData for CleanNAPWithOverridePoliciesPayload")
}
if pendingActionData == nil || pendingActionData.EndpointGroupID == 0 {
service.authorizationService.CleanNAPWithOverridePolicies(service.dataStore, endpoint, nil)
return nil
}
endpointGroupID := pendingAction.ActionData.(portainer.EndpointGroupID)
endpointGroupID := pendingActionData.EndpointGroupID
endpointGroup, err := service.dataStore.EndpointGroup().Read(portainer.EndpointGroupID(endpointGroupID))
if err != nil {
log.Error().Err(err).Msgf("Error reading environment group to clean NAP with override policies for environment %d and environment group %d", endpoint.ID, endpointGroup.ID)