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

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

4
api/http/proxy/factory/azure/access_control.go
View file

@ -18,7 +18,7 @@ func (transport *Transport) createAzureRequestContext(request *http.Request) (*a
return nil, err
}
resourceControls, err := transport.dataStore.ResourceControl().ResourceControls()
resourceControls, err := transport.dataStore.ResourceControl().ReadAll()
if err != nil {
return nil, err
}
@ -139,7 +139,7 @@ func (transport *Transport) removeResourceControl(containerGroup map[string]inte
if ok {
resourceControl := transport.findResourceControl(containerGroupID, context)
if resourceControl != nil {
err := transport.dataStore.ResourceControl().DeleteResourceControl(resourceControl.ID)
err := transport.dataStore.ResourceControl().Delete(resourceControl.ID)
return err
}
} else {

12
api/http/proxy/factory/docker/transport.go
View file

@ -179,7 +179,7 @@ func (transport *Transport) proxyAgentRequest(r *http.Request) (*http.Response,
}
if registryID != 0 {
registry, err = transport.dataStore.Registry().Registry(portainer.RegistryID(registryID))
registry, err = transport.dataStore.Registry().Read(portainer.RegistryID(registryID))
if err != nil {
return nil, fmt.Errorf("failed fetching registry: %w", err)
}
@ -507,7 +507,7 @@ func (transport *Transport) restrictedResourceOperation(request *http.Request, r
userTeamIDs = append(userTeamIDs, membership.TeamID)
}
resourceControls, err := transport.dataStore.ResourceControl().ResourceControls()
resourceControls, err := transport.dataStore.ResourceControl().ReadAll()
if err != nil {
return nil, err
}
@ -654,7 +654,7 @@ func (transport *Transport) executeGenericResourceDeletionOperation(request *htt
}
if resourceControl != nil {
err = transport.dataStore.ResourceControl().DeleteResourceControl(resourceControl.ID)
err = transport.dataStore.ResourceControl().Delete(resourceControl.ID)
if err != nil {
return response, err
}
@ -702,13 +702,13 @@ func (transport *Transport) createRegistryAccessContext(request *http.Request) (
endpointID: transport.endpoint.ID,
}
user, err := transport.dataStore.User().User(tokenData.ID)
user, err := transport.dataStore.User().Read(tokenData.ID)
if err != nil {
return nil, err
}
accessContext.user = user
registries, err := transport.dataStore.Registry().Registries()
registries, err := transport.dataStore.Registry().ReadAll()
if err != nil {
return nil, err
}
@ -735,7 +735,7 @@ func (transport *Transport) createOperationContext(request *http.Request) (*rest
return nil, err
}
resourceControls, err := transport.dataStore.ResourceControl().ResourceControls()
resourceControls, err := transport.dataStore.ResourceControl().ReadAll()
if err != nil {
return nil, err
}

8
api/http/proxy/factory/kubernetes/namespaces.go
View file

@ -12,7 +12,7 @@ func (transport *baseTransport) proxyNamespaceDeleteOperation(request *http.Requ
return nil, errors.WithMessagef(err, "failed to delete a namespace [%s] from portainer config", namespace)
}
registries, err := transport.dataStore.Registry().Registries()
registries, err := transport.dataStore.Registry().ReadAll()
if err != nil {
return nil, err
}
@ -39,7 +39,7 @@ func (transport *baseTransport) proxyNamespaceDeleteOperation(request *http.Requ
}
registry.RegistryAccesses[endpointID] = updatedAccessPolicies
err := transport.dataStore.Registry().UpdateRegistry(registry.ID, &registry)
err := transport.dataStore.Registry().Update(registry.ID, &registry)
if err != nil {
return nil, err
}
@ -47,14 +47,14 @@ func (transport *baseTransport) proxyNamespaceDeleteOperation(request *http.Requ
}
}
stacks, err := transport.dataStore.Stack().Stacks()
stacks, err := transport.dataStore.Stack().ReadAll()
if err != nil {
return nil, err
}
for _, s := range stacks {
if s.Namespace == namespace && s.EndpointID == transport.endpoint.ID {
if err := transport.dataStore.Stack().DeleteStack(s.ID); err != nil {
if err := transport.dataStore.Stack().Delete(s.ID); err != nil {
return nil, err
}
}

2
api/http/proxy/factory/kubernetes/transport.go
View file

@ -172,7 +172,7 @@ func decorateAgentDockerHubRequest(r *http.Request, dataStore dataservices.DataS
}
if registryID != 0 {
registry, err = dataStore.Registry().Registry(portainer.RegistryID(registryID))
registry, err = dataStore.Registry().Read(portainer.RegistryID(registryID))
if err != nil {
return fmt.Errorf("failed fetching registry: %w", err)
}