Fix package naming in local daemon package

janekbaraniewski · janekbaraniewski · commit bfab31cf6ee6 · 2025-04-10T17:39:26.000+02:00
diff --git a/cmd/pro/daemon/netcheck.go b/cmd/pro/daemon/netcheck.go
@@ -9,7 +9,7 @@ import (
 	"github.com/loft-sh/devpod/cmd/pro/completion"
 	proflags "github.com/loft-sh/devpod/cmd/pro/flags"
 	"github.com/loft-sh/devpod/pkg/config"
-	daemon "github.com/loft-sh/devpod/pkg/daemon/platform"
+	daemon "github.com/loft-sh/devpod/pkg/daemon/local"
 	providerpkg "github.com/loft-sh/devpod/pkg/provider"
 	"github.com/loft-sh/log"
 	"github.com/spf13/cobra"
diff --git a/cmd/pro/daemon/start.go b/cmd/pro/daemon/start.go
@@ -10,7 +10,7 @@ import (
 	"syscall"
 
 	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
-	daemon "github.com/loft-sh/devpod/pkg/daemon/platform"
+	daemon "github.com/loft-sh/devpod/pkg/daemon/local"
 	"github.com/loft-sh/devpod/pkg/platform/client"
 
 	"github.com/loft-sh/devpod/cmd/pro/completion"
diff --git a/cmd/pro/daemon/status.go b/cmd/pro/daemon/status.go
@@ -5,12 +5,11 @@ import (
 	"encoding/json"
 	"fmt"
 
-	platformdaemon "github.com/loft-sh/devpod/pkg/daemon/platform"
-
 	"github.com/loft-sh/devpod/cmd/agent"
 	"github.com/loft-sh/devpod/cmd/pro/completion"
 	proflags "github.com/loft-sh/devpod/cmd/pro/flags"
 	"github.com/loft-sh/devpod/pkg/config"
+	locald "github.com/loft-sh/devpod/pkg/daemon/local"
 	providerpkg "github.com/loft-sh/devpod/pkg/provider"
 	"github.com/loft-sh/log"
 	"github.com/spf13/cobra"
@@ -64,7 +63,7 @@ func NewStatusCmd(flags *proflags.GlobalFlags) *cobra.Command {
 }
 
 func (cmd *StatusCmd) Run(ctx context.Context, devPodConfig *config.Config, provider *providerpkg.ProviderConfig) error {
-	status, err := platformdaemon.NewLocalClient(provider.Name).Status(ctx, cmd.Debug)
+	status, err := locald.NewLocalClient(provider.Name).Status(ctx, cmd.Debug)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/pro/delete.go b/cmd/pro/delete.go
@@ -11,7 +11,7 @@ import (
 	providercmd "github.com/loft-sh/devpod/cmd/provider"
 	"github.com/loft-sh/devpod/pkg/client/clientimplementation"
 	"github.com/loft-sh/devpod/pkg/config"
-	daemon "github.com/loft-sh/devpod/pkg/daemon/platform"
+	daemon "github.com/loft-sh/devpod/pkg/daemon/local"
 	"github.com/loft-sh/devpod/pkg/platform"
 	"github.com/loft-sh/devpod/pkg/provider"
 	"github.com/loft-sh/devpod/pkg/workspace"
diff --git a/cmd/ssh.go b/cmd/ssh.go
@@ -17,7 +17,7 @@ import (
 	"github.com/loft-sh/devpod/pkg/agent"
 	client2 "github.com/loft-sh/devpod/pkg/client"
 	"github.com/loft-sh/devpod/pkg/config"
-	daemon "github.com/loft-sh/devpod/pkg/daemon/platform"
+	daemon "github.com/loft-sh/devpod/pkg/daemon/local"
 	"github.com/loft-sh/devpod/pkg/gpg"
 	"github.com/loft-sh/devpod/pkg/port"
 	"github.com/loft-sh/devpod/pkg/provider"
diff --git a/cmd/troubleshoot.go b/cmd/troubleshoot.go
@@ -12,7 +12,7 @@ import (
 	"github.com/loft-sh/devpod/cmd/provider"
 	"github.com/loft-sh/devpod/pkg/client"
 	"github.com/loft-sh/devpod/pkg/config"
-	daemon "github.com/loft-sh/devpod/pkg/daemon/platform"
+	daemon "github.com/loft-sh/devpod/pkg/daemon/local"
 	"github.com/loft-sh/devpod/pkg/platform"
 	pkgprovider "github.com/loft-sh/devpod/pkg/provider"
 	"github.com/loft-sh/devpod/pkg/version"
diff --git a/pkg/client/clientimplementation/daemonclient/client.go b/pkg/client/clientimplementation/daemonclient/client.go
@@ -15,7 +15,7 @@ import (
 	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
 	clientpkg "github.com/loft-sh/devpod/pkg/client"
 	"github.com/loft-sh/devpod/pkg/config"
-	daemon "github.com/loft-sh/devpod/pkg/daemon/platform"
+	daemon "github.com/loft-sh/devpod/pkg/daemon/local"
 	"github.com/loft-sh/devpod/pkg/options"
 	"github.com/loft-sh/devpod/pkg/platform"
 	platformclient "github.com/loft-sh/devpod/pkg/platform/client"
diff --git a/pkg/credentials/server.go b/pkg/credentials/server.go
@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"github.com/loft-sh/devpod/pkg/agent/tunnel"
-	locald "github.com/loft-sh/devpod/pkg/daemon/platform"
+	locald "github.com/loft-sh/devpod/pkg/daemon/local"
 	workspaced "github.com/loft-sh/devpod/pkg/daemon/workspace"
 	network "github.com/loft-sh/devpod/pkg/daemon/workspace/network"
 	devpodlog "github.com/loft-sh/devpod/pkg/log"
diff --git a/pkg/daemon/local/client.go b/pkg/daemon/local/client.go
@@ -1,4 +1,4 @@
-package daemon
+package local
 
 import (
 	"bytes"
diff --git a/pkg/daemon/local/credentials_server.go b/pkg/daemon/local/credentials_server.go
@@ -1,4 +1,4 @@
-package daemon
+package local
 
 import (
 	"context"
diff --git a/pkg/daemon/local/daemon.go b/pkg/daemon/local/daemon.go
@@ -1,4 +1,4 @@
-package daemon
+package local
 
 import (
 	"bufio"
diff --git a/pkg/daemon/local/error.go b/pkg/daemon/local/error.go
@@ -1,4 +1,4 @@
-package daemon
+package local
 
 import (
 	"errors"
diff --git a/pkg/daemon/local/error_unix.go b/pkg/daemon/local/error_unix.go
@@ -1,6 +1,6 @@
 //go:build linux || darwin || unix
 
-package daemon
+package local
 
 import (
 	"errors"
diff --git a/pkg/daemon/local/error_windows.go b/pkg/daemon/local/error_windows.go
@@ -1,6 +1,6 @@
 //go:build windows
 
-package daemon
+package local
 
 import (
 	"errors"
diff --git a/pkg/daemon/local/local_server.go b/pkg/daemon/local/local_server.go
@@ -1,4 +1,4 @@
-package daemon
+package local
 
 import (
 	"context"
diff --git a/pkg/daemon/local/socket.go b/pkg/daemon/local/socket.go
@@ -1,6 +1,6 @@
 //go:build linux || darwin || unix
 
-package daemon
+package local
 
 import (
 	"errors"
diff --git a/pkg/daemon/local/socket_windows.go b/pkg/daemon/local/socket_windows.go
@@ -1,6 +1,6 @@
 //go:build windows
 
-package daemon
+package local
 
 import (
 	"fmt"
diff --git a/pkg/daemon/local/ts_server.go b/pkg/daemon/local/ts_server.go
@@ -1,4 +1,4 @@
-package daemon
+package local
 
 import (
 	"context"
diff --git a/pkg/daemon/local/workspace_watcher.go b/pkg/daemon/local/workspace_watcher.go
@@ -1,4 +1,4 @@
-package daemon
+package local
 
 import (
 	"context"
diff --git a/pkg/workspace/list.go b/pkg/workspace/list.go
@@ -15,7 +15,7 @@ import (
 	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
 	"github.com/loft-sh/devpod/pkg/client/clientimplementation"
 	"github.com/loft-sh/devpod/pkg/config"
-	daemon "github.com/loft-sh/devpod/pkg/daemon/platform"
+	daemon "github.com/loft-sh/devpod/pkg/daemon/local"
 	"github.com/loft-sh/devpod/pkg/platform"
 	providerpkg "github.com/loft-sh/devpod/pkg/provider"
 	"github.com/loft-sh/devpod/pkg/types"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package daemon`
	`1`	`+package local`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"bytes"`