Merge pull request #1552 from spaceuptech/v0.21.4

V0.21.4

Author: YourTechBud

.dockerignore

@@ -13,7 +13,10 @@
 *.out
 
 **/node_modules/**
-css
+mission-control/public/**
+mission-control/src/**
+mission-control/node_modules/**
+
 .sass-cache
 
 # Ignore the binaries

.gitignore

@@ -12,7 +12,7 @@ test
 *.dylib
 *.db
 # Test binary, build with `go test -c`
-*.test  
+*.test
 
 # sh file for bash completion
 *.sh
@@ -56,10 +56,8 @@ gateway/scripts
 metric-proxy/scripts
 docker-build.sh
 
-
+scripts/*
 #IDEs
-.idea
-.vscode
 
 yarn.lock
 

gateway/.dockerignore

@@ -0,0 +1,2 @@
+*.zip
+gateway

gateway/Dockerfile

@@ -2,7 +2,7 @@ FROM golang:1.15.3-alpine3.12
 WORKDIR /build
 
 # Take the current space cloud version as a argument
-ARG SC_VERSION=0.21.3
+ARG SC_VERSION=0.21.4
 
 # 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.12
-ARG SC_VERSION=0.21.3
+ARG SC_VERSION=0.21.4
 
 RUN apk --no-cache add ca-certificates
 

gateway/config/config.go

@@ -11,6 +11,7 @@ type Config struct {
 	ClusterConfig    *ClusterConfig   `json:"clusterConfig" yaml:"clusterConfig" mapstructure:"clusterConfig"`
 	Integrations     Integrations     `json:"integrations" yaml:"integrations" mapstructure:"integrations"`
 	IntegrationHooks IntegrationHooks `json:"integrationsHooks" yaml:"integrationsHooks" mapstructure:"integrationsHooks"`
+	CacheConfig      *CacheConfig     `json:"cacheConfig" yaml:"cacheConfig" mapstructure:"cacheConfig"`
 }
 
 // ClusterConfig holds the cluster level configuration
@@ -119,10 +120,11 @@ type DatabaseSchema struct {
 
 // DatabaseRule stores information of db rule
 type DatabaseRule struct {
-	Table             string           `json:"col,omitempty" yaml:"col" mapstructure:"col"`
-	DbAlias           string           `json:"dbAlias,omitempty" yaml:"dbAlias" mapstructure:"dbAlias"`
-	IsRealTimeEnabled bool             `json:"isRealtimeEnabled,omitempty" yaml:"isRealtimeEnabled" mapstructure:"isRealtimeEnabled"`
-	Rules             map[string]*Rule `json:"rules,omitempty" yaml:"rules" mapstructure:"rules"`
+	Table                   string           `json:"col,omitempty" yaml:"col" mapstructure:"col"`
+	DbAlias                 string           `json:"dbAlias,omitempty" yaml:"dbAlias" mapstructure:"dbAlias"`
+	IsRealTimeEnabled       bool             `json:"isRealtimeEnabled,omitempty" yaml:"isRealtimeEnabled" mapstructure:"isRealtimeEnabled"`
+	EnableCacheInvalidation bool             `json:"enableCacheInvalidation,omitempty" yaml:"enableCacheInvalidation" mapstructure:"enableCacheInvalidation"`
+	Rules                   map[string]*Rule `json:"rules,omitempty" yaml:"rules" mapstructure:"rules"`
 }
 
 // EventingConfig stores information of eventing config
@@ -150,6 +152,15 @@ type FileStoreConfig struct {
 	ForcePathStyle *bool  `json:"forcePathStyle,omitempty" yaml:"forcePathStyle,omitempty" mapstructure:"forcePathStyle"`
 }
 
+// CacheConfig describes the config of the caching module
+type CacheConfig struct {
+	Enabled bool   `json:"enabled" yaml:"enabled" mapstructure:"enabled"`
+	Conn    string `json:"conn" yaml:"conn" mapstructure:"conn"`
+
+	// Represents Time To Live in seconds, default value is 5 minutes (5 * 60 seconds) if not provided
+	DefaultTTL int `json:"defaultTTL" yaml:"defaultTTL" mapstructure:"defaultTTL"`
+}
+
 // Secret describes the a secret object
 type Secret struct {
 	IsPrimary bool   `json:"isPrimary" yaml:"isPrimary" mapstructure:"isPrimary"` // used by the frontend & backend to generate token out of multiple secrets
@@ -191,9 +202,6 @@ const (
 // Admin holds the admin config
 type Admin struct {
 	ClusterConfig *ClusterConfig `json:"clusterConfig" yaml:"clusterConfig" mapstructure:"clusterConfig"`
-	LicenseKey    string         `json:"licenseKey" yaml:"licenseKey" mapstructure:"licenseKey"`
-	LicenseValue  string         `json:"licenseValue" yaml:"licenseValue" mapstructure:"licenseValue"`
-	License       string         `json:"license" yaml:"license" mapstructure:"license"`
 	Integrations  Integrations   `json:"integrations" yaml:"integrations" mapstructure:"integrations"`
 }
 
@@ -273,6 +281,7 @@ type Rule struct {
 	Template TemplatingEngine       `json:"template,omitempty" yaml:"template,omitempty" mapstructure:"template"`
 	ReqTmpl  string                 `json:"requestTemplate,omitempty" yaml:"requestTemplate,omitempty" mapstructure:"requestTemplate"`
 	OpFormat string                 `json:"outputFormat,omitempty" yaml:"outputFormat,omitempty" mapstructure:"outputFormat"`
+	Cache    *ReadCacheOptions      `json:"cache,omitempty" yaml:"cache,omitempty" mapstructure:"cache"`
 }
 
 // Auths holds the mapping of the sign in method
@@ -309,18 +318,19 @@ type Endpoint struct {
 	// depending upon the payload format, the graphQL request that
 	// gets converted to http request will use that format as it's payload
 	// currently supported formats are application/json,multipart/form-data
-	ReqPayloadFormat string  `json:"requestPayloadFormat" yaml:"requestPayloadFormat" mapstructure:"requestPayloadFormat"`
-	ReqTmpl          string  `json:"requestTemplate" yaml:"requestTemplate" mapstructure:"requestTemplate"`
-	GraphTmpl        string  `json:"graphTemplate" yaml:"graphTemplate" mapstructure:"graphTemplate"`
-	ResTmpl          string  `json:"responseTemplate" yaml:"responseTemplate" mapstructure:"responseTemplate"`
-	OpFormat         string  `json:"outputFormat,omitempty" yaml:"outputFormat,omitempty" mapstructure:"outputFormat"`
-	Token            string  `json:"token,omitempty" yaml:"token,omitempty" mapstructure:"token"`
-	Claims           string  `json:"claims,omitempty" yaml:"claims,omitempty" mapstructure:"claims"`
-	Method           string  `json:"method" yaml:"method" mapstructure:"method"`
-	Path             string  `json:"path" yaml:"path" mapstructure:"path"`
-	Rule             *Rule   `json:"rule,omitempty" yaml:"rule,omitempty" mapstructure:"rule"`
-	Headers          Headers `json:"headers,omitempty" yaml:"headers,omitempty" mapstructure:"headers"`
-	Timeout          int     `json:"timeout,omitempty" yaml:"timeout,omitempty" mapstructure:"timeout"` // Timeout is in seconds
+	ReqPayloadFormat string   `json:"requestPayloadFormat" yaml:"requestPayloadFormat" mapstructure:"requestPayloadFormat"`
+	ReqTmpl          string   `json:"requestTemplate" yaml:"requestTemplate" mapstructure:"requestTemplate"`
+	GraphTmpl        string   `json:"graphTemplate" yaml:"graphTemplate" mapstructure:"graphTemplate"`
+	ResTmpl          string   `json:"responseTemplate" yaml:"responseTemplate" mapstructure:"responseTemplate"`
+	OpFormat         string   `json:"outputFormat,omitempty" yaml:"outputFormat,omitempty" mapstructure:"outputFormat"`
+	Token            string   `json:"token,omitempty" yaml:"token,omitempty" mapstructure:"token"`
+	Claims           string   `json:"claims,omitempty" yaml:"claims,omitempty" mapstructure:"claims"`
+	Method           string   `json:"method" yaml:"method" mapstructure:"method"`
+	Path             string   `json:"path" yaml:"path" mapstructure:"path"`
+	Rule             *Rule    `json:"rule,omitempty" yaml:"rule,omitempty" mapstructure:"rule"`
+	Headers          Headers  `json:"headers,omitempty" yaml:"headers,omitempty" mapstructure:"headers"`
+	Timeout          int      `json:"timeout,omitempty" yaml:"timeout,omitempty" mapstructure:"timeout"` // Timeout is in seconds
+	CacheOptions     []string `json:"cacheOptions" yaml:"cacheOptions" mapstructure:"cacheOptions"`
 }
 
 // EndpointKind describes the type of endpoint. Default value - internal
@@ -448,3 +458,9 @@ type LetsEncrypt struct {
 	ID                 string   `json:"id,omitempty" yaml:"id,omitempty" mapstructure:"id"`
 	WhitelistedDomains []string `json:"domains" yaml:"domains" mapstructure:"domains"`
 }
+
+// ReadCacheOptions describes the cache options in requests
+type ReadCacheOptions struct {
+	TTL               int64 `json:"ttl" yaml:"ttl" mapstructure:"ttl"` // here ttl is represented in seconds
+	InstantInvalidate bool  `json:"instantInvalidate" yaml:"instantInvalidate" mapstructure:"instantInvalidate"`
+}

gateway/config/generate.go

@@ -8,6 +8,7 @@ func GenerateEmptyConfig() *Config {
 		ClusterConfig:    new(ClusterConfig),
 		Integrations:     make(Integrations),
 		IntegrationHooks: make(IntegrationHooks),
+		CacheConfig:      new(CacheConfig),
 	}
 }
 

gateway/config/integration.go

@@ -30,6 +30,8 @@ type IntegrationConfig struct {
 	AppURL              string                  `json:"appUrl" yaml:"appUrl" mapstructure:"appUrl"`
 	CompatibleVersion   string                  `json:"compatibleVersion" yaml:"compatibleVersion" mapstructure:"compatibleVersion"`
 	CompatibleVersionNo int                     `json:"compatibleVersionNo" yaml:"compatibleVersionNo" mapstructure:"compatibleVersionNo"`
+	Details             string                  `json:"details" yaml:"details" mapstructure:"details"`
+	Description         string                  `json:"description" yaml:"description" mapstructure:"description"`
 }
 
 // IntegrationHook describes the config for a integration hook
@@ -66,6 +68,9 @@ type IntegrationAuthResponse interface {
 	// an integration is trying to configure a resource which it does not have access to.
 	Error() error
 
+	// Status returns the status code returned by the integration
+	Status() int
+
 	// Result returns the value returned by the the hook. It will always be an []interface{} or map[string]interface{}.
 	// The receiver must decode it into the appropriate struct if necessary.
 	Result() interface{}

gateway/config/resource.go

@@ -26,6 +26,7 @@ var ResourceFetchingOrder = []Resource{
 	ResourceCluster,
 	ResourceIntegration,
 	ResourceIntegrationHook,
+	ResourceCacheConfig,
 }
 
 // Resource is a resource type
@@ -79,6 +80,9 @@ const (
 	// ResourceCluster is a resource
 	ResourceCluster Resource = "cluster"
 
+	// ResourceCacheConfig is a resource
+	ResourceCacheConfig Resource = "cache-config"
+
 	// ResourceDeployService is a resource
 	// ResourceDeployService Resource = "service"
 	// ResourceDeployServiceRoute is a resource

gateway/config/routing.go

@@ -44,12 +44,14 @@ func (a Routes) Less(i, j int) bool {
 
 // Route describes the parameters of a single route
 type Route struct {
-	ID      string        `json:"id" yaml:"id" mapstructure:"id"`
-	Project string        `json:"project" yaml:"project" mapstructure:"project"`
-	Source  RouteSource   `json:"source" yaml:"source" mapstructure:"source"`
-	Targets []RouteTarget `json:"targets" yaml:"targets" mapstructure:"targets"`
-	Rule    *Rule         `json:"rule" yaml:"rule" mapstructure:"rule"`
-	Modify  struct {
+	ID               string        `json:"id" yaml:"id" mapstructure:"id"`
+	Project          string        `json:"project" yaml:"project" mapstructure:"project"`
+	Source           RouteSource   `json:"source" yaml:"source" mapstructure:"source"`
+	Targets          []RouteTarget `json:"targets" yaml:"targets" mapstructure:"targets"`
+	Rule             *Rule         `json:"rule" yaml:"rule" mapstructure:"rule"`
+	IsRouteCacheable bool          `json:"isRouteCacheable" yaml:"isRouteCacheable" mapstructure:"isRouteCacheable"`
+	CacheOptions     []string      `json:"cacheOptions" yaml:"cacheOptions" mapstructure:"cacheOptions"`
+	Modify           struct {
 		Tmpl            TemplatingEngine `json:"template,omitempty" yaml:"template,omitempty" mapstructure:"template"`
 		ReqTmpl         string           `json:"requestTemplate" yaml:"requestTemplate" mapstructure:"requestTemplate"`
 		ResTmpl         string           `json:"responseTemplate" yaml:"responseTemplate" mapstructure:"responseTemplate"`

gateway/config/store.go

@@ -1,12 +1,14 @@
 package config
 
 import (
+	"context"
 	"encoding/json"
-	"errors"
+	"fmt"
 	"io/ioutil"
 	"strings"
 
 	"github.com/ghodss/yaml"
+	"github.com/spaceuptech/helpers"
 )
 
 // StoreConfigToFile stores the config file to disk
@@ -19,7 +21,7 @@ func StoreConfigToFile(conf *Config, path string) error {
 	} else if strings.HasSuffix(path, ".json") {
 		data, err = json.Marshal(conf)
 	} else {
-		return errors.New("Invalid config file type")
+		return helpers.Logger.LogError(helpers.GetRequestID(context.TODO()), fmt.Sprintf("Invalid config file type (%s) provided", path), nil, nil)
 	}
 
 	// Check if error occured while marshaling

gateway/go.mod

@@ -56,4 +56,6 @@ require (
 
 )
 
+replace github.com/coreos/go-systemd => github.com/coreos/go-systemd/v22 v22.0.0
+
 go 1.15

gateway/main.go

@@ -117,7 +117,7 @@ var essentialFlags = []cli.Flag{
 	// Flags for the metrics module
 	cli.BoolFlag{
 		Name:   "disable-metrics",
-		Usage:  "Disable anonymous metric collection",
+		Usage:  "Delete anonymous metric collection",
 		EnvVar: "DISABLE_METRICS",
 	},
 
@@ -132,7 +132,7 @@ var essentialFlags = []cli.Flag{
 func main() {
 	app := cli.NewApp()
 	app.Version = utils.BuildVersion
-	app.Name = "space-cloud"
+	app.Name = "space-cloud-ee"
 	app.Usage = "core binary to run space cloud"
 
 	app.Commands = []cli.Command{
@@ -165,7 +165,6 @@ func actionRun(c *cli.Context) error {
 	// Load cli flags
 	nodeID := c.String("id")
 	isDev := c.Bool("dev")
-	profiler := c.Bool("profiler")
 	logLevel := c.String("log-level")
 	logFormat := c.String("log-format")
 
@@ -199,7 +198,7 @@ func actionRun(c *cli.Context) error {
 
 	// Generate a new id if not provided
 	if nodeID == "none" {
-		nodeID = "auto-" + ksuid.New().String()
+		nodeID = fmt.Sprintf("auto-%s", ksuid.New().String())
 	}
 
 	helpers.Logger.LogInfo("start", fmt.Sprintf("Starting node with id - %s", nodeID), nil)
@@ -235,7 +234,7 @@ func actionRun(c *cli.Context) error {
 		}
 	}
 
-	return s.Start(profiler, staticPath, port, strings.Split(c.String("restrict-hosts"), ","))
+	return s.Start(false, staticPath, port, strings.Split(c.String("restrict-hosts"), ","))
 }
 
 func actionHealthCheck(c *cli.Context) error {

gateway/managers/admin/admin.go

@@ -1,36 +1,81 @@
 package admin
 
 import (
+	"context"
 	"sync"
+	"time"
 
 	"github.com/spaceuptech/space-cloud/gateway/config"
 	"github.com/spaceuptech/space-cloud/gateway/model"
 )
 
 // Manager manages all admin transactions
 type Manager struct {
-	lock   sync.RWMutex
-	quotas model.UsageQuotas
-	user   *config.AdminUser
-	isProd bool
+	lock         sync.RWMutex
+	user         *config.AdminUser
+	integrations config.Integrations
+
+	services model.ScServices
+	isProd   bool
+
+	syncMan        model.SyncManAdminInterface
+	integrationMan IntegrationInterface
 
 	nodeID, clusterID string
 }
 
 // New creates a new admin manager instance
 func New(nodeID, clusterID string, isDev bool, adminUserInfo *config.AdminUser) *Manager {
 	m := new(Manager)
-	m.user = adminUserInfo
-	m.quotas = model.UsageQuotas{MaxDatabases: 1, MaxProjects: 1}
 	m.nodeID = nodeID
+	m.isProd = !isDev // set inverted
 	m.clusterID = clusterID
-	m.isProd = !isDev
+
+	m.integrations = make(config.Integrations)
+	m.user = adminUserInfo
 	return m
 }
 
-// LoadEnv gets the env
-func (m *Manager) LoadEnv() (bool, string, model.UsageQuotas, string, string, string, string, string, string, string) {
+// SetSyncMan sets syncman manager
+func (m *Manager) SetSyncMan(s model.SyncManAdminInterface) {
+	m.lock.Lock()
+	defer m.lock.Unlock()
+	m.syncMan = s
+}
+
+// SetIntegrationMan sets integration manager
+func (m *Manager) SetIntegrationMan(i IntegrationInterface) {
 	m.lock.Lock()
 	defer m.lock.Unlock()
-	return m.isProd, "space-cloud-open", m.quotas, "/mission-control/login", "", "", "", "", "", "online"
+	m.integrationMan = i
+}
+
+// SetIntegrationConfig sets integration config
+func (m *Manager) SetIntegrationConfig(integrations config.Integrations) {
+	m.lock.Lock()
+	defer m.lock.Unlock()
+	m.integrations = integrations
+}
+
+// LoadEnv gets the env
+func (m *Manager) LoadEnv() (bool, string, error) {
+	m.lock.RLock()
+	defer m.lock.RUnlock()
+
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	loginURL := "/mission-control/login"
+
+	// Invoke integration hooks
+	hookResponse := m.integrationMan.InvokeHook(ctx, model.RequestParams{
+		Resource: "load-env",
+		Op:       "read",
+	})
+	if hookResponse.CheckResponse() {
+		if err := hookResponse.Error(); err == nil {
+			loginURL = hookResponse.Result().(map[string]interface{})["loginUrl"].(string)
+		}
+	}
+	return m.isProd, loginURL, nil
 }