Merge pull request #1273 from spaceuptech/v0.19.2

V0.19.2

Author: YourTechBud

gateway/Dockerfile

@@ -2,7 +2,7 @@ FROM golang:1.13.5-alpine3.10
 WORKDIR /build
 
 # Take the current space cloud version as a argument
-ARG SC_VERSION=0.19.1
+ARG SC_VERSION=0.19.2
 
 # Copy all the source files
 COPY . .
@@ -16,7 +16,7 @@ RUN GOOS=linux CGO_ENABLED=0 go build -a -ldflags '-s -w -extldflags "-static"'
 RUN echo $SC_VERSION && wget https://storage.googleapis.com/space-cloud/mission-control/mission-control-v$SC_VERSION.zip && unzip mission-control-v$SC_VERSION.zip
 
 FROM alpine:3.10
-ARG SC_VERSION=0.19.1
+ARG SC_VERSION=0.19.2
 
 RUN apk --no-cache add ca-certificates
 

gateway/config/generate.go

@@ -1,29 +1,5 @@
 package config
 
-import (
-	"fmt"
-	"html/template"
-	"os"
-	"strings"
-
-	"gopkg.in/AlecAivazis/survey.v1"
-
-	"github.com/spaceuptech/space-cloud/gateway/utils"
-)
-
-type input struct {
-	Conn         string
-	PrimaryDB    string
-	ID           string
-	Name         string
-	AdminName    string
-	AdminPass    string
-	AdminRole    string
-	AdminSecret  string
-	HomeDir      string
-	BuildVersion string
-}
-
 // GenerateEmptyConfig creates an empty config file
 func GenerateEmptyConfig() *Config {
 
@@ -38,113 +14,3 @@ func GenerateEmptyConfig() *Config {
 		Projects: []*Project{},
 	}
 }
-
-// GenerateConfig started the interactive cli to generate config file
-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.")
-	fmt.Println()
-	fmt.Println("Press ^C any time to quit.")
-
-	i := new(input)
-
-	// Ask the project id
-	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.Name, survey.Required)
-	if err != nil {
-		return err
-	}
-	i.ID = formatProjectID(i.Name)
-
-	// Ask the primary db
-	err = survey.AskOne(&survey.Select{
-		Message: "primary database:",
-		Options: []string{"mongo", "mysql", "postgres"},
-		Default: "mongo",
-	}, &i.PrimaryDB, survey.Required)
-	if err != nil {
-		return err
-	}
-
-	// Ask for the connection string
-	err = survey.AskOne(&survey.Input{Message: "connection string (" + i.PrimaryDB + ")", Default: getConnectionString(i.PrimaryDB)}, &i.Conn, survey.Required)
-	if err != nil {
-		return err
-	}
-
-	// 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, configFilePath string) error {
-	f, err := os.Create(configFilePath)
-	if err != nil {
-		return err
-	}
-	defer utils.CloseTheCloser(f)
-
-	tmplString := templateString
-
-	tmpl, err := template.New("config").Parse(tmplString)
-	if err != nil {
-		return err
-	}
-
-	err = tmpl.Execute(f, i)
-	if err != nil {
-		return err
-	}
-
-	return f.Sync()
-}
-
-func formatProjectID(id string) string {
-	return strings.Join(strings.Split(strings.ToLower(id), " "), "-")
-}
-
-func getConnectionString(db string) string {
-
-	switch db {
-	case string(utils.Mongo):
-		return "mongodb://localhost:27017"
-	case string(utils.MySQL):
-		return "user:my-secret-pwd@/project"
-	case string(utils.Postgres):
-		return "postgres://postgres:mysecretpassword@localhost/postgres?sslmode=disable"
-	default:
-		return "localhost"
-	}
-}

gateway/config/routing.go

@@ -1,9 +1,12 @@
 package config
 
 import (
+	"context"
 	"fmt"
 	"math/rand"
 	"strings"
+
+	"github.com/spaceuptech/helpers"
 )
 
 // GlobalRoutesConfig describes the project level config for ingress routing
@@ -57,7 +60,7 @@ type Route struct {
 }
 
 // SelectTarget returns a target based on the weights assigned
-func (r *Route) SelectTarget(weight int32) (RouteTarget, error) {
+func (r *Route) SelectTarget(ctx context.Context, weight int32) (RouteTarget, error) {
 
 	// Generate a random float in the range 0 to 100 if provided weight in lesser than zero
 	if weight < 0 {
@@ -75,7 +78,7 @@ func (r *Route) SelectTarget(weight int32) (RouteTarget, error) {
 	}
 
 	// Return error if no targets match
-	return RouteTarget{}, fmt.Errorf("no target found for route (%s) - make sure you have defined atleast one target with proper weights", r.Source.URL)
+	return RouteTarget{}, helpers.Logger.LogError(helpers.GetRequestID(ctx), fmt.Sprintf("No target found for route (%s) - make sure you have defined atleast one target with proper weights", r.Source.URL), nil, nil)
 }
 
 // RouteSource is the source of routing

gateway/config/routing_test.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"context"
 	"reflect"
 	"testing"
 )
@@ -63,7 +64,7 @@ func TestRoute_SelectTarget(t *testing.T) {
 				Source:  tt.fields.Source,
 				Targets: tt.fields.Targets,
 			}
-			got, err := r.SelectTarget(tt.args.weight)
+			got, err := r.SelectTarget(context.Background(), tt.args.weight)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("SelectTarget() error = %v, wantErr %v", err, tt.wantErr)
 				return

gateway/config/template.go

@@ -24,7 +24,7 @@ require (
 	github.com/google/go-cmp v0.5.0
 	github.com/googleapis/gnostic v0.3.1 // indirect
 	github.com/gorilla/mux v1.7.3
-	github.com/gorilla/websocket v1.4.1
+	github.com/gorilla/websocket v1.4.2
 	github.com/graph-gophers/dataloader v5.0.0+incompatible
 	github.com/graphql-go/graphql v0.7.8
 	github.com/grpc-ecosystem/go-grpc-middleware v1.2.0 // indirect
@@ -37,19 +37,18 @@ require (
 	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/jmoiron/sqlx v1.2.0
 	github.com/jonboulle/clockwork v0.1.0 // indirect
-	github.com/kr/pty v1.1.4 // indirect
 	github.com/lib/pq v1.2.0
-	github.com/mattn/go-colorable v0.1.2 // indirect
 	github.com/mattn/go-sqlite3 v1.11.0 // indirect
 	github.com/mholt/certmagic v0.9.1
 	github.com/mitchellh/copystructure v1.0.0 // indirect
-	github.com/mitchellh/mapstructure v1.1.2
+	github.com/mitchellh/mapstructure v1.3.3
 	github.com/rs/cors v1.7.0
 	github.com/satori/go.uuid v1.2.0
-	github.com/segmentio/ksuid v1.0.2
-	github.com/sirupsen/logrus v1.4.2
+	github.com/segmentio/ksuid v1.0.3
+	github.com/sirupsen/logrus v1.6.0 // indirect
 	github.com/soheilhy/cmux v0.1.4 // indirect
-	github.com/spaceuptech/space-api-go v0.17.3
+	github.com/spaceuptech/helpers v0.1.1
+	github.com/spaceuptech/space-api-go v0.18.1
 	github.com/stretchr/objx v0.2.0 // indirect
 	github.com/stretchr/testify v1.5.1
 	github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51 // indirect
@@ -61,11 +60,10 @@ require (
 	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
 	go.etcd.io/bbolt v1.3.3
 	go.mongodb.org/mongo-driver v1.1.1
-	go.uber.org/zap v1.15.0 // indirect
 	golang.org/x/crypto v0.0.0-20200219234226-1ad67e1f0ef4
 	golang.org/x/net v0.0.0-20200222125558-5a598a2470a0
+	golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8 // indirect
 	google.golang.org/api v0.18.0
-	gopkg.in/AlecAivazis/survey.v1 v1.8.5
 	gopkg.in/yaml.v2 v2.2.7 // indirect
 	k8s.io/api v0.17.2
 	k8s.io/apimachinery v0.17.2