refactor: move provider-scoped env vars to pkg/config/env.go

Move WORKSPACE_*, MACHINE_*, PROVIDER_*, LOFT_*, and DEVCONTAINER_ID
constants from pkg/provider/env.go to the centralized pkg/config/env.go
with EnvProviderXxx naming convention. Update all consumers.

Author: skevetter

cmd/pro/provider/create/workspace.go

@@ -9,6 +9,7 @@ import (
 
 	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
 	"github.com/skevetter/devpod/cmd/pro/flags"
+	"github.com/skevetter/devpod/pkg/config"
 	"github.com/skevetter/devpod/pkg/platform"
 	"github.com/skevetter/devpod/pkg/platform/client"
 	"github.com/skevetter/devpod/pkg/platform/form"
@@ -81,10 +82,10 @@ func (cmd *WorkspaceCmd) Run(
 	}
 
 	// Info through env, right now only used by CLI
-	workspaceID := os.Getenv(provider.WorkspaceID)
-	workspaceUID := os.Getenv(provider.WorkspaceUID)
-	workspaceFolder := os.Getenv(provider.WorkspaceFolder)
-	workspaceContext := os.Getenv(provider.WorkspaceContext)
+	workspaceID := os.Getenv(config.EnvProviderWorkspaceID)
+	workspaceUID := os.Getenv(config.EnvProviderWorkspaceUID)
+	workspaceFolder := os.Getenv(config.EnvProviderWorkspaceFolder)
+	workspaceContext := os.Getenv(config.EnvProviderWorkspaceContext)
 	workspacePicture := os.Getenv(platform.WorkspacePictureEnv)
 	workspaceSource := os.Getenv(platform.WorkspaceSourceEnv)
 	if workspaceUID == "" || workspaceID == "" || workspaceFolder == "" {

cmd/pro/provider/get/version.go

@@ -63,11 +63,11 @@ func (cmd *VersionCmd) Run(
 		return err
 	}
 
-	providerContext := os.Getenv(provider.ProviderContext)
+	providerContext := os.Getenv(config.EnvProviderContext)
 	if providerContext == "" {
 		providerContext = config.DefaultContext
 	}
-	providerID := os.Getenv(provider.ProviderID)
+	providerID := os.Getenv(config.EnvProviderID)
 	if providerID == "" {
 		return fmt.Errorf("provider ID %s not defined", providerID)
 	}

cmd/pro/provider/list/workspaces.go

@@ -8,11 +8,11 @@ import (
 
 	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
 	"github.com/skevetter/devpod/cmd/pro/flags"
+	"github.com/skevetter/devpod/pkg/config"
 	"github.com/skevetter/devpod/pkg/platform"
 	"github.com/skevetter/devpod/pkg/platform/client"
 	"github.com/skevetter/devpod/pkg/platform/labels"
 	"github.com/skevetter/devpod/pkg/platform/project"
-	"github.com/skevetter/devpod/pkg/provider"
 	"github.com/skevetter/log"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -66,7 +66,7 @@ func (cmd *WorkspacesCmd) Run(ctx context.Context) error {
 		)
 	}
 
-	filterByOwner := os.Getenv(provider.LoftFilterByOwner) == "true"
+	filterByOwner := os.Getenv(config.EnvLoftFilterByOwner) == "true"
 	workspaces := []*managementv1.DevPodWorkspaceInstance{}
 	for _, p := range projectList.Items {
 		ns := project.ProjectNamespace(p.GetName())

cmd/pro/provider/watch/workspaces.go

@@ -78,7 +78,7 @@ func (cmd *WorkspacesCmd) Run(
 		cmd.Context = config.DefaultContext
 	}
 
-	projectName := os.Getenv(provider.LoftProject)
+	projectName := os.Getenv(config.EnvLoftProject)
 	if projectName == "" {
 		return fmt.Errorf("project name not found")
 	}
@@ -104,7 +104,7 @@ func (cmd *WorkspacesCmd) Run(
 	workspaceInformer := factory.Management().V1().DevPodWorkspaceInstances()
 
 	self := baseClient.Self()
-	filterByOwner := os.Getenv(provider.LoftFilterByOwner) == "true"
+	filterByOwner := os.Getenv(config.EnvLoftFilterByOwner) == "true"
 	instanceStore := newStore(workspaceInformer, self, cmd.Context, filterByOwner, cmd.Log)
 
 	_, err = workspaceInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{

cmd/pro/version.go

@@ -60,8 +60,8 @@ func (cmd *VersionCmd) Run(
 	providerConfig *provider.ProviderConfig,
 ) error {
 	opts := devPodConfig.ProviderOptions(providerConfig.Name)
-	opts[provider.ProviderID] = config.OptionValue{Value: providerConfig.Name}
-	opts[provider.ProviderContext] = config.OptionValue{Value: cmd.Context}
+	opts[config.EnvProviderID] = config.OptionValue{Value: providerConfig.Name}
+	opts[config.EnvProviderContext] = config.OptionValue{Value: cmd.Context}
 
 	var buf bytes.Buffer
 	// ignore --debug because we tunnel json through stdio

cmd/pro/watch_workspaces.go

@@ -72,9 +72,9 @@ func (cmd *WatchWorkspacesCmd) Run(
 	defer cancel()
 
 	if cmd.FilterByOwner {
-		opts[provider.LoftFilterByOwner] = config.OptionValue{Value: "true"}
+		opts[config.EnvLoftFilterByOwner] = config.OptionValue{Value: "true"}
 	}
-	opts[provider.LoftProject] = config.OptionValue{Value: cmd.Project}
+	opts[config.EnvLoftProject] = config.OptionValue{Value: cmd.Project}
 
 	sigChan := make(chan os.Signal, 1)
 	signal.Notify(sigChan, syscall.SIGINT)

pkg/config/env.go

@@ -83,4 +83,60 @@ const (
 
 	// EnvProviderPrefix is the prefix for provider-specific option env vars (append provider name + "_").
 	EnvProviderPrefix = EnvPrefix + "PROVIDER_"
+
+	// --- Provider-scoped env vars (set when running provider commands) ---.
+
+	// EnvProviderWorkspaceID is the workspace identifier passed to providers.
+	EnvProviderWorkspaceID = "WORKSPACE_ID"
+
+	// EnvProviderWorkspaceUID is the workspace UID passed to providers.
+	EnvProviderWorkspaceUID = "WORKSPACE_UID"
+
+	// EnvProviderWorkspacePicture is the workspace picture URL passed to providers.
+	EnvProviderWorkspacePicture = "WORKSPACE_PICTURE"
+
+	// EnvProviderWorkspaceFolder is the workspace folder path passed to providers.
+	EnvProviderWorkspaceFolder = "WORKSPACE_FOLDER"
+
+	// EnvProviderWorkspaceContext is the workspace context passed to providers.
+	EnvProviderWorkspaceContext = "WORKSPACE_CONTEXT"
+
+	// EnvProviderWorkspaceOrigin is the workspace origin passed to providers.
+	EnvProviderWorkspaceOrigin = "WORKSPACE_ORIGIN"
+
+	// EnvProviderWorkspaceSource is the workspace source passed to providers.
+	EnvProviderWorkspaceSource = "WORKSPACE_SOURCE"
+
+	// EnvProviderWorkspaceProvider is the workspace provider name passed to providers.
+	EnvProviderWorkspaceProvider = "WORKSPACE_PROVIDER"
+
+	// EnvProviderMachineID is the machine identifier passed to providers.
+	EnvProviderMachineID = "MACHINE_ID"
+
+	// EnvProviderMachineContext is the machine context passed to providers.
+	EnvProviderMachineContext = "MACHINE_CONTEXT"
+
+	// EnvProviderMachineFolder is the machine folder path passed to providers.
+	EnvProviderMachineFolder = "MACHINE_FOLDER"
+
+	// EnvProviderMachineProvider is the machine provider name passed to providers.
+	EnvProviderMachineProvider = "MACHINE_PROVIDER"
+
+	// EnvProviderID is the provider identifier passed to providers.
+	EnvProviderID = "PROVIDER_ID"
+
+	// EnvProviderContext is the provider context passed to providers.
+	EnvProviderContext = "PROVIDER_CONTEXT"
+
+	// EnvProviderFolder is the provider folder path passed to providers.
+	EnvProviderFolder = "PROVIDER_FOLDER"
+
+	// EnvLoftProject is the Loft project name for pro features.
+	EnvLoftProject = "LOFT_PROJECT"
+
+	// EnvLoftFilterByOwner enables filtering by owner in Loft.
+	EnvLoftFilterByOwner = "LOFT_FILTER_BY_OWNER"
+
+	// EnvDevcontainerID is the devcontainer identifier.
+	EnvDevcontainerID = "DEVCONTAINER_ID"
 )

pkg/driver/custom/custom.go

@@ -313,7 +313,7 @@ func (c *customDriver) runCommand(
 	if err != nil {
 		return err
 	}
-	environ = append(environ, provider.DevcontainerID+"="+workspaceId)
+	environ = append(environ, pkgconfig.EnvDevcontainerID+"="+workspaceId)
 	environ = append(environ, extraEnv...)
 
 	// set debug level

pkg/provider/env.go

@@ -12,37 +12,6 @@ import (
 	log2 "github.com/skevetter/log"
 )
 
-const (
-	// workspace.
-	WorkspaceID        = "WORKSPACE_ID"
-	WorkspaceUID       = "WORKSPACE_UID"
-	WorkspacePicture   = "WORKSPACE_PICTURE"
-	WorkspaceFolder    = "WORKSPACE_FOLDER"
-	WorkspaceContext   = "WORKSPACE_CONTEXT"
-	WorkspaceOrigin    = "WORKSPACE_ORIGIN"
-	WorkspaceSourceEnv = "WORKSPACE_SOURCE"
-	WorkspaceProvider  = "WORKSPACE_PROVIDER"
-
-	// machine.
-	MachineID       = "MACHINE_ID"
-	MachineContext  = "MACHINE_CONTEXT"
-	MachineFolder   = "MACHINE_FOLDER"
-	MachineProvider = "MACHINE_PROVIDER"
-
-	// provider.
-	ProviderID      = "PROVIDER_ID"
-	ProviderContext = "PROVIDER_CONTEXT"
-	ProviderFolder  = "PROVIDER_FOLDER"
-
-	// pro.
-	LoftProject       = "LOFT_PROJECT"
-	LoftFilterByOwner = "LOFT_FILTER_BY_OWNER"
-)
-
-const (
-	DevcontainerID = "DEVCONTAINER_ID"
-)
-
 func combineOptions(
 	resolvedOptions map[string]config.OptionValue,
 	otherOptions map[string]config.OptionValue,
@@ -95,34 +64,39 @@ func ToOptionsWorkspace(workspace *Workspace) map[string]string {
 	retVars := map[string]string{}
 	if workspace != nil {
 		if workspace.ID != "" {
-			retVars[WorkspaceID] = workspace.ID
+			retVars[config.EnvProviderWorkspaceID] = workspace.ID
 		}
 		if workspace.UID != "" {
-			retVars[WorkspaceUID] = workspace.UID
+			retVars[config.EnvProviderWorkspaceUID] = workspace.UID
 		}
-		retVars[WorkspaceFolder], _ = GetWorkspaceDir(workspace.Context, workspace.ID)
-		retVars[WorkspaceFolder] = filepath.ToSlash(retVars[WorkspaceFolder])
+		retVars[config.EnvProviderWorkspaceFolder], _ = GetWorkspaceDir(
+			workspace.Context,
+			workspace.ID,
+		)
+		retVars[config.EnvProviderWorkspaceFolder] = filepath.ToSlash(
+			retVars[config.EnvProviderWorkspaceFolder],
+		)
 		if workspace.Context != "" {
-			retVars[WorkspaceContext] = workspace.Context
-			retVars[MachineContext] = workspace.Context
+			retVars[config.EnvProviderWorkspaceContext] = workspace.Context
+			retVars[config.EnvProviderMachineContext] = workspace.Context
 		}
 		if workspace.Origin != "" {
-			retVars[WorkspaceOrigin] = filepath.ToSlash(workspace.Origin)
+			retVars[config.EnvProviderWorkspaceOrigin] = filepath.ToSlash(workspace.Origin)
 		}
 		if workspace.Picture != "" {
-			retVars[WorkspacePicture] = workspace.Picture
+			retVars[config.EnvProviderWorkspacePicture] = workspace.Picture
 		}
-		retVars[WorkspaceSourceEnv] = workspace.Source.String()
+		retVars[config.EnvProviderWorkspaceSource] = workspace.Source.String()
 		if workspace.Provider.Name != "" {
-			retVars[WorkspaceProvider] = workspace.Provider.Name
+			retVars[config.EnvProviderWorkspaceProvider] = workspace.Provider.Name
 		}
 		if workspace.Machine.ID != "" {
-			retVars[MachineID] = workspace.Machine.ID
+			retVars[config.EnvProviderMachineID] = workspace.Machine.ID
 			machineDir, _ := GetMachineDir(workspace.Context, workspace.Machine.ID)
-			retVars[MachineFolder] = filepath.ToSlash(machineDir)
+			retVars[config.EnvProviderMachineFolder] = filepath.ToSlash(machineDir)
 		}
 		if workspace.Pro != nil && workspace.Pro.Project != "" {
-			retVars[LoftProject] = workspace.Pro.Project
+			retVars[config.EnvLoftProject] = workspace.Pro.Project
 		}
 		maps.Copy(retVars, GetBaseEnvironment(workspace.Context, workspace.Provider.Name))
 	}
@@ -133,15 +107,17 @@ func ToOptionsMachine(machine *Machine) map[string]string {
 	retVars := map[string]string{}
 	if machine != nil {
 		if machine.ID != "" {
-			retVars[MachineID] = machine.ID
+			retVars[config.EnvProviderMachineID] = machine.ID
 		}
-		retVars[MachineFolder], _ = GetMachineDir(machine.Context, machine.ID)
-		retVars[MachineFolder] = filepath.ToSlash(retVars[MachineFolder])
+		retVars[config.EnvProviderMachineFolder], _ = GetMachineDir(machine.Context, machine.ID)
+		retVars[config.EnvProviderMachineFolder] = filepath.ToSlash(
+			retVars[config.EnvProviderMachineFolder],
+		)
 		if machine.Context != "" {
-			retVars[MachineContext] = machine.Context
+			retVars[config.EnvProviderMachineContext] = machine.Context
 		}
 		if machine.Provider.Name != "" {
-			retVars[MachineProvider] = machine.Provider.Name
+			retVars[config.EnvProviderMachineProvider] = machine.Provider.Name
 		}
 		maps.Copy(retVars, GetBaseEnvironment(machine.Context, machine.Provider.Name))
 	}
@@ -180,10 +156,10 @@ func GetBaseEnvironment(context, provider string) map[string]string {
 	retVars[config.EnvBinaryPath] = filepath.ToSlash(devPodBinary)
 	retVars[config.EnvOS] = runtime.GOOS
 	retVars[config.EnvArch] = runtime.GOARCH
-	retVars[ProviderID] = provider
-	retVars[ProviderContext] = context
+	retVars[config.EnvProviderID] = provider
+	retVars[config.EnvProviderContext] = context
 	providerFolder, _ := GetProviderDir(context, provider)
-	retVars[ProviderFolder] = filepath.ToSlash(providerFolder)
+	retVars[config.EnvProviderFolder] = filepath.ToSlash(providerFolder)
 	retVars[config.EnvLogLevel] = log2.Default.GetLevel().String()
 	return retVars
 }

pkg/workspace/list.go

@@ -363,7 +363,7 @@ func listInstancesProxyProvider(
 	log log.Logger,
 ) ([]managementv1.DevPodWorkspaceInstance, error) {
 	opts := devPodConfig.ProviderOptions(provider)
-	opts[providerpkg.LoftFilterByOwner] = config.OptionValue{Value: "true"}
+	opts[config.EnvLoftFilterByOwner] = config.OptionValue{Value: "true"}
 	var stdout bytes.Buffer
 	var stderr bytes.Buffer