From 01676fe3a4c80a208af8c64e62a18faedf78d3fd Mon Sep 17 00:00:00 2001 From: Gianmaria Del Monte <39946305+gmgigi96@users.noreply.github.com> Date: Tue, 29 Nov 2022 13:47:13 +0100 Subject: [PATCH] Direct access to rules map when getting auth provider (#3028) * direct access to rules map when getting auth provider * add changelog --- changelog/unreleased/auth-registry.md | 3 +++ pkg/auth/registry/static/static.go | 14 ++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 changelog/unreleased/auth-registry.md diff --git a/changelog/unreleased/auth-registry.md b/changelog/unreleased/auth-registry.md new file mode 100644 index 0000000000..4dc6cb3e92 --- /dev/null +++ b/changelog/unreleased/auth-registry.md @@ -0,0 +1,3 @@ +Enhancement: Access directly auth registry rules map when getting provider + +https://github.com/cs3org/reva/pull/3028 diff --git a/pkg/auth/registry/static/static.go b/pkg/auth/registry/static/static.go index cb34592bc8..d98f9c87d8 100644 --- a/pkg/auth/registry/static/static.go +++ b/pkg/auth/registry/static/static.go @@ -50,7 +50,7 @@ type reg struct { } func (r *reg) ListProviders(ctx context.Context) ([]*registrypb.ProviderInfo, error) { - providers := []*registrypb.ProviderInfo{} + providers := make([]*registrypb.ProviderInfo, len(r.rules)) for k, v := range r.rules { providers = append(providers, ®istrypb.ProviderInfo{ ProviderType: k, @@ -61,13 +61,11 @@ func (r *reg) ListProviders(ctx context.Context) ([]*registrypb.ProviderInfo, er } func (r *reg) GetProvider(ctx context.Context, authType string) (*registrypb.ProviderInfo, error) { - for k, v := range r.rules { - if k == authType { - return ®istrypb.ProviderInfo{ - ProviderType: k, - Address: v, - }, nil - } + if address, ok := r.rules[authType]; ok { + return ®istrypb.ProviderInfo{ + ProviderType: authType, + Address: address, + }, nil } return nil, errtypes.NotFound("static: auth type not found: " + authType) }