POD-898 | Add Environment Template support to desktop app

cmd/pro/provider/list/templates.go

@@ -100,24 +100,50 @@ func (cmd *TemplatesCmd) Run(ctx context.Context) error {
 		return cmp.Compare(a.Value, b.Value)
 	})
 
-	return printOptions(&OptionsFormat{
-		Options: map[string]*types.Option{
-			loft.RunnerEnv: {
-				DisplayName: "Runner",
-				Description: "The DevPod Pro runner to use for a new workspace.",
-				Enum:        runners,
-				Required:    true,
-				Mutable:     false,
-			},
-			loft.TemplateOptionEnv: {
-				DisplayName:       "Template",
-				Description:       "The template to use for a new workspace.",
-				Required:          true,
-				Enum:              templates,
-				Default:           templateList.DefaultDevPodWorkspaceTemplate,
-				SubOptionsCommand: fmt.Sprintf("'%s' pro provider list templateoptions", executable),
-				Mutable:           true,
-			},
+	//collect environments
+	environmentsList, err := managementClient.Loft().ManagementV1().DevPodEnvironmentTemplates().List(ctx, metav1.ListOptions{})
+	if err != nil {
+		return fmt.Errorf("list environments: %w", err)
+	}
+
+	environments := []types.OptionEnum{}
+	for _, env := range environmentsList.Items {
+		environments = append(environments, types.OptionEnum{
+			Value:       env.Name,
+			DisplayName: loft.DisplayName(env.Name, env.Spec.DisplayName),
+		})
+	}
+
+	options := map[string]*types.Option{
+		loft.RunnerEnv: {
+			DisplayName: "Runner",
+			Description: "The DevPod Pro runner to use for a new workspace.",
+			Enum:        runners,
+			Required:    true,
+			Mutable:     false,
 		},
+		loft.TemplateOptionEnv: {
+			DisplayName:       "Template",
+			Description:       "The template to use for a new workspace.",
+			Required:          true,
+			Enum:              templates,
+			Default:           templateList.DefaultDevPodWorkspaceTemplate,
+			SubOptionsCommand: fmt.Sprintf("'%s' pro provider list templateoptions", executable),
+			Mutable:           true,
+		},
+	}
+
+	if len(environments) > 0 {
+		options[loft.EnvironmentTemplateOptionEnv] = &types.Option{
+			DisplayName: "Environment Template",
+			Description: "The template to use for creating environment",
+			Enum:        environments,
+			Required:    true,
+			Mutable:     false,
+		}
+	}
+
+	return printOptions(&OptionsFormat{
+		Options: options,
 	})
 }

cmd/pro/provider/up.go

@@ -207,6 +207,8 @@
 		templateVersion = ""
 	}
 
+	environmentName := os.Getenv(loft.EnvironmentTemplateOptionEnv)
+
 	// find parameters
 	resolvedParameters, err := getParametersFromEnvironment(ctx, managementClient, workspaceInfo.ProjectName, template, templateVersion)
 	if err != nil {
@@ -239,6 +241,9 @@
 					Name:    template,
 					Version: templateVersion,
 				},
+				EnvironmentRef: storagev1.EnvironmentRef{
+					Name: environmentName,
+				},
 			},
 		},
 	}

pkg/devcontainer/crane/run.go

@@ -38,7 +38,8 @@ type command struct {
 }
 
 func New(cmd string) *command {
-	return &command{cmd: cmd}
+	newCommand := &command{cmd: getBinName()}
+	return newCommand.WithArg(cmd)
 }
 
 func (c *command) WithFlag(flag, val string) *command {
@@ -73,7 +74,8 @@ func ShouldUse(cliOptions *provider2.CLIOptions) bool {
 
 // IsAvailable checks if devpod crane is installed in host system
 func IsAvailable() bool {
-	_, err := exec.LookPath(getBinName())
+	path, err := exec.LookPath(getBinName())
+	log.Default.Infof("Path found -> %v", path)
 	return err == nil
 }
 

pkg/loft/env.go

@@ -13,5 +13,7 @@ const (
 	TemplateOptionEnv        = "LOFT_TEMPLATE"
 	TemplateVersionOptionEnv = "LOFT_TEMPLATE_VERSION"
 
+	EnvironmentTemplateOptionEnv = "LOFT_ENVIRONMENT_TEMPLATE"
+
 	TimeoutEnv = "LOFT_TIMEOUT"
 )