Add dotenv support to run and login commands

Author: chicoxyzzy

cli/config.go

@@ -23,9 +23,15 @@ var (
 	DispatchConsoleUrl       string
 
 	DispatchConfigPath string
+
+	DotEnvFilePath string
 )
 
 func init() {
+	setVariables()
+}
+
+func setVariables() {
 	DispatchApiUrl = os.Getenv("DISPATCH_API_URL")
 	if DispatchApiUrl == "" {
 		DispatchApiUrl = "https://api.dispatch.run"

cli/env_file.go

@@ -0,0 +1,24 @@
+package cli
+
+import (
+	"fmt"
+	"log/slog"
+	"path/filepath"
+
+	"github.com/joho/godotenv"
+)
+
+func loadEnvFromFile(path string) error {
+	if path != "" {
+		absolutePath, err := filepath.Abs(path)
+		if err != nil {
+			return fmt.Errorf("failed to get absolute path for %s: %v", path, err)
+		}
+		if godotenv.Load(path) != nil {
+			return fmt.Errorf("failed to load env file from %s", absolutePath)
+		}
+		slog.Info("loading environment variables from file", "path", absolutePath)
+	}
+	setVariables()
+	return nil
+}

cli/login.go

@@ -22,6 +22,9 @@ account or login to an existing account.
 
 After authenticating with Dispatch, the API key will be persisted locally.`,
 		GroupID: "management",
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			return loadEnvFromFile(DotEnvFilePath)
+		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			token, err := generateToken()
 			if err != nil {

cli/main.go

@@ -24,6 +24,7 @@ Support: [email protected]
 		},
 	}
 	cmd.PersistentFlags().StringVarP(&DispatchApiKeyCli, "api-key", "k", "", "Dispatch API key (env: DISPATCH_API_KEY)")
+	cmd.PersistentFlags().StringVarP(&DotEnvFilePath, "env-file", "", "", "Path to .env file")
 
 	cmd.AddGroup(&cobra.Group{
 		ID:    "management",

cli/run.go

@@ -84,6 +84,9 @@ previous run.`, defaultEndpoint),
 		SilenceUsage: true,
 		GroupID:      "dispatch",
 		PreRunE: func(cmd *cobra.Command, args []string) error {
+			if err := loadEnvFromFile(DotEnvFilePath); err != nil {
+				return err
+			}
 			return runConfigFlow()
 		},
 		RunE: func(c *cobra.Command, args []string) error {

go.mod

@@ -21,6 +21,7 @@ require (
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/joho/godotenv v1.5.1 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mattn/go-isatty v0.0.18 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect

go.sum

@@ -23,6 +23,8 @@ github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=