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
221 changes: 0 additions & 221 deletions pkg/client/clientimplementation/daemonclient/form.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,17 @@ package daemonclient

import (
"context"
"fmt"
"strconv"

"charm.land/huh/v2"
managementv1 "github.com/devsy-org/api/pkg/apis/management/v1"
storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1"
"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/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"
"sigs.k8s.io/yaml"
)

func createInstanceInteractive(
Expand Down Expand Up @@ -185,219 +180,3 @@ func buildNewInstance(p buildNewInstanceParams) *managementv1.DevsyWorkspaceInst
},
}
}

func updateInstanceInteractive(
ctx context.Context,
baseClient platformclient.Client,
instance *managementv1.DevsyWorkspaceInstance,
) (*managementv1.DevsyWorkspaceInstance, error) {
formCtx, cancelForm := context.WithCancel(ctx)
defer cancelForm()

projectName := project.ProjectFromNamespace(instance.GetNamespace())
projectTemplates, err := list.Templates(ctx, baseClient, projectName)
if err != nil {
return nil, err
}
templateOptions, selectedTemplate := buildTemplateOptions(
projectTemplates.DevsyWorkspaceTemplates,
instance,
)
if selectedTemplate == nil {
return nil, fmt.Errorf("template not found: %#v", instance.Spec.TemplateRef)
}

var selectedTemplateVersion string
if instance.Spec.TemplateRef != nil {
selectedTemplateVersion = instance.Spec.TemplateRef.Version
}

err = huh.NewForm(
huh.NewGroup(
huh.NewSelect[*managementv1.DevsyWorkspaceTemplate]().
Title("Template").
Options(templateOptions...).
Value(&selectedTemplate),
huh.NewSelect[string]().
Title("Template Version").
OptionsFunc(func() []huh.Option[string] {
return form.TemplateVersionOptions(selectedTemplate)
}, &selectedTemplate).
Value(&selectedTemplateVersion).
WithHeight(8),
),
).RunWithContext(formCtx)
if err != nil {
return nil, err
}

renderedParameters, err := resolveInstanceParameters(
formCtx,
instance,
selectedTemplate,
selectedTemplateVersion,
)
if err != nil {
return nil, err
}

return applyInstanceChanges(
instance,
selectedTemplate,
selectedTemplateVersion,
renderedParameters,
), nil
}

func buildTemplateOptions(
templates []managementv1.DevsyWorkspaceTemplate,
instance *managementv1.DevsyWorkspaceInstance,
) ([]form.TemplateOption, *managementv1.DevsyWorkspaceTemplate) {
templateOptions := []form.TemplateOption{}
var selectedTemplate *managementv1.DevsyWorkspaceTemplate
for _, template := range templates {
t := &template
templateOptions = append(templateOptions, huh.Option[*managementv1.DevsyWorkspaceTemplate]{
Key: platform.DisplayName(template.GetName(), template.Spec.DisplayName),
Value: t,
})

if instance.Spec.TemplateRef != nil &&
instance.Spec.TemplateRef.Name == template.GetName() {
selectedTemplate = t
}
}

return templateOptions, selectedTemplate
}

func resolveInstanceParameters(
formCtx context.Context,
instance *managementv1.DevsyWorkspaceInstance,
selectedTemplate *managementv1.DevsyWorkspaceTemplate,
selectedTemplateVersion string,
) (string, error) {
parameters := selectedTemplate.Spec.Parameters
if len(selectedTemplate.GetVersions()) > 0 {
var err error
parameters, err = list.GetTemplateParameters(selectedTemplate, selectedTemplateVersion)
if err != nil {
return "", err
}
}
if len(parameters) == 0 {
return "", nil
}

existingParameters, err := existingParametersFor(
instance,
selectedTemplate,
selectedTemplateVersion,
)
if err != nil {
return "", err
}

fieldParameters := fieldParametersWithValues(parameters, existingParameters)

err = huh.NewForm(
huh.NewGroup(form.ParameterFields(fieldParameters)...),
).RunWithContext(formCtx)
if err != nil {
return "", err
}

return form.RenderParameters(fieldParameters)
}

func existingParametersFor(
instance *managementv1.DevsyWorkspaceInstance,
selectedTemplate *managementv1.DevsyWorkspaceTemplate,
selectedTemplateVersion string,
) (map[string]any, error) {
tRef := instance.Spec.TemplateRef
if tRef == nil || tRef.Name != selectedTemplate.GetName() ||
tRef.Version != selectedTemplateVersion {
return nil, nil
}

existingParameters := map[string]any{}
if err := yaml.Unmarshal([]byte(instance.Spec.Parameters), &existingParameters); err != nil {
return nil, err
}

return existingParameters, nil
}

func fieldParametersWithValues(
appParameters []storagev1.AppParameter,
existingParameters map[string]any,
) []*form.FieldParameter {
fieldParameters := []*form.FieldParameter{}
for _, p := range appParameters {
var value any = p.DefaultValue
if existingParameters != nil {
value = parameters.GetDeepValue(existingParameters, p.Variable)
}
fieldParameter := form.FieldParameter{AppParameter: p}
assignParameterValue(&fieldParameter, value)
fieldParameters = append(fieldParameters, &fieldParameter)
}

return fieldParameters
}

func assignParameterValue(fieldParameter *form.FieldParameter, value any) {
if fieldParameter.Type == form.ParameterTypeBoolean {
assignBoolValue(fieldParameter, value)
return
}
if value == nil {
fieldParameter.StringValue = fieldParameter.DefaultValue
return
}
if s, ok := value.(string); ok {
fieldParameter.StringValue = s
} else {
fieldParameter.StringValue = fmt.Sprintf("%v", value)
}
}

func assignBoolValue(fieldParameter *form.FieldParameter, value any) {
switch v := value.(type) {
case bool:
fieldParameter.BoolValue = v
case string:
if b, err := strconv.ParseBool(v); err == nil {
fieldParameter.BoolValue = b
}
default:
if b, err := strconv.ParseBool(fieldParameter.DefaultValue); err == nil {
fieldParameter.BoolValue = b
}
}
}

func applyInstanceChanges(
instance *managementv1.DevsyWorkspaceInstance,
selectedTemplate *managementv1.DevsyWorkspaceTemplate,
selectedTemplateVersion, renderedParameters string,
) *managementv1.DevsyWorkspaceInstance {
newInstance := instance.DeepCopy()
// template
if instance.Spec.TemplateRef != nil &&
instance.Spec.TemplateRef.Name != selectedTemplate.GetName() {
newInstance.Spec.TemplateRef.Name = selectedTemplate.GetName()
}
// version
if instance.Spec.TemplateRef != nil &&
instance.Spec.TemplateRef.Version != selectedTemplateVersion {
newInstance.Spec.TemplateRef.Version = selectedTemplateVersion
}
// parameters
if instance.Spec.Parameters != renderedParameters {
newInstance.Spec.Parameters = renderedParameters
}

return newInstance
}
3 changes: 2 additions & 1 deletion pkg/client/clientimplementation/daemonclient/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"fmt"

"github.com/devsy-org/devsy/pkg/platform/form"
"github.com/devsy-org/devsy/pkg/terminal"
)

Expand All @@ -23,7 +24,7 @@ func (c *client) updateInstance(ctx context.Context) error {
if oldInstance == nil {
return fmt.Errorf("unable to find old workspace instance")
}
newInstance, err := updateInstanceInteractive(ctx, baseClient, oldInstance)
newInstance, err := form.UpdateInstance(ctx, baseClient, oldInstance)
if err != nil {
return err
}
Expand Down
Loading