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

[arvados.git] / tools / sync-users / sync-users.go

diff --git a/tools/sync-users/sync-users.go b/tools/sync-users/sync-users.go
index f9f8b6046cd376d7e3b59d002168fe237066088c..626d9d04221721bc0f56d2a8503b29b25fc3f0b2 100644 (file)
--- a/tools/sync-users/sync-users.go
+++ b/tools/sync-users/sync-users.go
@@ -123,8 +123,10 @@ func ParseFlags(cfg *ConfigParams) error {
        // Input file as a required positional argument
        if flags.NArg() == 0 {
                return fmt.Errorf("please provide a path to an input file")
+       } else if flags.NArg() > 1 {
+               return fmt.Errorf("please provide just one input file argument")
        }
-       srcPath := &os.Args[flags.NFlag()+1]
+       srcPath := &os.Args[len(os.Args)-1]
 
        // Validations
        if *srcPath == "" {
@@ -247,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 {
@@ -370,7 +374,7 @@ type userRecord struct {
 
 func needsUpdating(user arvados.User, record userRecord) bool {
        userData := userRecord{"", user.FirstName, user.LastName, user.IsActive, user.IsAdmin}
-       recordData := userRecord{"", record.FirstName, record.LastName, record.Active, record.Admin}
+       recordData := userRecord{"", record.FirstName, record.LastName, record.Active, record.Active && record.Admin}
        return userData != recordData
 }
 
@@ -442,7 +446,6 @@ func ProcessRecord(cfg *ConfigParams, record userRecord, userIDToUUID map[string
                        }
                }
        }
-       allUsers[record.UserID] = user
        if createRequired {
                log.Printf("Created user %q", record.UserID)
        }