From: Lucas Di Pentima <lucas.dipentima@curii.com>
Date: Thu, 7 Jul 2022 17:31:24 +0000 (-0300)
Subject: 18858: Don't treat as an error empty usernames on system users.
X-Git-Tag: 2.5.0~121^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c294528f250d4eea64ee40183598f40f32e9e796

18858: Don't treat as an error empty usernames on system users.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>
---

diff --git a/tools/sync-users/sync-users.go b/tools/sync-users/sync-users.go
index 4b679ffe18..626d9d0422 100644
--- a/tools/sync-users/sync-users.go
+++ b/tools/sync-users/sync-users.go
@@ -249,8 +249,10 @@ func doMain(cfg *ConfigParams) error {
 			return err
 		}
 		if uID == "" {
-			emptyUserIDs = append(emptyUserIDs, u.UUID)
-			log.Printf("Empty %s found in user %s - ignoring", cfg.UserID, u.UUID)
+			if u.UUID != cfg.AnonUserUUID && u.UUID != cfg.SysUserUUID {
+				emptyUserIDs = append(emptyUserIDs, u.UUID)
+				log.Printf("Empty %s found in user %s - ignoring", cfg.UserID, u.UUID)
+			}
 			continue
 		}
 		if cfg.CaseInsensitive {