From 785bed2f78d228cd3e203c25b0f4484f1c53be6d Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Tue, 11 Feb 2020 14:10:48 -0300 Subject: [PATCH] 16141: Fixes User type, adjusts fixture to make the test pass. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- sdk/go/arvados/user.go | 4 ++-- services/api/test/fixtures/users.yml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk/go/arvados/user.go b/sdk/go/arvados/user.go index cbaf3d7a8e..68960144a8 100644 --- a/sdk/go/arvados/user.go +++ b/sdk/go/arvados/user.go @@ -22,8 +22,8 @@ type User struct { OwnerUUID string `json:"owner_uuid"` CreatedAt time.Time `json:"created_at"` ModifiedAt time.Time `json:"modified_at"` - ModifiedByUserUUID *string `json:"modified_by_user_uuid"` - ModifiedByClientUUID *string `json:"modified_by_client_uuid"` + ModifiedByUserUUID string `json:"modified_by_user_uuid"` + ModifiedByClientUUID string `json:"modified_by_client_uuid"` Prefs map[string]interface{} `json:"prefs"` WritableBy []string `json:"writable_by,omitempty"` } diff --git a/services/api/test/fixtures/users.yml b/services/api/test/fixtures/users.yml index 4733096cbe..57633a3120 100644 --- a/services/api/test/fixtures/users.yml +++ b/services/api/test/fixtures/users.yml @@ -72,6 +72,8 @@ active: owner_uuid: zzzzz-tpzed-000000000000000 uuid: zzzzz-tpzed-xurymjxw79nv3jz email: active-user@arvados.local + modified_by_client_uuid: zzzzz-ozdt8-teyxzyd8qllg11h + modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz first_name: Active last_name: User identity_url: https://active-user.openid.local -- 2.30.2