From 4b24019bae4f4a8bca9eb620e1afda49c5923ce4 Mon Sep 17 00:00:00 2001 From: Ieva Date: Tue, 14 May 2024 17:02:03 +0100 Subject: [PATCH] Dashboards: Don't set dashboard creator/updater if the action is done by an API key (#87704) don't parse userID if entity isn't user or service account --- pkg/services/dashboards/service/dashboard_service.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/services/dashboards/service/dashboard_service.go b/pkg/services/dashboards/service/dashboard_service.go index fb86d51e30a..1f149a67928 100644 --- a/pkg/services/dashboards/service/dashboard_service.go +++ b/pkg/services/dashboards/service/dashboard_service.go @@ -236,13 +236,14 @@ func resolveUserID(user identity.Requester, log log.Logger) (int64, error) { namespaceID, identifier := user.GetNamespacedID() if namespaceID != identity.NamespaceUser && namespaceID != identity.NamespaceServiceAccount { log.Debug("User does not belong to a user or service account namespace", "namespaceID", namespaceID, "userID", identifier) + } else { + var err error + userID, err = identity.IntIdentifier(namespaceID, identifier) + if err != nil { + log.Debug("failed to parse user ID", "namespaceID", namespaceID, "userID", identifier, "error", err) + } } - userID, err := identity.IntIdentifier(namespaceID, identifier) - - if err != nil { - log.Debug("failed to parse user ID", "namespaceID", namespaceID, "userID", identifier, "error", err) - } return userID, nil }