Merge branch '14715-keepprox-config'

[arvados.git] / sdk / go / arvados / user.go

diff --git a/sdk/go/arvados/user.go b/sdk/go/arvados/user.go
index 684a3af8aae86d0954b795d49717c2f4244b4d71..27d2b28a42b6c5c4312d0aa16624e8061103ac5d 100644 (file)
--- a/sdk/go/arvados/user.go
+++ b/sdk/go/arvados/user.go
@@ -1,11 +1,24 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package arvados
 
 // User is an arvados#user record
 type User struct {
-       UUID     string `json:"uuid,omitempty"`
+       UUID     string `json:"uuid"`
        IsActive bool   `json:"is_active"`
        IsAdmin  bool   `json:"is_admin"`
-       Username string `json:"username,omitempty"`
+       Username string `json:"username"`
+       Email    string `json:"email"`
+}
+
+// UserList is an arvados#userList resource.
+type UserList struct {
+       Items          []User `json:"items"`
+       ItemsAvailable int    `json:"items_available"`
+       Offset         int    `json:"offset"`
+       Limit          int    `json:"limit"`
 }
 
 // CurrentUser calls arvados.v1.users.current, and returns the User