Merge branch 'master' into kkumar-gcc/#726-auto-instrumentation

Author: krishankumar01

README.md

@@ -118,6 +118,7 @@ This project exists thanks to all the people who contribute, to participate in t
 <a href="https://github.com/zoryamba" target="_blank"><img src="https://github.com/u/21248500?v=4" width="48" height="48"></a>
 <a href="https://github.com/oguzhankrcb" target="_blank"><img src="https://github.com/u/7572058?v=4" width="48" height="48"></a>
 <a href="https://github.com/ChisThanh" target="_blank"><img src="https://github.com/u/93512710?v=4" width="48" height="48"></a>
+<a href="https://github.com/wyicwx" target="_blank"><img src="https://github.com/u/1241187?v=4" width="48" height="48"></a>
 
 ## Sponsor
 

README_zh.md

@@ -116,6 +116,7 @@ err := facades.Queue().Job(&jobs.Test{}, []queue.Arg{}).Dispatch()
 <a href="https://github.com/zoryamba" target="_blank"><img src="https://github.com/u/21248500?v=4" width="48" height="48"></a>
 <a href="https://github.com/oguzhankrcb" target="_blank"><img src="https://github.com/u/7572058?v=4" width="48" height="48"></a>
 <a href="https://github.com/ChisThanh" target="_blank"><img src="https://github.com/u/93512710?v=4" width="48" height="48"></a>
+<a href="https://github.com/wyicwx" target="_blank"><img src="https://github.com/u/1241187?v=4" width="48" height="48"></a>
 
 ## 打赏
 

console/service_provider.go

@@ -53,7 +53,31 @@ func (r *ServiceProvider) registerCommands(app foundation.Application) {
 		console.NewKeyGenerateCommand(configFacade),
 		console.NewMakeCommand(),
 		console.NewBuildCommand(configFacade),
-		console.NewDeployCommand(configFacade, artisanFacade),
+		// The deploy command is not completely ready yet, comment it out for now.
+		// https://github.com/goravel/goravel/issues/778
+		// https://github.com/goravel/goravel/issues/804
+		// Add the configuration when the command is enabled.
+		// "deploy": map[string]any{
+		// 	"base_dir":                  config.Env("DEPLOY_BASE_DIR", "/var/www/"),
+		// 	"ssh_ip":                    config.Env("DEPLOY_SSH_IP", "127.0.0.1"),
+		// 	"reverse_proxy_port":        config.Env("DEPLOY_REVERSE_PROXY_PORT", "9000"),
+		// 	"ssh_port":                  config.Env("DEPLOY_SSH_PORT", "22"),
+		// 	"ssh_user":                  config.Env("DEPLOY_SSH_USER", "root"),
+		// 	"ssh_key_path":              config.Env("DEPLOY_SSH_KEY_PATH", "~/.ssh/id_rsa"),
+		// 	"prod_env_file_path":        config.Env("DEPLOY_PROD_ENV_FILE_PATH", ".env.production"),
+		// 	"domain":                    config.Env("DEPLOY_DOMAIN", ""),
+		// 	"env_decrypt_key":           config.Env("DEPLOY_ENV_DECRYPT_KEY", ""),
+		// 	"reverse_proxy_enabled":     config.Env("DEPLOY_REVERSE_PROXY_ENABLED", true),
+		// 	"reverse_proxy_tls_enabled": config.Env("DEPLOY_REVERSE_PROXY_TLS_ENABLED", true),
+		// 	"remote_env_decrypt":        config.Env("DEPLOY_REMOTE_ENV_DECRYPT", false),
+		// },
+
+		// "build": map[string]any{
+		// 	"os":     config.Env("DEPLOY_OS", "linux"),
+		// 	"arch":   config.Env("DEPLOY_ARCH", "amd64"),
+		// 	"static": config.Env("DEPLOY_STATIC", true),
+		// },
+		// console.NewDeployCommand(configFacade, artisanFacade),
 		console.NewHelpCommand(),
 	})
 }

foundation/console/package_install_command.go

@@ -59,11 +59,22 @@ func (r *PackageInstallCommand) Extend() command.Extend {
 		Category:  "package",
 		Flags: []command.Flag{
 			&command.BoolFlag{
-				Name:    "all-facades",
+				Name:    "all",
 				Usage:   "Install all facades",
 				Aliases: []string{"a"},
 				Value:   false,
 			},
+			&command.BoolFlag{
+				Name:    "default",
+				Usage:   "Install facades with default drivers",
+				Aliases: []string{"d"},
+				Value:   false,
+			},
+			&command.BoolFlag{
+				Name:  "dev",
+				Usage: "Install drivers with the master branch",
+				Value: false,
+			},
 		},
 	}
 }
@@ -73,7 +84,7 @@ func (r *PackageInstallCommand) Handle(ctx console.Context) error {
 	names := ctx.Arguments()
 
 	if len(names) == 0 {
-		if ctx.OptionBool("all-facades") {
+		if ctx.OptionBool("all") {
 			names = getAvailableFacades(r.bindings)
 		} else {
 			var err error
@@ -160,6 +171,10 @@ func (r *PackageInstallCommand) inputThirdPackage(ctx console.Context) (string,
 }
 
 func (r *PackageInstallCommand) installPackage(ctx console.Context, pkg string) error {
+	if !strings.Contains(pkg, "@") && ctx.OptionBool("dev") {
+		pkg += "@master"
+	}
+
 	pkgPath, _, _ := strings.Cut(pkg, "@")
 	setup := pkgPath + "/setup"
 
@@ -169,7 +184,7 @@ func (r *PackageInstallCommand) installPackage(ctx console.Context, pkg string)
 	}
 
 	// install package
-	if err := supportconsole.ExecuteCommand(ctx, exec.Command("go", "run", setup, "install", "--package-name="+env.MainPath(), "--paths="+r.paths)); err != nil {
+	if err := supportconsole.ExecuteCommand(ctx, exec.Command("go", "run", setup, "install", "--main-path="+env.MainPath(), "--paths="+r.paths)); err != nil {
 		return fmt.Errorf("failed to install package: %s", err)
 	}
 
@@ -192,7 +207,7 @@ func (r *PackageInstallCommand) installFacade(ctx console.Context, name string)
 	}
 
 	bindingsToInstall := r.getBindingsToInstall(binding)
-	if len(bindingsToInstall) > 0 && !ctx.OptionBool("all-facades") {
+	if len(bindingsToInstall) > 0 && !ctx.OptionBool("all") {
 		facades := make([]string, len(bindingsToInstall))
 		for i := range bindingsToInstall {
 			facades[i] = convert.BindingToFacade(bindingsToInstall[i])
@@ -210,7 +225,7 @@ func (r *PackageInstallCommand) installFacade(ctx console.Context, name string)
 			continue
 		}
 
-		if err := supportconsole.ExecuteCommand(ctx, exec.Command("go", "run", setup, "install", "--facade="+facade, "--package-name="+env.MainPath(), "--paths="+r.paths)); err != nil {
+		if err := supportconsole.ExecuteCommand(ctx, exec.Command("go", "run", setup, "install", "--facade="+facade, "--main-path="+env.MainPath(), "--paths="+r.paths)); err != nil {
 			return fmt.Errorf("failed to install facade %s: %s", facade, err.Error())
 		}
 
@@ -271,27 +286,33 @@ func (r *PackageInstallCommand) installDriver(ctx console.Context, facade string
 		Value: "Custom",
 	})
 
-	driver, err := ctx.Choice(fmt.Sprintf("Select the %s driver to install", facade), options, console.ChoiceOption{
-		Description: fmt.Sprintf("A driver is required for %s, please select one to install.", facade),
-	})
-	if err != nil {
-		return err
-	}
-
-	if driver == "Custom" {
-		driver, err = ctx.Ask(fmt.Sprintf("Please enter the %s driver package", facade))
+	var driver string
+	if ctx.OptionBool("default") {
+		driver = options[0].Value
+	} else {
+		var err error
+		driver, err = ctx.Choice(fmt.Sprintf("Select the %s driver to install", facade), options, console.ChoiceOption{
+			Description: fmt.Sprintf("A driver is required for %s, please select one to install.", facade),
+		})
 		if err != nil {
 			return err
 		}
-	}
 
-	if driver == "" {
-		return r.installDriver(ctx, facade, bindingInfo)
+		if driver == "Custom" {
+			driver, err = ctx.Ask(fmt.Sprintf("Please enter the %s driver package", facade))
+			if err != nil {
+				return err
+			}
+		}
+
+		if driver == "" {
+			return r.installDriver(ctx, facade, bindingInfo)
+		}
 	}
 
 	if isInternalDriver(driver) {
 		setup := bindingInfo.PkgPath + "/setup"
-		if err := supportconsole.ExecuteCommand(ctx, exec.Command("go", "run", setup, "install", "--driver="+driver, "--package-name="+env.MainPath(), "--paths="+r.paths)); err != nil {
+		if err := supportconsole.ExecuteCommand(ctx, exec.Command("go", "run", setup, "install", "--driver="+driver, "--main-path="+env.MainPath(), "--paths="+r.paths)); err != nil {
 			return fmt.Errorf("failed to install driver %s: %s", driver, err.Error())
 		}