[ARVADOS] updated: 2.1.0-2152-g6a0268a55

[Git user]

Summary of changes:
 services/keep-web/handler.go | 8 ++++++++
 1 file changed, 8 insertions(+)

       via  6a0268a55822b5e7981b4bc798bf5680861b00f2 (commit)
      from  f8819df5b2fb49e42b60a90656fcbe228208388d (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 6a0268a55822b5e7981b4bc798bf5680861b00f2
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Mar 23 14:08:09 2022 -0400

    18903: keep-web: when logging a file upload or download, if the
           collection UUID is not known, blank the field rather than
           populating it with the PDH (which is also present in a separate
           field).
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go
index 97ec95e3a..2eaa147bf 100644
--- a/services/keep-web/handler.go
+++ b/services/keep-web/handler.go
@@ -914,6 +914,14 @@ func (h *handler) logUploadOrDownload(
 		props["collection_uuid"] = collection.UUID
 		props["collection_file_path"] = filepath
 	}
+	// h.determineCollection populates the collection_uuid prop with the PDH, if
+	// this collection is being accessed via PDH. In that case, blank the
+	// collection_uuid field so that consumers of the log entries can rely on it
+	// being a UUID, or blank. The PDH remains available via the
+	// portable_data_hash property.
+	if props["collection_uuid"] == props["portable_data_hash"] {
+		props["collection_uuid"] = ""
+	}
 	if r.Method == "PUT" || r.Method == "POST" {
 		log.Info("File upload")
 		if h.Config.cluster.Collections.WebDAVLogEvents {

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


hooks/post-receive
--