Skip to content

refactor(platform): pass instance identity and selection to builder #1630

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
skevetter merged 2 commits into from
Oct 21, 2026
Merged

refactor(platform): pass instance identity and selection to builder #1630

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc58885
refactor(platform): pass instance identity and selection to builder
skevetter Oct 20, 2026
1a011fd
Merge branch 'main' into refactor/surface-form-instance-arguments
skevetter Oct 21, 2026
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
47 changes: 17 additions & 30 deletions pkg/platform/form/form.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,7 @@ func createInstance(
return nil, createSelection{}, err
}

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,
})
instance := buildCreatedInstance(identity, selection, renderedParameters)
return instance, selection, nil
}

Expand Down Expand Up @@ -168,37 +159,33 @@ func renderedParametersForCreate(
return runParameterForm(formCtx, fieldParameters)
}

type buildCreatedInstanceParams struct {
id, uid, source, picture string
selectedProject *managementv1.Project
selectedTemplate *managementv1.DevsyWorkspaceTemplate
selectedTemplateVersion string
renderedParameters string
}

func buildCreatedInstance(p buildCreatedInstanceParams) *managementv1.DevsyWorkspaceInstance {
func buildCreatedInstance(
identity InstanceIdentity,
selection createSelection,
renderedParameters string,
) *managementv1.DevsyWorkspaceInstance {
return &managementv1.DevsyWorkspaceInstance{
ObjectMeta: metav1.ObjectMeta{
GenerateName: encoding.SafeConcatNameMax([]string{p.id}, 53) + "-",
Namespace: project.ProjectNamespace(p.selectedProject.GetName()),
GenerateName: encoding.SafeConcatNameMax([]string{identity.ID}, 53) + "-",
Namespace: project.ProjectNamespace(selection.project.GetName()),
Labels: map[string]string{
storagev1.DevsyWorkspaceIDLabel: p.id,
storagev1.DevsyWorkspaceUIDLabel: p.uid,
config.K8sProjectLabel: p.selectedProject.GetName(),
storagev1.DevsyWorkspaceIDLabel: identity.ID,
storagev1.DevsyWorkspaceUIDLabel: identity.UID,
config.K8sProjectLabel: selection.project.GetName(),
},
Annotations: map[string]string{
storagev1.DevsyWorkspacePictureAnnotation: p.picture,
storagev1.DevsyWorkspaceSourceAnnotation: p.source,
storagev1.DevsyWorkspacePictureAnnotation: identity.Picture,
storagev1.DevsyWorkspaceSourceAnnotation: identity.Source,
},
},
Spec: managementv1.DevsyWorkspaceInstanceSpec{
DevsyWorkspaceInstanceSpec: storagev1.DevsyWorkspaceInstanceSpec{
DisplayName: p.id,
DisplayName: identity.ID,
TemplateRef: &storagev1.TemplateRef{
Name: p.selectedTemplate.GetName(),
Version: p.selectedTemplateVersion,
Name: selection.template.GetName(),
Version: selection.templateVersion,
},
Parameters: p.renderedParameters,
Parameters: renderedParameters,
},
},
}
Expand Down
Loading