Merge branch 'v0.10.0' of https://github.com/spaceuptech/space-cloud into ee-v0.10.0

Author: YourTechBud

.gitignore

@@ -20,6 +20,7 @@ css
 .sass-cache
 
 space-cloud
+raft-store
 publish.sh
 
 test_config.yaml

config/config.go

@@ -4,21 +4,34 @@ import "github.com/spaceuptech/space-cloud/utils"
 
 // Config holds the entire configuration
 type Config struct {
-	Projects map[string]*Project `json:"projects" yaml:"projects"` // The key here is the project id
+	Projects []*Project `json:"projects" yaml:"projects"` // The key here is the project id
+	SSL      *SSL       `json:"ssl" yaml:"ssl"`
+	Admin    *Admin     `json:"admin" yaml:"admin"`
+	Cluster  string     `json:"cluster" yaml:"cluster"`
+	NodeID   string     `json:"nodeId" yaml:"nodeId"`
 }
 
 // Project holds the project level configuration
 type Project struct {
-	ID      string   `json:"id" yaml:"id"`
 	Secret  string   `json:"secret" yaml:"secret"`
+	ID      string   `json:"id" yaml:"id"`
+	Name    string   `json:"name" yaml:"name"`
 	Modules *Modules `json:"modules" yaml:"modules"`
-	SSL     *SSL     `json:"ssl" yaml:"ssl"`
+}
+
+// Admin stores the admin credentials
+type Admin struct {
+	User   string `json:"user" yaml:"user"`
+	Pass   string `json:"pass" yaml:"pass"`
+	Role   string `json:"role" yaml:"role"`
+	Secret string `json:"secret" yaml:"secret"`
 }
 
 // SSL holds the certificate and key file locations
 type SSL struct {
-	Crt string `json:"crt" yaml:"crt"`
-	Key string `json:"key" yaml:"key"`
+	Enabled bool   `json:"enabled" yaml:"enabled"`
+	Crt     string `json:"crt" yaml:"crt"`
+	Key     string `json:"key" yaml:"key"`
 }
 
 // Modules holds the config of all the modules of that environment
@@ -51,16 +64,16 @@ type TableRule struct {
 // Rule is the authorisation object at the query level
 type Rule struct {
 	Rule    string                 `json:"rule" yaml:"rule"`
-	Eval    string                 `json:"eval" yaml:"eval"`
-	Type    string                 `json:"type" yaml:"type"`
-	F1      interface{}            `json:"f1" yaml:"f1"`
-	F2      interface{}            `json:"f2" yaml:"f2"`
-	Clauses []*Rule                `json:"clauses" yaml:"clauses"`
-	DB      string                 `json:"db" yaml:"db"`
-	Col     string                 `json:"col" yaml:"col"`
-	Find    map[string]interface{} `json:"find" yaml:"find"`
-	Service string                 `json:"service" yaml:"service"`
-	Func    string                 `json:"func" yaml:"func"`
+	Eval    string                 `json:"eval,omitempty" yaml:"eval,omitempty"`
+	Type    string                 `json:"type,omitempty" yaml:"type,omitempty"`
+	F1      interface{}            `json:"f1,omitempty" yaml:"f1,omitempty"`
+	F2      interface{}            `json:"f2,omitempty" yaml:"f2,omitempty"`
+	Clauses []*Rule                `json:"clauses,omitempty" yaml:"clauses,omitempty"`
+	DB      string                 `json:"db,omitempty" yaml:"db,omitempty"`
+	Col     string                 `json:"col,omitempty" yaml:"col,omitempty"`
+	Find    map[string]interface{} `json:"find,omitempty" yaml:"find,omitempty"`
+	Service string                 `json:"service,omitempty" yaml:"service,omitempty"`
+	Func    string                 `json:"func,omitempty" yaml:"func,omitempty"`
 }
 
 // Auth holds the mapping of the sign in method
@@ -93,10 +106,10 @@ type Realtime struct {
 
 // FileStore holds the config for the file store module
 type FileStore struct {
-	Enabled   bool                 `json:"enabled" yaml:"enabled"`
-	StoreType string               `json:"storeType" yaml:"storeType"`
-	Conn      string               `json:"conn" yaml:"conn"`
-	Rules     map[string]*FileRule `json:"rules" yaml:"rules"`
+	Enabled   bool        `json:"enabled" yaml:"enabled"`
+	StoreType string      `json:"storeType" yaml:"storeType"`
+	Conn      string      `json:"conn" yaml:"conn"`
+	Rules     []*FileRule `json:"rules" yaml:"rules"`
 }
 
 // FileRule is the authorization object at the file rule level

config/generate.go

@@ -12,13 +12,28 @@ import (
 )
 
 type input struct {
-	Conn      string
-	PrimaryDB string
-	ID        string
+	Conn         string
+	PrimaryDB    string
+	ID           string
+	AdminName    string
+	AdminPass    string
+	AdminRole    string
+	AdminSecret  string
+	HomeDir      string
+	BuildVersion string
+}
+
+// GenerateEmptyConfig creates an empty config file
+func GenerateEmptyConfig() *Config {
+	return &Config{
+		SSL:      &SSL{Enabled: false},
+		Admin:    &Admin{User: "admin", Pass: "123", Role: "captain-cloud", Secret: "some-secret"},
+		Projects: []*Project{},
+	}
 }
 
 // GenerateConfig started the interactive cli to generate config file
-func GenerateConfig() error {
+func GenerateConfig(configFilePath string) error {
 	fmt.Println()
 	fmt.Println("This utility walks you through creating a config.yaml file for your space-cloud project.")
 	fmt.Println("It only covers the most essential configurations and suggests sensible defaults.")
@@ -28,9 +43,9 @@ func GenerateConfig() error {
 	i := new(input)
 
 	// Ask the project id
-	dir, _ := os.Getwd()
-	array := strings.Split(dir, string(os.PathSeparator))
-	dir = array[len(array)-1]
+	workingDir, _ := os.Getwd()
+	array := strings.Split(workingDir, string(os.PathSeparator))
+	dir := array[len(array)-1]
 	err := survey.AskOne(&survey.Input{Message: "project name:", Default: formatProjectID(dir)}, &i.ID, survey.Required)
 	if err != nil {
 		return err
@@ -56,17 +71,50 @@ func GenerateConfig() error {
 		return err
 	}
 
-	return writeConfig(i)
+	// Ask for the admin username
+	err = survey.AskOne(&survey.Input{Message: "Mission Control (UserName)", Default: "admin"}, &i.AdminName, survey.Required)
+	if err != nil {
+		return err
+	}
+
+	// Ask for the admin password
+	err = survey.AskOne(&survey.Input{Message: "Mission Control (Password)", Default: "123"}, &i.AdminPass, survey.Required)
+	if err != nil {
+		return err
+	}
+
+	// Ask for the admin role
+	err = survey.AskOne(&survey.Input{Message: "Mission Control (Role)", Default: "captain-cloud"}, &i.AdminRole, survey.Required)
+	if err != nil {
+		return err
+	}
+
+	// Ask for the admin secret
+	err = survey.AskOne(&survey.Input{Message: "Mission Control (JWT Secret)", Default: "some-secret"}, &i.AdminSecret, survey.Required)
+	if err != nil {
+		return err
+	}
+
+	i.HomeDir = utils.UserHomeDir()
+	i.BuildVersion = utils.BuildVersion
+
+	if configFilePath == "none" {
+		configFilePath = workingDir + string(os.PathSeparator) + i.ID + ".yaml"
+	}
+
+	return writeConfig(i, configFilePath)
 }
 
-func writeConfig(i *input) error {
-	f, err := os.Create("./" + i.ID + ".yaml")
+func writeConfig(i *input, configFilePath string) error {
+	f, err := os.Create(configFilePath)
 	if err != nil {
 		return err
 	}
 	defer f.Close()
 
-	tmpl, err := template.New("config").Parse(templateString)
+	tmplString := templateString
+
+	tmpl, err := template.New("config").Parse(tmplString)
 	if err != nil {
 		return err
 	}

config/http.go

@@ -9,38 +9,39 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-func loadEnvironmentVariable(p *Project) {
-	if strings.HasPrefix(p.Secret, "$") {
-		tempString := strings.TrimPrefix(p.Secret, "$")
-		tempEnvVar, present := os.LookupEnv(tempString)
-
-		if present {
-			p.Secret = tempEnvVar
+func loadEnvironmentVariable(c *Config) {
+	for _, p := range c.Projects {
+		if strings.HasPrefix(p.Secret, "$") {
+			tempString := strings.TrimPrefix(p.Secret, "$")
+			tempEnvVar, present := os.LookupEnv(tempString)
+
+			if present {
+				p.Secret = tempEnvVar
+			}
 		}
-	}
-
-	for _, value := range p.Modules.Crud {
-		if strings.HasPrefix(value.Conn, "$") {
-			tempStringC := strings.TrimPrefix(value.Conn, "$")
-			tempEnvVarC, presentC := os.LookupEnv(tempStringC)
-
-			if presentC {
-				value.Conn = tempEnvVarC
+		for _, value := range p.Modules.Crud {
+			if strings.HasPrefix(value.Conn, "$") {
+				tempStringC := strings.TrimPrefix(value.Conn, "$")
+				tempEnvVarC, presentC := os.LookupEnv(tempStringC)
+
+				if presentC {
+					value.Conn = tempEnvVarC
+				}
 			}
 		}
 	}
 }
 
 // LoadConfigFromFile loads the config from the provided file path
-func LoadConfigFromFile(path string) (*Project, error) {
+func LoadConfigFromFile(path string) (*Config, error) {
 	// Load the file in memory
 	dat, err := ioutil.ReadFile(path)
 	if err != nil {
 		return nil, err
 	}
 
 	// Marshal the configuration
-	conf := new(Project)
+	conf := new(Config)
 	if strings.HasSuffix(path, "json") {
 		err = json.Unmarshal(dat, conf)
 	} else {

config/load.go

@@ -0,0 +1,31 @@
+package config
+
+import (
+	"encoding/json"
+	"errors"
+	"io/ioutil"
+	"strings"
+
+	"gopkg.in/yaml.v2"
+)
+
+// StoreConfigToFile stores the config file to disk
+func StoreConfigToFile(conf *Config, path string) error {
+	var data []byte
+	var err error
+
+	if strings.HasSuffix(path, ".yaml") {
+		data, err = yaml.Marshal(conf)
+	} else if strings.HasSuffix(path, ".json") {
+		data, err = json.Marshal(conf)
+	} else {
+		return errors.New("Invalid config file type")
+	}
+
+	// Check if error occured while marshaling
+	if err != nil {
+		return err
+	}
+
+	return ioutil.WriteFile(path, data, 0644)
+}