[ARVADOS] updated: aed4b4024a9180a6f7d600060bda2d9680444384

[Git user]

Summary of changes:
 services/api/config/application.default.yml |  2 +-
 services/api/test/unit/log_test.rb          | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

       via  aed4b4024a9180a6f7d600060bda2d9680444384 (commit)
       via  04526d421ac831056aca7d90b0a4a6966c6c660b (commit)
      from  2bd7edf29bad74e61da31b801afd85b4c33ef7fe (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 aed4b4024a9180a6f7d600060bda2d9680444384
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Aug 25 14:41:43 2016 -0400

    9709: Tweak config comment.

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index e59f6e5..ed3b517 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -243,7 +243,7 @@ common:
   # silenced by throttling are not counted against this total.
   crunch_limit_log_bytes_per_job: 67108864
 
-  # Attributes to avoid saving in events and audit logs.  Notably,
+  # Attributes to suppress in events and audit logs.  Notably,
   # specifying ["manifest_text"] here typically makes the database
   # smaller and faster.
   #

commit 04526d421ac831056aca7d90b0a4a6966c6c660b
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Aug 25 14:41:01 2016 -0400

    9709: Test empty unlogged_attributes config.

diff --git a/services/api/test/unit/log_test.rb b/services/api/test/unit/log_test.rb
index fcd2b80..7e5637b 100644
--- a/services/api/test/unit/log_test.rb
+++ b/services/api/test/unit/log_test.rb
@@ -271,7 +271,7 @@ class LogTest < ActiveSupport::TestCase
     end
   end
 
-  test "manifest_text not included in collection logs" do
+  test "configuration.unlogged_attributes" do
     Rails.configuration.unlogged_attributes = ["manifest_text"]
     act_as_system_user do
       coll = Collection.create(manifest_text: ". acbd18db4cc2f85cedef654fccc4a4d8+3 0:3:foo\n")
@@ -282,5 +282,23 @@ class LogTest < ActiveSupport::TestCase
       coll.destroy
       assert_logged_with_clean_properties(coll, :destroy, 'manifest_text')
     end
+
+    Rails.configuration.unlogged_attributes = []
+    act_as_system_user do
+      txt = ". acbd18db4cc2f85cedef654fccc4a4d8+3 0:3:foo\n"
+      coll = Collection.create(manifest_text: txt)
+      assert_logged(coll, :create) do |props|
+        assert_equal(txt, props['new_attributes']['manifest_text'])
+      end
+      coll.update_attributes!(name: "testing")
+      assert_logged(coll, :create) do |props|
+        assert_equal(txt, props['old_attributes']['manifest_text'])
+        assert_equal(txt, props['new_attributes']['manifest_text'])
+      end
+      coll.destroy
+      assert_logged(coll, :destroy) do |props|
+        assert_equal(txt, props['old_attributes']['manifest_text'])
+      end
+    end
   end
 end

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


hooks/post-receive
--