[arvados] updated: 2.7.0-5389-g62bcd62d6c

git repository hosting git at public.arvados.org
Fri Nov 17 20:37:41 UTC 2023


Summary of changes:
 lib/controller/rpc/conn.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

       via  62bcd62d6c068e52424a1ecb26e896793d4285d0 (commit)
      from  e5164c27fbc150deba2e47d6e5143cf3cd65ee92 (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 62bcd62d6c068e52424a1ecb26e896793d4285d0
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Nov 17 15:37:23 2023 -0500

    20831: Don't panic on empty params
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index 095ce225f6..6195b79da1 100644
--- a/lib/controller/rpc/conn.go
+++ b/lib/controller/rpc/conn.go
@@ -147,10 +147,13 @@ func (conn *Conn) requestAndDecode(ctx context.Context, dst interface{}, ep arva
 	}
 
 	if len(tokens) > 1 {
+		if params == nil {
+			params = make(map[string]interface{})
+		}
 		params["reader_tokens"] = tokens[1:]
 	}
 	path := ep.Path
-	if strings.Contains(ep.Path, "/{uuid}") {
+	if strings.Contains(ep.Path, "/{uuid}") && params != nil {
 		uuid, _ := params["uuid"].(string)
 		path = strings.Replace(path, "/{uuid}", "/"+uuid, 1)
 		delete(params, "uuid")

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list