Merge pull request #1332 from spaceuptech/v0.19.4

v0.19.4

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.3
+ARG SC_VERSION=0.19.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.10
-ARG SC_VERSION=0.19.3
+ARG SC_VERSION=0.19.4
 
 RUN apk --no-cache add ca-certificates
 

gateway/config/config.go

@@ -40,6 +40,9 @@ type Secret struct {
 	JwkURL string      `json:"jwkUrl" yaml:"jwkUrl"`
 	JwkKey interface{} `json:"-" yaml:"-"`
 
+	Audience []string `json:"aud" yaml:"aud"`
+	Issuer   []string `json:"iss" yaml:"iss"`
+
 	// Used for HMAC256 secret
 	Secret string `json:"secret" yaml:"secret"`
 

gateway/integration_test.sh

@@ -8,7 +8,7 @@ go build .
 sudo kill -9 `sudo lsof -t -i:4122`
 
 # run the gateway in background
-./gateway run --dev &> /dev/null &
+./gateway run --dev --log-format text &> /dev/null &
 sleep 10
 #sc_process_num=$!
 

gateway/model/schema_type.go

@@ -31,6 +31,7 @@ type (
 		LinkedTable *TableProperties `json:"linkedTable"`
 		JointTable  *TableProperties `json:"jointTable"`
 		Default     interface{}      `json:"default"`
+		TypeIDSize  int              `json:"size"`
 	}
 
 	// TableProperties are properties of the table
@@ -59,8 +60,8 @@ const (
 	TypeID string = "ID"
 	// TypeJSON is variable used for Variable of type Jsonb
 	TypeJSON string = "JSON"
-	// SQLTypeIDSize is variable used for specifing si	ze of sql type ID
-	SQLTypeIDSize string = "50"
+	// SQLTypeIDSize is variable used for specifying size of sql type ID
+	SQLTypeIDSize int = 50
 	// TypeObject is a string with value object
 	TypeObject string = "Object"
 	// TypeEnum is a variable type enum
@@ -82,7 +83,8 @@ const (
 	// DirectiveDefault is used to add default key
 	DirectiveDefault string = "default"
 
-	// DefaultIndexName  string = ""
+	// DirectiveVarcharSize denotes the maximum allowable character for field type ID
+	DirectiveVarcharSize string = "size"
 
 	// DefaultIndexSort specifies default order of sorting
 	DefaultIndexSort string = "asc"
@@ -97,6 +99,7 @@ type InspectorFieldType struct {
 	FieldNull    string `db:"Null"`
 	FieldKey     string `db:"Key"`
 	FieldDefault string `db:"Default"`
+	VarcharSize  int    `db:"VarcharSize"`
 }
 
 // ForeignKeysType is the type for storing  foreignkeys information of sql inspection

gateway/modules/crud/mgo/integration_collections_test.go

@@ -56,7 +56,7 @@ func TestSQL_GetCollections(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := db.GetCollections(ctx)
+			got, err := db.GetCollections(context.Background())
 			if (err != nil) != tt.wantErr {
 				t.Errorf("GetCollections() error = %v, wantErr %v", err, tt.wantErr)
 			}

gateway/modules/crud/mgo/integration_main_test.go

@@ -21,42 +21,6 @@ var connection = flag.String("conn", "", "connection string of the database")
 
 func TestMain(m *testing.M) {
 	flag.Parse()
-	//var customerTable = `type customers {
-	//						id: ID! @primary
-	//						name: String!
-	//						age: Integer!
-	//						height: Float
-	//						is_prime: Boolean!
-	//						birth_date: DateTime!
-	//						address: JSON!
-	//					}`
-	//var companiesTable = `type companies {
-	//					 id: ID! @primary
-	//					 parent : ID!
-	//					 name : String!
-	//					 established_date : DateTime!
-	//					 kind : Integer!
-	//					 volume : Float!
-	//					 is_public : Boolean!
-	//					 description : JSON!
-	//				}`
-	//var ordersTable = `type orders {
-	//					id: ID! @primary
-	//					order_date: DateTime!
-	//					amount: Integer!
-	//					is_prime: Boolean,
-	//					product_id: String!
-	//					address: JSON!
-	//					stars: Float!
-	//				}`
-	//var rawBatch = `type raw_batch {
-	//					id: ID! @primary
-	//					score : Integer!
-	//				}`
-	//var rawQuery = `type raw_query {
-	//					id: ID! @primary
-	//					score : Integer!
-	//				}`
 
 	// create sc project
 	var projectInfo = `{"name":"myproject","id":"myproject","secrets":[{"secret":"27f6a16bf7864c319e01b7511737407d","isPrimary":true}],"aesKey":"MWJkOTE5ZjVmMGRjNGZiMjg4MDQ0NjQ5MDE0ZWM2MDQ=","contextTime":5,"modules":{"db":{},"eventing":{},"userMan":{},"remoteServices":{"externalServices":{}},"fileStore":{"enabled":false,"rules":[]}}}`
@@ -108,12 +72,12 @@ func TestMain(m *testing.M) {
 
 	db, err := Init(true, *connection, "myproject")
 	if err != nil {
-		helpers.Logger.LogInfo(helpers.GetRequestID(ctx), "Create() Couldn't establishing connection with database", dbType)
+		helpers.Logger.LogInfo(helpers.GetRequestID(context.Background()), "Create() Couldn't establishing connection with database", map[string]interface{}{"dbType": *dbType})
 		return
 	}
 	// clear data
 	if err := db.client.Database("myproject").Drop(context.Background()); err != nil {
-		helpers.Logger.LogInfo(helpers.GetRequestID(ctx), "Create() Couldn't truncate table", err)
+		helpers.Logger.LogInfo(helpers.GetRequestID(context.Background()), "Create() Couldn't truncate table", map[string]interface{}{"error": err})
 	}
 
 	os.Exit(exitVal)

gateway/modules/crud/mgo/read.go

@@ -116,8 +116,10 @@ func (m *Mongo) Read(ctx context.Context, col string, req *model.ReadRequest) (i
 		results := []interface{}{}
 
 		if len(req.Aggregate) > 0 {
+			helpers.Logger.LogDebug(helpers.GetRequestID(ctx), "Mongo aggregate", map[string]interface{}{"pipeline": pipeline})
 			cur, err = collection.Aggregate(ctx, pipeline)
 		} else {
+			helpers.Logger.LogDebug(helpers.GetRequestID(ctx), "Mongo query", map[string]interface{}{"find": req.Find, "options": findOptions})
 			cur, err = collection.Find(ctx, req.Find, findOptions)
 		}
 		if err != nil {

gateway/modules/crud/sql/describe.go

@@ -37,7 +37,8 @@ CASE
 	WHEN column_default = '1' THEN 'true'
 	WHEN column_default = '0' THEN 'false'
 	ELSE coalesce(column_default,'')
-END AS 'Default'
+END AS 'Default',
+coalesce(CHARACTER_MAXIMUM_LENGTH,50) AS 'VarcharSize'
 from information_schema.columns
 where (table_name,table_schema) = (?,?);`
 		args = append(args, col, project)
@@ -48,7 +49,9 @@ CASE
     WHEN t.constraint_type = 'PRIMARY KEY' THEN 'PRI'
     WHEN t.constraint_type = 'UNIQUE' THEN 'UNI'
     ELSE ''
-END AS "Key"
+END AS "Key",
+-- Set the null values to 50
+coalesce(isc.character_maximum_length,50) AS "VarcharSize"
 FROM information_schema.columns isc
     left join (select cu.table_schema, cu.table_name, cu.column_name, istc.constraint_type 
     	from information_schema.constraint_column_usage cu 
@@ -67,8 +70,10 @@ ORDER BY isc.ordinal_position;`
        CASE
            WHEN TC.CONSTRAINT_TYPE = 'PRIMARY KEY' THEN 'PRI'
            WHEN TC.CONSTRAINT_TYPE = 'UNIQUE' THEN 'UNI'
+           WHEN TC.CONSTRAINT_TYPE = 'FOREIGN KEY' THEN 'MUL'
            ELSE isnull(TC.CONSTRAINT_TYPE,'')
-           END AS 'Key'
+           END AS 'Key',
+coalesce(c.CHARACTER_MAXIMUM_LENGTH,50) AS 'VarcharSize'
 FROM INFORMATION_SCHEMA.COLUMNS AS C
          FULL JOIN INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE AS CC
                    ON C.COLUMN_NAME = CC.COLUMN_NAME
@@ -132,15 +137,17 @@ func (s *SQL) getForeignKeyDetails(ctx context.Context, project, col string) ([]
 	`
 		args = append(args, project, col)
 	case model.SQLServer:
-		queryString = `SELECT 
-		CCU.TABLE_NAME, CCU.COLUMN_NAME, CCU.CONSTRAINT_NAME, RC.DELETE_RULE,
-		isnull(KCU.TABLE_NAME,'') AS 'REFERENCED_TABLE_NAME', isnull(KCU.COLUMN_NAME,'') AS 'REFERENCED_COLUMN_NAME'
-	FROM INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE CCU
-		FULL JOIN INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS rc
-			ON CCU.CONSTRAINT_NAME = RC.CONSTRAINT_NAME 
-		FULL JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE KCU 
-			ON KCU.CONSTRAINT_NAME = RC.CONSTRAINT_NAME  
-	WHERE CCU.TABLE_SCHEMA = @p1 AND CCU.TABLE_NAME= @p2 AND KCU.TABLE_NAME= @p3`
+		queryString = `SELECT
+    CCU.TABLE_NAME, CCU.COLUMN_NAME, CCU.CONSTRAINT_NAME, RC.DELETE_RULE,
+    isnull(KCU2.TABLE_NAME,'') AS 'REFERENCED_TABLE_NAME', isnull(KCU2.COLUMN_NAME,'') AS 'REFERENCED_COLUMN_NAME'
+FROM INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE CCU
+         FUll JOIN INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS RC
+                   ON RC.CONSTRAINT_NAME = CCU.CONSTRAINT_NAME
+         FUll JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE KCU
+                   ON RC.CONSTRAINT_NAME = KCU.CONSTRAINT_NAME
+         FUll JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE KCU2
+                   ON RC.UNIQUE_CONSTRAINT_NAME = KCU2.CONSTRAINT_NAME
+WHERE CCU.TABLE_SCHEMA = @p1 AND CCU.TABLE_NAME= @p2 AND KCU.TABLE_NAME= @p3`
 		args = append(args, project, col, col)
 	}
 	rows, err := s.client.QueryxContext(ctx, queryString, args...)

gateway/modules/crud/sql/integration_collections_test.go

@@ -41,10 +41,9 @@ func TestSQL_GetCollections(t *testing.T) {
 	if err != nil {
 		t.Fatal("GetCollections() Couldn't establishing connection with database", dbType)
 	}
-
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := db.GetCollections(ctx)
+			got, err := db.GetCollections(context.Background())
 			if (err != nil) != tt.wantErr {
 				t.Errorf("GetCollections() error = %v, wantErr %v", err, tt.wantErr)
 			}

gateway/modules/crud/sql/integration_create_test.go

@@ -241,7 +241,7 @@ func TestSQL_Create(t *testing.T) {
 				if err := rows.MapScan(v); err != nil {
 					t.Error("Create() Scanning error", err)
 				}
-				mysqlTypeCheck(model.DBType(*dbType), rowTypes, v)
+				mysqlTypeCheck(context.Background(), model.DBType(*dbType), rowTypes, v)
 				readResult = append(readResult, v)
 			}
 			if len(tt.wantReadResult) != len(readResult) {

gateway/modules/crud/sql/integration_delete_test.go

@@ -161,7 +161,7 @@ func TestSQL_Delete(t *testing.T) {
 				if err := rows.MapScan(v); err != nil {
 					t.Error("Delete() Scanning error", err)
 				}
-				mysqlTypeCheck(model.DBType(*dbType), rowTypes, v)
+				mysqlTypeCheck(context.Background(), model.DBType(*dbType), rowTypes, v)
 				readResult = append(readResult, v)
 			}
 			if !reflect.DeepEqual(tt.wantReadResult, readResult) {
@@ -232,7 +232,7 @@ func TestSQL_DeleteCollection(t *testing.T) {
 				if err := rows.MapScan(v); err != nil {
 					t.Error("DeleteCollection Scanning error", err)
 				}
-				mysqlTypeCheck(model.DBType(*dbType), rowTypes, v)
+				mysqlTypeCheck(context.Background(), model.DBType(*dbType), rowTypes, v)
 				readResult = append(readResult, v)
 			}
 			if !reflect.DeepEqual(tt.wantResult, readResult) {