updating CLI to use v1.4.0-rc2 of the core

Author: dstpierre

cmd/root.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"path"
 
 	"github.com/gookit/color"
 	"github.com/spf13/cobra"
@@ -95,15 +96,22 @@ func initConfig() {
 		// Use config file from the flag.
 		viper.SetConfigFile(cfgFile)
 	} else {
-		// Find home directory.
+		// add current working directory
 		pwd, err := os.Getwd()
 		if err != nil {
 			fmt.Println(err)
 			os.Exit(1)
 		}
 
+		confDir, err := os.UserConfigDir()
+		if err != nil {
+			fmt.Println(err)
+			os.Exit(1)
+		}
+
 		// Search config in home directory with name ".cli" (without extension).
 		viper.AddConfigPath(pwd)
+		viper.AddConfigPath(path.Join(confDir, "backend"))
 		viper.SetConfigName(".backend")
 	}
 

cmd/server.go

@@ -3,10 +3,10 @@ package cmd
 import (
 	"fmt"
 	"net/http"
-	"os"
 	"time"
 
 	staticbackend "github.com/staticbackendhq/core"
+	sbconfig "github.com/staticbackendhq/core/config"
 
 	"github.com/gookit/color"
 	"github.com/spf13/cobra"
@@ -24,20 +24,6 @@ var (
 	verbose bool
 )
 
-func init() {
-	// initialize minimum env variables
-	//TODO: find another way to provide config to server
-	os.Setenv("SB_FROM_CLI", "yes")
-	os.Setenv("APP_ENV", "dev")
-	os.Setenv("DATA_STORE", "mem")
-	os.Setenv("JWT_SECRET", "fromcli")
-	os.Setenv("MAIL_PROVIDER", "dev")
-	os.Setenv("STORAGE_PROVIDER", "local")
-	os.Setenv("FROM_EMAIL", "you@cli.com")
-	os.Setenv("FROM_NAME", "from cli")
-	os.Setenv("LOCAL_STORAGE_URL", "http://localhost:8099")
-}
-
 // serverCmd represents the server command
 var serverCmd = &cobra.Command{
 	Use:   "server",
@@ -71,7 +57,15 @@ There are some limitations that you can learn more about here.
 		)
 		go createCustomer(uri, f.Value.String())
 
-		staticbackend.Start("mem", f.Value.String())
+		c := sbconfig.AppConfig{
+			FromCLI:         "yes",
+			Port:            f.Value.String(),
+			DatabaseURL:     "mem",
+			DataStore:       "mem",
+			LocalStorageURL: "http://localhost:8099",
+		}
+
+		staticbackend.Start(c)
 	},
 }
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/staticbackendhq/cli
 
-go 1.13
+go 1.18
 
 require (
 	github.com/google/uuid v1.3.0
@@ -9,10 +9,70 @@ require (
 	github.com/spf13/cobra v1.1.1
 	github.com/spf13/viper v1.7.0
 	github.com/staticbackendhq/backend-go v0.0.0-20201215215817-6e321a842def
-	github.com/staticbackendhq/core v1.2.1
-	golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa
+	github.com/staticbackendhq/core v1.4.0-rc2
+	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
 )
 
-replace github.com/staticbackendhq/backend-go => ../backend-go
+require (
+	cloud.google.com/go v0.75.0 // indirect
+	github.com/aws/aws-sdk-go v1.27.2 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/chromedp/cdproto v0.0.0-20211126220118-81fa0469ad77 // indirect
+	github.com/chromedp/chromedp v0.7.6 // indirect
+	github.com/chromedp/sysutil v1.0.0 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 // indirect
+	github.com/dop251/goja v0.0.0-20210804101310-32956a348b49 // indirect
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/gbrlsnchs/jwt/v3 v3.0.0-rc.1 // indirect
+	github.com/go-co-op/gocron v1.6.2 // indirect
+	github.com/go-redis/redis/v8 v8.4.4 // indirect
+	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
+	github.com/gobwas/httphead v0.1.0 // indirect
+	github.com/gobwas/pool v0.2.1 // indirect
+	github.com/gobwas/ws v1.1.0 // indirect
+	github.com/golang/protobuf v1.4.3 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/klauspost/compress v1.13.6 // indirect
+	github.com/lib/pq v1.10.4 // indirect
+	github.com/magefile/mage v1.9.0 // indirect
+	github.com/magiconair/properties v1.8.1 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/markbates/goth v1.73.0 // indirect
+	github.com/mitchellh/mapstructure v1.1.2 // indirect
+	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
+	github.com/mrjones/oauth v0.0.0-20180629183705-f4e24b6d100c // indirect
+	github.com/pelletier/go-toml v1.2.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/robfig/cron/v3 v3.0.1 // indirect
+	github.com/spf13/afero v1.8.1 // indirect
+	github.com/spf13/cast v1.3.0 // indirect
+	github.com/spf13/jwalterweatherman v1.0.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/stripe/stripe-go/v72 v72.94.0 // indirect
+	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
+	github.com/xdg-go/scram v1.1.1 // indirect
+	github.com/xdg-go/stringprep v1.0.3 // indirect
+	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
+	go.mongodb.org/mongo-driver v1.10.0 // indirect
+	go.opentelemetry.io/otel v0.15.0 // indirect
+	golang.org/x/image v0.0.0-20190802002840-cff245a6509b // indirect
+	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
+	golang.org/x/oauth2 v0.0.0-20220628200809-02e64fa58f26 // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.25.0 // indirect
+	gopkg.in/ini.v1 v1.51.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+)
 
-replace github.com/staticbackendhq/core => ../core
+replace github.com/staticbackendhq/backend-go => ../backend-go