[arvados] updated: 2.1.0-2693-gc294528f2

[git repository hosting]

Summary of changes:
 services/api/test/fixtures/users.yml | 2 --
 tools/sync-users/sync-users.go       | 6 ++++--
 2 files changed, 4 insertions(+), 4 deletions(-)

       via  c294528f250d4eea64ee40183598f40f32e9e796 (commit)
       via  0fa894e23fb824ea9b5222d808f3c205651d3170 (commit)
      from  15e759482006d9f689f8afeb40a97e0f15dfe278 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c294528f250d4eea64ee40183598f40f32e9e796
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Thu Jul 7 14:31:24 2022 -0300

    18858: Don't treat as an error empty usernames on system users.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/tools/sync-users/sync-users.go b/tools/sync-users/sync-users.go
index 4b679ffe1..626d9d042 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 {

commit 0fa894e23fb824ea9b5222d808f3c205651d3170
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Thu Jul 7 14:24:17 2022 -0300

    18858: Removed root & anonymous usernames from fixture to reflect reality.
    
    This makes tests to fail, but I think forcing usernames on common users
    is problematic on federated scenarios because of username collisions
    between users that exist on every cluster.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/services/api/test/fixtures/users.yml b/services/api/test/fixtures/users.yml
index 1d9bcbb04..56f44551e 100644
--- a/services/api/test/fixtures/users.yml
+++ b/services/api/test/fixtures/users.yml
@@ -12,7 +12,6 @@ system_user:
   modified_by_user_uuid: zzzzz-tpzed-000000000000000
   modified_at: 2014-11-27 06:38:21.208036000 Z
   email: root
-  username: root
   first_name: root
   last_name: ''
   identity_url:
@@ -233,7 +232,6 @@ anonymous:
   last_name: anonymouspublic
   is_active: false
   is_admin: false
-  username: anonymous
   prefs: {}
 
 job_reader:

-----------------------------------------------------------------------


hooks/post-receive
--