Skip to content

Commit 09b582d

Browse files
spikecurtisspikecurtis
committed
in-process provisionerd connection
Signed-off-by: Spike Curtis <spike@coder.com>
1 parent e2ed581 commit 09b582d

32 files changed

+337
-295
lines changed

‎cli/agent_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ func TestWorkspaceAgent(t *testing.T) {
1919
instanceID := "instanceidentifier"
2020
certificates, metadataClient := coderdtest.NewAzureInstanceIdentity(t, instanceID)
2121
client := coderdtest.New(t, &coderdtest.Options{
22-
AzureCertificates: certificates,
22+
AzureCertificates: certificates,
23+
IncludeProvisionerD: true,
2324
})
2425
user := coderdtest.CreateFirstUser(t, client)
25-
coderdtest.NewProvisionerDaemon(t, client)
2626
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
2727
Parse: echo.ParseComplete,
2828
Provision: []*proto.Provision_Response{{
@@ -73,10 +73,10 @@ func TestWorkspaceAgent(t *testing.T) {
7373
instanceID := "instanceidentifier"
7474
certificates, metadataClient := coderdtest.NewAWSInstanceIdentity(t, instanceID)
7575
client := coderdtest.New(t, &coderdtest.Options{
76-
AWSCertificates: certificates,
76+
AWSCertificates: certificates,
77+
IncludeProvisionerD: true,
7778
})
7879
user := coderdtest.CreateFirstUser(t, client)
79-
coderdtest.NewProvisionerDaemon(t, client)
8080
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
8181
Parse: echo.ParseComplete,
8282
Provision: []*proto.Provision_Response{{
@@ -128,9 +128,9 @@ func TestWorkspaceAgent(t *testing.T) {
128128
validator, metadata := coderdtest.NewGoogleInstanceIdentity(t, instanceID, false)
129129
client := coderdtest.New(t, &coderdtest.Options{
130130
GoogleTokenValidator: validator,
131+
IncludeProvisionerD: true,
131132
})
132133
user := coderdtest.CreateFirstUser(t, client)
133-
coderdtest.NewProvisionerDaemon(t, client)
134134
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
135135
Parse: echo.ParseComplete,
136136
Provision: []*proto.Provision_Response{{

‎cli/autostart_test.go

+5-10
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ func TestAutostart(t *testing.T) {
2222

2323
var (
2424
ctx = context.Background()
25-
client = coderdtest.New(t, nil)
26-
_ = coderdtest.NewProvisionerDaemon(t, client)
25+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
2726
user = coderdtest.CreateFirstUser(t, client)
2827
version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
2928
_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
@@ -54,8 +53,7 @@ func TestAutostart(t *testing.T) {
5453

5554
var (
5655
ctx = context.Background()
57-
client = coderdtest.New(t, nil)
58-
_ = coderdtest.NewProvisionerDaemon(t, client)
56+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
5957
user = coderdtest.CreateFirstUser(t, client)
6058
version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
6159
_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
@@ -99,8 +97,7 @@ func TestAutostart(t *testing.T) {
9997
t.Parallel()
10098

10199
var (
102-
client = coderdtest.New(t, nil)
103-
_ = coderdtest.NewProvisionerDaemon(t, client)
100+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
104101
user = coderdtest.CreateFirstUser(t, client)
105102
version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
106103
_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
@@ -117,8 +114,7 @@ func TestAutostart(t *testing.T) {
117114
t.Parallel()
118115

119116
var (
120-
client = coderdtest.New(t, nil)
121-
_ = coderdtest.NewProvisionerDaemon(t, client)
117+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
122118
user = coderdtest.CreateFirstUser(t, client)
123119
version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
124120
_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
@@ -136,8 +132,7 @@ func TestAutostart(t *testing.T) {
136132

137133
var (
138134
ctx = context.Background()
139-
client = coderdtest.New(t, nil)
140-
_ = coderdtest.NewProvisionerDaemon(t, client)
135+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
141136
user = coderdtest.CreateFirstUser(t, client)
142137
version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
143138
_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)

‎cli/autostop_test.go

+5-10
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ func TestAutostop(t *testing.T) {
2222

2323
var (
2424
ctx = context.Background()
25-
client = coderdtest.New(t, nil)
26-
_ = coderdtest.NewProvisionerDaemon(t, client)
25+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
2726
user = coderdtest.CreateFirstUser(t, client)
2827
version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
2928
_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
@@ -54,8 +53,7 @@ func TestAutostop(t *testing.T) {
5453

5554
var (
5655
ctx = context.Background()
57-
client = coderdtest.New(t, nil)
58-
_ = coderdtest.NewProvisionerDaemon(t, client)
56+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
5957
user = coderdtest.CreateFirstUser(t, client)
6058
version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
6159
_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
@@ -98,8 +96,7 @@ func TestAutostop(t *testing.T) {
9896
t.Parallel()
9997

10098
var (
101-
client = coderdtest.New(t, nil)
102-
_ = coderdtest.NewProvisionerDaemon(t, client)
99+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
103100
user = coderdtest.CreateFirstUser(t, client)
104101
version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
105102
_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
@@ -116,8 +113,7 @@ func TestAutostop(t *testing.T) {
116113
t.Parallel()
117114

118115
var (
119-
client = coderdtest.New(t, nil)
120-
_ = coderdtest.NewProvisionerDaemon(t, client)
116+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
121117
user = coderdtest.CreateFirstUser(t, client)
122118
version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
123119
_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
@@ -135,8 +131,7 @@ func TestAutostop(t *testing.T) {
135131

136132
var (
137133
ctx = context.Background()
138-
client = coderdtest.New(t, nil)
139-
_ = coderdtest.NewProvisionerDaemon(t, client)
134+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
140135
user = coderdtest.CreateFirstUser(t, client)
141136
version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
142137
_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)

‎cli/configssh_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ import (
2727
func TestConfigSSH(t *testing.T) {
2828
t.Parallel()
2929

30-
client := coderdtest.New(t, nil)
30+
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
3131
user := coderdtest.CreateFirstUser(t, client)
32-
coderdtest.NewProvisionerDaemon(t, client)
3332
authToken := uuid.NewString()
3433
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
3534
Parse: echo.ParseComplete,

‎cli/create_test.go

+4-8
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ func TestCreate(t *testing.T) {
1616
t.Parallel()
1717
t.Run("Create", func(t *testing.T) {
1818
t.Parallel()
19-
client := coderdtest.New(t, nil)
19+
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
2020
user := coderdtest.CreateFirstUser(t, client)
21-
coderdtest.NewProvisionerDaemon(t, client)
2221
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
2322
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
2423
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
@@ -46,9 +45,8 @@ func TestCreate(t *testing.T) {
4645
})
4746
t.Run("CreateFromList", func(t *testing.T) {
4847
t.Parallel()
49-
client := coderdtest.New(t, nil)
48+
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
5049
user := coderdtest.CreateFirstUser(t, client)
51-
coderdtest.NewProvisionerDaemon(t, client)
5250
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
5351
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
5452
_ = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
@@ -76,9 +74,8 @@ func TestCreate(t *testing.T) {
7674
})
7775
t.Run("FromNothing", func(t *testing.T) {
7876
t.Parallel()
79-
client := coderdtest.New(t, nil)
77+
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
8078
user := coderdtest.CreateFirstUser(t, client)
81-
coderdtest.NewProvisionerDaemon(t, client)
8279
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
8380
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
8481
_ = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
@@ -107,9 +104,8 @@ func TestCreate(t *testing.T) {
107104
})
108105
t.Run("WithParameter", func(t *testing.T) {
109106
t.Parallel()
110-
client := coderdtest.New(t, nil)
107+
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
111108
user := coderdtest.CreateFirstUser(t, client)
112-
coderdtest.NewProvisionerDaemon(t, client)
113109
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
114110
Parse: []*proto.Parse_Response{{
115111
Type: &proto.Parse_Response_Complete{

‎cli/gitssh_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
func TestGitSSH(t *testing.T) {
2323
t.Parallel()
2424
t.Run("Dial", func(t *testing.T) {
25-
client := coderdtest.New(t, nil)
25+
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
2626
user := coderdtest.CreateFirstUser(t, client)
2727

2828
// get user public key
@@ -31,9 +31,8 @@ func TestGitSSH(t *testing.T) {
3131
publicKey, _, _, _, err := gossh.ParseAuthorizedKey([]byte(keypair.PublicKey))
3232
require.NoError(t, err)
3333

34-
// setup provisioner
34+
// setup template
3535
agentToken := uuid.NewString()
36-
coderdtest.NewProvisionerDaemon(t, client)
3736
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
3837
Parse: echo.ParseComplete,
3938
ProvisionDryRun: echo.ProvisionComplete,

‎cli/list_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ func TestList(t *testing.T) {
1414
t.Parallel()
1515
t.Run("Single", func(t *testing.T) {
1616
t.Parallel()
17-
client := coderdtest.New(t, nil)
17+
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
1818
user := coderdtest.CreateFirstUser(t, client)
19-
coderdtest.NewProvisionerDaemon(t, client)
2019
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
2120
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
2221
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)

‎cli/portforward_test.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ func TestPortForward(t *testing.T) {
149149
t.Run("OnePort", func(t *testing.T) {
150150
t.Parallel()
151151
var (
152-
client = coderdtest.New(t, nil)
152+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
153153
user = coderdtest.CreateFirstUser(t, client)
154154
_, workspace = runAgent(t, client, user.UserID)
155155
l1, p1 = setupTestListener(t, c.setupRemote(t))
@@ -193,7 +193,7 @@ func TestPortForward(t *testing.T) {
193193
t.Run("TwoPorts", func(t *testing.T) {
194194
t.Parallel()
195195
var (
196-
client = coderdtest.New(t, nil)
196+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
197197
user = coderdtest.CreateFirstUser(t, client)
198198
_, workspace = runAgent(t, client, user.UserID)
199199
l1, p1 = setupTestListener(t, c.setupRemote(t))
@@ -244,7 +244,7 @@ func TestPortForward(t *testing.T) {
244244
t.Run("TCP2Unix", func(t *testing.T) {
245245
t.Parallel()
246246
var (
247-
client = coderdtest.New(t, nil)
247+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
248248
user = coderdtest.CreateFirstUser(t, client)
249249
_, workspace = runAgent(t, client, user.UserID)
250250

@@ -297,7 +297,7 @@ func TestPortForward(t *testing.T) {
297297
t.Run("All", func(t *testing.T) {
298298
t.Parallel()
299299
var (
300-
client = coderdtest.New(t, nil)
300+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
301301
user = coderdtest.CreateFirstUser(t, client)
302302
_, workspace = runAgent(t, client, user.UserID)
303303
// These aren't fixed size because we exclude Unix on Windows.
@@ -371,9 +371,8 @@ func runAgent(t *testing.T, client *codersdk.Client, userID uuid.UUID) ([]coders
371371
require.Greater(t, len(user.OrganizationIDs), 0, "user has no organizations")
372372
orgID := user.OrganizationIDs[0]
373373

374-
// Setup echo provisioner
374+
// Setup template
375375
agentToken := uuid.NewString()
376-
coderdtest.NewProvisionerDaemon(t, client)
377376
version := coderdtest.CreateTemplateVersion(t, client, orgID, &echo.Responses{
378377
Parse: echo.ParseComplete,
379378
ProvisionDryRun: echo.ProvisionComplete,

‎cli/server.go

+27-12
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import (
1919
"path/filepath"
2020
"time"
2121

22+
"github.com/coder/coder/provisioner/echo"
23+
2224
"github.com/briandowns/spinner"
2325
"github.com/coreos/go-systemd/daemon"
2426
"github.com/google/go-github/v43/github"
@@ -249,7 +251,7 @@ func server() *cobra.Command {
249251
}
250252
}
251253

252-
handler, closeCoderd := coderd.New(options)
254+
coderDaemon := coderd.New(options)
253255
client := codersdk.New(localURL)
254256
if tlsEnable {
255257
// Secure transport isn't needed for locally communicating!
@@ -275,7 +277,7 @@ func server() *cobra.Command {
275277
errCh := make(chan error, 1)
276278
provisionerDaemons := make([]*provisionerd.Server, 0)
277279
for i := 0; uint8(i) < provisionerDaemonCount; i++ {
278-
daemonClose, err := newProvisionerDaemon(cmd.Context(), client, logger, cacheDir, errCh)
280+
daemonClose, err := newProvisionerDaemon(cmd.Context(), coderDaemon, logger, cacheDir, errCh, dev)
279281
if err != nil {
280282
return xerrors.Errorf("create provisioner daemon: %w", err)
281283
}
@@ -295,7 +297,7 @@ func server() *cobra.Command {
295297
// These errors are typically noise like "TLS: EOF". Vault does similar:
296298
// https://github.com/hashicorp/vault/blob/e2490059d0711635e529a4efcbaa1b26998d6e1c/command/server.go#L2714
297299
ErrorLog: log.New(io.Discard, "", 0),
298-
Handler: handler,
300+
Handler: coderDaemon.Handler(),
299301
BaseContext: func(_ net.Listener) context.Context {
300302
return shutdownConnsCtx
301303
},
@@ -363,15 +365,15 @@ func server() *cobra.Command {
363365
signal.Notify(stopChan, os.Interrupt)
364366
select {
365367
case <-cmd.Context().Done():
366-
closeCoderd()
368+
coderDaemon.CloseWait()
367369
return cmd.Context().Err()
368370
case err := <-tunnelErrChan:
369371
if err != nil {
370372
return err
371373
}
372374
case err := <-errCh:
373375
shutdownConns()
374-
closeCoderd()
376+
coderDaemon.CloseWait()
375377
return err
376378
case <-stopChan:
377379
}
@@ -435,7 +437,7 @@ func server() *cobra.Command {
435437

436438
_, _ = fmt.Fprintf(cmd.OutOrStdout(), cliui.Styles.Prompt.String()+"Waiting for WebSocket connections to close...\n")
437439
shutdownConns()
438-
closeCoderd()
440+
coderDaemon.CloseWait()
439441
return nil
440442
},
441443
}
@@ -529,7 +531,8 @@ func createFirstUser(cmd *cobra.Command, client *codersdk.Client, cfg config.Roo
529531
return nil
530532
}
531533

532-
func newProvisionerDaemon(ctx context.Context, client *codersdk.Client, logger slog.Logger, cacheDir string, errChan chan error) (*provisionerd.Server, error) {
534+
func newProvisionerDaemon(ctx context.Context, coderDaemon coderd.CoderD,
535+
logger slog.Logger, cacheDir string, errChan chan error, dev bool) (*provisionerd.Server, error) {
533536
err := os.MkdirAll(cacheDir, 0700)
534537
if err != nil {
535538
return nil, xerrors.Errorf("mkdir %q: %w", cacheDir, err)
@@ -554,14 +557,26 @@ func newProvisionerDaemon(ctx context.Context, client *codersdk.Client, logger s
554557
return nil, err
555558
}
556559

557-
return provisionerd.New(client.ListenProvisionerDaemon, &provisionerd.Options{
560+
provisioners := provisionerd.Provisioners{
561+
string(database.ProvisionerTypeTerraform): proto.NewDRPCProvisionerClient(provisionersdk.Conn(terraformClient)),
562+
}
563+
// include echo provisioner when in dev mode
564+
if dev {
565+
echoClient, echoServer := provisionersdk.TransportPipe()
566+
go func() {
567+
err := echo.Serve(ctx, &provisionersdk.ServeOptions{Listener: echoServer})
568+
if err != nil {
569+
errChan <- err
570+
}
571+
}()
572+
provisioners[string(database.ProvisionerTypeEcho)] = proto.NewDRPCProvisionerClient(provisionersdk.Conn(echoClient))
573+
}
574+
return provisionerd.New(coderDaemon.ListenProvisionerDaemon, &provisionerd.Options{
558575
Logger: logger,
559576
PollInterval: 500 * time.Millisecond,
560577
UpdateInterval: 500 * time.Millisecond,
561-
Provisioners: provisionerd.Provisioners{
562-
string(database.ProvisionerTypeTerraform): proto.NewDRPCProvisionerClient(provisionersdk.Conn(terraformClient)),
563-
},
564-
WorkDirectory: tempDir,
578+
Provisioners: provisioners,
579+
WorkDirectory: tempDir,
565580
}), nil
566581
}
567582

0 commit comments

Comments
 (0)