Merge pull request #1391 from shopware/feat/backport

merge back

Author: shyim

.gitignore

@@ -23,6 +23,10 @@ dump.sql*
 .devenv*
 devenv.local.nix
 
+# mise local overrides
+/mise.local.toml
+/.mise.local.toml
+
 /.direnv
 /env-bridge/env-bridge
 

.golangci.yml

@@ -39,6 +39,7 @@ linters:
     - gocheckcompilerdirectives
     - godox
     - nilnil
+    - perfsprint
   exclusions:
     rules:
       - path: cmd\/*

CONTRIBUTING.md

@@ -44,6 +44,39 @@ golangci-lint run ./...
 
 Add or update tests for bug fixes and new behavior.
 
+### Using mise
+
+This repository includes a `mise.toml` file for managing the recommended Go
+and golangci-lint versions and for providing convenient development tasks.
+
+After installing mise, set up the project tools with:
+
+```sh
+mise install
+```
+
+You can then run the complete local check suite with:
+
+```sh
+mise run check
+```
+
+Individual tasks are also available:
+
+```sh
+mise run format       # Format Go source files
+mise run format-check # Check Go formatting (gofmt and gci) without changing files
+mise run build        # Build the shopware-cli binary
+mise run test         # Run the network-isolated test suite (Linux/macOS only)
+mise run test-unit    # Run Go tests without the sandbox wrapper (works everywhere)
+mise run vet          # Run go vet
+mise run lint         # Run golangci-lint
+```
+
+For machine-specific settings, create `mise.local.toml`. This file is ignored
+by Git and should not contain secrets that belong in a dedicated secret
+manager.
+
 ## Reviews
 
 Maintainers may ask for changes, suggest a different direction, or decline a PR if the approach was not discussed beforehand. That is not personal; it is how we keep the project consistent and sustainable.

README.md

@@ -75,6 +75,24 @@ If you need CI-friendly behavior, disable prompts:
 shopware-cli --no-interaction <command>
 ```
 
+Silence update notifications for a single command:
+
+```bash
+shopware-cli --no-update-hint
+```
+
+## Configuration
+
+### Disable update notifications
+
+To disable update notifications for the current shell session, set:
+
+```bash
+export SHOPWARE_CLI_NO_UPDATE_NOTIFICATION=true
+```
+
+To make the setting **persistent**, add the export command to your shell profile, such as `~/.bashrc` or `~/.zshrc`.
+
 ## Repository Layout
 
 - `cmd/`: Cobra command groups for account, extension, and project workflows

cmd/extension/extension_admin_watch.go

@@ -77,7 +77,7 @@ var extensionAdminWatchCmd = &cobra.Command{
 		cfgs := extension.BuildAssetConfigFromExtensions(cmd.Context(), sources, extension.AssetBuildConfig{}).FilterByAdmin()
 
 		if len(cfgs) == 0 {
-			return fmt.Errorf("found nothing to compile")
+			return errors.New("found nothing to compile")
 		}
 
 		if _, err := extension.InstallNodeModulesOfConfigs(cmd.Context(), cfgs, extension.AssetBuildConfig{}); err != nil {
@@ -125,7 +125,7 @@ var extensionAdminWatchCmd = &cobra.Command{
 		listenSplit := strings.Split(adminWatchListen, ":")
 
 		if len(listenSplit) != 2 {
-			return fmt.Errorf("listen should contain a colon")
+			return errors.New("listen should contain a colon")
 		}
 
 		if len(adminWatchURL) == 0 {
@@ -184,7 +184,7 @@ var extensionAdminWatchCmd = &cobra.Command{
 
 			// Modify admin url index page to load anything from our watcher
 			if req.URL.Path == targetShopUrl.Path+"/admin" {
-				resp, err := http.Get(fmt.Sprintf("%s/admin", targetShopUrl.Scheme+schemeHostSeparator+targetShopUrl.Host))
+				resp, err := http.Get(targetShopUrl.Scheme + schemeHostSeparator + targetShopUrl.Host + "/admin")
 				if err != nil {
 					logging.FromContext(cmd.Context()).Errorf("proxy failed %v", err)
 					w.WriteHeader(http.StatusInternalServerError)

cmd/extension/extension_config_init.go

@@ -1,7 +1,7 @@
 package extension
 
 import (
-	"fmt"
+	"errors"
 	"path/filepath"
 
 	"charm.land/huh/v2"
@@ -44,15 +44,15 @@ Examples:
 			form := huh.NewForm(
 				huh.NewGroup(
 					huh.NewConfirm().
-						Title(fmt.Sprintf("%s already exists. Overwrite?", extension.ConfigFileName)).
+						Title(extension.ConfigFileName + " already exists. Overwrite?").
 						Value(&overwrite),
 				),
 			)
 			if err := form.Run(); err != nil {
 				return err
 			}
 			if !overwrite {
-				return fmt.Errorf("aborted: config already exists (pass --force to overwrite)")
+				return errors.New("aborted: config already exists (pass --force to overwrite)")
 			}
 			force = true
 		}

cmd/extension/extension_fix.go

@@ -1,6 +1,7 @@
 package extension
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -25,7 +26,7 @@ var extensionFixCmd = &cobra.Command{
 
 		if !allowNonGit {
 			if stat, err := os.Stat(filepath.Join(args[0], ".git")); err != nil || !stat.IsDir() {
-				return fmt.Errorf("provided folder is not a git repository. Use --allow-non-git flag to run anyway")
+				return errors.New("provided folder is not a git repository. Use --allow-non-git flag to run anyway")
 			}
 		}
 

cmd/extension/extension_package.go

@@ -191,7 +191,7 @@ var extensionPackageCmd = &cobra.Command{
 		if len(fileName) == 0 {
 			fileName = fmt.Sprintf("%s-%s.zip", name, tag)
 			if len(tag) == 0 {
-				fileName = fmt.Sprintf("%s.zip", name)
+				fileName = name + ".zip"
 			}
 		}
 
@@ -247,8 +247,8 @@ func getStringOnStringError(val string, _ error) string {
 
 func executeHooks(ctx context.Context, ext extension.Extension, hooks []string, extDir string) error {
 	env := []string{
-		fmt.Sprintf("EXTENSION_DIR=%s", extDir),
-		fmt.Sprintf("ORIGINAL_EXTENSION_DIR=%s", ext.GetPath()),
+		"EXTENSION_DIR=" + extDir,
+		"ORIGINAL_EXTENSION_DIR=" + ext.GetPath(),
 	}
 
 	for _, hook := range hooks {

cmd/project/ci.go

@@ -3,6 +3,7 @@ package project
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 	"os/exec"
@@ -423,7 +424,7 @@ func projectCISafetyCheck(ctx context.Context, root string, force bool, getenv f
 	}
 
 	if dirty {
-		return fmt.Errorf("project ci removes source files and creates build stubs; refusing to run outside CI with a dirty git working tree. Commit, stash, or clean local changes, or pass --force if you intentionally want to run it")
+		return errors.New("project ci removes source files and creates build stubs; refusing to run outside CI with a dirty git working tree. Commit, stash, or clean local changes, or pass --force if you intentionally want to run it")
 	}
 
 	logging.FromContext(ctx).Warnf("Running project ci outside a CI environment; this command removes source files and should usually only be used in CI")
@@ -504,7 +505,7 @@ func executeCIHooks(ctx context.Context, sectionName string, hooks []string, roo
 		hookCmd.Stdout = os.Stdout
 		hookCmd.Stderr = os.Stderr
 		hookCmd.Dir = root
-		hookCmd.Env = append(os.Environ(), fmt.Sprintf("PROJECT_ROOT=%s", root))
+		hookCmd.Env = append(os.Environ(), "PROJECT_ROOT="+root)
 
 		if err := hookCmd.Run(); err != nil {
 			return fmt.Errorf("hook failed (%s): %w", hook, err)

cmd/project/executor.go

@@ -1,6 +1,8 @@
 package project
 
 import (
+	"database/sql"
+
 	"github.com/spf13/cobra"
 
 	"github.com/shopware/shopware-cli/internal/executor"
@@ -21,3 +23,36 @@ func resolveExecutor(cmd *cobra.Command, projectRoot string) (executor.Executor,
 
 	return executor.New(projectRoot, envCfg, cfg)
 }
+
+// resolveProjectDatabaseConnection resolves the database credentials of the
+// current environment through its executor.
+func resolveProjectDatabaseConnection(cmd *cobra.Command) (*executor.DatabaseConnection, error) {
+	projectRoot, err := findClosestShopwareProject()
+	if err != nil {
+		return nil, err
+	}
+
+	cmdExecutor, err := resolveExecutor(cmd, projectRoot)
+	if err != nil {
+		return nil, err
+	}
+
+	return cmdExecutor.DatabaseConnection(cmd.Context())
+}
+
+// connectProjectDatabase resolves the database of the current environment and
+// opens a single dedicated connection to it. The returned cleanup closes
+// connection and pool.
+func connectProjectDatabase(cmd *cobra.Command) (*sql.Conn, *executor.DatabaseConnection, func(), error) {
+	dbConn, err := resolveProjectDatabaseConnection(cmd)
+	if err != nil {
+		return nil, nil, nil, err
+	}
+
+	conn, cleanup, err := dbConn.Open(cmd.Context())
+	if err != nil {
+		return nil, nil, nil, err
+	}
+
+	return conn, dbConn, cleanup, nil
+}