get proxy address from an environment variable

This is more inline with what we already do to chage the API location

Author: glommer

internal/cmd/db_shell.go

@@ -20,16 +20,10 @@ import (
 	"github.com/tursodatabase/turso-cli/internal/turso"
 )
 
-var proxy string
-
 func init() {
 	dbCmd.AddCommand(shellCmd)
 	addInstanceFlag(shellCmd, "Connect to the database at the specified instance.")
 	addLocationFlag(shellCmd, "Connect to the database at the specified location.")
-	shellCmd.Flags().StringVar(&proxy, "proxy", "", "Proxy to use for the connection.")
-	shellCmd.RegisterFlagCompletionFunc("proxy", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return []string{}, cobra.ShellCompDirectiveNoFileComp
-	})
 	flags.AddAttachClaims(shellCmd)
 }
 
@@ -222,7 +216,7 @@ var shellCmd = &cobra.Command{
 
 		shellConfig := shell.ShellConfig{
 			DbUri:          dbUrl,
-			Proxy:          proxy,
+			Proxy:          getTursoProxyUrl(),
 			AuthToken:      authToken,
 			InF:            cmd.InOrStdin(),
 			OutF:           cmd.OutOrStdout(),

internal/cmd/utils.go

@@ -265,6 +265,11 @@ func getTursoUrl() string {
 	return url
 }
 
+func getTursoProxyUrl() string {
+	config, _ := settings.ReadSettings() // ok to ignore, we'll fallback to default
+	return config.GetProxyURL()
+}
+
 func promptConfirmation(prompt string) (bool, error) {
 	reader := bufio.NewReader(os.Stdin)
 

internal/settings/settings.go

@@ -34,6 +34,7 @@ func ReadSettings() (*Settings, error) {
 	configPath := configdir.LocalConfig("turso")
 	viper.BindEnv("config-path", "TURSO_CONFIG_FOLDER")
 	viper.BindEnv("baseURL", "TURSO_API_BASEURL")
+	viper.BindEnv("proxyURL", "TURSO_PROXY_URL")
 
 	configPathFlag := viper.GetString("config-path")
 	if len(configPathFlag) > 0 {
@@ -143,6 +144,10 @@ func (s *Settings) GetBaseURL() string {
 	return viper.GetString("baseURL")
 }
 
+func (s *Settings) GetProxyURL() string {
+	return viper.GetString("proxyURL")
+}
+
 func (s *Settings) SetAutoupdate(autoupdate string) {
 	config := viper.GetStringMap("config")
 	if config == nil {