Merge pull request #20 from cldcvr/fix/linting_issues

fix: logger_test linting issue fixed

README.md

@@ -70,12 +70,14 @@ Add the configuration in the given files:
 | ------ | ------ |
 | GoogleProjectID | Your Google Project ID |
 | SpannerDb | Your Spanner Database Name |
+| QueryLimit | Default limit for data|
 
 For example:
 ```
 {
-    "GoogleProjectID" : "first-project",
-    "SpannerDb"        : "test-db"
+    "GoogleProjectID"   : "first-project",
+    "SpannerDb"         : "test-db",
+    "QueryLimit"        : 5000
 }
 ```
 

api/v1/db.go

@@ -180,7 +180,7 @@ func queryResponse(query models.Query, c *gin.Context) {
 	}
 
 	if query.Limit == 0 {
-		query.Limit = 5000
+		query.Limit = config.ConfigurationMap.QueryLimit
 	}
 	query.ExpressionAttributeNames = ChangeColumnToSpannerExpressionName(query.TableName, query.ExpressionAttributeNames)
 	query = ReplaceHashRangeExpr(query)
@@ -550,7 +550,7 @@ func Update(c *gin.Context) {
 	}
 }
 
-// BatchWriteItem put & delte items in/from table
+// BatchWriteItem put & delete items in/from table
 // @Description Batch Write Item for putting and deleting data in/from table
 // @Summary Batch Write Items from table
 // @ID batch-write-rows

config-files/production/config-production.json

@@ -1,4 +1,5 @@
 {
     "GoogleProjectID": "Your Google Project ID",
-    "SpannerDb": "Your Spanner Database Name"
+    "SpannerDb": "Your Spanner Database Name",
+    "QueryLimit": 5000
 }

config-files/staging/config-staging.json

@@ -1,4 +1,5 @@
 {
     "GoogleProjectID": "Your Google Project ID",
-    "SpannerDb": "Your Spanner Database Name"
+    "SpannerDb": "Your Spanner Database Name",
+    "QueryLimit": 5000
 }

config/config.go

@@ -32,6 +32,7 @@ import (
 type Configuration struct {
 	GoogleProjectID string
 	SpannerDb       string
+	QueryLimit      int64
 }
 
 var once sync.Once

initializer/initializer.go

@@ -24,11 +24,11 @@ import (
 	"github.com/cloudspannerecosystem/dynamodb-adapter/storage"
 )
 
-// InitAll - this will initiliaze all the project object
-// Config, storage and all other global objects are initiliaze
+// InitAll - this will initialize all the project object
+// Config, storage and all other global objects are initialize
 func InitAll(box *rice.Box) error {
 	config.InitConfig(box)
-	storage.InitliazeDriver()
+	storage.InitializeDriver()
 	err := spanner.ParseDDL(true)
 	if err != nil {
 		return err

pkg/errors/error_test.go

@@ -14,36 +14,38 @@
 
 package errors
 
-// func TestInit(t *testing.T) {
-// 	box, err := rice.FindBox("../../errors")
-// 	assert.NoError(t, err)
-// 	Init(box)
-// }
-
-// func TestNew(t *testing.T) {
-// 	e := New("E0001")
-// 	assert.Error(t, e)
-// 	code, err := HTTPResponse(e)
-// 	assert.NotNil(t, err)
-// 	assert.Equal(t, http.StatusInternalServerError, code)
-// }
-
-// func TestHTTPResponse(t *testing.T) {
-// 	e := New("E0001")
-// 	assert.Error(t, e)
-// 	code, err := e.HTTPResponse()
-// 	assert.NotNil(t, err)
-// 	assert.Equal(t, http.StatusInternalServerError, code)
-// }
-
-// func TestNewForExceptionalError(t *testing.T) {
-// 	e := New("E1001")
-// 	assert.Error(t, e)
-// }
-
-// func TestNewForSystemErrors(t *testing.T) {
-// 	code, e := HTTPResponse(errors.New("Test"))
-// 	assert.NotNil(t, e)
-// 	assert.Equal(t, http.StatusInternalServerError, code)
-
-// }
+import (
+	"errors"
+	"net/http"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNew(t *testing.T) {
+	e := New("E0001")
+	assert.Error(t, e)
+	code, err := HTTPResponse(e, nil)
+	assert.NotNil(t, err)
+	assert.Equal(t, http.StatusBadRequest, code)
+}
+
+func TestHTTPResponse(t *testing.T) {
+	e := New("E0001")
+	assert.Error(t, e)
+	code, err := e.HTTPResponse(nil)
+	assert.NotNil(t, err)
+	assert.Equal(t, http.StatusBadRequest, code)
+}
+
+func TestNewForExceptionalError(t *testing.T) {
+	e := New("E1001")
+	assert.Error(t, e)
+}
+
+func TestNewForSystemErrors(t *testing.T) {
+	code, e := HTTPResponse(errors.New("Test"), nil)
+	assert.NotNil(t, e)
+	assert.Equal(t, http.StatusInternalServerError, code)
+
+}

pkg/logger/logger_test.go

@@ -26,6 +26,7 @@ func TestLogError(t *testing.T) {
 	}
 	LogError(err)
 }
+
 func TestLogInfo(t *testing.T) {
 	info := struct {
 		Info string
@@ -44,7 +45,6 @@ func TestLogDebug(t *testing.T) {
 	LogDebug(info)
 }
 
-// above shows the Benchmark for using LogError in Project
 func BenchmarkLogError(b *testing.B) {
 	err := struct {
 		Error string

service/services/config-control.go

@@ -139,10 +139,10 @@ func fetchConfigData() {
 
 func parseConfig(table string, config string, count int) {
 	tokens := strings.Split(config, ",")
-	if tokens[0] == "1" {
+	if len(tokens) >= 1 && tokens[0] == "1" {
 		models.ConfigController.ReadMap[table] = struct{}{}
 	}
-	if tokens[1] == "1" {
+	if len(tokens) >= 2 && tokens[1] == "1" {
 		models.ConfigController.WriteMap[table] = struct{}{}
 	}
 	if len(tokens) > 2 {
@@ -158,8 +158,8 @@ func parseConfig(table string, config string, count int) {
 	}
 }
 
-// IsMyStreamEnabled checks if a table is enabaled for streaming or not
-func IsMyStreamEnabled(tableName string) bool {
+// IsStreamEnabled checks if a table is enabled for streaming or not
+func IsStreamEnabled(tableName string) bool {
 	models.ConfigController.Mux.RLock()
 	defer models.ConfigController.Mux.RUnlock()
 	_, ok := models.ConfigController.StreamEnable[tableName]

service/services/config-control_test.go

@@ -33,7 +33,7 @@ func init() {
 	}
 }
 
-func TestIsMyStreamEnabled(t *testing.T) {
+func TestIsStreamEnabled(t *testing.T) {
 	tests := []struct {
 		testName  string
 		tableName string
@@ -62,7 +62,7 @@ func TestIsMyStreamEnabled(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		got := IsMyStreamEnabled(tc.tableName)
+		got := IsStreamEnabled(tc.tableName)
 		assert.Equal(t, got, tc.want)
 	}
 }