-
Notifications
You must be signed in to change notification settings - Fork 937
feat: implement feature to support template version while creating workspace using cli #14880
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -133,6 +133,70 @@ func TestCreate(t *testing.T) { | |||||||||||||||
} | ||||||||||||||||
}) | ||||||||||||||||
|
||||||||||||||||
t.Run("CreateWithSpecificTemplateVersion", func(t *testing.T) { | ||||||||||||||||
t.Parallel() | ||||||||||||||||
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) | ||||||||||||||||
owner := coderdtest.CreateFirstUser(t, client) | ||||||||||||||||
member, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID) | ||||||||||||||||
version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, completeWithAgent()) | ||||||||||||||||
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) | ||||||||||||||||
template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID) | ||||||||||||||||
|
||||||||||||||||
// Create a new version | ||||||||||||||||
version2 := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, completeWithAgent(), func(ctvr *codersdk.CreateTemplateVersionRequest) { | ||||||||||||||||
ctvr.TemplateID = template.ID | ||||||||||||||||
}) | ||||||||||||||||
Comment on lines
+146
to
+148
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. got it, I've updated the test |
||||||||||||||||
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version2.ID) | ||||||||||||||||
|
||||||||||||||||
args := []string{ | ||||||||||||||||
"create", | ||||||||||||||||
"my-workspace", | ||||||||||||||||
"--template", template.Name, | ||||||||||||||||
"--template-version", version2.Name, | ||||||||||||||||
"--start-at", "9:30AM Mon-Fri US/Central", | ||||||||||||||||
"--stop-after", "8h", | ||||||||||||||||
"--automatic-updates", "always", | ||||||||||||||||
} | ||||||||||||||||
inv, root := clitest.New(t, args...) | ||||||||||||||||
clitest.SetupConfig(t, member, root) | ||||||||||||||||
doneChan := make(chan struct{}) | ||||||||||||||||
pty := ptytest.New(t).Attach(inv) | ||||||||||||||||
go func() { | ||||||||||||||||
defer close(doneChan) | ||||||||||||||||
err := inv.Run() | ||||||||||||||||
assert.NoError(t, err) | ||||||||||||||||
}() | ||||||||||||||||
matches := []struct { | ||||||||||||||||
match string | ||||||||||||||||
write string | ||||||||||||||||
}{ | ||||||||||||||||
{match: "compute.main"}, | ||||||||||||||||
{match: "smith (linux, i386)"}, | ||||||||||||||||
{match: "Confirm create", write: "yes"}, | ||||||||||||||||
} | ||||||||||||||||
for _, m := range matches { | ||||||||||||||||
pty.ExpectMatch(m.match) | ||||||||||||||||
if len(m.write) > 0 { | ||||||||||||||||
pty.WriteLine(m.write) | ||||||||||||||||
} | ||||||||||||||||
} | ||||||||||||||||
<-doneChan | ||||||||||||||||
|
||||||||||||||||
ws, err := member.WorkspaceByOwnerAndName(context.Background(), codersdk.Me, "my-workspace", codersdk.WorkspaceOptions{}) | ||||||||||||||||
if assert.NoError(t, err, "expected workspace to be created") { | ||||||||||||||||
assert.Equal(t, ws.TemplateName, template.Name) | ||||||||||||||||
// Check if the workspace is using the new template version | ||||||||||||||||
assert.Equal(t, ws.LatestBuild.TemplateVersionID, version2.ID, "expected workspace to use the specified template version") | ||||||||||||||||
if assert.NotNil(t, ws.AutostartSchedule) { | ||||||||||||||||
assert.Equal(t, *ws.AutostartSchedule, "CRON_TZ=US/Central 30 9 * * Mon-Fri") | ||||||||||||||||
} | ||||||||||||||||
if assert.NotNil(t, ws.TTLMillis) { | ||||||||||||||||
assert.Equal(t, *ws.TTLMillis, 8*time.Hour.Milliseconds()) | ||||||||||||||||
} | ||||||||||||||||
assert.Equal(t, codersdk.AutomaticUpdatesAlways, ws.AutomaticUpdates) | ||||||||||||||||
} | ||||||||||||||||
}) | ||||||||||||||||
|
||||||||||||||||
t.Run("InheritStopAfterFromTemplate", func(t *testing.T) { | ||||||||||||||||
t.Parallel() | ||||||||||||||||
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) | ||||||||||||||||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This unfortunately does not accept the template version uuid. It would be better if the name or uuid worked.
We should fix this in the route handler imo: https://github.com/coder/coder/blob/main/coderd/templateversions.go#L885-L885
Not needed in this PR.