From abc334cbc0a30b762fbc5bf6cdffdcd0d5647faa Mon Sep 17 00:00:00 2001 From: Samuel K Date: Sun, 18 Oct 2026 10:38:38 -0600 Subject: [PATCH 1/2] refactor(platform): share form option helpers with daemonclient daemonclient/form.go duplicated the huh option and parameter helpers already in platform/form. Export the platform copies and call them from daemonclient; delete the duplicate block. No behaviour change. --- .../clientimplementation/daemonclient/form.go | 277 ++---------------- pkg/platform/form/form.go | 46 +-- 2 files changed, 47 insertions(+), 276 deletions(-) diff --git a/pkg/client/clientimplementation/daemonclient/form.go b/pkg/client/clientimplementation/daemonclient/form.go index df72f0e982..966349b158 100644 --- a/pkg/client/clientimplementation/daemonclient/form.go +++ b/pkg/client/clientimplementation/daemonclient/form.go @@ -3,7 +3,6 @@ package daemonclient import ( "context" "fmt" - "slices" "strconv" "charm.land/huh/v2" @@ -12,9 +11,9 @@ import ( "github.com/devsy-org/devsy/cmd/pro/provider/list" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/encoding" - "github.com/devsy-org/devsy/pkg/log" "github.com/devsy-org/devsy/pkg/platform" platformclient "github.com/devsy-org/devsy/pkg/platform/client" + "github.com/devsy-org/devsy/pkg/platform/form" "github.com/devsy-org/devsy/pkg/platform/parameters" "github.com/devsy-org/devsy/pkg/platform/project" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -66,14 +65,14 @@ type projectClusterTemplateSelection struct { func selectProjectClusterTemplate( ctx, formCtx context.Context, baseClient platformclient.Client, - cancelForm CancelFunc, + cancelForm form.CancelFunc, ) (projectClusterTemplateSelection, error) { var selectedCluster *managementv1.Cluster var selectedProject *managementv1.Project var selectedTemplate *managementv1.DevsyWorkspaceTemplate selectedTemplateVersion := "" - options, err := projectOptions(ctx, baseClient) + options, err := form.ProjectOptions(ctx, baseClient) if err != nil { return projectClusterTemplateSelection{}, err } @@ -87,20 +86,20 @@ func selectProjectClusterTemplate( huh.NewSelect[*managementv1.Cluster](). Title("Cluster"). OptionsFunc(func() []huh.Option[*managementv1.Cluster] { - return getClusterOptions(ctx, baseClient, selectedProject, cancelForm) + return form.ClusterOptions(ctx, baseClient, selectedProject, cancelForm) }, &selectedProject). Value(&selectedCluster). WithHeight(5), huh.NewSelect[*managementv1.DevsyWorkspaceTemplate](). Title("Template"). OptionsFunc(func() []huh.Option[*managementv1.DevsyWorkspaceTemplate] { - return getTemplateOptions(ctx, baseClient, selectedProject, cancelForm) + return form.TemplateOptions(ctx, baseClient, selectedProject, cancelForm) }, &selectedProject). Value(&selectedTemplate), huh.NewSelect[string](). Title("Template Version"). OptionsFunc(func() []huh.Option[string] { - return getTemplateVersionOptions(selectedTemplate) + return form.TemplateVersionOptions(selectedTemplate) }, &selectedTemplate). Value(&selectedTemplateVersion). WithHeight(8), @@ -135,14 +134,14 @@ func resolveNewInstanceParameters( return "", nil } - fieldParameters := prepareParameters(parameters) + fieldParameters := form.PrepareParameters(parameters) if err := huh.NewForm( - huh.NewGroup(parameterFields(fieldParameters)...), + huh.NewGroup(form.ParameterFields(fieldParameters)...), ).RunWithContext(formCtx); err != nil { return "", err } - return renderParameters(fieldParameters) + return form.RenderParameters(fieldParameters) } type buildNewInstanceParams struct { @@ -222,7 +221,7 @@ func updateInstanceInteractive( huh.NewSelect[string](). Title("Template Version"). OptionsFunc(func() []huh.Option[string] { - return getTemplateVersionOptions(selectedTemplate) + return form.TemplateVersionOptions(selectedTemplate) }, &selectedTemplate). Value(&selectedTemplateVersion). WithHeight(8), @@ -253,8 +252,8 @@ func updateInstanceInteractive( func buildTemplateOptions( templates []managementv1.DevsyWorkspaceTemplate, instance *managementv1.DevsyWorkspaceInstance, -) ([]TemplateOption, *managementv1.DevsyWorkspaceTemplate) { - templateOptions := []TemplateOption{} +) ([]form.TemplateOption, *managementv1.DevsyWorkspaceTemplate) { + templateOptions := []form.TemplateOption{} var selectedTemplate *managementv1.DevsyWorkspaceTemplate for _, template := range templates { t := &template @@ -302,13 +301,13 @@ func resolveInstanceParameters( fieldParameters := fieldParametersWithValues(parameters, existingParameters) err = huh.NewForm( - huh.NewGroup(parameterFields(fieldParameters)...), + huh.NewGroup(form.ParameterFields(fieldParameters)...), ).RunWithContext(formCtx) if err != nil { return "", err } - return renderParameters(fieldParameters) + return form.RenderParameters(fieldParameters) } func existingParametersFor( @@ -333,14 +332,14 @@ func existingParametersFor( func fieldParametersWithValues( appParameters []storagev1.AppParameter, existingParameters map[string]any, -) []*FieldParameter { - fieldParameters := []*FieldParameter{} +) []*form.FieldParameter { + fieldParameters := []*form.FieldParameter{} for _, p := range appParameters { var value any = p.DefaultValue if existingParameters != nil { value = parameters.GetDeepValue(existingParameters, p.Variable) } - fieldParameter := FieldParameter{AppParameter: p} + fieldParameter := form.FieldParameter{AppParameter: p} assignParameterValue(&fieldParameter, value) fieldParameters = append(fieldParameters, &fieldParameter) } @@ -348,8 +347,8 @@ func fieldParametersWithValues( return fieldParameters } -func assignParameterValue(fieldParameter *FieldParameter, value any) { - if fieldParameter.Type == paramTypeBoolean { +func assignParameterValue(fieldParameter *form.FieldParameter, value any) { + if fieldParameter.Type == form.ParameterTypeBoolean { assignBoolValue(fieldParameter, value) return } @@ -364,7 +363,7 @@ func assignParameterValue(fieldParameter *FieldParameter, value any) { } } -func assignBoolValue(fieldParameter *FieldParameter, value any) { +func assignBoolValue(fieldParameter *form.FieldParameter, value any) { switch v := value.(type) { case bool: fieldParameter.BoolValue = v @@ -402,239 +401,3 @@ func applyInstanceChanges( return newInstance } - -type ( - ProjectOption = huh.Option[*managementv1.Project] - TemplateOption = huh.Option[*managementv1.DevsyWorkspaceTemplate] - CancelFunc = func() -) - -const paramTypeBoolean = "boolean" - -var latestTemplateVersion = huh.Option[string]{ - Key: "latest", - Value: "", -} - -func projectOptions(ctx context.Context, client platformclient.Client) ([]ProjectOption, error) { - projects, err := list.Projects(ctx, client) - if err != nil { - return nil, err - } - projectOptions := []ProjectOption{} - for _, project := range projects.Items { - p := &project - projectOptions = append(projectOptions, ProjectOption{ - Key: platform.DisplayName(project.GetName(), project.Spec.DisplayName), - Value: p, - }) - } - - return projectOptions, nil -} - -func getClusterOptions( - ctx context.Context, - client platformclient.Client, - project *managementv1.Project, - cancel CancelFunc, -) []huh.Option[*managementv1.Cluster] { - opts := []huh.Option[*managementv1.Cluster]{} - if project == nil { - return opts - } - - clusters, err := list.Clusters(ctx, client, project.GetName()) - if err != nil { - log.Error(err) - cancel() - - return nil - } - for _, cluster := range clusters.Clusters { - r := &cluster - opts = append(opts, huh.Option[*managementv1.Cluster]{ - Key: platform.DisplayName(cluster.GetName(), cluster.Spec.DisplayName), - Value: r, - }) - } - - return opts -} - -func getTemplateOptions( - ctx context.Context, - client platformclient.Client, - project *managementv1.Project, - cancel CancelFunc, -) []huh.Option[*managementv1.DevsyWorkspaceTemplate] { - opts := []huh.Option[*managementv1.DevsyWorkspaceTemplate]{} - if project == nil { - return opts - } - - templates, err := list.Templates(ctx, client, project.GetName()) - if err != nil { - log.Error(err) - cancel() - - return nil - } - - var defaultOpt huh.Option[*managementv1.DevsyWorkspaceTemplate] - for _, template := range templates.DevsyWorkspaceTemplates { - t := &template - opt := huh.Option[*managementv1.DevsyWorkspaceTemplate]{ - Key: platform.DisplayName(template.GetName(), template.Spec.DisplayName), - Value: t, - } - if t.GetName() == templates.DefaultDevsyWorkspaceTemplate { - defaultOpt = opt - continue - } - opts = append(opts, opt) - } - if defaultOpt.Key != "" { - // make sure the default template is the first - opts = slices.Insert(opts, 0, defaultOpt) - } - - return opts -} - -func getTemplateVersionOptions( - template *managementv1.DevsyWorkspaceTemplate, -) []huh.Option[string] { - opts := []huh.Option[string]{latestTemplateVersion} - if template == nil { - return opts - } - - for _, version := range template.GetVersions() { - opts = append(opts, huh.Option[string]{ - Key: version.GetVersion(), - Value: version.GetVersion(), - }) - } - - return opts -} - -type FieldParameter struct { - storagev1.AppParameter - - StringValue string - BoolValue bool -} - -func prepareParameters(parameters []storagev1.AppParameter) []*FieldParameter { - retParams := []*FieldParameter{} - for _, p := range parameters { - fieldParameter := FieldParameter{AppParameter: p} - if p.Type == paramTypeBoolean { - v, err := strconv.ParseBool(p.DefaultValue) - if err == nil { - fieldParameter.BoolValue = v - } - } else { - fieldParameter.StringValue = p.DefaultValue - } - - retParams = append(retParams, &fieldParameter) - } - - return retParams -} - -func parameterFields(fieldParameters []*FieldParameter) []huh.Field { - fields := []huh.Field{} - for _, param := range fieldParameters { - fields = append(fields, parameterField(param)) - } - - return fields -} - -func parameterField(param *FieldParameter) huh.Field { - title := param.Label - if title == "" { - title = param.Variable - } - paramType := param.Type - if paramType == "" { - paramType = "string" - } - - switch paramType { - case "multiline": - return huh.NewText(). - Title(title). - Description(param.Description). - Value(¶m.StringValue) - case "password", "number", "string": - return stringParameterField(param, title) - case paramTypeBoolean: - return huh.NewConfirm(). - Title(title). - Description(param.Description). - Value(¶m.BoolValue) - } - - return stringParameterField(param, title) -} - -func stringParameterField(param *FieldParameter, title string) huh.Field { - // display a select field if param has options - if len(param.Options) > 0 { - opts := []huh.Option[string]{} - for _, o := range param.Options { - huhOption := huh.Option[string]{ - Key: o, - Value: o, - } - if o == param.DefaultValue { - huhOption = huhOption.Selected(true) - } - opts = append(opts, huhOption) - } - - return huh.NewSelect[string](). - Title(title). - Options(opts...). - Value(¶m.StringValue) - } - - input := huh.NewInput().Title(title). - Description(param.Description). - Value(¶m.StringValue) - - if param.Type == "password" { - input.EchoMode(huh.EchoModePassword) - } - if param.Type == "number" { - input.Validate(func(s string) error { - _, err := strconv.ParseFloat(s, 64) - return err - }) - } - - return input -} - -func renderParameters(fieldParameters []*FieldParameter) (string, error) { - p := map[string]any{} - for _, fp := range fieldParameters { - if fp.StringValue != "" { - p[fp.Variable] = fp.StringValue - } else if fp.BoolValue { - p[fp.Variable] = strconv.FormatBool(fp.BoolValue) - } - } - - rawParameters, err := yaml.Marshal(p) - if err != nil { - return "", err - } - - return string(rawParameters), nil -} diff --git a/pkg/platform/form/form.go b/pkg/platform/form/form.go index 2eb539957c..d38888641f 100644 --- a/pkg/platform/form/form.go +++ b/pkg/platform/form/form.go @@ -21,7 +21,8 @@ import ( "sigs.k8s.io/yaml" ) -const parameterTypeBoolean = "boolean" +// ParameterTypeBoolean is the template parameter type for boolean values. +const ParameterTypeBoolean = "boolean" func CreateInstance( ctx context.Context, @@ -73,7 +74,7 @@ func runCreateSelectionForm( var selectedProject *managementv1.Project var selectedTemplate *managementv1.DevsyWorkspaceTemplate selectedTemplateVersion := "" - projectOptions, err := projectOptions(ctx, baseClient) + projectOptions, err := ProjectOptions(ctx, baseClient) if err != nil { return createSelection{}, err } @@ -86,20 +87,20 @@ func runCreateSelectionForm( huh.NewSelect[*managementv1.Cluster](). Title("Cluster"). OptionsFunc(func() []huh.Option[*managementv1.Cluster] { - return getClusterOptions(ctx, baseClient, selectedProject, cancelForm) + return ClusterOptions(ctx, baseClient, selectedProject, cancelForm) }, &selectedProject). Value(&selectedCluster). WithHeight(5), huh.NewSelect[*managementv1.DevsyWorkspaceTemplate](). Title("Template"). OptionsFunc(func() []huh.Option[*managementv1.DevsyWorkspaceTemplate] { - return getTemplateOptions(ctx, baseClient, selectedProject, cancelForm) + return TemplateOptions(ctx, baseClient, selectedProject, cancelForm) }, &selectedProject). Value(&selectedTemplate), huh.NewSelect[string](). Title("Template Version"). OptionsFunc(func() []huh.Option[string] { - return getTemplateVersionOptions(selectedTemplate) + return TemplateVersionOptions(selectedTemplate) }, &selectedTemplate). Value(&selectedTemplateVersion). WithHeight(8), @@ -129,7 +130,7 @@ func renderedParametersForCreate( return "", nil } - fieldParameters := prepareParameters(parameters) + fieldParameters := PrepareParameters(parameters) return runParameterForm(formCtx, fieldParameters) } @@ -187,12 +188,12 @@ func resolveTemplateParameters( func runParameterForm(formCtx context.Context, fieldParameters []*FieldParameter) (string, error) { if err := huh.NewForm( - huh.NewGroup(parameterFields(fieldParameters)...), + huh.NewGroup(ParameterFields(fieldParameters)...), ).RunWithContext(formCtx); err != nil { return "", err } - return renderParameters(fieldParameters) + return RenderParameters(fieldParameters) } func UpdateInstance( @@ -268,7 +269,7 @@ func selectUpdateTemplate( huh.NewSelect[string](). Title("Template Version"). OptionsFunc(func() []huh.Option[string] { - return getTemplateVersionOptions(selectedTemplate) + return TemplateVersionOptions(selectedTemplate) }, &selectedTemplate). Value(&selectedTemplateVersion). WithHeight(8), @@ -365,7 +366,7 @@ func buildFieldParameters( } func assignFieldValue(fieldParameter *FieldParameter, value any) { - if fieldParameter.Type == parameterTypeBoolean { + if fieldParameter.Type == ParameterTypeBoolean { assignBoolFieldValue(fieldParameter, value) return } @@ -432,7 +433,8 @@ var latestTemplateVersion = huh.Option[string]{ Value: "", } -func projectOptions(ctx context.Context, client client.Client) ([]ProjectOption, error) { +// ProjectOptions lists the platform projects as select options. +func ProjectOptions(ctx context.Context, client client.Client) ([]ProjectOption, error) { projects, err := list.Projects(ctx, client) if err != nil { return nil, err @@ -449,7 +451,8 @@ func projectOptions(ctx context.Context, client client.Client) ([]ProjectOption, return projectOptions, nil } -func getClusterOptions( +// ClusterOptions lists the clusters of project as select options; cancels the form on error. +func ClusterOptions( ctx context.Context, client client.Client, project *managementv1.Project, @@ -478,7 +481,8 @@ func getClusterOptions( return opts } -func getTemplateOptions( +// TemplateOptions lists the project templates as select options, default template first. +func TemplateOptions( ctx context.Context, client client.Client, project *managementv1.Project, @@ -518,7 +522,8 @@ func getTemplateOptions( return opts } -func getTemplateVersionOptions( +// TemplateVersionOptions lists the "latest" option followed by the template versions. +func TemplateVersionOptions( template *managementv1.DevsyWorkspaceTemplate, ) []huh.Option[string] { opts := []huh.Option[string]{latestTemplateVersion} @@ -543,11 +548,12 @@ type FieldParameter struct { BoolValue bool } -func prepareParameters(parameters []storagev1.AppParameter) []*FieldParameter { +// PrepareParameters wraps template parameters as field parameters seeded from their defaults. +func PrepareParameters(parameters []storagev1.AppParameter) []*FieldParameter { retParams := []*FieldParameter{} for _, p := range parameters { fieldParameter := FieldParameter{AppParameter: p} - if p.Type == parameterTypeBoolean { + if p.Type == ParameterTypeBoolean { v, err := strconv.ParseBool(p.DefaultValue) if err == nil { fieldParameter.BoolValue = v @@ -562,7 +568,8 @@ func prepareParameters(parameters []storagev1.AppParameter) []*FieldParameter { return retParams } -func parameterFields(fieldParameters []*FieldParameter) []huh.Field { +// ParameterFields builds one huh field per parameter. +func ParameterFields(fieldParameters []*FieldParameter) []huh.Field { fields := []huh.Field{} for _, param := range fieldParameters { title := param.Label @@ -579,7 +586,7 @@ func parameterFields(fieldParameters []*FieldParameter) []huh.Field { Value(¶m.StringValue) case "password", "number", "string": field = stringParameterField(param, title) - case parameterTypeBoolean: + case ParameterTypeBoolean: field = huh.NewConfirm(). Title(title). Description(param.Description). @@ -631,7 +638,8 @@ func stringParameterField(param *FieldParameter, title string) huh.Field { return input } -func renderParameters(fieldParameters []*FieldParameter) (string, error) { +// RenderParameters serializes the parameter values to YAML. +func RenderParameters(fieldParameters []*FieldParameter) (string, error) { p := map[string]any{} for _, fp := range fieldParameters { if fp.StringValue != "" { From 3108ecc883d2e45152260e03af0a7cdf24561ce9 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Sun, 18 Oct 2026 10:48:31 -0600 Subject: [PATCH 2/2] refactor(platform): share form option pickers with daemonclient --- .../clientimplementation/daemonclient/form.go | 143 ++++++++++++++++-- pkg/platform/form/form.go | 32 ++-- 2 files changed, 146 insertions(+), 29 deletions(-) diff --git a/pkg/client/clientimplementation/daemonclient/form.go b/pkg/client/clientimplementation/daemonclient/form.go index 966349b158..1faf14b64b 100644 --- a/pkg/client/clientimplementation/daemonclient/form.go +++ b/pkg/client/clientimplementation/daemonclient/form.go @@ -134,14 +134,14 @@ func resolveNewInstanceParameters( return "", nil } - fieldParameters := form.PrepareParameters(parameters) + fieldParameters := prepareParameters(parameters) if err := huh.NewForm( - huh.NewGroup(form.ParameterFields(fieldParameters)...), + huh.NewGroup(parameterFields(fieldParameters)...), ).RunWithContext(formCtx); err != nil { return "", err } - return form.RenderParameters(fieldParameters) + return renderParameters(fieldParameters) } type buildNewInstanceParams struct { @@ -301,13 +301,13 @@ func resolveInstanceParameters( fieldParameters := fieldParametersWithValues(parameters, existingParameters) err = huh.NewForm( - huh.NewGroup(form.ParameterFields(fieldParameters)...), + huh.NewGroup(parameterFields(fieldParameters)...), ).RunWithContext(formCtx) if err != nil { return "", err } - return form.RenderParameters(fieldParameters) + return renderParameters(fieldParameters) } func existingParametersFor( @@ -332,14 +332,14 @@ func existingParametersFor( func fieldParametersWithValues( appParameters []storagev1.AppParameter, existingParameters map[string]any, -) []*form.FieldParameter { - fieldParameters := []*form.FieldParameter{} +) []*FieldParameter { + fieldParameters := []*FieldParameter{} for _, p := range appParameters { var value any = p.DefaultValue if existingParameters != nil { value = parameters.GetDeepValue(existingParameters, p.Variable) } - fieldParameter := form.FieldParameter{AppParameter: p} + fieldParameter := FieldParameter{AppParameter: p} assignParameterValue(&fieldParameter, value) fieldParameters = append(fieldParameters, &fieldParameter) } @@ -347,8 +347,8 @@ func fieldParametersWithValues( return fieldParameters } -func assignParameterValue(fieldParameter *form.FieldParameter, value any) { - if fieldParameter.Type == form.ParameterTypeBoolean { +func assignParameterValue(fieldParameter *FieldParameter, value any) { + if fieldParameter.Type == paramTypeBoolean { assignBoolValue(fieldParameter, value) return } @@ -363,7 +363,7 @@ func assignParameterValue(fieldParameter *form.FieldParameter, value any) { } } -func assignBoolValue(fieldParameter *form.FieldParameter, value any) { +func assignBoolValue(fieldParameter *FieldParameter, value any) { switch v := value.(type) { case bool: fieldParameter.BoolValue = v @@ -401,3 +401,124 @@ func applyInstanceChanges( return newInstance } + +const paramTypeBoolean = "boolean" + +type FieldParameter struct { + storagev1.AppParameter + + StringValue string + BoolValue bool +} + +func prepareParameters(parameters []storagev1.AppParameter) []*FieldParameter { + retParams := []*FieldParameter{} + for _, p := range parameters { + fieldParameter := FieldParameter{AppParameter: p} + if p.Type == paramTypeBoolean { + v, err := strconv.ParseBool(p.DefaultValue) + if err == nil { + fieldParameter.BoolValue = v + } + } else { + fieldParameter.StringValue = p.DefaultValue + } + + retParams = append(retParams, &fieldParameter) + } + + return retParams +} + +func parameterFields(fieldParameters []*FieldParameter) []huh.Field { + fields := []huh.Field{} + for _, param := range fieldParameters { + fields = append(fields, parameterField(param)) + } + + return fields +} + +func parameterField(param *FieldParameter) huh.Field { + title := param.Label + if title == "" { + title = param.Variable + } + paramType := param.Type + if paramType == "" { + paramType = "string" + } + + switch paramType { + case "multiline": + return huh.NewText(). + Title(title). + Description(param.Description). + Value(¶m.StringValue) + case "password", "number", "string": + return stringParameterField(param, title) + case paramTypeBoolean: + return huh.NewConfirm(). + Title(title). + Description(param.Description). + Value(¶m.BoolValue) + } + + return stringParameterField(param, title) +} + +func stringParameterField(param *FieldParameter, title string) huh.Field { + // display a select field if param has options + if len(param.Options) > 0 { + opts := []huh.Option[string]{} + for _, o := range param.Options { + huhOption := huh.Option[string]{ + Key: o, + Value: o, + } + if o == param.DefaultValue { + huhOption = huhOption.Selected(true) + } + opts = append(opts, huhOption) + } + + return huh.NewSelect[string](). + Title(title). + Options(opts...). + Value(¶m.StringValue) + } + + input := huh.NewInput().Title(title). + Description(param.Description). + Value(¶m.StringValue) + + if param.Type == "password" { + input.EchoMode(huh.EchoModePassword) + } + if param.Type == "number" { + input.Validate(func(s string) error { + _, err := strconv.ParseFloat(s, 64) + return err + }) + } + + return input +} + +func renderParameters(fieldParameters []*FieldParameter) (string, error) { + p := map[string]any{} + for _, fp := range fieldParameters { + if fp.StringValue != "" { + p[fp.Variable] = fp.StringValue + } else if fp.BoolValue { + p[fp.Variable] = strconv.FormatBool(fp.BoolValue) + } + } + + rawParameters, err := yaml.Marshal(p) + if err != nil { + return "", err + } + + return string(rawParameters), nil +} diff --git a/pkg/platform/form/form.go b/pkg/platform/form/form.go index d38888641f..cfe93ada8f 100644 --- a/pkg/platform/form/form.go +++ b/pkg/platform/form/form.go @@ -21,8 +21,7 @@ import ( "sigs.k8s.io/yaml" ) -// ParameterTypeBoolean is the template parameter type for boolean values. -const ParameterTypeBoolean = "boolean" +const parameterTypeBoolean = "boolean" func CreateInstance( ctx context.Context, @@ -130,7 +129,7 @@ func renderedParametersForCreate( return "", nil } - fieldParameters := PrepareParameters(parameters) + fieldParameters := prepareParameters(parameters) return runParameterForm(formCtx, fieldParameters) } @@ -188,12 +187,12 @@ func resolveTemplateParameters( func runParameterForm(formCtx context.Context, fieldParameters []*FieldParameter) (string, error) { if err := huh.NewForm( - huh.NewGroup(ParameterFields(fieldParameters)...), + huh.NewGroup(parameterFields(fieldParameters)...), ).RunWithContext(formCtx); err != nil { return "", err } - return RenderParameters(fieldParameters) + return renderParameters(fieldParameters) } func UpdateInstance( @@ -366,7 +365,7 @@ func buildFieldParameters( } func assignFieldValue(fieldParameter *FieldParameter, value any) { - if fieldParameter.Type == ParameterTypeBoolean { + if fieldParameter.Type == parameterTypeBoolean { assignBoolFieldValue(fieldParameter, value) return } @@ -433,7 +432,7 @@ var latestTemplateVersion = huh.Option[string]{ Value: "", } -// ProjectOptions lists the platform projects as select options. +// ProjectOptions lists projects as huh options. func ProjectOptions(ctx context.Context, client client.Client) ([]ProjectOption, error) { projects, err := list.Projects(ctx, client) if err != nil { @@ -451,7 +450,7 @@ func ProjectOptions(ctx context.Context, client client.Client) ([]ProjectOption, return projectOptions, nil } -// ClusterOptions lists the clusters of project as select options; cancels the form on error. +// ClusterOptions lists clusters of a project as huh options. func ClusterOptions( ctx context.Context, client client.Client, @@ -481,7 +480,7 @@ func ClusterOptions( return opts } -// TemplateOptions lists the project templates as select options, default template first. +// TemplateOptions lists templates of a project as huh options, default first. func TemplateOptions( ctx context.Context, client client.Client, @@ -522,7 +521,7 @@ func TemplateOptions( return opts } -// TemplateVersionOptions lists the "latest" option followed by the template versions. +// TemplateVersionOptions lists template versions, latest first. func TemplateVersionOptions( template *managementv1.DevsyWorkspaceTemplate, ) []huh.Option[string] { @@ -548,12 +547,11 @@ type FieldParameter struct { BoolValue bool } -// PrepareParameters wraps template parameters as field parameters seeded from their defaults. -func PrepareParameters(parameters []storagev1.AppParameter) []*FieldParameter { +func prepareParameters(parameters []storagev1.AppParameter) []*FieldParameter { retParams := []*FieldParameter{} for _, p := range parameters { fieldParameter := FieldParameter{AppParameter: p} - if p.Type == ParameterTypeBoolean { + if p.Type == parameterTypeBoolean { v, err := strconv.ParseBool(p.DefaultValue) if err == nil { fieldParameter.BoolValue = v @@ -568,8 +566,7 @@ func PrepareParameters(parameters []storagev1.AppParameter) []*FieldParameter { return retParams } -// ParameterFields builds one huh field per parameter. -func ParameterFields(fieldParameters []*FieldParameter) []huh.Field { +func parameterFields(fieldParameters []*FieldParameter) []huh.Field { fields := []huh.Field{} for _, param := range fieldParameters { title := param.Label @@ -586,7 +583,7 @@ func ParameterFields(fieldParameters []*FieldParameter) []huh.Field { Value(¶m.StringValue) case "password", "number", "string": field = stringParameterField(param, title) - case ParameterTypeBoolean: + case parameterTypeBoolean: field = huh.NewConfirm(). Title(title). Description(param.Description). @@ -638,8 +635,7 @@ func stringParameterField(param *FieldParameter, title string) huh.Field { return input } -// RenderParameters serializes the parameter values to YAML. -func RenderParameters(fieldParameters []*FieldParameter) (string, error) { +func renderParameters(fieldParameters []*FieldParameter) (string, error) { p := map[string]any{} for _, fp := range fieldParameters { if fp.StringValue != "" {