[arvados] updated: 2.5.0-299-ga7438bf8e

[git repository hosting]

Summary of changes:
 lib/controller/router/router.go      | 2 +-
 lib/controller/router/router_test.go | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

       via  a7438bf8ec3a27920905d732c62baf91a355bf27 (commit)
       via  924351594891e9af8685b527c2854f4d6c1f8cae (commit)
      from  58f2b95b4d10037cfd59972838a40dd0af9373e9 (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 a7438bf8ec3a27920905d732c62baf91a355bf27
Author: Tom Clegg <tom at curii.com>
Date:   Thu Mar 23 11:14:49 2023 -0400

    19889: Fix webdav methods condition.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/controller/router/router.go b/lib/controller/router/router.go
index f2d1e1f0a..72e5ab310 100644
--- a/lib/controller/router/router.go
+++ b/lib/controller/router/router.go
@@ -623,7 +623,7 @@ func (rtr *router) addRoute(endpoint arvados.APIEndpoint, defaultOpts func() int
 	if alt, ok := altMethod[endpoint.Method]; ok {
 		methods = append(methods, alt)
 	}
-	if strings.HasPrefix(endpoint.Path, strings.TrimSuffix(arvados.EndpointContainerLog.Path, "/{path:.*}")) {
+	if strings.HasSuffix(endpoint.Path, ".*}") {
 		// webdav methods
 		methods = append(methods, "OPTIONS", "PROPFIND")
 	}

commit 924351594891e9af8685b527c2854f4d6c1f8cae
Author: Tom Clegg <tom at curii.com>
Date:   Thu Mar 23 10:15:46 2023 -0400

    19889: Add routing test.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/controller/router/router_test.go b/lib/controller/router/router_test.go
index bb67eb7db..b194bd222 100644
--- a/lib/controller/router/router_test.go
+++ b/lib/controller/router/router_test.go
@@ -259,6 +259,13 @@ func (s *RouterSuite) TestOptions(c *check.C) {
 					Header: http.Header{"Authorization": {"Bearer " + arvadostest.ActiveToken}},
 					Path:   "/"}},
 		},
+		{
+			comment:      "/logX does not route to ContainerLog",
+			method:       "GET",
+			path:         "/arvados/v1/containers/" + arvadostest.CompletedContainerUUID + "/logX",
+			shouldStatus: http.StatusNotFound,
+			shouldCall:   "",
+		},
 	} {
 		// Reset calls captured in previous trial
 		s.stub = arvadostest.APIStub{}

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


hooks/post-receive
--