Skip to content

refactor(cli): adjust parameter resolver #9019

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 2 commits into from
Aug 10, 2023
Merged

refactor(cli): adjust parameter resolver #9019

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd5c916
continue loop
mtojek Aug 10, 2023
216c088
replace len(pr.buildOptions)
mtojek Aug 10, 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
30 changes: 15 additions & 15 deletions cli/parameterresolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,46 +77,46 @@ func (pr *ParameterResolver) Resolve(inv *clibase.Invocation, action WorkspaceCL
}

func (pr *ParameterResolver) resolveWithParametersMapFile(resolved []codersdk.WorkspaceBuildParameter) []codersdk.WorkspaceBuildParameter {
next:
for name, value := range pr.richParametersFile {
for i, r := range resolved {
if r.Name == name {
resolved[i].Value = value
goto done
continue next
}
}

resolved = append(resolved, codersdk.WorkspaceBuildParameter{
Name: name,
Value: value,
})
done:
}
return resolved
}

func (pr *ParameterResolver) resolveWithCommandLineOrEnv(resolved []codersdk.WorkspaceBuildParameter) []codersdk.WorkspaceBuildParameter {
nextRichParameter:
for _, richParameter := range pr.richParameters {
for i, r := range resolved {
if r.Name == richParameter.Name {
resolved[i].Value = richParameter.Value
goto richParameterDone
continue nextRichParameter
}
}

resolved = append(resolved, richParameter)
richParameterDone:
}

nextBuildOption:
for _, buildOption := range pr.buildOptions {
for i, r := range resolved {
if r.Name == buildOption.Name {
resolved[i].Value = buildOption.Value
goto buildOptionDone
continue nextBuildOption
}
}

resolved = append(resolved, buildOption)
buildOptionDone:
}
return resolved
}
Expand All @@ -126,6 +126,7 @@ func (pr *ParameterResolver) resolveWithLastBuildParameters(resolved []codersdk.
return resolved // don't pull parameters from last build
}

next:
for _, buildParameter := range pr.lastBuildParameters {
tvp := findTemplateVersionParameter(buildParameter, templateVersionParameters)
if tvp == nil {
Expand All @@ -143,12 +144,11 @@ func (pr *ParameterResolver) resolveWithLastBuildParameters(resolved []codersdk.
for i, r := range resolved {
if r.Name == buildParameter.Name {
resolved[i].Value = buildParameter.Value
goto done
continue next
}
}

resolved = append(resolved, buildParameter)
done:
}
return resolved
}
Expand All @@ -160,7 +160,7 @@ func (pr *ParameterResolver) verifyConstraints(resolved []codersdk.WorkspaceBuil
return xerrors.Errorf("parameter %q is not present in the template", r.Name)
}

if tvp.Ephemeral && !pr.promptBuildOptions && len(pr.buildOptions) == 0 {
if tvp.Ephemeral && !pr.promptBuildOptions && findWorkspaceBuildParameter(tvp.Name, pr.buildOptions) == nil {
return xerrors.Errorf("ephemeral parameter %q can be used only with --build-options or --build-option flag", r.Name)
}

Expand All @@ -173,12 +173,12 @@ func (pr *ParameterResolver) verifyConstraints(resolved []codersdk.WorkspaceBuil

func (pr *ParameterResolver) resolveWithInput(resolved []codersdk.WorkspaceBuildParameter, inv *clibase.Invocation, action WorkspaceCLIAction, templateVersionParameters []codersdk.TemplateVersionParameter) ([]codersdk.WorkspaceBuildParameter, error) {
for _, tvp := range templateVersionParameters {
p := findWorkspaceBuildParameter(tvp, resolved)
p := findWorkspaceBuildParameter(tvp.Name, resolved)
if p != nil {
continue
}

firstTimeUse := pr.isFirstTimeUse(tvp)
firstTimeUse := pr.isFirstTimeUse(tvp.Name)

if (tvp.Ephemeral && pr.promptBuildOptions) ||
tvp.Required ||
Expand All @@ -201,8 +201,8 @@ func (pr *ParameterResolver) resolveWithInput(resolved []codersdk.WorkspaceBuild
return resolved, nil
}

func (pr *ParameterResolver) isFirstTimeUse(tvp codersdk.TemplateVersionParameter) bool {
return findWorkspaceBuildParameter(tvp, pr.lastBuildParameters) == nil
func (pr *ParameterResolver) isFirstTimeUse(parameterName string) bool {
return findWorkspaceBuildParameter(parameterName, pr.lastBuildParameters) == nil
}

func findTemplateVersionParameter(workspaceBuildParameter codersdk.WorkspaceBuildParameter, templateVersionParameters []codersdk.TemplateVersionParameter) *codersdk.TemplateVersionParameter {
Expand All @@ -214,9 +214,9 @@ func findTemplateVersionParameter(workspaceBuildParameter codersdk.WorkspaceBuil
return nil
}

func findWorkspaceBuildParameter(tvp codersdk.TemplateVersionParameter, params []codersdk.WorkspaceBuildParameter) *codersdk.WorkspaceBuildParameter {
func findWorkspaceBuildParameter(parameterName string, params []codersdk.WorkspaceBuildParameter) *codersdk.WorkspaceBuildParameter {
for _, p := range params {
if p.Name == tvp.Name {
if p.Name == parameterName {
return &p
}
}
Expand Down