refactor: add context to SetupTools and improve Docker container configuration

Author: shyim

Dockerfile.base

@@ -71,7 +71,6 @@ EOF
 
 ENV SHOPWARE_CLI_TOOLS_DIR=/opt/verifier
 
-
 COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
 
 CMD ["sh"]

cmd/extension/extension_fix.go

@@ -17,7 +17,7 @@ var extensionFixCmd = &cobra.Command{
 	Use:   "fix",
 	Short: "Fix an extension",
 	PreRunE: func(cmd *cobra.Command, args []string) error {
-		return verifier.SetupTools(cmd.Root().Version)
+		return verifier.SetupTools(cmd.Context(), cmd.Root().Version)
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		allowNonGit, _ := cmd.Flags().GetBool("allow-non-git")

cmd/extension/extension_format.go

@@ -16,7 +16,7 @@ var extensionFormat = &cobra.Command{
 	Use:   "format",
 	Short: "Format an extension",
 	PreRunE: func(cmd *cobra.Command, args []string) error {
-		return verifier.SetupTools(cmd.Root().Version)
+		return verifier.SetupTools(cmd.Context(), cmd.Root().Version)
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		dryRun, _ := cmd.Flags().GetBool("dry-run")

cmd/extension/extension_validate.go

@@ -11,6 +11,7 @@ import (
 	"github.com/shopware/shopware-cli/extension"
 	"github.com/shopware/shopware-cli/internal/system"
 	"github.com/shopware/shopware-cli/internal/verifier"
+	"github.com/shopware/shopware-cli/logging"
 )
 
 var extensionValidateCmd = &cobra.Command{
@@ -49,8 +50,18 @@ var extensionValidateCmd = &cobra.Command{
 		var toolCfg *verifier.ToolConfig
 
 		if stat.IsDir() {
-			if err := system.CopyFiles(args[0], tmpDir); err != nil {
-				return err
+			if isFull {
+				if err := system.CopyFiles(args[0], tmpDir); err != nil {
+					return err
+				}
+
+				defer func() {
+					if err := os.RemoveAll(tmpDir); err != nil {
+						logging.FromContext(cmd.Context()).Error("Failed to remove temporary directory:", err)
+					}
+				}()
+			} else {
+				tmpDir = args[0]
 			}
 
 			ext, err := extension.GetExtensionByFolder(path)
@@ -126,6 +137,6 @@ func init() {
 			return nil
 		}
 
-		return verifier.SetupTools("latest")
+		return verifier.SetupTools(cmd.Context(), cmd.Root().Version)
 	}
 }

cmd/project/project_fix.go

@@ -14,6 +14,9 @@ import (
 var projectFixCmd = &cobra.Command{
 	Use:   "fix",
 	Short: "Fix project",
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		return verifier.SetupTools(cmd.Context(), cmd.Root().Version)
+	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		allowNonGit, _ := cmd.Flags().GetBool("allow-non-git")
 		gitPath := filepath.Join(args[0], ".git")

cmd/project/project_format.go

@@ -13,6 +13,9 @@ import (
 var projectFormatCmd = &cobra.Command{
 	Use:   "format",
 	Short: "Format project",
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		return verifier.SetupTools(cmd.Context(), cmd.Root().Version)
+	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		var err error
 		only, _ := cmd.Flags().GetString("only")

cmd/project/project_validate.go

@@ -15,6 +15,9 @@ import (
 var projectValidateCmd = &cobra.Command{
 	Use:   "validate",
 	Short: "Validate project",
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		return verifier.SetupTools(cmd.Context(), cmd.Root().Version)
+	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		reportingFormat, _ := cmd.Flags().GetString("reporter")
 		only, _ := cmd.Flags().GetString("only")

internal/verifier/embed.go

@@ -1,6 +1,7 @@
 package verifier
 
 import (
+	"context"
 	"embed"
 	"fmt"
 	"log"
@@ -9,14 +10,16 @@ import (
 	"path"
 
 	"github.com/shopware/shopware-cli/internal/system"
+	"github.com/shopware/shopware-cli/logging"
 )
 
 //go:embed php/composer.json php/composer.lock php/configs js/configs js/packages js/package*.json
 var toolsFS embed.FS
 
-func SetupTools(currentVersion string) error {
+func SetupTools(ctx context.Context, currentVersion string) error {
 	customToolDir := os.Getenv("SHOPWARE_CLI_TOOLS_DIR")
 	if customToolDir != "" {
+		logging.FromContext(ctx).Debugf("Using custom tool directory: %s", customToolDir)
 		setToolDirectory(customToolDir)
 		return nil
 	}
@@ -25,10 +28,12 @@ func SetupTools(currentVersion string) error {
 	toolsDir := path.Join(cacheDir, "tools", currentVersion)
 
 	if _, err := os.Stat(toolsDir); err == nil {
+		logging.FromContext(ctx).Debugf("Using cached tool directory: %s", toolsDir)
 		setToolDirectory(toolsDir)
 		return nil
 	}
 
+	logging.FromContext(ctx).Debugf("Using tool directory: %s", toolsDir)
 	if err := os.MkdirAll(toolsDir, os.ModePerm); err != nil {
 		return fmt.Errorf("failed to create directory %s: %w", toolsDir, err)
 	}