[ARVADOS] updated: 2.1.0-1978-g3d5ac704c

[Git user]

Summary of changes:
 doc/api/methods/groups.html.textile.liquid |  2 +-
 lib/controller/handler_test.go             | 16 +++++++---------
 lib/controller/router/response.go          |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

       via  3d5ac704cca086a5ce66e6724f7087ff487abe3c (commit)
      from  209ab9fc8bcdc6451bf5fdc73a5023057dd7291f (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 3d5ac704cca086a5ce66e6724f7087ff487abe3c
Author: Tom Clegg <tom at curii.com>
Date:   Fri Mar 4 12:45:44 2022 -0500

    18691: Return null for empty frozen_by_uuid in controller response.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/doc/api/methods/groups.html.textile.liquid b/doc/api/methods/groups.html.textile.liquid
index 6f5b4bbb8..cf4c346fa 100644
--- a/doc/api/methods/groups.html.textile.liquid
+++ b/doc/api/methods/groups.html.textile.liquid
@@ -34,7 +34,7 @@ table(table table-bordered table-condensed).
 |trash_at|datetime|If @trash_at@ is non-null and in the past, this group and all objects directly or indirectly owned by the group will be hidden from API calls.  May be untrashed.||
 |delete_at|datetime|If @delete_at@ is non-null and in the past, the group and all objects directly or indirectly owned by the group may be permanently deleted.||
 |is_trashed|datetime|True if @trash_at@ is in the past, false if not.||
-|frozen_by_uuid|string|For a frozen project, indicates the user who froze the project. Empty in all other cases. When a project is frozen, no further changes can be made to the project or its contents.||
+|frozen_by_uuid|string|For a frozen project, indicates the user who froze the project; null in all other cases. When a project is frozen, no further changes can be made to the project or its contents.||
 
 h3. Frozen projects
 
diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go
index 723e1011f..817cff796 100644
--- a/lib/controller/handler_test.go
+++ b/lib/controller/handler_test.go
@@ -367,16 +367,14 @@ func (s *HandlerSuite) CheckObjectType(c *check.C, url string, token string, ski
 	for k := range direct {
 		if _, ok := skippedFields[k]; ok {
 			continue
-		} else if val, ok := proxied[k]; ok {
-			if direct["kind"] == "arvados#collection" && k == "manifest_text" {
-				// Tokens differ from request to request
-				c.Check(strings.Split(val.(string), "+A")[0], check.Equals, strings.Split(direct[k].(string), "+A")[0])
-			} else {
-				c.Check(val, check.DeepEquals, direct[k],
-					check.Commentf("RailsAPI %s key %q's value %q differs from controller's %q.", direct["kind"], k, direct[k], val))
-			}
-		} else {
+		} else if val, ok := proxied[k]; !ok {
 			c.Errorf("%s's key %q missing on controller's response.", direct["kind"], k)
+		} else if direct["kind"] == "arvados#collection" && k == "manifest_text" {
+			// Tokens differ from request to request
+			c.Check(strings.Split(val.(string), "+A")[0], check.Equals, strings.Split(direct[k].(string), "+A")[0])
+		} else {
+			c.Check(val, check.DeepEquals, direct[k],
+				check.Commentf("RailsAPI %s key %q's value %q differs from controller's %q.", direct["kind"], k, direct[k], val))
 		}
 	}
 }
diff --git a/lib/controller/router/response.go b/lib/controller/router/response.go
index c0c599be8..42b343559 100644
--- a/lib/controller/router/response.go
+++ b/lib/controller/router/response.go
@@ -208,7 +208,7 @@ func (rtr *router) mungeItemFields(tmp map[string]interface{}) {
 		// they appear in responses as null, rather than a
 		// zero value.
 		switch k {
-		case "output_uuid", "output_name", "log_uuid", "description", "requesting_container_uuid", "container_uuid":
+		case "output_uuid", "output_name", "log_uuid", "description", "requesting_container_uuid", "container_uuid", "modified_by_client_uuid", "frozen_by_uuid":
 			if v == "" {
 				tmp[k] = nil
 			}

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


hooks/post-receive
--