20690: Remove wb1 webshell check in diagnostics.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/doc/admin/diagnostics.html.textile.liquid b/doc/admin/diagnostics.html.textile.liquid
index 18c15fa5e321ecbd8afa8e43d0d99a0e6a085634..f78533fddd2d90f9e79f684fbf2bc4ee4f8ce814 100644 (file)
--- a/doc/admin/diagnostics.html.textile.liquid
+++ b/doc/admin/diagnostics.html.textile.liquid
@@ -91,7 +91,6 @@ INFO     123: downloading from webdav (https://download.zzzzz.arvadosapi.com/c=d
 INFO     124: downloading from webdav (https://a15a27cbc1c7d2d4a0d9e02529aaec7e-128.collections.zzzzz.arvadosapi.com/sha256:feb5d9fea6a5e9606aa995e879d862b825965ba48de054caab5ef356dc6b3412.tar)
 INFO     125: downloading from webdav (https://download.zzzzz.arvadosapi.com/c=zzzzz-4zz18-twitqma8mbvwydy/_/sha256:feb5d9fea6a5e9606aa995e879d862b825965ba48de054caab5ef356dc6b3412.tar)
 INFO     130: getting list of virtual machines
-INFO     140: getting workbench1 webshell page
 INFO     150: connecting to webshell service
 INFO     160: running a container
 INFO      ... container request submitted, waiting up to 10m for container to run

diff --git a/lib/diagnostics/cmd.go b/lib/diagnostics/cmd.go
index 4c9a6e2d3dbfa505a9a97c0b8ae89f25c5ba788f..30dd6ee83b4139ef9bb9078e6bc4ae851e6b6b31 100644 (file)
--- a/lib/diagnostics/cmd.go
+++ b/lib/diagnostics/cmd.go
@@ -649,35 +649,6 @@ func (diag *diagnoser) runtests() {
                return nil
        })
 
-       diag.dotest(140, "getting workbench1 webshell page", func() error {
-               ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(diag.timeout))
-               defer cancel()
-               if vm.UUID == "" {
-                       diag.warnf("skipping, no vm available")
-                       return nil
-               }
-               webshelltermurl := cluster.Services.Workbench1.ExternalURL.String() + "virtual_machines/" + vm.UUID + "/webshell/testusername"
-               diag.debugf("url %s", webshelltermurl)
-               req, err := http.NewRequestWithContext(ctx, "GET", webshelltermurl, nil)
-               if err != nil {
-                       return err
-               }
-               req.Header.Set("Authorization", "Bearer "+client.AuthToken)
-               resp, err := http.DefaultClient.Do(req)
-               if err != nil {
-                       return err
-               }
-               defer resp.Body.Close()
-               body, err := ioutil.ReadAll(resp.Body)
-               if err != nil {
-                       return fmt.Errorf("reading response: %s", err)
-               }
-               if resp.StatusCode != http.StatusOK {
-                       return fmt.Errorf("unexpected response status: %s %q", resp.Status, body)
-               }
-               return nil
-       })
-
        diag.dotest(150, "connecting to webshell service", func() error {
                ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(diag.timeout))
                defer cancel()