[arvados] updated: 2.7.0-5953-gf65d320d9f

[git repository hosting]

Summary of changes:
 lib/controller/integration_test.go                 |  2 +-
 services/api/app/models/user.rb                    | 20 +++++++++++---
 .../functional/arvados/v1/users_controller_test.rb | 31 ++++++++++++++++++++++
 3 files changed, 48 insertions(+), 5 deletions(-)

       via  f65d320d9f4dda35dcf90c294c494b059b4c36a6 (commit)
       via  1d0e275d1c2a1d5cb3d2351334788c13b9eea4a5 (commit)
       via  972b62e2bb581832cb7cfafce71e3cc6794e4361 (commit)
       via  9f487917d8c2aa3958473dd1c11dc584485c1229 (commit)
      from  d506da189ae39bbf86f53e7cd9cda0db45a54695 (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 f65d320d9f4dda35dcf90c294c494b059b4c36a6
Merge: d506da189a 1d0e275d1c
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Feb 2 16:44:13 2024 -0500

    Merge branch '21304-user-update' refs #21304
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>


commit 1d0e275d1c2a1d5cb3d2351334788c13b9eea4a5
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Feb 2 16:41:44 2024 -0500

    21304: Add a test
    
    Confirmed this fails on main and passes on this branch
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/services/api/test/functional/arvados/v1/users_controller_test.rb b/services/api/test/functional/arvados/v1/users_controller_test.rb
index 07e0b71d86..cc0b5e1320 100644
--- a/services/api/test/functional/arvados/v1/users_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/users_controller_test.rb
@@ -1101,6 +1101,37 @@ The Arvados team.
     assert_equal(1, Log.where(object_uuid: unchanginguuid).count)
   end
 
+  test 'batch update does not produce spurious log events' do
+    # test for bug #21304
+
+    existinguuid = 'remot-tpzed-foobarbazwazqux'
+    act_as_system_user do
+      User.create!(uuid: existinguuid,
+                   first_name: 'root',
+                   is_active: true,
+                  )
+    end
+    assert_equal(1, Log.where(object_uuid: existinguuid).count)
+
+    Rails.configuration.Login.LoginCluster = 'remot'
+
+    authorize_with(:admin)
+    patch(:batch_update,
+          params: {
+            updates: {
+              existinguuid => {
+                'first_name' => 'root',
+                'email' => '',
+                'username' => '',
+                'is_active' => true,
+                'is_invited' => true
+              },
+            }})
+    assert_response(:success)
+
+    assert_equal(1, Log.where(object_uuid: existinguuid).count)
+  end
+
   NON_ADMIN_USER_DATA = ["uuid", "kind", "is_active", "is_admin", "is_invited", "email", "first_name",
                          "last_name", "username", "can_write", "can_manage"].sort
 

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


hooks/post-receive
--