Fix more ineffassign warnings.

[arvados.git] / lib / service / cmd_test.go

diff --git a/lib/service/cmd_test.go b/lib/service/cmd_test.go
index 62960dc31cb2b71a2b2aea85db0300f00a44995d..4a984c9e780a9fba5bca0ff3d964e972ec2eb728 100644 (file)
--- a/lib/service/cmd_test.go
+++ b/lib/service/cmd_test.go
@@ -8,14 +8,17 @@ package service
 import (
        "bytes"
        "context"
+       "crypto/tls"
        "fmt"
        "io/ioutil"
        "net/http"
        "os"
        "testing"
+       "time"
 
-       "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "git.curoverse.com/arvados.git/sdk/go/ctxlog"
+       "git.arvados.org/arvados.git/sdk/go/arvados"
+       "git.arvados.org/arvados.git/sdk/go/ctxlog"
+       "github.com/prometheus/client_golang/prometheus"
        check "gopkg.in/check.v1"
 )
 
@@ -38,7 +41,7 @@ func (*Suite) TestCommand(c *check.C) {
        ctx, cancel := context.WithCancel(context.Background())
        defer cancel()
 
-       cmd := Command(arvados.ServiceNameController, func(ctx context.Context, _ *arvados.Cluster, _ *arvados.NodeProfile, token string) Handler {
+       cmd := Command(arvados.ServiceNameController, func(ctx context.Context, _ *arvados.Cluster, token string, reg *prometheus.Registry) Handler {
                c.Check(ctx.Value("foo"), check.Equals, "bar")
                c.Check(token, check.Equals, "abcde")
                return &testHandler{ctx: ctx, healthCheck: healthCheck}
@@ -62,12 +65,79 @@ func (*Suite) TestCommand(c *check.C) {
        c.Check(stderr.String(), check.Matches, `(?ms).*"msg":"CheckHealth called".*`)
 }
 
+func (*Suite) TestTLS(c *check.C) {
+       cwd, err := os.Getwd()
+       c.Assert(err, check.IsNil)
+
+       stdin := bytes.NewBufferString(`
+Clusters:
+ zzzzz:
+  SystemRootToken: abcde
+  Services:
+   Controller:
+    ExternalURL: "https://localhost:12345"
+    InternalURLs: {"https://localhost:12345": {}}
+  TLS:
+   Key: file://` + cwd + `/../../services/api/tmp/self-signed.key
+   Certificate: file://` + cwd + `/../../services/api/tmp/self-signed.pem
+`)
+
+       called := make(chan bool)
+       cmd := Command(arvados.ServiceNameController, func(ctx context.Context, _ *arvados.Cluster, token string, reg *prometheus.Registry) Handler {
+               return &testHandler{handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+                       w.Write([]byte("ok"))
+                       close(called)
+               })}
+       })
+
+       exited := make(chan bool)
+       var stdout, stderr bytes.Buffer
+       go func() {
+               cmd.RunCommand("arvados-controller", []string{"-config", "-"}, stdin, &stdout, &stderr)
+               close(exited)
+       }()
+       got := make(chan bool)
+       go func() {
+               defer close(got)
+               client := &http.Client{Transport: &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}}
+               for range time.NewTicker(time.Millisecond).C {
+                       resp, err := client.Get("https://localhost:12345")
+                       if err != nil {
+                               c.Log(err)
+                               continue
+                       }
+                       body, err := ioutil.ReadAll(resp.Body)
+                       c.Check(err, check.IsNil)
+                       c.Logf("status %d, body %s", resp.StatusCode, string(body))
+                       c.Check(resp.StatusCode, check.Equals, http.StatusOK)
+                       break
+               }
+       }()
+       select {
+       case <-called:
+       case <-exited:
+               c.Error("command exited without calling handler")
+       case <-time.After(time.Second):
+               c.Error("timed out")
+       }
+       select {
+       case <-got:
+       case <-exited:
+               c.Error("command exited before client received response")
+       case <-time.After(time.Second):
+               c.Error("timed out")
+       }
+       c.Log(stderr.String())
+}
+
 type testHandler struct {
        ctx         context.Context
+       handler     http.Handler
        healthCheck chan bool
 }
 
-func (th *testHandler) ServeHTTP(http.ResponseWriter, *http.Request) {}
+func (th *testHandler) Done() <-chan struct{}                            { return nil }
+func (th *testHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { th.handler.ServeHTTP(w, r) }
 func (th *testHandler) CheckHealth() error {
        ctxlog.FromContext(th.ctx).Info("CheckHealth called")
        select {