From 8fd29b33d9527ece1ba5469e957889e42594869f Mon Sep 17 00:00:00 2001 From: Samuel K Date: Sun, 18 Oct 2026 22:14:08 -0600 Subject: [PATCH] refactor(platform): share instance creation form --- .../daemonclient/create.go | 15 +- .../clientimplementation/daemonclient/form.go | 182 ------------------ pkg/platform/form/form.go | 51 ++++- 3 files changed, 50 insertions(+), 198 deletions(-) delete mode 100644 pkg/client/clientimplementation/daemonclient/form.go diff --git a/pkg/client/clientimplementation/daemonclient/create.go b/pkg/client/clientimplementation/daemonclient/create.go index b2fb9da78c..db12ce7017 100644 --- a/pkg/client/clientimplementation/daemonclient/create.go +++ b/pkg/client/clientimplementation/daemonclient/create.go @@ -5,6 +5,7 @@ import ( "fmt" "io" + "github.com/devsy-org/devsy/pkg/platform/form" "github.com/devsy-org/devsy/pkg/platform/project" "github.com/devsy-org/devsy/pkg/provider" "github.com/devsy-org/devsy/pkg/terminal" @@ -33,14 +34,12 @@ func (c *client) Create( return fmt.Errorf("unable to create new instance through CLI if stdin is not a terminal") } - instance, err = createInstanceInteractive( - ctx, - baseClient, - c.workspace.ID, - c.workspace.UID, - c.workspace.Source.String(), - c.workspace.Picture, - ) + instance, err = form.CreateInstanceOnCluster(ctx, baseClient, form.InstanceIdentity{ + ID: c.workspace.ID, + UID: c.workspace.UID, + Source: c.workspace.Source.String(), + Picture: c.workspace.Picture, + }) if err != nil { return err } diff --git a/pkg/client/clientimplementation/daemonclient/form.go b/pkg/client/clientimplementation/daemonclient/form.go deleted file mode 100644 index d7ab92170e..0000000000 --- a/pkg/client/clientimplementation/daemonclient/form.go +++ /dev/null @@ -1,182 +0,0 @@ -package daemonclient - -import ( - "context" - - "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" - platformclient "github.com/devsy-org/devsy/pkg/platform/client" - "github.com/devsy-org/devsy/pkg/platform/form" - "github.com/devsy-org/devsy/pkg/platform/project" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" -) - -func createInstanceInteractive( - ctx context.Context, - baseClient platformclient.Client, - id, uid, source, picture string, -) (*managementv1.DevsyWorkspaceInstance, error) { - formCtx, cancelForm := context.WithCancel(ctx) - defer cancelForm() - - selection, err := selectProjectClusterTemplate(ctx, formCtx, baseClient, cancelForm) - if err != nil { - return nil, err - } - - renderedParameters, err := resolveNewInstanceParameters( - formCtx, - selection.template, - selection.templateVersion, - ) - if err != nil { - return nil, err - } - - return buildNewInstance(buildNewInstanceParams{ - id: id, - uid: uid, - source: source, - picture: picture, - selectedProject: selection.project, - selectedCluster: selection.cluster, - selectedTemplate: selection.template, - selectedTemplateVersion: selection.templateVersion, - renderedParameters: renderedParameters, - }), nil -} - -type projectClusterTemplateSelection struct { - project *managementv1.Project - cluster *managementv1.Cluster - template *managementv1.DevsyWorkspaceTemplate - templateVersion string -} - -func selectProjectClusterTemplate( - ctx, formCtx context.Context, - baseClient platformclient.Client, - cancelForm form.CancelFunc, -) (projectClusterTemplateSelection, error) { - var selectedCluster *managementv1.Cluster - var selectedProject *managementv1.Project - var selectedTemplate *managementv1.DevsyWorkspaceTemplate - selectedTemplateVersion := "" - - options, err := form.ProjectOptions(ctx, baseClient) - if err != nil { - return projectClusterTemplateSelection{}, err - } - - err = huh.NewForm( - huh.NewGroup( - huh.NewSelect[*managementv1.Project](). - Title("Project"). - Options(options...). - Value(&selectedProject), - huh.NewSelect[*managementv1.Cluster](). - Title("Cluster"). - OptionsFunc(func() []huh.Option[*managementv1.Cluster] { - 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 form.TemplateOptions(ctx, baseClient, selectedProject, cancelForm) - }, &selectedProject). - 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 projectClusterTemplateSelection{}, err - } - - return projectClusterTemplateSelection{ - project: selectedProject, - cluster: selectedCluster, - template: selectedTemplate, - templateVersion: selectedTemplateVersion, - }, nil -} - -func resolveNewInstanceParameters( - formCtx context.Context, - 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 - } - - fieldParameters := form.PrepareParameters(parameters) - if err := huh.NewForm( - huh.NewGroup(form.ParameterFields(fieldParameters)...), - ).RunWithContext(formCtx); err != nil { - return "", err - } - - return form.RenderParameters(fieldParameters) -} - -type buildNewInstanceParams struct { - id, uid, source, picture string - selectedProject *managementv1.Project - selectedCluster *managementv1.Cluster - selectedTemplate *managementv1.DevsyWorkspaceTemplate - selectedTemplateVersion string - renderedParameters string -} - -func buildNewInstance(p buildNewInstanceParams) *managementv1.DevsyWorkspaceInstance { - return &managementv1.DevsyWorkspaceInstance{ - ObjectMeta: metav1.ObjectMeta{ - GenerateName: encoding.SafeConcatNameMax([]string{p.id}, 53) + "-", - Namespace: project.ProjectNamespace(p.selectedProject.GetName()), - Labels: map[string]string{ - storagev1.DevsyWorkspaceIDLabel: p.id, - storagev1.DevsyWorkspaceUIDLabel: p.uid, - config.K8sProjectLabel: p.selectedProject.GetName(), - }, - Annotations: map[string]string{ - storagev1.DevsyWorkspacePictureAnnotation: p.picture, - storagev1.DevsyWorkspaceSourceAnnotation: p.source, - }, - }, - Spec: managementv1.DevsyWorkspaceInstanceSpec{ - DevsyWorkspaceInstanceSpec: storagev1.DevsyWorkspaceInstanceSpec{ - DisplayName: p.id, - TemplateRef: &storagev1.TemplateRef{ - Name: p.selectedTemplate.GetName(), - Version: p.selectedTemplateVersion, - }, - Target: storagev1.WorkspaceTarget{ - Cluster: &storagev1.WorkspaceTargetName{ - Name: p.selectedCluster.GetName(), - }, - }, - Parameters: p.renderedParameters, - }, - }, - } -} diff --git a/pkg/platform/form/form.go b/pkg/platform/form/form.go index 0c7e3da69e..99fe3ae28b 100644 --- a/pkg/platform/form/form.go +++ b/pkg/platform/form/form.go @@ -28,12 +28,44 @@ func CreateInstance( baseClient client.Client, id, uid, source, picture string, ) (*managementv1.DevsyWorkspaceInstance, error) { + instance, _, err := createInstance(ctx, baseClient, InstanceIdentity{ + ID: id, + UID: uid, + Source: source, + Picture: picture, + }) + return instance, err +} + +func CreateInstanceOnCluster( + ctx context.Context, + baseClient client.Client, + identity InstanceIdentity, +) (*managementv1.DevsyWorkspaceInstance, error) { + instance, selection, err := createInstance(ctx, baseClient, identity) + if err != nil { + return nil, err + } + + instance.Spec.Target.Cluster = &storagev1.WorkspaceTargetName{Name: selection.cluster.GetName()} + return instance, nil +} + +type InstanceIdentity struct { + ID, UID, Source, Picture string +} + +func createInstance( + ctx context.Context, + baseClient client.Client, + identity InstanceIdentity, +) (*managementv1.DevsyWorkspaceInstance, createSelection, error) { formCtx, cancelForm := context.WithCancel(ctx) defer cancelForm() selection, err := runCreateSelectionForm(ctx, baseClient, formCtx, cancelForm) if err != nil { - return nil, err + return nil, createSelection{}, err } renderedParameters, err := renderedParametersForCreate( @@ -42,23 +74,25 @@ func CreateInstance( selection.templateVersion, ) if err != nil { - return nil, err + return nil, createSelection{}, err } - return buildCreatedInstance(buildCreatedInstanceParams{ - id: id, - uid: uid, - source: source, - picture: picture, + instance := buildCreatedInstance(buildCreatedInstanceParams{ + id: identity.ID, + uid: identity.UID, + source: identity.Source, + picture: identity.Picture, selectedProject: selection.project, selectedTemplate: selection.template, selectedTemplateVersion: selection.templateVersion, renderedParameters: renderedParameters, - }), nil + }) + return instance, selection, nil } type createSelection struct { project *managementv1.Project + cluster *managementv1.Cluster template *managementv1.DevsyWorkspaceTemplate templateVersion string } @@ -111,6 +145,7 @@ func runCreateSelectionForm( return createSelection{ project: selectedProject, + cluster: selectedCluster, template: selectedTemplate, templateVersion: selectedTemplateVersion, }, nil