From 21d04eddc68e55e215298f6473c8cc383fb675f2 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 9 Jul 2024 13:04:24 -0400 Subject: [PATCH] 21910: Remove ModifiedByClientUUID from SDK & controller responses. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- sdk/go/arvados/api_client_authorization.go | 25 +++++++------- sdk/go/arvados/authorized_key.go | 23 ++++++------- sdk/go/arvados/collection.go | 1 - sdk/go/arvados/container.go | 2 -- sdk/go/arvados/group.go | 37 ++++++++++---------- sdk/go/arvados/link.go | 29 ++++++++-------- sdk/go/arvados/user.go | 39 +++++++++++----------- 7 files changed, 74 insertions(+), 82 deletions(-) diff --git a/sdk/go/arvados/api_client_authorization.go b/sdk/go/arvados/api_client_authorization.go index f948c5a7c6..e357da96b1 100644 --- a/sdk/go/arvados/api_client_authorization.go +++ b/sdk/go/arvados/api_client_authorization.go @@ -8,19 +8,18 @@ import "time" // APIClientAuthorization is an arvados#apiClientAuthorization resource. type APIClientAuthorization struct { - UUID string `json:"uuid"` - APIToken string `json:"api_token"` - CreatedAt time.Time `json:"created_at"` - CreatedByIPAddress string `json:"created_by_ip_address"` - Etag string `json:"etag"` - ExpiresAt time.Time `json:"expires_at"` - LastUsedAt time.Time `json:"last_used_at"` - LastUsedByIPAddress string `json:"last_used_by_ip_address"` - ModifiedAt time.Time `json:"modified_at"` - ModifiedByClientUUID string `json:"modified_by_client_uuid"` - ModifiedByUserUUID string `json:"modified_by_user_uuid"` - OwnerUUID string `json:"owner_uuid"` - Scopes []string `json:"scopes"` + UUID string `json:"uuid"` + APIToken string `json:"api_token"` + CreatedAt time.Time `json:"created_at"` + CreatedByIPAddress string `json:"created_by_ip_address"` + Etag string `json:"etag"` + ExpiresAt time.Time `json:"expires_at"` + LastUsedAt time.Time `json:"last_used_at"` + LastUsedByIPAddress string `json:"last_used_by_ip_address"` + ModifiedAt time.Time `json:"modified_at"` + ModifiedByUserUUID string `json:"modified_by_user_uuid"` + OwnerUUID string `json:"owner_uuid"` + Scopes []string `json:"scopes"` } // APIClientAuthorizationList is an arvados#apiClientAuthorizationList resource. diff --git a/sdk/go/arvados/authorized_key.go b/sdk/go/arvados/authorized_key.go index 642fc11261..0d363e1164 100644 --- a/sdk/go/arvados/authorized_key.go +++ b/sdk/go/arvados/authorized_key.go @@ -8,18 +8,17 @@ import "time" // AuthorizedKey is an arvados#authorizedKey resource. type AuthorizedKey struct { - UUID string `json:"uuid"` - Etag string `json:"etag"` - OwnerUUID string `json:"owner_uuid"` - CreatedAt time.Time `json:"created_at"` - ModifiedAt time.Time `json:"modified_at"` - ModifiedByClientUUID string `json:"modified_by_client_uuid"` - ModifiedByUserUUID string `json:"modified_by_user_uuid"` - Name string `json:"name"` - AuthorizedUserUUID string `json:"authorized_user_uuid"` - PublicKey string `json:"public_key"` - KeyType string `json:"key_type"` - ExpiresAt time.Time `json:"expires_at"` + UUID string `json:"uuid"` + Etag string `json:"etag"` + OwnerUUID string `json:"owner_uuid"` + CreatedAt time.Time `json:"created_at"` + ModifiedAt time.Time `json:"modified_at"` + ModifiedByUserUUID string `json:"modified_by_user_uuid"` + Name string `json:"name"` + AuthorizedUserUUID string `json:"authorized_user_uuid"` + PublicKey string `json:"public_key"` + KeyType string `json:"key_type"` + ExpiresAt time.Time `json:"expires_at"` } // AuthorizedKeyList is an arvados#authorizedKeyList resource. diff --git a/sdk/go/arvados/collection.go b/sdk/go/arvados/collection.go index 1e9616c428..f9702bb5a8 100644 --- a/sdk/go/arvados/collection.go +++ b/sdk/go/arvados/collection.go @@ -31,7 +31,6 @@ type Collection struct { Name string `json:"name"` CreatedAt time.Time `json:"created_at"` ModifiedAt time.Time `json:"modified_at"` - ModifiedByClientUUID string `json:"modified_by_client_uuid"` ModifiedByUserUUID string `json:"modified_by_user_uuid"` PortableDataHash string `json:"portable_data_hash"` ReplicationConfirmed *int `json:"replication_confirmed"` diff --git a/sdk/go/arvados/container.go b/sdk/go/arvados/container.go index 70038a18f7..11ff8ecd00 100644 --- a/sdk/go/arvados/container.go +++ b/sdk/go/arvados/container.go @@ -11,7 +11,6 @@ type Container struct { UUID string `json:"uuid"` Etag string `json:"etag"` CreatedAt time.Time `json:"created_at"` - ModifiedByClientUUID string `json:"modified_by_client_uuid"` ModifiedByUserUUID string `json:"modified_by_user_uuid"` ModifiedAt time.Time `json:"modified_at"` Command []string `json:"command"` @@ -49,7 +48,6 @@ type ContainerRequest struct { UUID string `json:"uuid"` OwnerUUID string `json:"owner_uuid"` CreatedAt time.Time `json:"created_at"` - ModifiedByClientUUID string `json:"modified_by_client_uuid"` ModifiedByUserUUID string `json:"modified_by_user_uuid"` ModifiedAt time.Time `json:"modified_at"` Href string `json:"href"` diff --git a/sdk/go/arvados/group.go b/sdk/go/arvados/group.go index 0782bd43d1..9dee2fe99f 100644 --- a/sdk/go/arvados/group.go +++ b/sdk/go/arvados/group.go @@ -10,25 +10,24 @@ import ( // Group is an arvados#group record type Group struct { - UUID string `json:"uuid"` - Name string `json:"name"` - OwnerUUID string `json:"owner_uuid"` - GroupClass string `json:"group_class"` - Etag string `json:"etag"` - Href string `json:"href"` - TrashAt *time.Time `json:"trash_at"` - CreatedAt time.Time `json:"created_at"` - ModifiedAt time.Time `json:"modified_at"` - ModifiedByClientUUID string `json:"modified_by_client_uuid"` - ModifiedByUserUUID string `json:"modified_by_user_uuid"` - DeleteAt *time.Time `json:"delete_at"` - IsTrashed bool `json:"is_trashed"` - Properties map[string]interface{} `json:"properties"` - WritableBy []string `json:"writable_by,omitempty"` - Description string `json:"description"` - FrozenByUUID string `json:"frozen_by_uuid"` - CanWrite bool `json:"can_write"` - CanManage bool `json:"can_manage"` + UUID string `json:"uuid"` + Name string `json:"name"` + OwnerUUID string `json:"owner_uuid"` + GroupClass string `json:"group_class"` + Etag string `json:"etag"` + Href string `json:"href"` + TrashAt *time.Time `json:"trash_at"` + CreatedAt time.Time `json:"created_at"` + ModifiedAt time.Time `json:"modified_at"` + ModifiedByUserUUID string `json:"modified_by_user_uuid"` + DeleteAt *time.Time `json:"delete_at"` + IsTrashed bool `json:"is_trashed"` + Properties map[string]interface{} `json:"properties"` + WritableBy []string `json:"writable_by,omitempty"` + Description string `json:"description"` + FrozenByUUID string `json:"frozen_by_uuid"` + CanWrite bool `json:"can_write"` + CanManage bool `json:"can_manage"` } // GroupList is an arvados#groupList resource. diff --git a/sdk/go/arvados/link.go b/sdk/go/arvados/link.go index 3bf5bcb8dd..4ccc47fd50 100644 --- a/sdk/go/arvados/link.go +++ b/sdk/go/arvados/link.go @@ -8,21 +8,20 @@ import "time" // Link is an arvados#link record type Link struct { - UUID string `json:"uuid,omitempty"` - Etag string `json:"etag"` - Href string `json:"href"` - OwnerUUID string `json:"owner_uuid"` - Name string `json:"name"` - LinkClass string `json:"link_class"` - CreatedAt time.Time `json:"created_at"` - ModifiedAt time.Time `json:"modified_at"` - ModifiedByClientUUID string `json:"modified_by_client_uuid"` - ModifiedByUserUUID string `json:"modified_by_user_uuid"` - HeadUUID string `json:"head_uuid"` - HeadKind string `json:"head_kind"` - TailUUID string `json:"tail_uuid"` - TailKind string `json:"tail_kind"` - Properties map[string]interface{} `json:"properties"` + UUID string `json:"uuid,omitempty"` + Etag string `json:"etag"` + Href string `json:"href"` + OwnerUUID string `json:"owner_uuid"` + Name string `json:"name"` + LinkClass string `json:"link_class"` + CreatedAt time.Time `json:"created_at"` + ModifiedAt time.Time `json:"modified_at"` + ModifiedByUserUUID string `json:"modified_by_user_uuid"` + HeadUUID string `json:"head_uuid"` + HeadKind string `json:"head_kind"` + TailUUID string `json:"tail_uuid"` + TailKind string `json:"tail_kind"` + Properties map[string]interface{} `json:"properties"` } // LinkList is an arvados#linkList resource. diff --git a/sdk/go/arvados/user.go b/sdk/go/arvados/user.go index 2fb061e7fb..157a3d8863 100644 --- a/sdk/go/arvados/user.go +++ b/sdk/go/arvados/user.go @@ -8,26 +8,25 @@ import "time" // User is an arvados#user record type User struct { - UUID string `json:"uuid"` - Etag string `json:"etag"` - IsActive bool `json:"is_active"` - IsAdmin bool `json:"is_admin"` - Username string `json:"username"` - Email string `json:"email"` - FullName string `json:"full_name"` - FirstName string `json:"first_name"` - LastName string `json:"last_name"` - IdentityURL string `json:"identity_url"` - IsInvited bool `json:"is_invited"` - 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"` - Prefs map[string]interface{} `json:"prefs"` - WritableBy []string `json:"writable_by,omitempty"` - CanWrite bool `json:"can_write"` - CanManage bool `json:"can_manage"` + UUID string `json:"uuid"` + Etag string `json:"etag"` + IsActive bool `json:"is_active"` + IsAdmin bool `json:"is_admin"` + Username string `json:"username"` + Email string `json:"email"` + FullName string `json:"full_name"` + FirstName string `json:"first_name"` + LastName string `json:"last_name"` + IdentityURL string `json:"identity_url"` + IsInvited bool `json:"is_invited"` + OwnerUUID string `json:"owner_uuid"` + CreatedAt time.Time `json:"created_at"` + ModifiedAt time.Time `json:"modified_at"` + ModifiedByUserUUID string `json:"modified_by_user_uuid"` + Prefs map[string]interface{} `json:"prefs"` + WritableBy []string `json:"writable_by,omitempty"` + CanWrite bool `json:"can_write"` + CanManage bool `json:"can_manage"` } // UserList is an arvados#userList resource. -- 2.30.2