May 3, 2024 · May 1, 2024 · May 1, 2024 · May 1, 2024 · May 1, 2024 · May 1, 2024
diff --git a/cli/server.go b/cli/server.go
 var provisionerdWaitGroup sync.WaitGroup
 defer provisionerdWaitGroup.Wait()
 provisionerdMetrics := provisionerd.NewMetrics(options.PrometheusRegistry)

 // Built in provisioner daemons will support the same types.
 // By default, this is the slice {"terraform"}
 provisionerTypes := make([]codersdk.ProvisionerType, 0)
 for _, pt := range vals.Provisioner.DaemonTypes {
 provisionerTypes = append(provisionerTypes, codersdk.ProvisionerType(pt))
 }
 for i := int64(0); i < vals.Provisioner.Daemons.Value(); i++ {
 suffix := fmt.Sprintf("%d", i)
 // The suffix is added to the hostname, so we may need to trim to fit into
 name := fmt.Sprintf("%s-%s", hostname, suffix)
 daemonCacheDir := filepath.Join(cacheDir, fmt.Sprintf("provisioner-%d", i))
 daemon, err := newProvisionerDaemon(
 ctx, coderAPI, provisionerdMetrics, logger, vals, daemonCacheDir, errCh, &provisionerdWaitGroup, name,
 ctx, coderAPI, provisionerdMetrics, logger, vals, daemonCacheDir, errCh, &provisionerdWaitGroup, name, provisionerTypes,
 )
 if err != nil {
 return xerrors.Errorf("create provisioner daemon: %w", err)
 errCh chan error,
 wg *sync.WaitGroup,
 name string,
 provisionerTypes []codersdk.ProvisionerType,
 ) (srv *provisionerd.Server, err error) {
 ctx, cancel := context.WithCancel(ctx)
 defer func() {
 return nil, xerrors.Errorf("mkdir work dir: %w", err)
 }

 // Omit any duplicates
 provisionerTypes = slice.Unique(provisionerTypes)

 // Populate the connector with the supported types.
 connector := provisionerd.LocalProvisioners{}
 if cfg.Provisioner.DaemonsEcho {
 echoClient, echoServer := drpc.MemTransportPipe()
 wg.Add(1)
 go func() {
 defer wg.Done()
 <-ctx.Done()
 _ = echoClient.Close()
 _ = echoServer.Close()
 }()
 wg.Add(1)
 go func() {
 defer wg.Done()
 defer cancel()
 for _, provisionerType := range provisionerTypes {
 switch provisionerType {
 case codersdk.ProvisionerTypeEcho:
 echoClient, echoServer := drpc.MemTransportPipe()
 wg.Add(1)
 go func() {
 defer wg.Done()
 <-ctx.Done()
 _ = echoClient.Close()
 _ = echoServer.Close()
 }()
 wg.Add(1)
 go func() {
 defer wg.Done()
 defer cancel()

 err := echo.Serve(ctx, &provisionersdk.ServeOptions{
 Listener:      echoServer,
 WorkDirectory: workDir,
 Logger:        logger.Named("echo"),
 })
 if err != nil {
 select {
 case errCh <- err:
 default:
 err := echo.Serve(ctx, &provisionersdk.ServeOptions{
 Listener:      echoServer,
 WorkDirectory: workDir,
 Logger:        logger.Named("echo"),
 })
 if err != nil {
 select {
 case errCh <- err:
 default:
 }
 }
 }()
 connector[string(database.ProvisionerTypeEcho)] = sdkproto.NewDRPCProvisionerClient(echoClient)
 case codersdk.ProvisionerTypeTerraform:
 tfDir := filepath.Join(cacheDir, "tf")
 err = os.MkdirAll(tfDir, 0o700)
 if err != nil {
 return nil, xerrors.Errorf("mkdir terraform dir: %w", err)
 }
 }()
 connector[string(database.ProvisionerTypeEcho)] = sdkproto.NewDRPCProvisionerClient(echoClient)
 } else {
 tfDir := filepath.Join(cacheDir, "tf")
 err = os.MkdirAll(tfDir, 0o700)
 if err != nil {
 return nil, xerrors.Errorf("mkdir terraform dir: %w", err)
 }

 tracer := coderAPI.TracerProvider.Tracer(tracing.TracerName)
 terraformClient, terraformServer := drpc.MemTransportPipe()
 wg.Add(1)
 go func() {
 defer wg.Done()
 <-ctx.Done()
 _ = terraformClient.Close()
 _ = terraformServer.Close()
 }()
 wg.Add(1)
 go func() {
 defer wg.Done()
 defer cancel()

 err := terraform.Serve(ctx, &terraform.ServeOptions{
 ServeOptions: &provisionersdk.ServeOptions{
 Listener:      terraformServer,
 Logger:        logger.Named("terraform"),
 WorkDirectory: workDir,
 },
 CachePath: tfDir,
 Tracer:    tracer,
 })
 if err != nil && !xerrors.Is(err, context.Canceled) {
 select {
 case errCh <- err:
 default:
 tracer := coderAPI.TracerProvider.Tracer(tracing.TracerName)
 terraformClient, terraformServer := drpc.MemTransportPipe()
 wg.Add(1)
 go func() {
 defer wg.Done()
 <-ctx.Done()
 _ = terraformClient.Close()
 _ = terraformServer.Close()
 }()
 wg.Add(1)
 go func() {
 defer wg.Done()
 defer cancel()

 err := terraform.Serve(ctx, &terraform.ServeOptions{
 ServeOptions: &provisionersdk.ServeOptions{
 Listener:      terraformServer,
 Logger:        logger.Named("terraform"),
 WorkDirectory: workDir,
 },
 CachePath: tfDir,
 Tracer:    tracer,
 })
 if err != nil && !xerrors.Is(err, context.Canceled) {
 select {
 case errCh <- err:
 default:
 }
 }
 }
 }()
 }()

 connector[string(database.ProvisionerTypeTerraform)] = sdkproto.NewDRPCProvisionerClient(terraformClient)
 connector[string(database.ProvisionerTypeTerraform)] = sdkproto.NewDRPCProvisionerClient(terraformClient)
 default:
 return nil, fmt.Errorf("unknown provisioner type %q", provisionerType)
 }
 }

 return provisionerd.New(func(dialCtx context.Context) (proto.DRPCProvisionerDaemonClient, error) {
 // This debounces calls to listen every second. Read the comment
 // in provisionerdserver.go to learn more!
 return coderAPI.CreateInMemoryProvisionerDaemon(dialCtx, name)
 return coderAPI.CreateInMemoryProvisionerDaemon(dialCtx, name, provisionerTypes)
 }, &provisionerd.Options{
 Logger:              logger.Named(fmt.Sprintf("provisionerd-%s", name)),
 UpdateInterval:      time.Second,
diff --git a/cli/server_test.go b/cli/server_test.go
 "--in-memory",
 "--http-address", ":0",
 "--access-url", "http://example.com",
 "--provisioner-daemons-echo",
 "--provisioner-daemons=3",
 "--provisioner-types=echo",
 "--log-human", fiName,
 )
 clitest.Start(t, root)
 "--in-memory",
 "--http-address", ":0",
 "--access-url", "http://example.com",
 "--provisioner-daemons-echo",
 "--provisioner-daemons=3",
 "--provisioner-types=echo",
 "--log-human", fi,
 )
 clitest.Start(t, root)
 "--in-memory",
 "--http-address", ":0",
 "--access-url", "http://example.com",
 "--provisioner-daemons-echo",
 "--provisioner-daemons=3",
 "--provisioner-types=echo",
 "--log-json", fi,
 )
 clitest.Start(t, root)
 "--in-memory",
 "--http-address", ":0",
 "--access-url", "http://example.com",
 "--provisioner-daemons-echo",
 "--provisioner-daemons=3",
 "--provisioner-types=echo",
 "--log-stackdriver", fi,
 )
 // Attach pty so we get debug output from the command if this test
 "--in-memory",
 "--http-address", ":0",
 "--access-url", "http://example.com",
 "--provisioner-daemons-echo",
 "--provisioner-daemons=3",
 "--provisioner-types=echo",
 "--log-human", fi1,
 "--log-json", fi2,
 "--log-stackdriver", fi3,
diff --git a/cli/testdata/server-config.yaml.golden b/cli/testdata/server-config.yaml.golden
  # state for a long time, consider increasing this.
  # (default: 3, type: int)
  daemons: 3
  # Whether to use echo provisioner daemons instead of Terraform. This is for E2E
  # tests.
  # (default: false, type: bool)
  daemonsEcho: false
  # The supported job types for the built-in provisioners. By default, this is only
  # the terraform type. Supported types: terraform,echo.
  # (default: terraform, type: string-array)
  daemonTypes:
    - terraform
  # Deprecated and ignored.
  # (default: 1s, type: duration)
  daemonPollInterval: 1s
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/coderd.go b/coderd/coderd.go

 // CreateInMemoryProvisionerDaemon is an in-memory connection to a provisionerd.
 // Useful when starting coderd and provisionerd in the same process.
 func (api *API) CreateInMemoryProvisionerDaemon(dialCtx context.Context, name string) (client proto.DRPCProvisionerDaemonClient, err error) {
 func (api *API) CreateInMemoryProvisionerDaemon(dialCtx context.Context, name string, provisionerTypes []codersdk.ProvisionerType) (client proto.DRPCProvisionerDaemonClient, err error) {
 tracer := api.TracerProvider.Tracer(tracing.TracerName)
 clientSession, serverSession := drpc.MemTransportPipe()
 defer func() {
 return nil, xerrors.Errorf("unable to fetch default org for in memory provisioner: %w", err)
 }

 dbTypes := make([]database.ProvisionerType, 0, len(provisionerTypes))
 for _, tp := range provisionerTypes {
 dbTypes = append(dbTypes, database.ProvisionerType(tp))
 }

 //nolint:gocritic // in-memory provisioners are owned by system
 daemon, err := api.Database.UpsertProvisionerDaemon(dbauthz.AsSystemRestricted(dialCtx), database.UpsertProvisionerDaemonParams{
 Name:           name,
 OrganizationID: defaultOrg.ID,
 CreatedAt:      dbtime.Now(),
 Provisioners: []database.ProvisionerType{
 database.ProvisionerTypeEcho, database.ProvisionerTypeTerraform,
 },
 Tags:       provisionersdk.MutateTags(uuid.Nil, nil),
 LastSeenAt: sql.NullTime{Time: dbtime.Now(), Valid: true},
 Version:    buildinfo.Version(),
 APIVersion: proto.CurrentVersion.String(),
 Provisioners:   dbTypes,
 Tags:           provisionersdk.MutateTags(uuid.Nil, nil),
 LastSeenAt:     sql.NullTime{Time: dbtime.Now(), Valid: true},
 Version:        buildinfo.Version(),
 APIVersion:     proto.CurrentVersion.String(),
 })
 if err != nil {
 return nil, xerrors.Errorf("failed to create in-memory provisioner daemon: %w", err)
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
 }()

 daemon := provisionerd.New(func(dialCtx context.Context) (provisionerdproto.DRPCProvisionerDaemonClient, error) {
 return coderAPI.CreateInMemoryProvisionerDaemon(dialCtx, "test")
 return coderAPI.CreateInMemoryProvisionerDaemon(dialCtx, "test", []codersdk.ProvisionerType{codersdk.ProvisionerTypeEcho})
 }, &provisionerd.Options{
 Logger:              coderAPI.Logger.Named("provisionerd").Leveled(slog.LevelDebug),
 UpdateInterval:      250 * time.Millisecond,
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
 }

 type ProvisionerConfig struct {
 Daemons             serpent.Int64    `json:"daemons" typescript:",notnull"`
 DaemonsEcho         serpent.Bool     `json:"daemons_echo" typescript:",notnull"`
 DaemonPollInterval  serpent.Duration `json:"daemon_poll_interval" typescript:",notnull"`
 DaemonPollJitter    serpent.Duration `json:"daemon_poll_jitter" typescript:",notnull"`
 ForceCancelInterval serpent.Duration `json:"force_cancel_interval" typescript:",notnull"`
 DaemonPSK           serpent.String   `json:"daemon_psk" typescript:",notnull"`
 // Daemons is the number of built-in terraform provisioners.
 Daemons             serpent.Int64       `json:"daemons" typescript:",notnull"`
 DaemonTypes         serpent.StringArray `json:"daemon_types" typescript:",notnull"`
 DaemonPollInterval  serpent.Duration    `json:"daemon_poll_interval" typescript:",notnull"`
 DaemonPollJitter    serpent.Duration    `json:"daemon_poll_jitter" typescript:",notnull"`
 ForceCancelInterval serpent.Duration    `json:"force_cancel_interval" typescript:",notnull"`
 DaemonPSK           serpent.String      `json:"daemon_psk" typescript:",notnull"`
 }

 type RateLimitConfig struct {
 YAML:        "daemons",
 },
 {
 Name:        "Echo Provisioner",
 Description: "Whether to use echo provisioner daemons instead of Terraform. This is for E2E tests.",
 Flag:        "provisioner-daemons-echo",
 Env:         "CODER_PROVISIONER_DAEMONS_ECHO",
 Hidden:      true,
 Default:     "false",
 Value:       &c.Provisioner.DaemonsEcho,
 Group:       &deploymentGroupProvisioning,
 YAML:        "daemonsEcho",
 Name: "Provisioner Daemon Types",
 Description: fmt.Sprintf("The supported job types for the built-in provisioners. By default, this is only the terraform type. Supported types: %s.",
 strings.Join([]string{
 string(ProvisionerTypeTerraform), string(ProvisionerTypeEcho),
 }, ",")),
 Flag:    "provisioner-types",
 Env:     "CODER_PROVISIONER_TYPES",
 Hidden:  true,
 Default: string(ProvisionerTypeTerraform),
 Value: serpent.Validate(&c.Provisioner.DaemonTypes, func(values *serpent.StringArray) error {
 if values == nil {
 return nil
 }

 for _, value := range *values {
 if err := ProvisionerTypeValid(value); err != nil {
 return err
 }
 }

 return nil
 }),
 Group: &deploymentGroupProvisioning,
 YAML:  "daemonTypes",
 },
 {
 Name:        "Poll Interval",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -944,6 +944,13 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.
		var provisionerdWaitGroup sync.WaitGroup
		defer provisionerdWaitGroup.Wait()
		provisionerdMetrics := provisionerd.NewMetrics(options.PrometheusRegistry)

		// Built in provisioner daemons will support the same types.
		// By default, this is the slice {"terraform"}
		provisionerTypes := make([]codersdk.ProvisionerType, 0)
		for _, pt := range vals.Provisioner.DaemonTypes {
		provisionerTypes = append(provisionerTypes, codersdk.ProvisionerType(pt))
		}
		for i := int64(0); i < vals.Provisioner.Daemons.Value(); i++ {
		suffix := fmt.Sprintf("%d", i)
		// The suffix is added to the hostname, so we may need to trim to fit into
Expand All		@@ -952,7 +959,7 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.
		name := fmt.Sprintf("%s-%s", hostname, suffix)
		daemonCacheDir := filepath.Join(cacheDir, fmt.Sprintf("provisioner-%d", i))
		daemon, err := newProvisionerDaemon(
		ctx, coderAPI, provisionerdMetrics, logger, vals, daemonCacheDir, errCh, &provisionerdWaitGroup, name,
		ctx, coderAPI, provisionerdMetrics, logger, vals, daemonCacheDir, errCh, &provisionerdWaitGroup, name, provisionerTypes,
		)
		if err != nil {
		return xerrors.Errorf("create provisioner daemon: %w", err)
Expand DownExpand Up		@@ -1340,6 +1347,7 @@ func newProvisionerDaemon(
		errCh chan error,
		wg *sync.WaitGroup,
		name string,
		provisionerTypes []codersdk.ProvisionerType,
		) (srv *provisionerd.Server, err error) {
		ctx, cancel := context.WithCancel(ctx)
		defer func() {
Expand All		@@ -1359,79 +1367,88 @@ func newProvisionerDaemon(
		return nil, xerrors.Errorf("mkdir work dir: %w", err)
		}

		// Omit any duplicates
		provisionerTypes = slice.Unique(provisionerTypes)

		// Populate the connector with the supported types.
		connector := provisionerd.LocalProvisioners{}
		if cfg.Provisioner.DaemonsEcho {
		echoClient, echoServer := drpc.MemTransportPipe()
		wg.Add(1)
		go func() {
		defer wg.Done()
		<-ctx.Done()
		_ = echoClient.Close()
		_ = echoServer.Close()
		}()
		wg.Add(1)
		go func() {
		defer wg.Done()
		defer cancel()
		for _, provisionerType := range provisionerTypes {
		switch provisionerType {
		case codersdk.ProvisionerTypeEcho:
		echoClient, echoServer := drpc.MemTransportPipe()
		wg.Add(1)
		go func() {
		defer wg.Done()
		<-ctx.Done()
		_ = echoClient.Close()
		_ = echoServer.Close()
		}()
		wg.Add(1)
		go func() {
		defer wg.Done()
		defer cancel()

		err := echo.Serve(ctx, &provisionersdk.ServeOptions{
		Listener: echoServer,
		WorkDirectory: workDir,
		Logger: logger.Named("echo"),
		})
		if err != nil {
		select {
		case errCh <- err:
		default:
		err := echo.Serve(ctx, &provisionersdk.ServeOptions{
		Listener: echoServer,
		WorkDirectory: workDir,
		Logger: logger.Named("echo"),
		})
		if err != nil {
		select {
		case errCh <- err:
		default:
		}
		}
		}()
		connector[string(database.ProvisionerTypeEcho)] = sdkproto.NewDRPCProvisionerClient(echoClient)
		case codersdk.ProvisionerTypeTerraform:
		tfDir := filepath.Join(cacheDir, "tf")
		err = os.MkdirAll(tfDir, 0o700)
		if err != nil {
		return nil, xerrors.Errorf("mkdir terraform dir: %w", err)
		}
		}()
		connector[string(database.ProvisionerTypeEcho)] = sdkproto.NewDRPCProvisionerClient(echoClient)
		} else {
		tfDir := filepath.Join(cacheDir, "tf")
		err = os.MkdirAll(tfDir, 0o700)
		if err != nil {
		return nil, xerrors.Errorf("mkdir terraform dir: %w", err)
		}

		tracer := coderAPI.TracerProvider.Tracer(tracing.TracerName)
		terraformClient, terraformServer := drpc.MemTransportPipe()
		wg.Add(1)
		go func() {
		defer wg.Done()
		<-ctx.Done()
		_ = terraformClient.Close()
		_ = terraformServer.Close()
		}()
		wg.Add(1)
		go func() {
		defer wg.Done()
		defer cancel()

		err := terraform.Serve(ctx, &terraform.ServeOptions{
		ServeOptions: &provisionersdk.ServeOptions{
		Listener: terraformServer,
		Logger: logger.Named("terraform"),
		WorkDirectory: workDir,
		},
		CachePath: tfDir,
		Tracer: tracer,
		})
		if err != nil && !xerrors.Is(err, context.Canceled) {
		select {
		case errCh <- err:
		default:
		tracer := coderAPI.TracerProvider.Tracer(tracing.TracerName)
		terraformClient, terraformServer := drpc.MemTransportPipe()
		wg.Add(1)
		go func() {
		defer wg.Done()
		<-ctx.Done()
		_ = terraformClient.Close()
		_ = terraformServer.Close()
		}()
		wg.Add(1)
		go func() {
		defer wg.Done()
		defer cancel()

		err := terraform.Serve(ctx, &terraform.ServeOptions{
		ServeOptions: &provisionersdk.ServeOptions{
		Listener: terraformServer,
		Logger: logger.Named("terraform"),
		WorkDirectory: workDir,
		},
		CachePath: tfDir,
		Tracer: tracer,
		})
		if err != nil && !xerrors.Is(err, context.Canceled) {
		select {
		case errCh <- err:
		default:
		}
		}
		}
		}()
		}()

		connector[string(database.ProvisionerTypeTerraform)] = sdkproto.NewDRPCProvisionerClient(terraformClient)
		connector[string(database.ProvisionerTypeTerraform)] = sdkproto.NewDRPCProvisionerClient(terraformClient)
		default:
		return nil, fmt.Errorf("unknown provisioner type %q", provisionerType)
		}
		}

		return provisionerd.New(func(dialCtx context.Context) (proto.DRPCProvisionerDaemonClient, error) {
		// This debounces calls to listen every second. Read the comment
		// in provisionerdserver.go to learn more!
		return coderAPI.CreateInMemoryProvisionerDaemon(dialCtx, name)
		return coderAPI.CreateInMemoryProvisionerDaemon(dialCtx, name, provisionerTypes)
		}, &provisionerd.Options{
		Logger: logger.Named(fmt.Sprintf("provisionerd-%s", name)),
		UpdateInterval: time.Second,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1367,7 +1367,8 @@ func TestServer(t *testing.T) {
		"--in-memory",
		"--http-address", ":0",
		"--access-url", "http://example.com",
		"--provisioner-daemons-echo",
		"--provisioner-daemons=3",
		"--provisioner-types=echo",
		"--log-human", fiName,
		)
		clitest.Start(t, root)
Expand All		@@ -1385,7 +1386,8 @@ func TestServer(t *testing.T) {
		"--in-memory",
		"--http-address", ":0",
		"--access-url", "http://example.com",
		"--provisioner-daemons-echo",
		"--provisioner-daemons=3",
		"--provisioner-types=echo",
		"--log-human", fi,
		)
		clitest.Start(t, root)
Expand All		@@ -1403,7 +1405,8 @@ func TestServer(t *testing.T) {
		"--in-memory",
		"--http-address", ":0",
		"--access-url", "http://example.com",
		"--provisioner-daemons-echo",
		"--provisioner-daemons=3",
		"--provisioner-types=echo",
		"--log-json", fi,
		)
		clitest.Start(t, root)
Expand All		@@ -1424,7 +1427,8 @@ func TestServer(t *testing.T) {
		"--in-memory",
		"--http-address", ":0",
		"--access-url", "http://example.com",
		"--provisioner-daemons-echo",
		"--provisioner-daemons=3",
		"--provisioner-types=echo",
		"--log-stackdriver", fi,
		)
		// Attach pty so we get debug output from the command if this test
Expand DownExpand Up		@@ -1459,7 +1463,8 @@ func TestServer(t *testing.T) {
		"--in-memory",
		"--http-address", ":0",
		"--access-url", "http://example.com",
		"--provisioner-daemons-echo",
		"--provisioner-daemons=3",
		"--provisioner-types=echo",
		"--log-human", fi1,
		"--log-json", fi2,
		"--log-stackdriver", fi3,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -379,10 +379,11 @@ provisioning:
		# state for a long time, consider increasing this.
		# (default: 3, type: int)
		daemons: 3
		# Whether to use echo provisioner daemons instead of Terraform. This is for E2E
		# tests.
		# (default: false, type: bool)
		daemonsEcho: false
		# The supported job types for the built-in provisioners. By default, this is only
		# the terraform type. Supported types: terraform,echo.
		# (default: terraform, type: string-array)
		daemonTypes:
		- terraform
		# Deprecated and ignored.
		# (default: 1s, type: duration)
		daemonPollInterval: 1s
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1348,7 +1348,7 @@ func compressHandler(h http.Handler) http.Handler {

		// CreateInMemoryProvisionerDaemon is an in-memory connection to a provisionerd.
		// Useful when starting coderd and provisionerd in the same process.
		func (api *API) CreateInMemoryProvisionerDaemon(dialCtx context.Context, name string) (client proto.DRPCProvisionerDaemonClient, err error) {
		func (api *API) CreateInMemoryProvisionerDaemon(dialCtx context.Context, name string, provisionerTypes []codersdk.ProvisionerType) (client proto.DRPCProvisionerDaemonClient, err error) {
		tracer := api.TracerProvider.Tracer(tracing.TracerName)
		clientSession, serverSession := drpc.MemTransportPipe()
		defer func() {
Expand All		@@ -1365,18 +1365,21 @@ func (api *API) CreateInMemoryProvisionerDaemon(dialCtx context.Context, name st
		return nil, xerrors.Errorf("unable to fetch default org for in memory provisioner: %w", err)
		}

		dbTypes := make([]database.ProvisionerType, 0, len(provisionerTypes))
		for _, tp := range provisionerTypes {
		dbTypes = append(dbTypes, database.ProvisionerType(tp))
		}

		//nolint:gocritic // in-memory provisioners are owned by system
		daemon, err := api.Database.UpsertProvisionerDaemon(dbauthz.AsSystemRestricted(dialCtx), database.UpsertProvisionerDaemonParams{
		Name: name,
		OrganizationID: defaultOrg.ID,
		CreatedAt: dbtime.Now(),
		Provisioners: []database.ProvisionerType{
		database.ProvisionerTypeEcho, database.ProvisionerTypeTerraform,
		},
		Tags: provisionersdk.MutateTags(uuid.Nil, nil),
		LastSeenAt: sql.NullTime{Time: dbtime.Now(), Valid: true},
		Version: buildinfo.Version(),
		APIVersion: proto.CurrentVersion.String(),
		Provisioners: dbTypes,
		Tags: provisionersdk.MutateTags(uuid.Nil, nil),
		LastSeenAt: sql.NullTime{Time: dbtime.Now(), Valid: true},
		Version: buildinfo.Version(),
		APIVersion: proto.CurrentVersion.String(),
		})
		if err != nil {
		return nil, xerrors.Errorf("failed to create in-memory provisioner daemon: %w", err)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -578,7 +578,7 @@ func NewProvisionerDaemon(t testing.TB, coderAPI *coderd.API) io.Closer {
		}()

		daemon := provisionerd.New(func(dialCtx context.Context) (provisionerdproto.DRPCProvisionerDaemonClient, error) {
		return coderAPI.CreateInMemoryProvisionerDaemon(dialCtx, "test")
		return coderAPI.CreateInMemoryProvisionerDaemon(dialCtx, "test", []codersdk.ProvisionerType{codersdk.ProvisionerTypeEcho})
		}, &provisionerd.Options{
		Logger: coderAPI.Logger.Named("provisionerd").Leveled(slog.LevelDebug),
		UpdateInterval: 250 * time.Millisecond,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -406,12 +406,13 @@ type ExternalAuthConfig struct {
		}

		type ProvisionerConfig struct {
		Daemons serpent.Int64 `json:"daemons" typescript:",notnull"`
		DaemonsEcho serpent.Bool `json:"daemons_echo" typescript:",notnull"`
		DaemonPollInterval serpent.Duration `json:"daemon_poll_interval" typescript:",notnull"`
		DaemonPollJitter serpent.Duration `json:"daemon_poll_jitter" typescript:",notnull"`
		ForceCancelInterval serpent.Duration `json:"force_cancel_interval" typescript:",notnull"`
		DaemonPSK serpent.String `json:"daemon_psk" typescript:",notnull"`
		// Daemons is the number of built-in terraform provisioners.
		Daemons serpent.Int64 `json:"daemons" typescript:",notnull"`
		DaemonTypes serpent.StringArray `json:"daemon_types" typescript:",notnull"`
		DaemonPollInterval serpent.Duration `json:"daemon_poll_interval" typescript:",notnull"`
		DaemonPollJitter serpent.Duration `json:"daemon_poll_jitter" typescript:",notnull"`
		ForceCancelInterval serpent.Duration `json:"force_cancel_interval" typescript:",notnull"`
		DaemonPSK serpent.String `json:"daemon_psk" typescript:",notnull"`
		}

		type RateLimitConfig struct {
Expand DownExpand Up		@@ -1413,15 +1414,30 @@ when required by your organization's security policy.`,
		YAML: "daemons",
		},
		{
		Name: "Echo Provisioner",
		Description: "Whether to use echo provisioner daemons instead of Terraform. This is for E2E tests.",
		Flag: "provisioner-daemons-echo",
		Env: "CODER_PROVISIONER_DAEMONS_ECHO",
		Hidden: true,
		Default: "false",
		Value: &c.Provisioner.DaemonsEcho,
		Group: &deploymentGroupProvisioning,
		YAML: "daemonsEcho",
		Name: "Provisioner Daemon Types",
		Description: fmt.Sprintf("The supported job types for the built-in provisioners. By default, this is only the terraform type. Supported types: %s.",
		strings.Join([]string{
		string(ProvisionerTypeTerraform), string(ProvisionerTypeEcho),
		}, ",")),
		Flag: "provisioner-types",
		Env: "CODER_PROVISIONER_TYPES",
		Hidden: true,
		Default: string(ProvisionerTypeTerraform),
		Value: serpent.Validate(&c.Provisioner.DaemonTypes, func(values *serpent.StringArray) error {
		if values == nil {
		return nil
		}

		for _, value := range *values {
		if err := ProvisionerTypeValid(value); err != nil {
		return err
		}
		}

		return nil
		}),
Comment on lines +1426 to +1438 Copy link MemberAuthor EmyrkMay 2, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. some enum validation. This is case sensitive.
		Group: &deploymentGroupProvisioning,
		YAML: "daemonTypes",
		},
		{
		Name: "Poll Interval",
Expand Down