Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-04 13:25:26 +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/internal/registryutils/access/access.go
View file

@ -14,7 +14,7 @@ func hasPermission(
endpointID portainer.EndpointID,
registry *portainer.Registry,
) (hasPermission bool, err error) {
user, err := dataStore.User().User(userID)
user, err := dataStore.User().Read(userID)
if err != nil {
return
}
@ -41,7 +41,7 @@ func GetAccessibleRegistry(
registryID portainer.RegistryID,
) (registry *portainer.Registry, err error) {
registry, err = dataStore.Registry().Registry(registryID)
registry, err = dataStore.Registry().Read(registryID)
if err != nil {
return
}

2
api/internal/registryutils/ecr_kube_secret.go
View file

@ -16,7 +16,7 @@ func isRegistryAssignedToNamespace(registry portainer.Registry, endpointID porta
}
func RefreshEcrSecret(cli portainer.KubeClient, endpoint *portainer.Endpoint, dataStore dataservices.DataStore, namespace string) (err error) {
registries, err := dataStore.Registry().Registries()
registries, err := dataStore.Registry().ReadAll()
if err != nil {
return
}

2
api/internal/registryutils/ecr_reg_token.go
View file

@ -24,7 +24,7 @@ func doGetRegToken(dataStore dataservices.DataStore, registry *portainer.Registr
registry.AccessToken = *accessToken
registry.AccessTokenExpiry = expiryAt.Unix()
err = dataStore.Registry().UpdateRegistry(registry.ID, registry)
err = dataStore.Registry().Update(registry.ID, registry)
return
}