Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions cli/exp_task_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ func (r *RootCmd) taskCreate() *serpent.Command {
templateVersionName string
presetName string
stdin bool
quiet bool
)

cmd := &serpent.Command{
Expand Down Expand Up @@ -57,6 +58,13 @@ func (r *RootCmd) taskCreate() *serpent.Command {
Description: "Reads from stdin for the task input.",
Value: serpent.BoolOf(&stdin),
},
{
Name: "quiet",
Flag: "quiet",
FlagShorthand: "q",
Description: "Only display the created task's ID.",
Value: serpent.BoolOf(&quiet),
},
},
Handler: func(inv *serpent.Invocation) error {
var (
Expand Down Expand Up @@ -166,12 +174,16 @@ func (r *RootCmd) taskCreate() *serpent.Command {
return xerrors.Errorf("create task: %w", err)
}

_, _ = fmt.Fprintf(
inv.Stdout,
"The task %s has been created at %s!\n",
cliui.Keyword(task.Name),
cliui.Timestamp(task.CreatedAt),
)
if quiet {
_, _ = fmt.Fprintln(inv.Stdout, task.ID)
} else {
_, _ = fmt.Fprintf(
inv.Stdout,
"The task %s has been created at %s!\n",
cliui.Keyword(task.Name),
cliui.Timestamp(task.CreatedAt),
)
}

return nil
},
Expand Down
15 changes: 12 additions & 3 deletions cli/exp_task_create_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ func TestTaskCreate(t *testing.T) {
templateID = uuid.New()
templateVersionID = uuid.New()
templateVersionPresetID = uuid.New()
taskID = uuid.New()
)

templateAndVersionFoundHandler := func(t *testing.T, ctx context.Context, orgID uuid.UUID, templateName, templateVersionName, presetName, prompt string) http.HandlerFunc {
Expand All @@ -44,11 +45,11 @@ func TestTaskCreate(t *testing.T) {
ID: orgID,
}},
})
case fmt.Sprintf("/api/v2/organizations/%s/templates/my-template/versions/my-template-version", orgID):
case fmt.Sprintf("/api/v2/organizations/%s/templates/%s/versions/%s", orgID, templateName, templateVersionName):
httpapi.Write(ctx, w, http.StatusOK, codersdk.TemplateVersion{
ID: templateVersionID,
})
case fmt.Sprintf("/api/v2/organizations/%s/templates/my-template", orgID):
case fmt.Sprintf("/api/v2/organizations/%s/templates/%s", orgID, templateName):
httpapi.Write(ctx, w, http.StatusOK, codersdk.Template{
ID: templateID,
ActiveVersionID: templateVersionID,
Expand Down Expand Up @@ -83,7 +84,8 @@ func TestTaskCreate(t *testing.T) {
assert.Equal(t, templateVersionPresetID, req.TemplateVersionPresetID, "template version preset id mismatch")
}

httpapi.Write(ctx, w, http.StatusCreated, codersdk.Workspace{
httpapi.Write(ctx, w, http.StatusCreated, codersdk.Task{
ID: taskID,
Name: "task-wild-goldfish-27",
CreatedAt: taskCreatedAt,
})
Expand Down Expand Up @@ -161,6 +163,13 @@ func TestTaskCreate(t *testing.T) {
return templateAndVersionFoundHandler(t, ctx, organizationID, "my-template", "", "my-preset", "my custom prompt")
},
},
{
args: []string{"my custom prompt", "-q"},
expectOutput: taskID.String(),
handler: func(t *testing.T, ctx context.Context) http.HandlerFunc {
return templateAndVersionFoundHandler(t, ctx, organizationID, "my-template", "my-template-version", "", "my custom prompt")
},
},
{
args: []string{"my custom prompt", "--template", "my-template", "--preset", "not-real-preset"},
expectError: `preset "not-real-preset" not found`,
Expand Down
Loading