Add provisioner daemon routes

coder · kylecarbs · Feb 3, 2022 · Feb 1, 2022 · Feb 1, 2022 · Feb 1, 2022
commit 33ecab0c4c0b2879bfacab588f0671eb7d59d4e1
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -27,9 +27,23 @@
     "coderd",
     "coderdtest",
     "codersdk",
+    "drpc",
+    "drpcmux",
+    "drpcserver",
+    "goleak",
+    "hashicorp",
     "httpmw",
+    "moby",
+    "nhooyr",
+    "nosec",
     "oneof",
+    "protobuf",
+    "provisionerd",
+    "provisionersdk",
+    "retrier",
+    "sdkproto",
     "stretchr",
-    "xerrors"
+    "xerrors",
+    "yamux"
   ]
 }
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -89,6 +89,11 @@ func New(options *Options) http.Handler {
 				})
 			})
 		})
+
+		r.Route("/provisioners/daemons", func(r chi.Router) {
+			r.Get("/", api.provisionerDaemons)
+			r.Get("/serve", api.provisionerDaemonsServe)
+		})
 	})
 	r.NotFound(site.Handler().ServeHTTP)
 	return r

diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -3,20 +3,27 @@ package coderdtest
 import (
 	"context"
 	"database/sql"
+	"io"
 	"net/http/httptest"
 	"net/url"
 	"os"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 
+	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/coderd"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/cryptorand"
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/database/databasefake"
 	"github.com/coder/coder/database/postgres"
+	"github.com/coder/coder/provisioner/terraform"
+	"github.com/coder/coder/provisionerd"
+	"github.com/coder/coder/provisionersdk"
+	"github.com/coder/coder/provisionersdk/proto"
 )
 
 // Server represents a test instance of coderd.
@@ -57,6 +64,38 @@ func (s *Server) RandomInitialUser(t *testing.T) coderd.CreateInitialUserRequest
 	return req
 }
 
+// AddProvisionerd launches a new provisionerd instance!
+func (s *Server) AddProvisionerd(t *testing.T) io.Closer {
+	tfClient, tfServer := provisionersdk.TransportPipe()
+	ctx, cancelFunc := context.WithCancel(context.Background())
+	t.Cleanup(func() {
+		_ = tfClient.Close()
+		_ = tfServer.Close()
+		cancelFunc()
+	})
+	go func() {
+		err := terraform.Serve(ctx, &terraform.ServeOptions{
+			ServeOptions: &provisionersdk.ServeOptions{
+				Listener: tfServer,
+			},
+		})
+		require.NoError(t, err)
+	}()
+
+	closer := provisionerd.New(s.Client.ProvisionerDaemonClient, &provisionerd.Options{
+		Logger:       slogtest.Make(t, nil).Named("provisionerd").Leveled(slog.LevelInfo),
+		PollInterval: 50 * time.Millisecond,
+		Provisioners: provisionerd.Provisioners{
+			string(database.ProvisionerTypeTerraform): proto.NewDRPCProvisionerClient(provisionersdk.Conn(tfClient)),
+		},
+		WorkDirectory: t.TempDir(),
+	})
+	t.Cleanup(func() {
+		_ = closer.Close()
+	})
+	return closer
+}
+
 // New constructs a new coderd test instance. This returned Server
 // should contain no side-effects.
 func New(t *testing.T) Server {

diff --git a/coderd/coderdtest/coderdtest_test.go b/coderd/coderdtest/coderdtest_test.go
@@ -16,4 +16,5 @@ func TestNew(t *testing.T) {
 	t.Parallel()
 	server := coderdtest.New(t)
 	_ = server.RandomInitialUser(t)
+	_ = server.AddProvisionerd(t)
 }
diff --git a/coderd/projecthistory.go b/coderd/projecthistory.go
@@ -116,3 +116,7 @@ func convertProjectHistory(history database.ProjectHistory) ProjectHistory {
 		Name:      history.Name,
 	}
 }
+
+func projectHistoryLogsChannel(projectHistoryID uuid.UUID) string {
+	return fmt.Sprintf("project-history-logs:%s", projectHistoryID)
+}