Skip to content

Commit 1e75762

Browse files
authored
fix(cli): scaletest: create-worksapces: remove invalid character for kubernetes provider in implicit plan (#10228)
1 parent 3adf86b commit 1e75762

File tree

1 file changed

+1
-41
lines changed

1 file changed

+1
-41
lines changed

cli/exp_scaletest.go

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,6 @@ func (r *RootCmd) scaletestCreateWorkspaces() *clibase.Cmd {
503503
count int64
504504
template string
505505

506-
noPlan bool
507506
noCleanup bool
508507
// TODO: implement this flag
509508
// noCleanupFailures bool
@@ -594,10 +593,6 @@ func (r *RootCmd) scaletestCreateWorkspaces() *clibase.Cmd {
594593
if tpl.ID == uuid.Nil {
595594
return xerrors.Errorf("could not find template %q in any organization", template)
596595
}
597-
templateVersion, err := client.TemplateVersion(ctx, tpl.ActiveVersionID)
598-
if err != nil {
599-
return xerrors.Errorf("get template version %q: %w", tpl.ActiveVersionID, err)
600-
}
601596

602597
cliRichParameters, err := asWorkspaceBuildParameters(parameterFlags.richParameters)
603598
if err != nil {
@@ -607,7 +602,7 @@ func (r *RootCmd) scaletestCreateWorkspaces() *clibase.Cmd {
607602
richParameters, err := prepWorkspaceBuild(inv, client, prepWorkspaceBuildArgs{
608603
Action: WorkspaceCreate,
609604
Template: tpl,
610-
NewWorkspaceName: "scaletest-%", // TODO: the scaletest runner will pass in a different name here. Does this matter?
605+
NewWorkspaceName: "scaletest-N", // TODO: the scaletest runner will pass in a different name here. Does this matter?
611606

612607
RichParameterFile: parameterFlags.richParameterFile,
613608
RichParameters: cliRichParameters,
@@ -616,35 +611,6 @@ func (r *RootCmd) scaletestCreateWorkspaces() *clibase.Cmd {
616611
return xerrors.Errorf("prepare build: %w", err)
617612
}
618613

619-
// Do a dry-run to ensure the template and parameters are valid
620-
// before we start creating users and workspaces.
621-
if !noPlan {
622-
dryRun, err := client.CreateTemplateVersionDryRun(ctx, templateVersion.ID, codersdk.CreateTemplateVersionDryRunRequest{
623-
WorkspaceName: "scaletest",
624-
RichParameterValues: richParameters,
625-
})
626-
if err != nil {
627-
return xerrors.Errorf("start dry run workspace creation: %w", err)
628-
}
629-
_, _ = fmt.Fprintln(inv.Stdout, "Planning workspace...")
630-
err = cliui.ProvisionerJob(inv.Context(), inv.Stdout, cliui.ProvisionerJobOptions{
631-
Fetch: func() (codersdk.ProvisionerJob, error) {
632-
return client.TemplateVersionDryRun(inv.Context(), templateVersion.ID, dryRun.ID)
633-
},
634-
Cancel: func() error {
635-
return client.CancelTemplateVersionDryRun(inv.Context(), templateVersion.ID, dryRun.ID)
636-
},
637-
Logs: func() (<-chan codersdk.ProvisionerJobLog, io.Closer, error) {
638-
return client.TemplateVersionDryRunLogsAfter(inv.Context(), templateVersion.ID, dryRun.ID, 0)
639-
},
640-
// Don't show log output for the dry-run unless there's an error.
641-
Silent: true,
642-
})
643-
if err != nil {
644-
return xerrors.Errorf("dry-run workspace: %w", err)
645-
}
646-
}
647-
648614
tracerProvider, closeTracing, tracingEnabled, err := tracingFlags.provider(ctx)
649615
if err != nil {
650616
return xerrors.Errorf("create tracer provider: %w", err)
@@ -793,12 +759,6 @@ func (r *RootCmd) scaletestCreateWorkspaces() *clibase.Cmd {
793759
Description: "Required: Name or ID of the template to use for workspaces.",
794760
Value: clibase.StringOf(&template),
795761
},
796-
{
797-
Flag: "no-plan",
798-
Env: "CODER_SCALETEST_NO_PLAN",
799-
Description: `Skip the dry-run step to plan the workspace creation. This step ensures that the given parameters are valid for the given template.`,
800-
Value: clibase.BoolOf(&noPlan),
801-
},
802762
{
803763
Flag: "no-cleanup",
804764
Env: "CODER_SCALETEST_NO_CLEANUP",

0 commit comments

Comments
 (0)