fix(cli): import legacy workspaces

loft-sh · Feb 5, 2025 · 8b37b09 · 8b37b09
1 parent 02a89b6
commit 8b37b09
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/cmd/pro/import_workspace.go b/cmd/pro/import_workspace.go
@@ -118,7 +118,7 @@ func (cmd *ImportCmd) Run(ctx context.Context, args []string) error {
 			return fmt.Errorf("resolve instance options: %w", err)
 		}
 
-		err = cmd.writeWorkspaceDefinition(devPodConfig, provider, instanceOpts, instance)
+		err = cmd.writeWorkspaceDefinition(devPodConfig, provider, instanceOpts)
 		if err != nil {
 			return errors.Wrap(err, "prepare workspace to import definition")
 		}
@@ -152,7 +152,7 @@ func (cmd *ImportCmd) writeNewWorkspaceDefinition(devPodConfig *config.Config, i
 	return provider2.SaveWorkspaceConfig(workspaceObj)
 }
 
-func (cmd *ImportCmd) writeWorkspaceDefinition(devPodConfig *config.Config, provider *provider2.ProviderConfig, instanceOpts map[string]string, instance *managementv1.DevPodWorkspaceInstance) error {
+func (cmd *ImportCmd) writeWorkspaceDefinition(devPodConfig *config.Config, provider *provider2.ProviderConfig, instanceOpts map[string]string) error {
 	workspaceObj := &provider2.Workspace{
 		ID:  cmd.WorkspaceId,
 		UID: cmd.WorkspaceUid,
@@ -162,10 +162,6 @@ func (cmd *ImportCmd) writeWorkspaceDefinition(devPodConfig *config.Config, prov
 		},
 		Context:  devPodConfig.DefaultContext,
 		Imported: !cmd.Own,
-		Pro: &provider2.ProMetadata{
-			Project:     instanceOpts[platform.ProjectEnv],
-			DisplayName: instance.Spec.DisplayName,
-		},
 	}
 
 	devPodConfig, err := options.ResolveOptions(context.Background(), devPodConfig, provider, instanceOpts, false, false, nil, cmd.log)

diff --git a/pkg/workspace/delete.go b/pkg/workspace/delete.go
@@ -44,16 +44,16 @@ func Delete(ctx context.Context, devPodConfig *config.Config, args []string, ign
 		return workspaceID, nil
 	}
 
-	// skip deletion if imported
+	// only remove local folder if workspace is imported or pro
 	workspaceConfig := client.WorkspaceConfig()
-	if !force && workspaceConfig.Imported {
+	if !force && (workspaceConfig.Imported || workspaceConfig.IsPro()) {
 		// delete workspace folder
 		err = clientimplementation.DeleteWorkspaceFolder(devPodConfig.DefaultContext, client.Workspace(), workspaceConfig.SSHConfigPath, log)
 		if err != nil {
 			return "", err
 		}
 
-		log.Donef("Skip remote deletion of workspace %s as it is imported, if you really want to delete this workspace also remotely, run with --force", client.Workspace())
+		log.Donef("Skip remote deletion of workspace %s, if you really want to delete this workspace also remotely, run with --force", client.Workspace())
 		return client.Workspace(), nil
 	}