[arvados] updated: 2.1.0-2672-gb7d8c9664

[git repository hosting]

Summary of changes:
 lib/diagnostics/cmd.go | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

       via  b7d8c9664cf2f478100c74eaa1ec37902a2f55ce (commit)
      from  f67d3bf3131937389676faebe3322d14a234a55f (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 b7d8c9664cf2f478100c74eaa1ec37902a2f55ce
Author: Tom Clegg <tom at curii.com>
Date:   Mon Jul 4 10:55:38 2022 -0400

    19235: Don't try bogus URL if WebDAV ExternalURL has no wildcard.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/diagnostics/cmd.go b/lib/diagnostics/cmd.go
index d0b1d0774..56a8b8de2 100644
--- a/lib/diagnostics/cmd.go
+++ b/lib/diagnostics/cmd.go
@@ -408,29 +408,35 @@ func (diag *diagnoser) runtests() {
 	})
 
 	davurl := cluster.Services.WebDAV.ExternalURL
+	davWildcard := strings.HasPrefix(davurl.Host, "*--") || strings.HasPrefix(davurl.Host, "*.")
 	diag.dotest(110, fmt.Sprintf("checking WebDAV ExternalURL wildcard (%s)", davurl), func() error {
 		if davurl.Host == "" {
 			return fmt.Errorf("host missing - content previews will not work")
 		}
-		if !strings.HasPrefix(davurl.Host, "*--") && !strings.HasPrefix(davurl.Host, "*.") && !cluster.Collections.TrustAllContent {
+		if !davWildcard && !cluster.Collections.TrustAllContent {
 			diag.warnf("WebDAV ExternalURL has no leading wildcard and TrustAllContent==false - content previews will not work")
 		}
 		return nil
 	})
 
 	for i, trial := range []struct {
-		needcoll bool
-		status   int
-		fileurl  string
+		needcoll     bool
+		needWildcard bool
+		status       int
+		fileurl      string
 	}{
-		{false, http.StatusNotFound, strings.Replace(davurl.String(), "*", "d41d8cd98f00b204e9800998ecf8427e-0", 1) + "foo"},
-		{false, http.StatusNotFound, strings.Replace(davurl.String(), "*", "d41d8cd98f00b204e9800998ecf8427e-0", 1) + "testfile"},
-		{false, http.StatusNotFound, cluster.Services.WebDAVDownload.ExternalURL.String() + "c=d41d8cd98f00b204e9800998ecf8427e+0/_/foo"},
-		{false, http.StatusNotFound, cluster.Services.WebDAVDownload.ExternalURL.String() + "c=d41d8cd98f00b204e9800998ecf8427e+0/_/testfile"},
-		{true, http.StatusOK, strings.Replace(davurl.String(), "*", strings.Replace(collection.PortableDataHash, "+", "-", -1), 1) + "testfile"},
-		{true, http.StatusOK, cluster.Services.WebDAVDownload.ExternalURL.String() + "c=" + collection.UUID + "/_/testfile"},
+		{false, false, http.StatusNotFound, strings.Replace(davurl.String(), "*", "d41d8cd98f00b204e9800998ecf8427e-0", 1) + "foo"},
+		{false, false, http.StatusNotFound, strings.Replace(davurl.String(), "*", "d41d8cd98f00b204e9800998ecf8427e-0", 1) + "testfile"},
+		{false, false, http.StatusNotFound, cluster.Services.WebDAVDownload.ExternalURL.String() + "c=d41d8cd98f00b204e9800998ecf8427e+0/_/foo"},
+		{false, false, http.StatusNotFound, cluster.Services.WebDAVDownload.ExternalURL.String() + "c=d41d8cd98f00b204e9800998ecf8427e+0/_/testfile"},
+		{true, true, http.StatusOK, strings.Replace(davurl.String(), "*", strings.Replace(collection.PortableDataHash, "+", "-", -1), 1) + "testfile"},
+		{true, false, http.StatusOK, cluster.Services.WebDAVDownload.ExternalURL.String() + "c=" + collection.UUID + "/_/testfile"},
 	} {
 		diag.dotest(120+i, fmt.Sprintf("downloading from webdav (%s)", trial.fileurl), func() error {
+			if trial.needWildcard && !davWildcard {
+				diag.warnf("skipping collection-id-in-vhost test because WebDAV ExternalURL has no leading wildcard")
+				return nil
+			}
 			ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(diag.timeout))
 			defer cancel()
 			if trial.needcoll && collection.UUID == "" {

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


hooks/post-receive
--