Skip to content

feat(cli): create workspace using parameters from existing workspace #10604

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.

Sign up for GitHub

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

Merged
merged 10 commits into from
Nov 9, 2023
Merged

feat(cli): create workspace using parameters from existing workspace #10604

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3979b41
CopyParameters -first version
mtojek Nov 9, 2023
487424d
make gen
mtojek Nov 9, 2023
925c812
Use resolver
mtojek Nov 9, 2023
f0bb47e
Improve
mtojek Nov 9, 2023
4c9c77e
Fix default
mtojek Nov 9, 2023
c5f8ee9
make gen
mtojek Nov 9, 2023
4deaad0
WIP
mtojek Nov 9, 2023
f966294
CLI test
mtojek Nov 9, 2023
5861631
copy-parameters-from
mtojek Nov 9, 2023
0162795
Fix: use right template version
mtojek Nov 9, 2023
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
Prev Previous commit
Next Next commit
Use resolver
  • Loading branch information
@mtojek
mtojek committed Nov 9, 2023
commit 925c812f9e46bc243a5532680c9278ede789d724
22 changes: 13 additions & 9 deletions cli/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,17 +151,17 @@ func (r *RootCmd) create() *clibase.Cmd {
schedSpec = ptr.Ref(sched.String())
}

var buildParameters []codersdk.WorkspaceBuildParameter
cliBuildParameters, err := asWorkspaceBuildParameters(parameterFlags.richParameters)
if err != nil {
return xerrors.Errorf("can't parse given parameter values: %w", err)
}

var sourceWorkspaceParameters []codersdk.WorkspaceBuildParameter
if copyParameters != "" {
buildParameters, err = client.WorkspaceBuildParameters(inv.Context(), sourceWorkspace.ID)
sourceWorkspaceParameters, err = client.WorkspaceBuildParameters(inv.Context(), sourceWorkspace.ID)
if err != nil {
return err
}
} else {
buildParameters, err = asWorkspaceBuildParameters(parameterFlags.richParameters)
if err != nil {
return xerrors.Errorf("can't parse given parameter values: %w", err)
}
}

richParameters, err := prepWorkspaceBuild(inv, client, prepWorkspaceBuildArgs{
Expand All @@ -170,7 +170,9 @@ func (r *RootCmd) create() *clibase.Cmd {
NewWorkspaceName: workspaceName,

RichParameterFile: parameterFlags.richParameterFile,
RichParameters: buildParameters,
RichParameters: cliBuildParameters,

SourceWorkspaceParameters: sourceWorkspaceParameters,
})
if err != nil {
return xerrors.Errorf("prepare build: %w", err)
Expand Down Expand Up @@ -260,7 +262,8 @@ type prepWorkspaceBuildArgs struct {
TemplateVersionID uuid.UUID
NewWorkspaceName string

LastBuildParameters []codersdk.WorkspaceBuildParameter
LastBuildParameters []codersdk.WorkspaceBuildParameter
SourceWorkspaceParameters []codersdk.WorkspaceBuildParameter

PromptBuildOptions bool
BuildOptions []codersdk.WorkspaceBuildParameter
Expand Down Expand Up @@ -295,6 +298,7 @@ func prepWorkspaceBuild(inv *clibase.Invocation, client *codersdk.Client, args p

resolver := new(ParameterResolver).
WithLastBuildParameters(args.LastBuildParameters).
WithSourceWorkspaceParameters(args.SourceWorkspaceParameters).
WithPromptBuildOptions(args.PromptBuildOptions).
WithBuildOptions(args.BuildOptions).
WithPromptRichParameters(args.PromptRichParameters).
Expand Down
33 changes: 32 additions & 1 deletion cli/parameterresolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ const (
)

type ParameterResolver struct {
lastBuildParameters []codersdk.WorkspaceBuildParameter
lastBuildParameters []codersdk.WorkspaceBuildParameter
sourceWorkspaceParameters []codersdk.WorkspaceBuildParameter

richParameters []codersdk.WorkspaceBuildParameter
richParametersFile map[string]string
Expand All @@ -38,6 +39,11 @@ func (pr *ParameterResolver) WithLastBuildParameters(params []codersdk.Workspace
return pr
}

func (pr *ParameterResolver) WithSourceWorkspaceParameters(params []codersdk.WorkspaceBuildParameter) *ParameterResolver {
pr.sourceWorkspaceParameters = params
return pr
}

func (pr *ParameterResolver) WithRichParameters(params []codersdk.WorkspaceBuildParameter) *ParameterResolver {
pr.richParameters = params
return pr
Expand Down Expand Up @@ -69,6 +75,7 @@ func (pr *ParameterResolver) Resolve(inv *clibase.Invocation, action WorkspaceCL

staged = pr.resolveWithParametersMapFile(staged)
staged = pr.resolveWithCommandLineOrEnv(staged)
staged = pr.resolveWithSourceBuildParameters(staged, templateVersionParameters)
staged = pr.resolveWithLastBuildParameters(staged, templateVersionParameters)
if err = pr.verifyConstraints(staged, action, templateVersionParameters); err != nil {
return nil, err
Expand Down Expand Up @@ -160,6 +167,30 @@ next:
return resolved
}

func (pr *ParameterResolver) resolveWithSourceBuildParameters(resolved []codersdk.WorkspaceBuildParameter, templateVersionParameters []codersdk.TemplateVersionParameter) []codersdk.WorkspaceBuildParameter {
next:
for _, buildParameter := range pr.sourceWorkspaceParameters {
tvp := findTemplateVersionParameter(buildParameter, templateVersionParameters)
if tvp == nil {
continue // it looks like this parameter is not present anymore
}

if tvp.Ephemeral {
continue // ephemeral parameters should not be passed to consecutive builds
}

for i, r := range resolved {
if r.Name == buildParameter.Name {
resolved[i].Value = buildParameter.Value
continue next
}
}

resolved = append(resolved, buildParameter)
}
return resolved
}

func (pr *ParameterResolver) verifyConstraints(resolved []codersdk.WorkspaceBuildParameter, action WorkspaceCLIAction, templateVersionParameters []codersdk.TemplateVersionParameter) error {
for _, r := range resolved {
tvp := findTemplateVersionParameter(r, templateVersionParameters)
Expand Down