Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/account/account_producer_extension_info_pull.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var accountCompanyProducerExtensionInfoPullCmd = &cobra.Command{
return fmt.Errorf("cannot open file: %w", err)
}

zipExt, err := extension.GetExtensionByFolder(absolutePath)
zipExt, err := extension.GetExtensionByFolder(cmd.Context(), absolutePath)
if err != nil {
return fmt.Errorf("cannot open extension: %w", err)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/account/account_producer_extension_info_push.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ var accountCompanyProducerExtensionInfoPushCmd = &cobra.Command{
var zipExt extension.Extension

if stat.IsDir() {
zipExt, err = extension.GetExtensionByFolder(absolutePath)
zipExt, err = extension.GetExtensionByFolder(cmd.Context(), absolutePath)
} else {
zipExt, err = extension.GetExtensionByZip(absolutePath)
zipExt, err = extension.GetExtensionByZip(cmd.Context(), absolutePath)
}

if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/account/account_producer_extension_upload.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var accountCompanyProducerExtensionUploadCmd = &cobra.Command{
return err
}

zipExt, err := extension.GetExtensionByZip(path)
zipExt, err := extension.GetExtensionByZip(cmd.Context(), path)
if err != nil {
logging.FromContext(cmd.Context()).Debugf("Failed to read extension from zip: %v", err)
return err
Expand Down
4 changes: 2 additions & 2 deletions cmd/extension/extension_admin_watch.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ var extensionAdminWatchCmd = &cobra.Command{
var sources []asset.Source

for _, extensionPath := range args[:len(args)-1] {
ext, err := extension.GetExtensionByFolder(extensionPath)
ext, err := extension.GetExtensionByFolder(cmd.Context(), extensionPath)
if err != nil {
shopCfg, err := shop.ReadConfig(path.Join(extensionPath, shop.DefaultConfigFileName()), true)
shopCfg, err := shop.ReadConfig(cmd.Context(), path.Join(extensionPath, shop.DefaultConfigFileName()), true)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/extension/extension_ai_twig_upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var extensionAiTwigUpgradeCmd = &cobra.Command{
Short: "Upgrade Twig templates using AI",
Args: cobra.ExactArgs(3),
RunE: func(cmd *cobra.Command, args []string) error {
ext, err := extension.GetExtensionByFolder(args[0])
ext, err := extension.GetExtensionByFolder(cmd.Context(), args[0])
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/extension/extension_build.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var extensionAssetBundleCmd = &cobra.Command{
return fmt.Errorf("cannot open file: %w", err)
}

ext, err := extension.GetExtensionByFolder(path)
ext, err := extension.GetExtensionByFolder(cmd.Context(), path)
if err != nil {
return fmt.Errorf("cannot open extension: %w", err)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/extension/extension_changelog.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ var extensionChangelogCmd = &cobra.Command{
var ext extension.Extension

if stat.IsDir() {
ext, err = extension.GetExtensionByFolder(path)
ext, err = extension.GetExtensionByFolder(cmd.Context(), path)
} else {
ext, err = extension.GetExtensionByZip(path)
ext, err = extension.GetExtensionByZip(cmd.Context(), path)
}

if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/extension/extension_fix.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var extensionFixCmd = &cobra.Command{
return fmt.Errorf("cannot find path: %w", err)
}

ext, err := extension.GetExtensionByFolder(path)
ext, err := extension.GetExtensionByFolder(cmd.Context(), path)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/extension/extension_format.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var extensionFormat = &cobra.Command{
return fmt.Errorf("cannot find path: %w", err)
}

ext, err := extension.GetExtensionByFolder(path)
ext, err := extension.GetExtensionByFolder(cmd.Context(), path)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/extension/extension_name.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ var extensionNameCmd = &cobra.Command{
var ext extension.Extension

if stat.IsDir() {
ext, err = extension.GetExtensionByFolder(path)
ext, err = extension.GetExtensionByFolder(cmd.Context(), path)
} else {
ext, err = extension.GetExtensionByZip(path)
ext, err = extension.GetExtensionByZip(cmd.Context(), path)
}

if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/extension/extension_prepare.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var extensionPrepareCmd = &cobra.Command{
return fmt.Errorf("path not found: %w", err)
}

ext, err := extension.GetExtensionByFolder(path)
ext, err := extension.GetExtensionByFolder(cmd.Context(), path)
if err != nil {
return fmt.Errorf("detect extension type: %w", err)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/extension/extension_validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ var extensionValidateCmd = &cobra.Command{
tmpDir = args[0]
}

ext, err := extension.GetExtensionByFolder(tmpDir)
ext, err := extension.GetExtensionByFolder(cmd.Context(), tmpDir)
if err != nil {
return err
}
Expand All @@ -89,7 +89,7 @@ var extensionValidateCmd = &cobra.Command{

toolCfg.InputWasDirectory = true
} else {
ext, err := extension.GetExtensionByZip(args[0])
ext, err := extension.GetExtensionByZip(cmd.Context(), args[0])
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/extension/extension_version.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ var extensionVersionCmd = &cobra.Command{
var ext extension.Extension

if stat.IsDir() {
ext, err = extension.GetExtensionByFolder(path)
ext, err = extension.GetExtensionByFolder(cmd.Context(), path)
} else {
ext, err = extension.GetExtensionByZip(path)
ext, err = extension.GetExtensionByZip(cmd.Context(), path)
}

if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions cmd/extension/extension_zip.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ var extensionZipCmd = &cobra.Command{
branch = args[1]
}

ext, err := extension.GetExtensionByFolder(extPath)
ext, err := extension.GetExtensionByFolder(cmd.Context(), extPath)
if err != nil {
return fmt.Errorf("detect extension type: %w", err)
}
Expand Down Expand Up @@ -124,7 +124,7 @@ var extensionZipCmd = &cobra.Command{
}
}
var tempExt extension.Extension
if tempExt, err = extension.GetExtensionByFolder(extDir); err != nil {
if tempExt, err = extension.GetExtensionByFolder(cmd.Context(), extDir); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/project/ci.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ var projectCI = &cobra.Command{
// Remove annoying cache invalidation errors while asset install
_ = os.Setenv("SHOPWARE_SKIP_ASSET_INSTALL_CACHE_INVALIDATION", "1")

shopCfg, err := shop.ReadConfig(projectConfigPath, true)
shopCfg, err := shop.ReadConfig(cmd.Context(), projectConfigPath, true)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/project/project_admin_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var projectAdminApiCmd = &cobra.Command{
var cfg *shop.Config
var err error

if cfg, err = shop.ReadConfig(projectConfigPath, false); err != nil {
if cfg, err = shop.ReadConfig(cobraCmd.Context(), projectConfigPath, false); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/project/project_admin_build.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var projectAdminBuildCmd = &cobra.Command{
return err
}

shopCfg, err := shop.ReadConfig(projectConfigPath, true)
shopCfg, err := shop.ReadConfig(cmd.Context(), projectConfigPath, true)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/project/project_admin_watch.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var projectAdminWatchCmd = &cobra.Command{
return err
}

shopCfg, err := shop.ReadConfig(projectConfigPath, true)
shopCfg, err := shop.ReadConfig(cmd.Context(), projectConfigPath, true)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/project/project_clear_cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var projectClearCacheCmd = &cobra.Command{
var cfg *shop.Config
var err error

if cfg, err = shop.ReadConfig(projectConfigPath, false); err != nil {
if cfg, err = shop.ReadConfig(cmd.Context(), projectConfigPath, false); err != nil {
return err
}

Expand Down
5 changes: 4 additions & 1 deletion cmd/project/project_config_init.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"

"github.com/shopware/shopware-cli/internal/compatibility"
"github.com/shopware/shopware-cli/internal/shop"
"github.com/shopware/shopware-cli/internal/system"
"github.com/shopware/shopware-cli/logging"
Expand All @@ -21,7 +22,9 @@ var projectConfigInitCmd = &cobra.Command{
return fmt.Errorf("this command requires interaction, but interaction is disabled")
}

config := &shop.Config{}
config := &shop.Config{
CompatibilityDate: compatibility.DefaultDate(),
}

if err := askProjectConfig(config); err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion cmd/project/project_debug.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var projectDebug = &cobra.Command{
return err
}

shopCfg, err := shop.ReadConfig(projectConfigPath, true)
shopCfg, err := shop.ReadConfig(cmd.Context(), projectConfigPath, true)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/project/project_dump.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ var projectDatabaseDumpCmd = &cobra.Command{
dumper.InsertIntoLimit = insertIntoLimit

var projectCfg *shop.Config
if projectCfg, err = shop.ReadConfig(projectConfigPath, true); err != nil {
if projectCfg, err = shop.ReadConfig(cmd.Context(), projectConfigPath, true); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/project/project_extension_activate.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var projectExtensionActivateCmd = &cobra.Command{
var cfg *shop.Config
var err error

if cfg, err = shop.ReadConfig(projectConfigPath, false); err != nil {
if cfg, err = shop.ReadConfig(cmd.Context(), projectConfigPath, false); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/project/project_extension_deactivate.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var projectExtensionDeactivateCmd = &cobra.Command{
var cfg *shop.Config
var err error

if cfg, err = shop.ReadConfig(projectConfigPath, true); err != nil {
if cfg, err = shop.ReadConfig(cmd.Context(), projectConfigPath, true); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/project/project_extension_delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var projectExtensionDeleteCmd = &cobra.Command{
var cfg *shop.Config
var err error

if cfg, err = shop.ReadConfig(projectConfigPath, true); err != nil {
if cfg, err = shop.ReadConfig(cmd.Context(), projectConfigPath, true); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/project/project_extension_install.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var projectExtensionInstallCmd = &cobra.Command{
var cfg *shop.Config
var err error

if cfg, err = shop.ReadConfig(projectConfigPath, true); err != nil {
if cfg, err = shop.ReadConfig(cmd.Context(), projectConfigPath, true); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/project/project_extension_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var projectExtensionListCmd = &cobra.Command{

outputAsJson, _ := cmd.PersistentFlags().GetBool("json")

if cfg, err = shop.ReadConfig(projectConfigPath, true); err != nil {
if cfg, err = shop.ReadConfig(cmd.Context(), projectConfigPath, true); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/project/project_extension_outdated.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var projectExtensionOutdatedCmd = &cobra.Command{

outputAsJson, _ := cmd.PersistentFlags().GetBool("json")

if cfg, err = shop.ReadConfig(projectConfigPath, true); err != nil {
if cfg, err = shop.ReadConfig(cmd.Context(), projectConfigPath, true); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/project/project_extension_uninstall.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var projectExtensionUninstallCmd = &cobra.Command{
var cfg *shop.Config
var err error

if cfg, err = shop.ReadConfig(projectConfigPath, true); err != nil {
if cfg, err = shop.ReadConfig(cmd.Context(), projectConfigPath, true); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/project/project_extension_update.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var projectExtensionUpdateCmd = &cobra.Command{
var cfg *shop.Config
var err error

if cfg, err = shop.ReadConfig(projectConfigPath, true); err != nil {
if cfg, err = shop.ReadConfig(cmd.Context(), projectConfigPath, true); err != nil {
return err
}

Expand Down
10 changes: 5 additions & 5 deletions cmd/project/project_extension_upload.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ var projectExtensionUploadCmd = &cobra.Command{
isFolder := true

if stat.IsDir() {
ext, err = extension.GetExtensionByFolder(path)
ext, err = extension.GetExtensionByFolder(cmd.Context(), path)
} else {
ext, err = extension.GetExtensionByZip(path)
ext, err = extension.GetExtensionByZip(cmd.Context(), path)
isFolder = false
}

Expand All @@ -71,7 +71,7 @@ var projectExtensionUploadCmd = &cobra.Command{
return err
}

ext, err = extension.GetExtensionByFolder(ext.GetPath())
ext, err = extension.GetExtensionByFolder(cmd.Context(), ext.GetPath())
if err != nil {
return err
}
Expand Down Expand Up @@ -107,7 +107,7 @@ var projectExtensionUploadCmd = &cobra.Command{
return fmt.Errorf("copy files: %w", err)
}

ext, err = extension.GetExtensionByFolder(extDir)
ext, err = extension.GetExtensionByFolder(cmd.Context(), extDir)
if err != nil {
return err
}
Expand All @@ -118,7 +118,7 @@ var projectExtensionUploadCmd = &cobra.Command{
}
}

if cfg, err = shop.ReadConfig(projectConfigPath, true); err != nil {
if cfg, err = shop.ReadConfig(cmd.Context(), projectConfigPath, true); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/project/project_image_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ If a file is not found locally, it proxies the request to the upstream server.`,
return err
}

cfg, err := shop.ReadConfig(projectConfigPath, true)
cfg, err := shop.ReadConfig(cmd.Context(), projectConfigPath, true)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/project/project_storefront_build.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var projectStorefrontBuildCmd = &cobra.Command{
return err
}

shopCfg, err := shop.ReadConfig(projectConfigPath, true)
shopCfg, err := shop.ReadConfig(cmd.Context(), projectConfigPath, true)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/project/project_storefront_watch.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var projectStorefrontWatchCmd = &cobra.Command{
return err
}

shopCfg, err := shop.ReadConfig(projectConfigPath, true)
shopCfg, err := shop.ReadConfig(cmd.Context(), projectConfigPath, true)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/project/project_upgrade_check.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var projectUpgradeCheckCmd = &cobra.Command{
var shopwareVersion *version.Version
var extensions map[string]string

if cfg, err = shop.ReadConfig(projectConfigPath, true); err != nil {
if cfg, err = shop.ReadConfig(cmd.Context(), projectConfigPath, true); err != nil {
return err
}

Expand Down
Loading