Commitfd69221

committed

update agentcontainers API file watch init

1 parent2a9a842 commitfd69221Copy full SHA for fd69221

File tree

+34

-16

lines changed

+34

-16

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -272,8 +272,9 @@ type agent struct {`
`272`	`272`	`metrics*agentMetrics`
`273`	`273`	`execer agentexec.Execer`
`274`	`274`
`275`		`-containerAPIOptions []agentcontainers.Option`
`276`	`275`	`experimentalDevcontainersEnabledbool`
	`276`	`+containerAPIOptions []agentcontainers.Option`
	`277`	`+containerAPI*agentcontainers.API`
`277`	`278`	`}`
`278`	`279`
`279`	`280`	`func (aagent)TailnetConn()tailnet.Conn {`
`@@ -1167,6 +1168,11 @@ func (a agent) handleManifest(manifestOK checkpoint) func(ctx context.Context,`
`1167`	`1168`	`}`
`1168`	`1169`	`a.metrics.startupScriptSeconds.WithLabelValues(label).Set(dur)`
`1169`	`1170`	`a.scriptRunner.StartCron()`
	`1171`	`+ifa.containerAPI!=nil {`
	`1172`	`+// Start the containerAPI service after`
	`1173`	`+// devcontainers have been started.`
	`1174`	`+a.containerAPI.Start()`
	`1175`	`+}`
`1170`	`1176`	`})`
`1171`	`1177`	`iferr!=nil {`
`1172`	`1178`	`returnxerrors.Errorf("track conn goroutine: %w",err)`

Lines changed: 18 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -146,21 +146,30 @@ func NewAPI(logger slog.Logger, options ...Option) *API {`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`
	`149`	`+goapi.loop()`
	`150`	`+`
	`151`	`+returnapi`
	`152`	`+}`
	`153`	`+`
	`154`	`+// Start watching for devcontainer config file changes and prime the`
	`155`	`+// cache with the current list of containers.`
	`156`	`+func (api*API)Start() {`
	`157`	`+// Prime the cache with the current list of containers.`
	`158`	`+_,_=api.cl.List(api.ctx)`
	`159`	`+`
`149`	`160`	`// Make sure we watch the devcontainer config files for changes.`
`150`	`161`	`for_,devcontainer:=rangeapi.knownDevcontainers {`
`151`		`-ifdevcontainer.ConfigPath!="" {`
`152`		`-iferr:=api.watcher.Add(devcontainer.ConfigPath);err!=nil {`
`153`		`-api.logger.Error(ctx,"watch devcontainer config file failed",slog.Error(err),slog.F("file",devcontainer.ConfigPath))`
`154`		`-}`
	`162`	`+ifdevcontainer.ConfigPath=="" {`
	`163`	`+continue`
`155`	`164`	`}`
`156`		`-}`
`157`		`-`
`158`		`-goapi.start()`
`159`	`165`
`160`		`-returnapi`
	`166`	`+iferr:=api.watcher.Add(devcontainer.ConfigPath);err!=nil {`
	`167`	`+api.logger.Error(api.ctx,"watch devcontainer config file failed",slog.Error(err),slog.F("file",devcontainer.ConfigPath))`
	`168`	`+}`
	`169`	`+}`
`161`	`170`	`}`
`162`	`171`
`163`		`-func (api*API)start() {`
	`172`	`+func (api*API)loop() {`
`164`	`173`	`deferclose(api.done)`
`165`	`174`
`166`	`175`	`for {`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ import (`
`18`	`18`	`"cdr.dev/slog"`
`19`	`19`	`"cdr.dev/slog/sloggers/slogtest"`
`20`	`20`	`"github.com/coder/coder/v2/agent/agentcontainers"`
	`21`	`+"github.com/coder/coder/v2/agent/agentcontainers/watcher"`
`21`	`22`	`"github.com/coder/coder/v2/codersdk"`
`22`	`23`	`"github.com/coder/coder/v2/testutil"`
`23`	`24`	`"github.com/coder/quartz"`
`@@ -253,6 +254,7 @@ func TestAPI(t *testing.T) {`
`253`	`254`	`logger,`
`254`	`255`	`agentcontainers.WithLister(tt.lister),`
`255`	`256`	`agentcontainers.WithDevcontainerCLI(tt.devcontainerCLI),`
	`257`	`+agentcontainers.WithWatcher(watcher.NewNoop()),`
`256`	`258`	`)`
`257`	`259`	`deferapi.Close()`
`258`	`260`	`r.Mount("/",api.Routes())`
`@@ -558,6 +560,7 @@ func TestAPI(t *testing.T) {`
`558`	`560`	`r:=chi.NewRouter()`
`559`	`561`	`apiOptions:= []agentcontainers.Option{`
`560`	`562`	`agentcontainers.WithLister(tt.lister),`
	`563`	`+agentcontainers.WithWatcher(watcher.NewNoop()),`
`561`	`564`	`}`
`562`	`565`
`563`	`566`	`iflen(tt.knownDevcontainers)>0 {`
`@@ -631,6 +634,8 @@ func TestAPI(t *testing.T) {`
`631`	`634`	`)`
`632`	`635`	`deferapi.Close()`
`633`	`636`
	`637`	`+api.Start()`
	`638`	`+`
`634`	`639`	`r:=chi.NewRouter()`
`635`	`640`	`r.Mount("/",api.Routes())`
`636`	`641`

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ func (a *agent) apiHandler() (http.Handler, func() error) {`
`37`	`37`	`cacheDuration:cacheDuration,`
`38`	`38`	`}`
`39`	`39`
`40`		`-varcontainerAPI*agentcontainers.API`
`41`	`40`	`ifa.experimentalDevcontainersEnabled {`
`42`	`41`	`containerAPIOpts:= []agentcontainers.Option{`
`43`	`42`	`agentcontainers.WithExecer(a.execer),`
`@@ -53,9 +52,8 @@ func (a *agent) apiHandler() (http.Handler, func() error) {`
`53`	`52`	`// Append after to allow the agent options to override the default options.`
`54`	`53`	`containerAPIOpts=append(containerAPIOpts,a.containerAPIOptions...)`
`55`	`54`
`56`		`-containerAPI=agentcontainers.NewAPI(a.logger.Named("containers"),containerAPIOpts...)`
`57`		`-`
`58`		`-r.Mount("/api/v0/containers",containerAPI.Routes())`
	`55`	`+a.containerAPI=agentcontainers.NewAPI(a.logger.Named("containers"),containerAPIOpts...)`
	`56`	`+r.Mount("/api/v0/containers",a.containerAPI.Routes())`
`59`	`57`	`}else {`
`60`	`58`	`r.HandleFunc("/api/v0/containers",func(w http.ResponseWriter,r*http.Request) {`
`61`	`59`	`httpapi.Write(r.Context(),w,http.StatusNotFound, codersdk.Response{`
`@@ -77,8 +75,8 @@ func (a *agent) apiHandler() (http.Handler, func() error) {`
`77`	`75`	`r.Get("/debug/prometheus",promHandler.ServeHTTP)`
`78`	`76`
`79`	`77`	`returnr,func()error {`
`80`		`-ifcontainerAPI!=nil {`
`81`		`-returncontainerAPI.Close()`
	`78`	`+ifa.containerAPI!=nil {`
	`79`	`+returna.containerAPI.Close()`
`82`	`80`	`}`
`83`	`81`	`returnnil`
`84`	`82`	`}`

Comments

(0)