From 28a94d6623ef34bfdbed246bcdef7d3e987f587e Mon Sep 17 00:00:00 2001 From: Todd Date: Tue, 16 Apr 2024 13:29:19 -0700 Subject: [PATCH] reviewer comments --- internal/daemon/controller/handlers/users/user_service.go | 2 -- internal/perms/grants.go | 8 ++++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/daemon/controller/handlers/users/user_service.go b/internal/daemon/controller/handlers/users/user_service.go index 3956bfc4ed..8ca5ac2852 100644 --- a/internal/daemon/controller/handlers/users/user_service.go +++ b/internal/daemon/controller/handlers/users/user_service.go @@ -15,7 +15,6 @@ import ( "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/daemon/controller/handlers/targets" "github.com/hashicorp/boundary/internal/errors" - "github.com/hashicorp/boundary/internal/event" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/iam/store" @@ -518,7 +517,6 @@ func (s Service) ListResolvableAliases(ctx context.Context, req *pbs.ListResolva SortDir: "desc", }, nil } - event.WriteSysEvent(ctx, op, "permissions found") pageSize := int(s.maxPageSize) // Use the requested page size only if it is smaller than diff --git a/internal/perms/grants.go b/internal/perms/grants.go index eda5ed1fb9..de73502d0d 100644 --- a/internal/perms/grants.go +++ b/internal/perms/grants.go @@ -59,14 +59,18 @@ func (g GrantTuples) GrantHash(ctx context.Context) ([]byte, error) { } // Sort for deterministic output slices.Sort(values) - hashVal, err := hashStrings(values...) + hashVal, err := hashStrings(ctx, values...) if err != nil { return nil, errors.Wrap(ctx, err, op) } return binary.LittleEndian.AppendUint64(make([]byte, 0, 4), hashVal), nil } -func hashStrings(s ...string) (uint64, error) { +func hashStrings(ctx context.Context, s ...string) (uint64, error) { + const op = "perms.hashStrings" + if len(s) == 0 { + return 0, errors.New(ctx, errors.InvalidParameter, op, "no strings provided") + } hasher := fnv.New64() var h uint64 var err error