feat: key make support custom env path (#237)

* feat: key make support custom env path * refactor: env path * fix: tests * fix: flag Parse * feat: optimize env
goravel · Jul 10, 2023 · 4b0ca1d · 4b0ca1d
1 parent 23981ff
commit 4b0ca1d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/auth/console/jwt_secret_command.go b/auth/console/jwt_secret_command.go
@@ -10,6 +10,7 @@ import (
 	"github.com/goravel/framework/contracts/config"
 	"github.com/goravel/framework/contracts/console"
 	"github.com/goravel/framework/contracts/console/command"
+	"github.com/goravel/framework/support"
 	"github.com/goravel/framework/support/str"
 )
 
@@ -77,14 +78,14 @@ func (receiver *JwtSecretCommand) setSecretInEnvironmentFile(key string) error {
 
 // writeNewEnvironmentFileWith Write a new environment file with the given key.
 func (receiver *JwtSecretCommand) writeNewEnvironmentFileWith(key string) error {
-	content, err := os.ReadFile(".env")
+	content, err := os.ReadFile(support.EnvPath)
 	if err != nil {
 		return err
 	}
 
 	newContent := strings.Replace(string(content), "JWT_SECRET="+receiver.config.GetString("jwt.secret"), "JWT_SECRET="+key, 1)
 
-	err = os.WriteFile(".env", []byte(newContent), 0644)
+	err = os.WriteFile(support.EnvPath, []byte(newContent), 0644)
 	if err != nil {
 		return err
 	}

diff --git a/config/service_provider.go b/config/service_provider.go
@@ -1,8 +1,6 @@
 package config
 
 import (
-	"flag"
-
 	"github.com/goravel/framework/contracts/foundation"
 	"github.com/goravel/framework/support"
 )
@@ -13,17 +11,8 @@ type ServiceProvider struct {
 }
 
 func (config *ServiceProvider) Register(app foundation.Application) {
-	var env *string
-	if support.Env == support.EnvTest {
-		testEnv := ".env"
-		env = &testEnv
-	} else {
-		env = flag.String("env", ".env", "custom .env path")
-		flag.Parse()
-	}
-
 	app.Singleton(Binding, func(app foundation.Application) (any, error) {
-		return NewApplication(*env), nil
+		return NewApplication(support.EnvPath), nil
 	})
 }
 

diff --git a/console/console/key_generate_command.go b/console/console/key_generate_command.go
@@ -10,6 +10,7 @@ import (
 	"github.com/goravel/framework/contracts/config"
 	"github.com/goravel/framework/contracts/console"
 	"github.com/goravel/framework/contracts/console/command"
+	"github.com/goravel/framework/support"
 	"github.com/goravel/framework/support/str"
 )
 
@@ -82,14 +83,14 @@ func (receiver *KeyGenerateCommand) generateRandomKey() string {
 
 // writeNewEnvironmentFileWith Write a new environment file with the given key.
 func (receiver *KeyGenerateCommand) writeNewEnvironmentFileWith(key string) error {
-	content, err := os.ReadFile(".env")
+	content, err := os.ReadFile(support.EnvPath)
 	if err != nil {
 		return err
 	}
 
 	newContent := strings.Replace(string(content), "APP_KEY="+receiver.config.GetString("app.key"), "APP_KEY="+key, 1)
 
-	err = os.WriteFile(".env", []byte(newContent), 0644)
+	err = os.WriteFile(support.EnvPath, []byte(newContent), 0644)
 	if err != nil {
 		return err
 	}

diff --git a/foundation/application.go b/foundation/application.go
@@ -1,6 +1,7 @@
 package foundation
 
 import (
+	"flag"
 	"os"
 	"path/filepath"
 	"strings"
@@ -178,6 +179,17 @@ func setEnv() {
 			support.Env = support.EnvArtisan
 		}
 	}
+
+	var env *string
+	if !flag.Parsed() && support.Env != support.EnvTest {
+		env = flag.String("env", ".env", "custom .env path")
+		flag.Parse()
+	} else {
+		testEnv := ".env"
+		env = &testEnv
+	}
+
+	support.EnvPath = *env
 }
 
 func setRootPath() {

diff --git a/support/constant.go b/support/constant.go
@@ -10,5 +10,6 @@ const (
 
 var (
 	Env      = EnvRuntime
+	EnvPath  = ".env"
 	RootPath string
 )