Commit4c2532a

committed

fix(agent/agentcontainers): generate devcontainer metadata from schema

1 parent09dd69a commit4c2532aCopy full SHA for 4c2532a

File tree

+616

-10

lines changed

+616

-10

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -634,6 +634,14 @@ coderd/database/pubsub/psmock/psmock.go: coderd/database/pubsub/pubsub.go`
`634`	`634`	`agent/agentcontainers/acmock/acmock.go: agent/agentcontainers/containers.go`
`635`	`635`	`go generate ./agent/agentcontainers/acmock/`
`636`	`636`
	`637`	`+agent/agentcontainers/devcontainer_base_gen.go:`
	`638`	`+TMPDIR=$$(mktemp -d)`
	`639`	`+wget -O"$$TMPDIR/devContainer.base.schema.json" https://raw.githubusercontent.com/devcontainers/spec/refs/heads/main/schemas/devContainer.base.schema.json`
	`640`	`+quicktype --src"$$TMPDIR/devContainer.base.schema.json" --lang go --package agentcontainers --src-lang schema --top-level DevContainerBase --out"$$TMPDIR/devcontainer_base_gen.go"`
	`641`	`+rm -f agent/agentcontainers/devcontainer_base_gen.go`
	`642`	`+mv"$$TMPDIR/devcontainer_base_gen.go" agent/agentcontainers/devcontainer_base_gen.go`
	`643`	`+rm -rf"$$TMPDIR"`
	`644`	`+`
`637`	`645`	`$(TAILNETTEST_MOCKS): tailnet/coordinator.go tailnet/service.go`
`638`	`646`	`go generate ./tailnet/tailnettest/`
`639`	`647`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ func devcontainerEnv(ctx context.Context, execer agentexec.Execer, container str`
`183`	`183`	`returnnil,nil`
`184`	`184`	`}`
`185`	`185`
`186`		`-meta:=make([]DevContainerMeta,0)`
	`186`	`+meta:=make([]DevContainerBase,0)`
`187`	`187`	`iferr:=json.Unmarshal([]byte(rawMeta),&meta);err!=nil {`
`188`	`188`	`returnnil,xerrors.Errorf("unmarshal devcontainer.metadata: %w",err)`
`189`	`189`	`}`
`@@ -192,7 +192,10 @@ func devcontainerEnv(ctx context.Context, execer agentexec.Execer, container str`
`192`	`192`	`env:=make([]string,0)`
`193`	`193`	`for_,m:=rangemeta {`
`194`	`194`	`fork,v:=rangem.RemoteEnv {`
`195`		`-env=append(env,fmt.Sprintf("%s=%s",k,v))`
	`195`	`+ifv==nil {// *string per spec`
	`196`	`+continue`
	`197`	`+}`
	`198`	`+env=append(env,fmt.Sprintf("%s=%s",k,*v))`
`196`	`199`	`}`
`197`	`200`	`}`
`198`	`201`	`slices.Sort(env)`
`@@ -276,7 +279,7 @@ func (dcl *DockerCLILister) List(ctx context.Context) (codersdk.WorkspaceAgentLi`
`276`	`279`	`// log this error, but I'm not sure it's worth it.`
`277`	`280`	`ins,dockerInspectStderr,err:=runDockerInspect(ctx,dcl.execer,ids...)`
`278`	`281`	`iferr!=nil {`
`279`		`-return codersdk.WorkspaceAgentListContainersResponse{},xerrors.Errorf("run docker inspect: %w",err)`
	`282`	`+return codersdk.WorkspaceAgentListContainersResponse{},xerrors.Errorf("run docker inspect: %w: %s",err,dockerInspectStderr)`
`280`	`283`	`}`
`281`	`284`
`282`	`285`	`for_,in:=rangeins {`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ import (`
`35`	`35`	`//`
`36`	`36`	`// CODER_TEST_USE_DOCKER=1 go test ./agent/agentcontainers -run TestDockerCLIContainerLister`
`37`	`37`	`funcTestIntegrationDocker(t*testing.T) {`
`38`		`-t.Parallel()`
	`38`	`+//nolint:paralleltest // This test tends to flake when lots of containers start and stop in parallel.`
`39`	`39`	`ifctud,ok:=os.LookupEnv("CODER_TEST_USE_DOCKER");!ok\|\|ctud!="1" {`
`40`	`40`	`t.Skip("Set CODER_TEST_USE_DOCKER=1 to run this test")`
`41`	`41`	`}`
`@@ -419,7 +419,7 @@ func TestConvertDockerVolume(t *testing.T) {`
`419`	`419`	`//`
`420`	`420`	`// CODER_TEST_USE_DOCKER=1 go test ./agent/agentcontainers -run TestDockerEnvInfoer`
`421`	`421`	`funcTestDockerEnvInfoer(t*testing.T) {`
`422`		`-t.Parallel()`
	`422`	`+//nolint:paralleltest // This test tends to flake when lots of containers start and stop in parallel.`
`423`	`423`	`ifctud,ok:=os.LookupEnv("CODER_TEST_USE_DOCKER");!ok\|\|ctud!="1" {`
`424`	`424`	`t.Skip("Set CODER_TEST_USE_DOCKER=1 to run this test")`
`425`	`425`	`}`

Comments

(0)