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
143 changes: 11 additions & 132 deletions pkg/client/clientimplementation/daemonclient/form.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,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 {
Expand Down Expand Up @@ -301,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(
Expand All @@ -332,23 +332,23 @@ 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)
}

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
}
Expand All @@ -363,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
Expand Down Expand Up @@ -401,124 +401,3 @@ 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(&param.StringValue)
case "password", "number", "string":
return stringParameterField(param, title)
case paramTypeBoolean:
return huh.NewConfirm().
Title(title).
Description(param.Description).
Value(&param.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(&param.StringValue)
}

input := huh.NewInput().Title(title).
Description(param.Description).
Value(&param.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
}
20 changes: 10 additions & 10 deletions pkg/platform/form/form.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"sigs.k8s.io/yaml"
)

const parameterTypeBoolean = "boolean"
const ParameterTypeBoolean = "boolean"

func CreateInstance(
ctx context.Context,
Expand Down Expand Up @@ -129,7 +129,7 @@ func renderedParametersForCreate(
return "", nil
}

fieldParameters := prepareParameters(parameters)
fieldParameters := PrepareParameters(parameters)
return runParameterForm(formCtx, fieldParameters)
}

Expand Down Expand Up @@ -187,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(
Expand Down Expand Up @@ -365,7 +365,7 @@ func buildFieldParameters(
}

func assignFieldValue(fieldParameter *FieldParameter, value any) {
if fieldParameter.Type == parameterTypeBoolean {
if fieldParameter.Type == ParameterTypeBoolean {
assignBoolFieldValue(fieldParameter, value)
return
}
Expand Down Expand Up @@ -547,11 +547,11 @@ type FieldParameter struct {
BoolValue bool
}

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
Expand All @@ -566,7 +566,7 @@ func prepareParameters(parameters []storagev1.AppParameter) []*FieldParameter {
return retParams
}

func parameterFields(fieldParameters []*FieldParameter) []huh.Field {
func ParameterFields(fieldParameters []*FieldParameter) []huh.Field {
fields := []huh.Field{}
for _, param := range fieldParameters {
title := param.Label
Expand All @@ -583,7 +583,7 @@ func parameterFields(fieldParameters []*FieldParameter) []huh.Field {
Value(&param.StringValue)
case "password", "number", "string":
field = stringParameterField(param, title)
case parameterTypeBoolean:
case ParameterTypeBoolean:
field = huh.NewConfirm().
Title(title).
Description(param.Description).
Expand Down Expand Up @@ -635,7 +635,7 @@ func stringParameterField(param *FieldParameter, title string) huh.Field {
return input
}

func renderParameters(fieldParameters []*FieldParameter) (string, error) {
func RenderParameters(fieldParameters []*FieldParameter) (string, error) {
p := map[string]any{}
for _, fp := range fieldParameters {
if fp.StringValue != "" {
Expand Down
Loading