Commitb69d8fa

committed

Fix DataGen not quite mirroring toAgentModels()

It should omit agent information when the workspace specifies no agentsand the name should combine the workspace and agent names.

1 parentc8e503e commitb69d8faCopy full SHA for b69d8fa

File tree

+12

-5

lines changed

src
- main/kotlin/com/coder/gateway/models
  - WorkspaceAgentModel.kt
- test/groovy
  - DataGen.groovy

+12

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ data class WorkspaceAgentModel(`
`17`	`17`	`valagentID:UUID?,`
`18`	`18`	`valworkspaceID:UUID,`
`19`	`19`	`valworkspaceName:String,`
`20`		`-valname:String,// Name of the workspace ORtheagent if this is for an agent.`
	`20`	`+valname:String,// Name of the workspace ORworkspace.agent if this is for an agent.`
`21`	`21`	`valtemplateID:UUID,`
`22`	`22`	`valtemplateName:String,`
`23`	`23`	`valtemplateIconPath:String,`

Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,19 @@ import com.coder.gateway.sdk.v2.models.WorkspaceStatus`
`5`	`5`	`importcom.coder.gateway.sdk.v2.models.WorkspaceTransition`
`6`	`6`
`7`	`7`	`classDataGen {`
`8`		`-staticWorkspaceAgentModelworkspace(Stringname,StringworkspaceName= name) {`
	`8`	`+// Create a random workspace agent model. If the workspace name is omitted`
	`9`	`+// then return a model without any agent bits, similar to what`
	`10`	`+// toAgentModels() does if the workspace does not specify any agents.`
	`11`	`+// TODO: Maybe better to randomly generate the workspace and then call`
	`12`	`+// toAgentModels() on it. Also the way an "agent" model can have no`
	`13`	`+// agent in it seems weird; can we refactor to remove`
	`14`	`+// WorkspaceAgentModel and use the original structs from the API?`
	`15`	`+staticWorkspaceAgentModelworkspace(Stringname,StringworkspaceName="",UUIDagentId=UUID.randomUUID()) {`
`9`	`16`	`returnnewWorkspaceAgentModel(`
	`17`	`+ workspaceName==""?null: agentId,`
`10`	`18`	`UUID.randomUUID(),`
`11`		`-UUID.randomUUID(),`
`12`		`- workspaceName,`
`13`		`- name,`
	`19`	`+ workspaceName==""? name: workspaceName,`
	`20`	`+ workspaceName==""? name: (workspaceName+"."+ name),`
`14`	`21`	`UUID.randomUUID(),`
`15`	`22`	`"template-name",`
`16`	`23`	`"template-icon-path",`

Comments

(0)