Movatterモバイル変換

Skip to content

coder/coderPublic

NotificationsYou must be signed in to change notification settings
Fork1k
Star11.2k

Commitb71ae03

mafredri

committed

feat: add name to workspace agent devcontainers

In the presence of multiple devcontainers, it would be nice todifferentiate them by name. This change inherits the resource name fromterraform.

1 parent4c33846 commitb71ae03Copy full SHA for b71ae03

File tree

22 files changed

+798

-743

lines changed

agent/proto
- agent.pb.go
- agent.proto
coderd
- agentapi
  - manifest.go
  - manifest_test.go
- database
  - dbgen
    - dbgen.go
  - dbmem
    - dbmem.go
  - dump.sql
  - migrations
    - 000309_add_devcontainer_name.down.sql
    - 000309_add_devcontainer_name.up.sql
  - models.go
  - queries.sql.go
  - queries
    - workspaceagentdevcontainers.sql
- provisionerdserver
  - provisionerdserver.go
  - provisionerdserver_test.go
codersdk
- agentsdk
  - convert.go
- workspaceagents.go
provisionersdk/proto
- provisioner.pb.go
- provisioner.proto
provisioner/terraform
- resources.go
- resources_test.go
site
- e2e
  - provisionerGenerated.ts
- src/api
  - typesGenerated.ts

22 files changed

+798

-743

lines changed

`‎agent/proto/agent.pb.go‎`

Lines changed: 434 additions & 425 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

`‎agent/proto/agent.proto‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ message WorkspaceAgentDevcontainer {`
`102`	`102`	`bytesid=1;`
`103`	`103`	`stringworkspace_folder=2;`
`104`	`104`	`stringconfig_path=3;`
	`105`	`+stringname=4;`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`messageGetManifestRequest {}`

`‎coderd/agentapi/manifest.go‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -244,6 +244,7 @@ func dbAgentDevcontainersToProto(devcontainers []database.WorkspaceAgentDevconta`
`244`	`244`	`fori,dc:=rangedevcontainers {`
`245`	`245`	`ret[i]=&agentproto.WorkspaceAgentDevcontainer{`
`246`	`246`	`Id:dc.ID[:],`
	`247`	`+Name:dc.Name,`
`247`	`248`	`WorkspaceFolder:dc.WorkspaceFolder,`
`248`	`249`	`ConfigPath:dc.ConfigPath,`
`249`	`250`	`}`

`‎coderd/agentapi/manifest_test.go‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -159,11 +159,13 @@ func TestGetManifest(t *testing.T) {`
`159`	`159`	`devcontainers= []database.WorkspaceAgentDevcontainer{`
`160`	`160`	`{`
`161`	`161`	`ID:uuid.New(),`
	`162`	`+Name:"cool",`
`162`	`163`	`WorkspaceAgentID:agent.ID,`
`163`	`164`	`WorkspaceFolder:"/cool/folder",`
`164`	`165`	`},`
`165`	`166`	`{`
`166`	`167`	`ID:uuid.New(),`
	`168`	`+Name:"another",`
`167`	`169`	`WorkspaceAgentID:agent.ID,`
`168`	`170`	`WorkspaceFolder:"/another/cool/folder",`
`169`	`171`	`ConfigPath:"/another/cool/folder/.devcontainer/devcontainer.json",`
`@@ -283,10 +285,12 @@ func TestGetManifest(t *testing.T) {`
`283`	`285`	`protoDevcontainers= []*agentproto.WorkspaceAgentDevcontainer{`
`284`	`286`	`{`
`285`	`287`	`Id:devcontainers[0].ID[:],`
	`288`	`+Name:devcontainers[0].Name,`
`286`	`289`	`WorkspaceFolder:devcontainers[0].WorkspaceFolder,`
`287`	`290`	`},`
`288`	`291`	`{`
`289`	`292`	`Id:devcontainers[1].ID[:],`
	`293`	`+Name:devcontainers[1].Name,`
`290`	`294`	`WorkspaceFolder:devcontainers[1].WorkspaceFolder,`
`291`	`295`	`ConfigPath:devcontainers[1].ConfigPath,`
`292`	`296`	`},`

`‎coderd/database/dbgen/dbgen.go‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -260,6 +260,7 @@ func WorkspaceAgentDevcontainer(t testing.TB, db database.Store, orig database.W`
`260`	`260`	`WorkspaceAgentID:takeFirst(orig.WorkspaceAgentID,uuid.New()),`
`261`	`261`	`CreatedAt:takeFirst(orig.CreatedAt,dbtime.Now()),`
`262`	`262`	`ID: []uuid.UUID{takeFirst(orig.ID,uuid.New())},`
	`263`	`+Name: []string{takeFirst(orig.Name,testutil.GetRandomName(t))},`
`263`	`264`	`WorkspaceFolder: []string{takeFirst(orig.WorkspaceFolder,"/workspace")},`
`264`	`265`	`ConfigPath: []string{takeFirst(orig.ConfigPath,"")},`
`265`	`266`	`})`

`‎coderd/database/dbmem/dbmem.go‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9171,6 +9171,7 @@ func (q *FakeQuerier) InsertWorkspaceAgentDevcontainers(_ context.Context, arg d`
`9171`	`9171`	`WorkspaceAgentID:arg.WorkspaceAgentID,`
`9172`	`9172`	`CreatedAt:arg.CreatedAt,`
`9173`	`9173`	`ID:id,`
	`9174`	`+Name:arg.Name[i],`
`9174`	`9175`	`WorkspaceFolder:arg.WorkspaceFolder[i],`
`9175`	`9176`	`ConfigPath:arg.ConfigPath[i],`
`9176`	`9177`	`})`

`‎coderd/database/dump.sql‎`

Lines changed: 2 additions & 1 deletion

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

`‎coderd/database/migrations/000309_add_devcontainer_name.down.sql‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ALTERTABLE workspace_agent_devcontainers DROP COLUMN name;`

`‎coderd/database/migrations/000309_add_devcontainer_name.up.sql‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+ALTERTABLE workspace_agent_devcontainers ADD COLUMN nameTEXTNOT NULL DEFAULT'';`
	`2`	`+ALTERTABLE workspace_agent_devcontainers ALTER COLUMN name DROP DEFAULT;`

`‎coderd/database/models.go‎`

Lines changed: 1 addition & 0 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp