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

fix(code): clean up EE-4432 (#7865)

Browse source
This commit is contained in:
andres-portainer 2022-10-14 18:09:07 -03:00 • committed by GitHub
parent 367f3dd6d4
commit ae2bec4bd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 25 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

7
api/http/handler/hostmanagement/fdo/fdo.go
View file

@ -128,12 +128,7 @@ func (handler *Handler) addDefaultProfile() error {
profile.FilePath = filePath
profile.DateCreated = time.Now().Unix()
err = handler.DataStore.FDOProfile().Create(profile)
if err != nil {
return err
}
return nil
return handler.DataStore.FDOProfile().Create(profile)
}
const defaultProfileFileContent = `

6
api/http/handler/hostmanagement/openamt/amtconfiguration.go
View file

@ -169,12 +169,8 @@ func (handler *Handler) saveConfiguration(configuration portainer.OpenAMTConfigu
configuration.MPSToken = ""
settings.OpenAMTConfiguration = configuration
err = handler.DataStore.Settings().UpdateSettings(settings)
if err != nil {
return err
}
return nil
return handler.DataStore.Settings().UpdateSettings(settings)
}
func (handler *Handler) disableOpenAMT() error {

10
api/http/handler/hostmanagement/openamt/amtrpc.go
View file

@ -295,11 +295,8 @@ func (handler *Handler) activateDevice(endpoint *portainer.Endpoint, settings po
}
_, err := handler.PullAndRunContainer(ctx, endpoint, rpcGoImageName, rpcGoContainerName, cmdLine)
if err != nil {
return err
}
return nil
return err
}
func (handler *Handler) deactivateDevice(endpoint *portainer.Endpoint, settings portainer.Settings) error {
@ -315,9 +312,6 @@ func (handler *Handler) deactivateDevice(endpoint *portainer.Endpoint, settings
}
_, err := handler.PullAndRunContainer(ctx, endpoint, rpcGoImageName, rpcGoContainerName, cmdLine)
if err != nil {
return err
}
return nil
return err
}