Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 15:59:41 +02:00
Code Issues Releases Activity

chore(code): remove unnecessary type conversions EE-7191 (#11908)

Browse source
This commit is contained in:
andres-portainer 2024-06-10 09:32:52 -03:00 • committed by GitHub
parent 8e480c9fab
commit 90a19cec5c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
42 changed files with 56 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
api/http/handler/endpoints/endpoint_delete.go
View file

@ -130,7 +130,7 @@ func (handler *Handler) endpointDeleteBatch(w http.ResponseWriter, r *http.Reque
}
func (handler *Handler) deleteEndpoint(tx dataservices.DataStoreTx, endpointID portainer.EndpointID, deleteCluster bool) error {
endpoint, err := tx.Endpoint().Endpoint(portainer.EndpointID(endpointID))
endpoint, err := tx.Endpoint().Endpoint(endpointID)
if tx.IsErrObjectNotFound(err) {
return httperror.NotFound("Unable to find an environment with the specified identifier inside the database", err)
} else if err != nil {
@ -252,7 +252,7 @@ func (handler *Handler) deleteEndpoint(tx dataservices.DataStoreTx, endpointID p
log.Warn().Err(err).Int("endpointId", int(endpoint.ID)).Msgf("Unable to delete pending actions")
}
err = tx.Endpoint().DeleteEndpoint(portainer.EndpointID(endpointID))
err = tx.Endpoint().DeleteEndpoint(endpointID)
if err != nil {
return httperror.InternalServerError("Unable to delete the environment from the database", err)
}

2
api/http/handler/endpoints/endpoint_registries_list.go
View file

@ -62,7 +62,7 @@ func (handler *Handler) listRegistries(tx dataservices.DataStoreTx, r *http.Requ
return nil, httperror.InternalServerError("Unable to retrieve user from the database", err)
}
endpoint, err := tx.Endpoint().Endpoint(portainer.EndpointID(endpointID))
endpoint, err := tx.Endpoint().Endpoint(endpointID)
if tx.IsErrObjectNotFound(err) {
return nil, httperror.NotFound("Unable to find an environment with the specified identifier inside the database", err)
} else if err != nil {

2
api/http/handler/endpoints/endpoint_registry_access.go
View file

@ -122,7 +122,7 @@ func (handler *Handler) updateRegistryAccess(tx dataservices.DataStoreTx, r *htt
registryAccess.TeamAccessPolicies = payload.TeamAccessPolicies
}
registry.RegistryAccesses[portainer.EndpointID(endpointID)] = registryAccess
registry.RegistryAccesses[endpointID] = registryAccess
return tx.Registry().Update(registry.ID, registry)
}

2
api/http/handler/endpoints/filter.go
View file

@ -432,7 +432,7 @@ func edgeGroupMatchSearchCriteria(
func filterEndpointsByTypes(endpoints []portainer.Endpoint, endpointTypes []portainer.EndpointType) []portainer.Endpoint {
typeSet := map[portainer.EndpointType]bool{}
for _, endpointType := range endpointTypes {
typeSet[portainer.EndpointType(endpointType)] = true
typeSet[endpointType] = true
}
n := 0