May 16, 2025 · May 14, 2025 · May 14, 2025 · May 14, 2025 · May 14, 2025 · May 14, 2025
diff --git a/coderd/coderd.go b/coderd/coderd.go
 // passed to dbauthz.
 AccessControlStore  *atomic.Pointer[dbauthz.AccessControlStore]
 PortSharer          atomic.Pointer[portsharing.PortSharer]
 FileCache           files.Cache
 FileCache*files.Cache
 PrebuildsClaimer    atomic.Pointer[prebuilds.Claimer]
 PrebuildsReconciler atomic.Pointer[prebuilds.ReconciliationOrchestrator]

 return cmp.Handler(h)
 }

 type MemoryProvisionerDaemonOption func(*memoryProvisionerDaemonOptions)

 func MemoryProvisionerWithVersionOverride(version string) MemoryProvisionerDaemonOption {
 return func(opts *memoryProvisionerDaemonOptions) {
 opts.versionOverride = version
 }
 }

 type memoryProvisionerDaemonOptions struct {
 versionOverride string
 }

 // 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, provisionerTypes []codersdk.ProvisionerType) (client proto.DRPCProvisionerDaemonClient, err error) {
 return api.CreateInMemoryTaggedProvisionerDaemon(dialCtx, name, provisionerTypes, nil)
 }

 func (api *API) CreateInMemoryTaggedProvisionerDaemon(dialCtx context.Context, name string, provisionerTypes []codersdk.ProvisionerType, provisionerTags map[string]string) (client proto.DRPCProvisionerDaemonClient, err error) {
 func (api *API) CreateInMemoryTaggedProvisionerDaemon(dialCtx context.Context, name string, provisionerTypes []codersdk.ProvisionerType, provisionerTags map[string]string, opts ...MemoryProvisionerDaemonOption) (client proto.DRPCProvisionerDaemonClient, err error) {
 options := &memoryProvisionerDaemonOptions{}
 for _, opt := range opts {
 opt(options)
 }

 tracer := api.TracerProvider.Tracer(tracing.TracerName)
 clientSession, serverSession := drpcsdk.MemTransportPipe()
 defer func() {
 return nil, xerrors.Errorf("failed to parse built-in provisioner key ID: %w", err)
 }

 apiVersion := proto.CurrentVersion.String()
 if options.versionOverride != "" && flag.Lookup("test.v") != nil {
 // This should only be usable for unit testing. To fake a different provisioner version
 apiVersion = options.versionOverride
 }

 //nolint:gocritic // in-memory provisioners are owned by system
 daemon, err := api.Database.UpsertProvisionerDaemon(dbauthz.AsSystemRestricted(dialCtx), database.UpsertProvisionerDaemonParams{
 Name:           name,
 Tags:           provisionersdk.MutateTags(uuid.Nil, provisionerTags),
 LastSeenAt:     sql.NullTime{Time: dbtime.Now(), Valid: true},
 Version:        buildinfo.Version(),
 APIVersion:proto.CurrentVersion.String(),
 APIVersion:apiVersion,
 KeyID:          keyID,
 })
 if err != nil {
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go

 // IncludeProvisionerDaemon when true means to start an in-memory provisionerD
 IncludeProvisionerDaemon    bool
 ProvisionerDaemonVersion    string
 ProvisionerDaemonTags       map[string]string
 MetricsCacheRefreshInterval time.Duration
 AgentStatsRefreshInterval   time.Duration
 setHandler(rootHandler)
 var provisionerCloser io.Closer = nopcloser{}
 if options.IncludeProvisionerDaemon {
 provisionerCloser = NewTaggedProvisionerDaemon(t, coderAPI, "test", options.ProvisionerDaemonTags)
 provisionerCloser = NewTaggedProvisionerDaemon(t, coderAPI, "test", options.ProvisionerDaemonTags, coderd.MemoryProvisionerWithVersionOverride(options.ProvisionerDaemonVersion))
 }
 client := codersdk.New(serverURL)
 t.Cleanup(func() {
 return NewTaggedProvisionerDaemon(t, coderAPI, "test", nil)
 }

 func NewTaggedProvisionerDaemon(t testing.TB, coderAPI *coderd.API, name string, provisionerTags map[string]string) io.Closer {
 func NewTaggedProvisionerDaemon(t testing.TB, coderAPI *coderd.API, name string, provisionerTags map[string]string, opts ...coderd.MemoryProvisionerDaemonOption) io.Closer {
 t.Helper()

 // t.Cleanup runs in last added, first called order. t.TempDir() will delete

 connectedCh := make(chan struct{})
 daemon := provisionerd.New(func(dialCtx context.Context) (provisionerdproto.DRPCProvisionerDaemonClient, error) {
 return coderAPI.CreateInMemoryTaggedProvisionerDaemon(dialCtx, name, []codersdk.ProvisionerType{codersdk.ProvisionerTypeEcho}, provisionerTags)
 return coderAPI.CreateInMemoryTaggedProvisionerDaemon(dialCtx, name, []codersdk.ProvisionerType{codersdk.ProvisionerTypeEcho}, provisionerTags, opts...)
 }, &provisionerd.Options{
 Logger:              coderAPI.Logger.Named("provisionerd").Leveled(slog.LevelDebug),
 UpdateInterval:      250 * time.Millisecond,
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
 JobID:          job.ID,
 TemplateID:     uuid.NullUUID{UUID: t.ID, Valid: true},
 })
 dbgen.TemplateVersionTerraformValues(s.T(), db, database.InsertTemplateVersionTerraformValuesByJobIDParams{
 JobID: job.ID,
 dbgen.TemplateVersionTerraformValues(s.T(), db, database.TemplateVersionTerraformValue{
 TemplateVersionID: tv.ID,
 })
 check.Args(tv.ID).Asserts(t, policy.ActionRead)
 }))
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
 return version
 }

 func TemplateVersionTerraformValues(t testing.TB, db database.Store, orig database.InsertTemplateVersionTerraformValuesByJobIDParams) {
 func TemplateVersionTerraformValues(t testing.TB, db database.Store, orig database.TemplateVersionTerraformValue) database.TemplateVersionTerraformValue {
 t.Helper()

 jobID := uuid.New()
 if orig.TemplateVersionID != uuid.Nil {
 v, err := db.GetTemplateVersionByID(genCtx, orig.TemplateVersionID)
 if err == nil {
 jobID = v.JobID
 }
 }

 params := database.InsertTemplateVersionTerraformValuesByJobIDParams{
 JobID:takeFirst(orig.JobID, uuid.New()),
 JobID:jobID,
 CachedPlan:          takeFirstSlice(orig.CachedPlan, []byte("{}")),
 CachedModuleFiles:   orig.CachedModuleFiles,
 UpdatedAt:           takeFirst(orig.UpdatedAt, dbtime.Now()),

 err := db.InsertTemplateVersionTerraformValuesByJobID(genCtx, params)
 require.NoError(t, err, "insert template version parameter")

 v, err := db.GetTemplateVersionTerraformValues(genCtx, orig.TemplateVersionID)
 require.NoError(t, err, "get template version values")

 return v
 }

 func WorkspaceAgentStat(t testing.TB, db database.Store, orig database.WorkspaceAgentStat) database.WorkspaceAgentStat {
diff --git a/coderd/files/cache.go b/coderd/files/cache.go

 // NewFromStore returns a file cache that will fetch files from the provided
 // database.
 func NewFromStore(store database.Store) Cache {
 func NewFromStore(store database.Store)*Cache {
 fetcher := func(ctx context.Context, fileID uuid.UUID) (fs.FS, error) {
 file, err := store.GetFileByID(ctx, fileID)
 if err != nil {
 return archivefs.FromTarReader(content), nil
 }

 return Cache{
 return&Cache{
 lock:    sync.Mutex{},
 data:    make(map[uuid.UUID]*cacheEntry),
 fetcher: fetcher,

 delete(c.data, fileID)
 }

 // Count returns the number of files currently in the cache.
 // Mainly used for unit testing assertions.
 func (c *Cache) Count() int {
 c.lock.Lock()
 defer c.lock.Unlock()

 return len(c.data)
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1597,7 +1597,7 @@ type API struct {
		// passed to dbauthz.
		AccessControlStore *atomic.Pointer[dbauthz.AccessControlStore]
		PortSharer atomic.Pointer[portsharing.PortSharer]
		FileCache files.Cache
		FileCache*files.Cache
		PrebuildsClaimer atomic.Pointer[prebuilds.Claimer]
		PrebuildsReconciler atomic.Pointer[prebuilds.ReconciliationOrchestrator]

Expand DownExpand Up		@@ -1722,13 +1722,30 @@ func compressHandler(h http.Handler) http.Handler {
		return cmp.Handler(h)
		}

		type MemoryProvisionerDaemonOption func(*memoryProvisionerDaemonOptions)

		func MemoryProvisionerWithVersionOverride(version string) MemoryProvisionerDaemonOption {
		return func(opts *memoryProvisionerDaemonOptions) {
		opts.versionOverride = version
		}
		}

		type memoryProvisionerDaemonOptions struct {
		versionOverride string
		}

		// 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, provisionerTypes []codersdk.ProvisionerType) (client proto.DRPCProvisionerDaemonClient, err error) {
		return api.CreateInMemoryTaggedProvisionerDaemon(dialCtx, name, provisionerTypes, nil)
		}

		func (api *API) CreateInMemoryTaggedProvisionerDaemon(dialCtx context.Context, name string, provisionerTypes []codersdk.ProvisionerType, provisionerTags map[string]string) (client proto.DRPCProvisionerDaemonClient, err error) {
		func (api *API) CreateInMemoryTaggedProvisionerDaemon(dialCtx context.Context, name string, provisionerTypes []codersdk.ProvisionerType, provisionerTags map[string]string, opts ...MemoryProvisionerDaemonOption) (client proto.DRPCProvisionerDaemonClient, err error) {
		options := &memoryProvisionerDaemonOptions{}
		for _, opt := range opts {
		opt(options)
		}

		tracer := api.TracerProvider.Tracer(tracing.TracerName)
		clientSession, serverSession := drpcsdk.MemTransportPipe()
		defer func() {
Expand All		@@ -1755,6 +1772,12 @@ func (api *API) CreateInMemoryTaggedProvisionerDaemon(dialCtx context.Context, n
		return nil, xerrors.Errorf("failed to parse built-in provisioner key ID: %w", err)
		}

		apiVersion := proto.CurrentVersion.String()
		if options.versionOverride != "" && flag.Lookup("test.v") != nil {
		// This should only be usable for unit testing. To fake a different provisioner version
		apiVersion = options.versionOverride
		}

		//nolint:gocritic // in-memory provisioners are owned by system
		daemon, err := api.Database.UpsertProvisionerDaemon(dbauthz.AsSystemRestricted(dialCtx), database.UpsertProvisionerDaemonParams{
		Name: name,
Expand All		@@ -1764,7 +1787,7 @@ func (api *API) CreateInMemoryTaggedProvisionerDaemon(dialCtx context.Context, n
		Tags: provisionersdk.MutateTags(uuid.Nil, provisionerTags),
		LastSeenAt: sql.NullTime{Time: dbtime.Now(), Valid: true},
		Version: buildinfo.Version(),
		APIVersion:proto.CurrentVersion.String(),
		APIVersion:apiVersion,
		KeyID: keyID,
		})
		if err != nil {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -135,6 +135,7 @@ type Options struct {

		// IncludeProvisionerDaemon when true means to start an in-memory provisionerD
		IncludeProvisionerDaemon bool
		ProvisionerDaemonVersion string
		ProvisionerDaemonTags map[string]string
		MetricsCacheRefreshInterval time.Duration
		AgentStatsRefreshInterval time.Duration
Expand DownExpand Up		@@ -601,7 +602,7 @@ func NewWithAPI(t testing.TB, options Options) (codersdk.Client, io.Closer, *c
		setHandler(rootHandler)
		var provisionerCloser io.Closer = nopcloser{}
		if options.IncludeProvisionerDaemon {
		provisionerCloser = NewTaggedProvisionerDaemon(t, coderAPI, "test", options.ProvisionerDaemonTags)
		provisionerCloser = NewTaggedProvisionerDaemon(t, coderAPI, "test", options.ProvisionerDaemonTags, coderd.MemoryProvisionerWithVersionOverride(options.ProvisionerDaemonVersion))
		}
		client := codersdk.New(serverURL)
		t.Cleanup(func() {
Expand DownExpand Up		@@ -648,7 +649,7 @@ func NewProvisionerDaemon(t testing.TB, coderAPI *coderd.API) io.Closer {
		return NewTaggedProvisionerDaemon(t, coderAPI, "test", nil)
		}

		func NewTaggedProvisionerDaemon(t testing.TB, coderAPI *coderd.API, name string, provisionerTags map[string]string) io.Closer {
		func NewTaggedProvisionerDaemon(t testing.TB, coderAPI *coderd.API, name string, provisionerTags map[string]string, opts ...coderd.MemoryProvisionerDaemonOption) io.Closer {
		t.Helper()

		// t.Cleanup runs in last added, first called order. t.TempDir() will delete
Expand DownExpand Up		@@ -676,7 +677,7 @@ func NewTaggedProvisionerDaemon(t testing.TB, coderAPI *coderd.API, name string,

		connectedCh := make(chan struct{})
		daemon := provisionerd.New(func(dialCtx context.Context) (provisionerdproto.DRPCProvisionerDaemonClient, error) {
		return coderAPI.CreateInMemoryTaggedProvisionerDaemon(dialCtx, name, []codersdk.ProvisionerType{codersdk.ProvisionerTypeEcho}, provisionerTags)
		return coderAPI.CreateInMemoryTaggedProvisionerDaemon(dialCtx, name, []codersdk.ProvisionerType{codersdk.ProvisionerTypeEcho}, provisionerTags, opts...)
		}, &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		@@ -1214,8 +1214,8 @@ func (s *MethodTestSuite) TestTemplate() {
		JobID: job.ID,
		TemplateID: uuid.NullUUID{UUID: t.ID, Valid: true},
		})
		dbgen.TemplateVersionTerraformValues(s.T(), db, database.InsertTemplateVersionTerraformValuesByJobIDParams{
		JobID: job.ID,
		dbgen.TemplateVersionTerraformValues(s.T(), db, database.TemplateVersionTerraformValue{
		TemplateVersionID: tv.ID,
		})
		check.Args(tv.ID).Asserts(t, policy.ActionRead)
		}))
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -998,11 +998,19 @@ func TemplateVersionParameter(t testing.TB, db database.Store, orig database.Tem
		return version
		}

		func TemplateVersionTerraformValues(t testing.TB, db database.Store, orig database.InsertTemplateVersionTerraformValuesByJobIDParams) {
		func TemplateVersionTerraformValues(t testing.TB, db database.Store, orig database.TemplateVersionTerraformValue) database.TemplateVersionTerraformValue {
		t.Helper()

		jobID := uuid.New()
		if orig.TemplateVersionID != uuid.Nil {
		v, err := db.GetTemplateVersionByID(genCtx, orig.TemplateVersionID)
		if err == nil {
		jobID = v.JobID
		}
		}

		params := database.InsertTemplateVersionTerraformValuesByJobIDParams{
		JobID:takeFirst(orig.JobID, uuid.New()),
		JobID:jobID,
		CachedPlan: takeFirstSlice(orig.CachedPlan, []byte("{}")),
		CachedModuleFiles: orig.CachedModuleFiles,
		UpdatedAt: takeFirst(orig.UpdatedAt, dbtime.Now()),
Expand All		@@ -1011,6 +1019,11 @@ func TemplateVersionTerraformValues(t testing.TB, db database.Store, orig databa

		err := db.InsertTemplateVersionTerraformValuesByJobID(genCtx, params)
		require.NoError(t, err, "insert template version parameter")

		v, err := db.GetTemplateVersionTerraformValues(genCtx, orig.TemplateVersionID)
		require.NoError(t, err, "get template version values")

		return v
		}

		func WorkspaceAgentStat(t testing.TB, db database.Store, orig database.WorkspaceAgentStat) database.WorkspaceAgentStat {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,7 +16,7 @@ import (

		// NewFromStore returns a file cache that will fetch files from the provided
		// database.
		func NewFromStore(store database.Store) Cache {
		func NewFromStore(store database.Store)*Cache {
		fetcher := func(ctx context.Context, fileID uuid.UUID) (fs.FS, error) {
		file, err := store.GetFileByID(ctx, fileID)
		if err != nil {
Expand All		@@ -27,7 +27,7 @@ func NewFromStore(store database.Store) Cache {
		return archivefs.FromTarReader(content), nil
		}

		return Cache{
		return&Cache{
		lock: sync.Mutex{},
		data: make(map[uuid.UUID]*cacheEntry),
		fetcher: fetcher,
Expand DownExpand Up		@@ -112,3 +112,12 @@ func (c *Cache) Release(fileID uuid.UUID) {

		delete(c.data, fileID)
		}

		// Count returns the number of files currently in the cache.
		// Mainly used for unit testing assertions.
		func (c *Cache) Count() int {
		c.lock.Lock()
		defer c.lock.Unlock()

		return len(c.data)
		}