refactor(log): migrate remaining cmd/ to pkg/log

cmd/build.go

@@ -10,9 +10,10 @@ import (
 	"github.com/devsy-org/devsy/pkg/client/clientimplementation"
 	"github.com/devsy-org/devsy/pkg/config"
 	"github.com/devsy-org/devsy/pkg/image"
+	"github.com/devsy-org/devsy/pkg/log"
 	"github.com/devsy-org/devsy/pkg/provider"
 	workspace2 "github.com/devsy-org/devsy/pkg/workspace"
-	"github.com/devsy-org/log"
+	oldlog "github.com/devsy-org/log"
 	"github.com/spf13/cobra"
 )
 
@@ -78,7 +79,7 @@ func NewBuildCmd(flags *flags.GlobalFlags) *cobra.Command {
 			}
 
 			// create a temporary workspace
-			exists := workspace2.Exists(ctx, devsyConfig, args, "", cmd.Owner, log.Default)
+			exists := workspace2.Exists(ctx, devsyConfig, args, "", cmd.Owner, oldlog.Default)
 			sshConfigFile, err := os.CreateTemp("", config.BinaryName+"ssh.config")
 			if err != nil {
 				return err
@@ -107,7 +108,7 @@ func NewBuildCmd(flags *flags.GlobalFlags) *cobra.Command {
 					ChangeLastUsed:       false,
 					Owner:                cmd.Owner,
 				},
-				log.Default,
+				oldlog.Default,
 			)
 			if err != nil {
 				return err
@@ -118,7 +119,7 @@ func NewBuildCmd(flags *flags.GlobalFlags) *cobra.Command {
 				defer func() {
 					err = baseWorkspaceClient.Delete(ctx, client.DeleteOptions{Force: true})
 					if err != nil {
-						log.Default.Errorf("Error deleting workspace: %v", err)
+						log.Errorf("Error deleting workspace: %v", err)
 					}
 				}()
 			}
@@ -179,13 +180,13 @@ func NewBuildCmd(flags *flags.GlobalFlags) *cobra.Command {
 }
 
 func (cmd *BuildCmd) Run(ctx context.Context, client client.WorkspaceClient) error {
-	return cmd.build(ctx, client, log.Default)
+	return cmd.build(ctx, client, oldlog.Default)
 }
 
 func (cmd *BuildCmd) build(
 	ctx context.Context,
 	workspaceClient client.WorkspaceClient,
-	log log.Logger,
+	log oldlog.Logger,
 ) error {
 	err := workspaceClient.Lock(ctx)
 	if err != nil {

cmd/completion/suggestions.go

@@ -7,7 +7,7 @@ import (
 	"github.com/devsy-org/devsy/pkg/config"
 	"github.com/devsy-org/devsy/pkg/platform"
 	"github.com/devsy-org/devsy/pkg/workspace"
-	"github.com/devsy-org/log"
+	oldlog "github.com/devsy-org/log"
 	"github.com/spf13/cobra"
 )
 
@@ -22,7 +22,6 @@ func RegisterFlagCompletionFuns(rootCmd *cobra.Command, globalFlags *flags.Globa
 				args,
 				toComplete,
 				globalFlags.Owner,
-				log.Default,
 			)
 		},
 	); err != nil {
@@ -39,7 +38,6 @@ func RegisterFlagCompletionFuns(rootCmd *cobra.Command, globalFlags *flags.Globa
 				args,
 				toComplete,
 				globalFlags.Owner,
-				log.Default,
 			)
 		},
 	); err != nil {
@@ -55,14 +53,13 @@ func GetWorkspaceSuggestions(
 	args []string,
 	toComplete string,
 	owner platform.OwnerFilter,
-	logger log.Logger,
 ) ([]string, cobra.ShellCompDirective) {
 	devsyConfig, err := config.LoadConfig(context, provider)
 	if err != nil {
 		return nil, cobra.ShellCompDirectiveError
 	}
 
-	workspaces, err := workspace.List(rootCmd.Context(), devsyConfig, false, owner, logger)
+	workspaces, err := workspace.List(rootCmd.Context(), devsyConfig, false, owner, oldlog.Default)
 	if err != nil {
 		return nil, cobra.ShellCompDirectiveError
 	}
@@ -82,14 +79,13 @@ func GetProviderSuggestions(
 	args []string,
 	toComplete string,
 	owner platform.OwnerFilter,
-	logger log.Logger,
 ) ([]string, cobra.ShellCompDirective) {
 	devsyConfig, err := config.LoadConfig(context, provider)
 	if err != nil {
 		return nil, cobra.ShellCompDirectiveError
 	}
 
-	providers, err := workspace.LoadAllProviders(devsyConfig, log.Default.ErrorStreamOnly())
+	providers, err := workspace.LoadAllProviders(devsyConfig, oldlog.Default.ErrorStreamOnly())
 	if err != nil {
 		return nil, cobra.ShellCompDirectiveError
 	}
@@ -109,7 +105,6 @@ func GetContextSuggestions(
 	args []string,
 	toComplete string,
 	owner platform.OwnerFilter,
-	logger log.Logger,
 ) ([]string, cobra.ShellCompDirective) {
 	devsyConfig, err := config.LoadConfig(context, provider)
 	if err != nil {

cmd/delete.go

@@ -9,8 +9,9 @@ import (
 	client2 "github.com/devsy-org/devsy/pkg/client"
 	"github.com/devsy-org/devsy/pkg/client/clientimplementation"
 	"github.com/devsy-org/devsy/pkg/config"
+	"github.com/devsy-org/devsy/pkg/log"
 	"github.com/devsy-org/devsy/pkg/workspace"
-	"github.com/devsy-org/log"
+	oldlog "github.com/devsy-org/log"
 	"github.com/spf13/cobra"
 )
 
@@ -43,7 +44,6 @@ If the workspace is not found, you can use the --ignore-not-found flag to treat
 				args,
 				toComplete,
 				cmd.Owner,
-				log.Default,
 			)
 		},
 	}
@@ -98,7 +98,7 @@ func (cmd *DeleteCmd) deleteSingle(
 		return err
 	}
 
-	log.Default.Donef("deleted workspace %s", name)
+	log.Infof("deleted workspace %s", name)
 
 	return nil
 }
@@ -117,7 +117,7 @@ func (cmd *DeleteCmd) deleteMultiple(
 			continue
 		}
 
-		log.Default.Donef("deleted workspace %s", name)
+		log.Infof("deleted workspace %s", name)
 	}
 
 	if len(errs) > 0 {
@@ -143,6 +143,6 @@ func (cmd *DeleteCmd) deleteWorkspace(
 		Force:          cmd.Force,
 		ClientDelete:   cmd.DeleteOptions,
 		Owner:          cmd.Owner,
-		Log:            log.Default,
+		Log:            oldlog.Default,
 	})
 }

cmd/export.go

@@ -10,7 +10,7 @@ import (
 	"github.com/devsy-org/devsy/pkg/config"
 	"github.com/devsy-org/devsy/pkg/provider"
 	workspace2 "github.com/devsy-org/devsy/pkg/workspace"
-	"github.com/devsy-org/log"
+	oldlog "github.com/devsy-org/log"
 	"github.com/spf13/cobra"
 )
 
@@ -47,7 +47,6 @@ func NewExportCmd(flags *flags.GlobalFlags) *cobra.Command {
 				args,
 				toComplete,
 				cmd.Owner,
-				log.Default,
 			)
 		},
 	}
@@ -58,12 +57,11 @@ func NewExportCmd(flags *flags.GlobalFlags) *cobra.Command {
 // Run runs the command logic.
 func (cmd *ExportCmd) Run(ctx context.Context, devsyConfig *config.Config, args []string) error {
 	// try to load workspace
-	logger := log.Default.ErrorStreamOnly()
 	client, err := workspace2.Get(ctx, workspace2.GetOptions{
 		DevsyConfig: devsyConfig,
 		Args:        args,
 		Owner:       cmd.Owner,
-		Log:         logger,
+		Log:         oldlog.Default,
 	})
 	if err != nil {
 		return err

cmd/helper/check_provider_update.go

@@ -13,15 +13,14 @@ import (
 	"github.com/devsy-org/devsy/pkg/config"
 	"github.com/devsy-org/devsy/pkg/provider"
 	"github.com/devsy-org/devsy/pkg/workspace"
-	"github.com/devsy-org/log"
+	oldlog "github.com/devsy-org/log"
 	"github.com/spf13/cobra"
 )
 
 var errProviderNotFound = errors.New("provider not found")
 
 type CheckProviderUpdateCmd struct {
 	*flags.GlobalFlags
-	log log.Logger
 }
 
 type providerVersionCheck struct {
@@ -33,7 +32,6 @@ type providerVersionCheck struct {
 func NewCheckProviderUpdateCmd(flags *flags.GlobalFlags) *cobra.Command {
 	cmd := &CheckProviderUpdateCmd{
 		GlobalFlags: flags,
-		log:         log.Default,
 	}
 	shellCmd := &cobra.Command{
 		Use:   "check-provider-update",
@@ -60,13 +58,17 @@ func (cmd *CheckProviderUpdateCmd) Run(
 	}
 	providerName := args[0]
 
-	providerSourceRaw, err := workspace.ResolveProviderSource(devsyConfig, providerName, cmd.log)
+	providerSourceRaw, err := workspace.ResolveProviderSource(
+		devsyConfig,
+		providerName,
+		oldlog.Default,
+	)
 	if err != nil {
 		return fmt.Errorf("provider %s doesn't exist", providerName)
 	}
 
 	// retrieve current config for provider
-	allProviders, err := workspace.LoadAllProviders(devsyConfig, cmd.log)
+	allProviders, err := workspace.LoadAllProviders(devsyConfig, oldlog.Default)
 	if err != nil {
 		return err
 	}
@@ -75,7 +77,7 @@ func (cmd *CheckProviderUpdateCmd) Run(
 		return errProviderNotFound
 	}
 
-	latestProviderConfig, err := loadLatestProvider(providerSourceRaw, cmd.log)
+	latestProviderConfig, err := loadLatestProvider(providerSourceRaw)
 	if err != nil {
 		return err
 	}
@@ -109,9 +111,8 @@ func (cmd *CheckProviderUpdateCmd) Run(
 
 func loadLatestProvider(
 	providerSourceRaw string,
-	log log.Logger,
 ) (*provider.ProviderConfig, error) {
-	providerRaw, _, err := workspace.ResolveProvider(providerSourceRaw, log)
+	providerRaw, _, err := workspace.ResolveProvider(providerSourceRaw, oldlog.Default)
 	if err != nil {
 		return nil, fmt.Errorf("resolve provider: %w", err)
 	}

cmd/helper/docker_credentials.go

@@ -7,7 +7,7 @@ import (
 	"github.com/devsy-org/devsy/cmd/flags"
 	"github.com/devsy-org/devsy/pkg/credentials"
 	"github.com/devsy-org/devsy/pkg/dockercredentials"
-	"github.com/devsy-org/log"
+	oldlog "github.com/devsy-org/log"
 	"github.com/spf13/cobra"
 )
 
@@ -42,5 +42,5 @@ func (c *DockerCredentialsHelperCmd) Run(cmd *cobra.Command, _ []string) error {
 		return fmt.Errorf("get port: %w", err)
 	}
 
-	return dockercredentials.ConfigureCredentialsContainer(u.Name, port, log.Default)
+	return dockercredentials.ConfigureCredentialsContainer(u.Name, port, oldlog.Default)
 }

cmd/helper/get_provider_name.go

@@ -8,7 +8,7 @@ import (
 	"github.com/devsy-org/devsy/cmd/flags"
 	"github.com/devsy-org/devsy/pkg/provider"
 	"github.com/devsy-org/devsy/pkg/workspace"
-	"github.com/devsy-org/log"
+	oldlog "github.com/devsy-org/log"
 	"github.com/spf13/cobra"
 )
 
@@ -37,7 +37,7 @@ func (cmd *GetProviderNameCmd) Run(ctx context.Context, args []string) error {
 		return fmt.Errorf("provider is missing")
 	}
 
-	providerRaw, _, err := workspace.ResolveProvider(args[0], log.Default.ErrorStreamOnly())
+	providerRaw, _, err := workspace.ResolveProvider(args[0], oldlog.Default.ErrorStreamOnly())
 	if err != nil {
 		return fmt.Errorf("resolve provider: %w", err)
 	}

cmd/helper/get_workspace_config.go

@@ -10,7 +10,8 @@ import (
 	"github.com/devsy-org/devsy/cmd/flags"
 	"github.com/devsy-org/devsy/pkg/config"
 	"github.com/devsy-org/devsy/pkg/devcontainer"
-	"github.com/devsy-org/log"
+	"github.com/devsy-org/devsy/pkg/log"
+	oldlog "github.com/devsy-org/log"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -43,7 +44,7 @@ func NewGetWorkspaceConfigCommand(flags *flags.GlobalFlags) *cobra.Command {
 			}
 
 			if cmd.maxDepth < 0 {
-				log.Default.Debugf("--max-depth was %d, setting to 0", cmd.maxDepth)
+				log.Debugf("--max-depth was %d, setting to 0", cmd.maxDepth)
 				cmd.maxDepth = 0
 			}
 
@@ -69,13 +70,13 @@ func (cmd *GetWorkspaceConfigCommand) Run(
 	}
 	rawSource := args[0]
 
-	level := log.Default.GetLevel()
+	level := oldlog.Default.GetLevel()
 	if cmd.Debug {
 		level = logrus.DebugLevel
 	}
-	var logger log.Logger = log.NewStdoutLogger(os.Stdin, os.Stdout, os.Stderr, level)
+	var logger oldlog.Logger = oldlog.NewStdoutLogger(os.Stdin, os.Stdout, os.Stderr, level)
 	if os.Getenv(config.EnvUI) == config.BoolTrue {
-		logger = log.Discard
+		logger = oldlog.Discard
 	}
 	logger.Debugf("Resolving devcontainer config for source: %s", rawSource)
 

cmd/helper/ssh_server.go

@@ -12,7 +12,7 @@ import (
 	"github.com/devsy-org/devsy/pkg/ssh/server/port"
 	"github.com/devsy-org/devsy/pkg/stdio"
 	"github.com/devsy-org/devsy/pkg/token"
-	"github.com/devsy-org/log"
+	oldlog "github.com/devsy-org/log"
 	"github.com/devsy-org/ssh"
 	"github.com/spf13/cobra"
 )
@@ -104,7 +104,7 @@ func (cmd *SSHServerCmd) Run(_ *cobra.Command, _ []string) error {
 		keys,
 		cmd.Workdir,
 		cmd.ReuseSSHAuthSock,
-		log.Default.ErrorStreamOnly(),
+		oldlog.Default.ErrorStreamOnly(),
 	)
 	if err != nil {
 		return err
@@ -152,7 +152,7 @@ func (cmd *SSHServerCmd) Run(_ *cobra.Command, _ []string) error {
 			return fmt.Errorf("address %s already in use: %w", cmd.Address, err)
 		}
 
-		log.Default.ErrorStreamOnly().Infof("address %s already in use", cmd.Address)
+		oldlog.Default.ErrorStreamOnly().Infof("address %s already in use", cmd.Address)
 		return nil
 	}