Apr 10, 2025 · Apr 7, 2025 · Apr 8, 2025 · Apr 9, 2025 · Apr 9, 2025 · Apr 10, 2025
diff --git a/archive/fs/tar.go b/archive/fs/tar.go
 "github.com/spf13/afero/tarfs"
 )

 // FromTarReader creates a read-only in-memory FS
 func FromTarReader(r io.Reader) fs.FS {
 tr := tar.NewReader(r)
 tfs := tarfs.New(tr)
 rofs := afero.NewReadOnlyFs(tfs)
 return afero.NewIOFS(rofs)
 return afero.NewIOFS(tarfs.New(tr))
 }
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

 "github.com/coder/coder/v2/coderd/cryptokeys"
 "github.com/coder/coder/v2/coderd/entitlements"
 "github.com/coder/coder/v2/coderd/files"
 "github.com/coder/coder/v2/coderd/idpsync"
 "github.com/coder/coder/v2/coderd/runtimeconfig"
 "github.com/coder/coder/v2/coderd/webpush"
 TemplateScheduleStore:       options.TemplateScheduleStore,
 UserQuietHoursScheduleStore: options.UserQuietHoursScheduleStore,
 AccessControlStore:          options.AccessControlStore,
 FileCache:                   files.NewFromStore(options.Database),
 Experiments:                 experiments,
 WebpushDispatcher:           options.WebPushDispatcher,
 healthCheckGroup:            &singleflight.Group[string, *healthsdk.HealthcheckReport]{},
 // The idea is to return an empty [], so that the coder CLI won't get blocked accidentally.
 r.Get("/schema", templateVersionSchemaDeprecated)
 r.Get("/parameters", templateVersionParametersDeprecated)
 r.Group(func(r chi.Router) {
 r.Use(httpmw.RequireExperiment(api.Experiments, codersdk.ExperimentDynamicParameters))
 r.Get("/dynamic-parameters", api.templateVersionDynamicParameters)
 })
 r.Get("/rich-parameters", api.templateVersionRichParameters)
 r.Get("/external-auth", api.templateVersionExternalAuth)
 r.Get("/variables", api.templateVersionVariables)
 // passed to dbauthz.
 AccessControlStore *atomic.Pointer[dbauthz.AccessControlStore]
 PortSharer         atomic.Pointer[portsharing.PortSharer]
 FileCache          files.Cache

 UpdatesProvider tailnet.WorkspaceUpdatesProvider
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,9 +9,8 @@ import (
		"github.com/spf13/afero/tarfs"
		)

		// FromTarReader creates a read-only in-memory FS
		func FromTarReader(r io.Reader) fs.FS {
		tr := tar.NewReader(r)
		tfs := tarfs.New(tr)
		rofs := afero.NewReadOnlyFs(tfs)
		return afero.NewIOFS(rofs)
		return afero.NewIOFS(tarfs.New(tr))
Emyrk marked this conversation as resolved. Show resolvedHide resolved
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,6 +43,7 @@ import (

		"github.com/coder/coder/v2/coderd/cryptokeys"
		"github.com/coder/coder/v2/coderd/entitlements"
		"github.com/coder/coder/v2/coderd/files"
		"github.com/coder/coder/v2/coderd/idpsync"
		"github.com/coder/coder/v2/coderd/runtimeconfig"
		"github.com/coder/coder/v2/coderd/webpush"
Expand DownExpand Up		@@ -557,6 +558,7 @@ func New(options Options) API {
		TemplateScheduleStore: options.TemplateScheduleStore,
		UserQuietHoursScheduleStore: options.UserQuietHoursScheduleStore,
		AccessControlStore: options.AccessControlStore,
		FileCache: files.NewFromStore(options.Database),
		Experiments: experiments,
		WebpushDispatcher: options.WebPushDispatcher,
		healthCheckGroup: &singleflight.Group[string, *healthsdk.HealthcheckReport]{},
Expand DownExpand Up		@@ -1096,6 +1098,10 @@ func New(options Options) API {
		// The idea is to return an empty [], so that the coder CLI won't get blocked accidentally.
		r.Get("/schema", templateVersionSchemaDeprecated)
		r.Get("/parameters", templateVersionParametersDeprecated)
		r.Group(func(r chi.Router) {
		r.Use(httpmw.RequireExperiment(api.Experiments, codersdk.ExperimentDynamicParameters))
		r.Get("/dynamic-parameters", api.templateVersionDynamicParameters)
		})
		r.Get("/rich-parameters", api.templateVersionRichParameters)
		r.Get("/external-auth", api.templateVersionExternalAuth)
		r.Get("/variables", api.templateVersionVariables)
Expand DownExpand Up		@@ -1545,6 +1551,7 @@ type API struct {
		// passed to dbauthz.
		AccessControlStore *atomic.Pointer[dbauthz.AccessControlStore]
		PortSharer atomic.Pointer[portsharing.PortSharer]
		FileCache files.Cache

		UpdatesProvider tailnet.WorkspaceUpdatesProvider

Expand Down