From 82e53e8fc2da0cfd3e552facfe9e734df830d963 Mon Sep 17 00:00:00 2001
From: "MKCLINDIA\\onkars" <onkars@mkcl.org>
Date: Fri, 21 Jul 2017 11:56:57 +0530
Subject: [PATCH] Code Cleanup
Remove 'fmt', change func to return error
---
authhelper/jwtHelper.go | 11 ++++++----
cachehelper/cacheHelper.go | 10 ++++-----
dalhelper/dalFDB.go | 7 ++----
dalhelper/dalMySQL.go | 9 +++++---
dalhelper/dalNoSQL.go | 10 ++++-----
filehelper/fileHelper.go | 18 +++++++++------
logginghelper/loggingHelper.go | 2 +-
notificationhelper/smsHelper.go | 21 +++++++++---------
securityhelper/compressionHelper.go | 1 -
securityhelper/securityHelper.go | 33 +++++++++++++++++-----------
validationhelper/validationHelper.go | 9 --------
11 files changed, 67 insertions(+), 64 deletions(-)
diff --git a/authhelper/jwtHelper.go b/authhelper/jwtHelper.go
index 9dec84f..e3809d2 100644
--- a/authhelper/jwtHelper.go
+++ b/authhelper/jwtHelper.go
@@ -30,19 +30,22 @@ func GetJwtConfig() middleware.JWTConfig {
}
// DecodeToken decode token
-func DecodeToken(tokenFromRequest string) jwt.MapClaims {
+func DecodeToken(tokenFromRequest string) (jwt.MapClaims, error) {
tokenFromRequest = strings.Trim(strings.Split(tokenFromRequest, "Bearer")[1], " ")
// get data i.e.Claims from token
- token, _ := jwt.Parse(tokenFromRequest, func(token *jwt.Token) (interface{}, error) {
+ token, err := jwt.Parse(tokenFromRequest, func(token *jwt.Token) (interface{}, error) {
// Don't forget to validate the alg is what you expect:
if _, ok := token.Method.(*jwt.SigningMethodRSA); !ok {
return nil, fmt.Errorf("Unexpected signing method: %v", token.Header["alg"])
}
return JwtKey, nil
})
+ if err != nil {
+ return nil, err
+ }
claims, ok := token.Claims.(jwt.MapClaims)
if !ok {
- return nil
+ return nil, nil
}
- return claims
+ return claims, nil
}
diff --git a/cachehelper/cacheHelper.go b/cachehelper/cacheHelper.go
index b687e55..39f80e1 100644
--- a/cachehelper/cacheHelper.go
+++ b/cachehelper/cacheHelper.go
@@ -1,9 +1,9 @@
package cachehelper
import (
- "fmt"
"time"
+ "corelab.mkcl.org/MKCLOS/coredevelopmentplatform/coreospackage/logginghelper"
"github.com/allegro/bigcache"
)
@@ -12,7 +12,7 @@ const (
BIGCACHEMaxEntrySize = 1024
BIGCACHEVerbose = true
BIGCACHEHardMaxCacheSize = 0
- BIGCACHEMaxEntriesInWindow = 1000 * 10 * 60
+ BIGCACHEMaxEntriesInWindow = 100000
BIGCACHELifeWindow = 2
)
@@ -47,8 +47,8 @@ func GetValue(key string) ([]byte, error) {
}
//SetValue SetValue
-func SetValue(key string, value []byte) {
- cache.Set(key, value)
+func SetValue(key string, value []byte) error {
+ return cache.Set(key, value)
}
//GetLength GetLength
@@ -59,5 +59,5 @@ func GetLength() int {
//Callback function executed when cache element is removed.
//Executed only when onRemove of cache config poting to this function
func onRemove(key string, entry []byte) {
- fmt.Println(key + " removed at " + time.Now().String())
+ logginghelper.LogInfo(key + " removed at " + time.Now().String())
}
diff --git a/dalhelper/dalFDB.go b/dalhelper/dalFDB.go
index b1a82ab..9da9d98 100644
--- a/dalhelper/dalFDB.go
+++ b/dalhelper/dalFDB.go
@@ -1,8 +1,6 @@
package dalhelper
import (
- "fmt"
-
"corelab.mkcl.org/MKCLOS/coredevelopmentplatform/coreospackage/filehelper"
"time"
@@ -10,14 +8,13 @@ import (
//GetDataFromFDB gets data from FDB
func GetDataFromFDB(filePath string) ([]byte, error) {
- data, errr := filehelper.ReadFile(filePath)
- return data, errr
+ data, err := filehelper.ReadFile(filePath)
+ return data, err
}
//SaveDataToFDB saves data to FDB
func SaveDataToFDB(filePath string, data []byte) error {
err := filehelper.WriteFile(filePath, data)
- fmt.Println(err)
return err
}
diff --git a/dalhelper/dalMySQL.go b/dalhelper/dalMySQL.go
index f835f1b..8512e45 100644
--- a/dalhelper/dalMySQL.go
+++ b/dalhelper/dalMySQL.go
@@ -10,17 +10,20 @@ import (
// Hold a single global connection (pooling provided by sql driver)
var sqlConnection *dbr.Connection
+var connectionError error
var sqlOnce sync.Once
//GetSQLConnection to db
func GetSQLConnection() (*dbr.Connection, error) {
sqlOnce.Do(func() {
// create a connection db(e.g. "postgres", "mysql", or "sqlite3")
- connection, _ := dbr.Open("mysql", confighelper.GetConfig("MysqlDSN"), nil)
-
+ connection, err := dbr.Open("mysql", confighelper.GetConfig("MysqlDSN"), nil)
+ if err != nil {
+ connectionError = err
+ }
// connection.SetMaxIdleConns(10)
// connection.SetMaxOpenConns(5)
sqlConnection = connection
})
- return sqlConnection, nil
+ return sqlConnection, connectionError
}
diff --git a/dalhelper/dalNoSQL.go b/dalhelper/dalNoSQL.go
index 9700bf8..0e1bd32 100644
--- a/dalhelper/dalNoSQL.go
+++ b/dalhelper/dalNoSQL.go
@@ -1,7 +1,6 @@
package dalhelper
import (
- "fmt"
"sync"
"corelab.mkcl.org/MKCLOS/coredevelopmentplatform/coreospackage/confighelper"
@@ -10,10 +9,11 @@ import (
)
var instance *mgo.Session
+var sessionError error
var once sync.Once
//GetMongoConnection method
-func GetMongoConnection() *mgo.Session {
+func GetMongoConnection() (*mgo.Session, error) {
once.Do(func() {
Host := []string{
confighelper.GetConfig("MONGODSN"),
@@ -31,14 +31,12 @@ func GetMongoConnection() *mgo.Session {
Database: Database,
})
if err != nil {
-
+ sessionError = err
}
//defer session.Close()
- fmt.Printf("Connected to replica set %v!\n", session.LiveServers())
-
instance = session
})
- return instance
+ return instance, sessionError
}
diff --git a/filehelper/fileHelper.go b/filehelper/fileHelper.go
index 0ca81cb..76496dd 100644
--- a/filehelper/fileHelper.go
+++ b/filehelper/fileHelper.go
@@ -79,7 +79,7 @@ func Zip(source, target string) error {
info, err := os.Stat(source)
if err != nil {
- return nil
+ return err
}
var baseDir string
@@ -122,6 +122,8 @@ func Zip(source, target string) error {
}
defer file.Close()
_, err = io.Copy(writer, file)
+ if err != nil {
+ }
return err
})
@@ -135,7 +137,8 @@ func Unzip(archive, target string) error {
return err
}
- if err := os.MkdirAll(target, 0755); err != nil {
+ err = os.MkdirAll(target, 0755)
+ if err != nil {
return err
}
@@ -158,7 +161,8 @@ func Unzip(archive, target string) error {
}
defer targetFile.Close()
- if _, err := io.Copy(targetFile, fileReader); err != nil {
+ _, err = io.Copy(targetFile, fileReader)
+ if err != nil {
return err
}
}
@@ -185,7 +189,8 @@ func CopyFile(source, destination string) error {
return err
}
err = ioutil.WriteFile(destination, data, 0644)
-
+ if err != nil {
+ }
return err
}
@@ -193,7 +198,8 @@ func CopyFile(source, destination string) error {
func ReplaceFile(data []byte, destination string) error {
err := ioutil.WriteFile(destination, data, 0644)
-
+ if err != nil {
+ }
return err
}
@@ -247,14 +253,12 @@ func FileSearch(fileName, path string) ([]string, error) {
func findFile(path string, fileInfo os.FileInfo, err error) error {
if err != nil {
-
return err
}
// get absolute path of the folder that we are searching
absolute, err := filepath.Abs(path)
if err != nil {
-
return err
}
diff --git a/logginghelper/loggingHelper.go b/logginghelper/loggingHelper.go
index 0740146..3bfdbd9 100644
--- a/logginghelper/loggingHelper.go
+++ b/logginghelper/loggingHelper.go
@@ -16,7 +16,7 @@ func init() {
if err == nil {
logger.Out = file
} else {
- logger.Info("Failed to log to file, using default stderr")
+ logger.Error(err)
}
}
diff --git a/notificationhelper/smsHelper.go b/notificationhelper/smsHelper.go
index 49c81d7..d9b0240 100644
--- a/notificationhelper/smsHelper.go
+++ b/notificationhelper/smsHelper.go
@@ -1,11 +1,10 @@
package notificationhelper
import (
- "fmt"
- "io/ioutil"
- "log"
"net/http"
"net/url"
+
+ "corelab.mkcl.org/MKCLOS/coredevelopmentplatform/coreospackage/confighelper"
)
type SMS struct {
@@ -20,17 +19,19 @@ type SMS struct {
// SendSMS : send SMS Service
func SendSMS(smsObject SMS) error {
var postURL string
- postURL = GetConfig("SMSAPIURL") + "?UserName=" + smsObject.UserName + "&password=" + smsObject.Password + "&MobileNo=" + smsObject.MobileNumber + "&SenderID=" + smsObject.SenderID + "&CDMAHeader=" + smsObject.CDMAHeader + "&Message=" + url.QueryEscape(smsObject.Message)
- // fmt.Println(postURL)
+ postURL = confighelper.GetConfig("SMSAPIURL") + "?UserName=" + smsObject.UserName + "&password=" + smsObject.Password + "&MobileNo=" + smsObject.MobileNumber + "&SenderID=" + smsObject.SenderID + "&CDMAHeader=" + smsObject.CDMAHeader + "&Message=" + url.QueryEscape(smsObject.Message)
+
resp, err := http.Get(postURL)
if err != nil {
- // handle error
- log.Fatal(err)
+ return err
}
defer resp.Body.Close()
- body, err := ioutil.ReadAll(resp.Body)
- fmt.Println(body)
- return err
+ // body, err := ioutil.ReadAll(resp.Body)
+ // if err != nil {
+ // return err
+ // }
+
+ return nil
}
// GetSMSObject : get sms object
diff --git a/securityhelper/compressionHelper.go b/securityhelper/compressionHelper.go
index 54ab679..43289c4 100644
--- a/securityhelper/compressionHelper.go
+++ b/securityhelper/compressionHelper.go
@@ -5,7 +5,6 @@ import "github.com/DataDog/zstd"
//Compress Compress
func Compress(inputData []byte) ([]byte, error) {
compressedData, err := zstd.Compress(nil, inputData)
-
return compressedData, err
}
diff --git a/securityhelper/securityHelper.go b/securityhelper/securityHelper.go
index 35cc43b..c13e671 100644
--- a/securityhelper/securityHelper.go
+++ b/securityhelper/securityHelper.go
@@ -6,6 +6,8 @@ import (
"crypto/cipher"
"encoding/base64"
+ "corelab.mkcl.org/MKCLOS/coredevelopmentplatform/coreospackage/filehelper"
+
"github.com/OneOfOne/xxhash"
)
@@ -14,10 +16,10 @@ const (
)
//AESEncrypt Encrypts given text
-func AESEncrypt(plainText, key []byte) []byte {
+func AESEncrypt(plainText, key []byte) ([]byte, error) {
block, err := aes.NewCipher(key)
if err != nil {
- panic(err)
+ return nil, err
}
padding := block.BlockSize() - len(plainText)%block.BlockSize()
@@ -35,7 +37,7 @@ func AESEncrypt(plainText, key []byte) []byte {
base64.StdEncoding.Encode(encodedData, cipherText)
- return encodedData
+ return encodedData, nil
}
//AESDecrypt Decrypts given cipher text
@@ -64,19 +66,24 @@ func AESDecrypt(encodedData, key []byte) []byte {
}
//GetHashChecksumOfByteArray Get Hash Check sum
-func GetHashChecksumOfByteArray(byteArray []byte) uint64 {
+func GetHashChecksumOfByteArray(byteArray []byte) (uint64, error) {
h := xxhash.New64()
- h.Write(byteArray)
- return h.Sum64()
+ _, err := h.Write(byteArray)
+ if err != nil {
+ return 0, err
+ }
+ return h.Sum64(), nil
}
//GetHashChecksumOfFile Get Hash Check sum
-func GetHashChecksumOfFile(filePath string) uint64 {
- byteArray, err := ReadFile(filePath)
- if err == nil {
- hash := GetHashChecksumOfByteArray(byteArray)
- return hash
+func GetHashChecksumOfFile(filePath string) (uint64, error) {
+ byteArray, err := filehelper.ReadFile(filePath)
+ if err != nil {
+ return 0, err
}
-
- return 0
+ hash, err := GetHashChecksumOfByteArray(byteArray)
+ if err != nil {
+ return 0, err
+ }
+ return hash, nil
}
diff --git a/validationhelper/validationHelper.go b/validationhelper/validationHelper.go
index 7742a12..2bbe7e7 100644
--- a/validationhelper/validationHelper.go
+++ b/validationhelper/validationHelper.go
@@ -16,17 +16,13 @@ func Validate(s interface{}) map[string]string {
validate = validator.New()
en := en.New()
- //mr := mr.New()
-
uni = ut.New(en, en)
trans, _ := uni.GetTranslator("en")
en_translations.RegisterDefaultTranslations(validate, trans)
- // mr_translations.RegisterDefaultTranslations(validate, trans)
//For custom error message
// validate.RegisterTranslation("required", trans, func(ut ut.Translator) error {
- // // fmt.Println(ut)
// return ut.Add("required", "{0} must have a value!", true) // see universal-translator for details
// }, func(ut ut.Translator, fe validator.FieldError) string {
@@ -36,19 +32,14 @@ func Validate(s interface{}) map[string]string {
// })
err := validate.Struct(s)
-
if err != nil {
errs := err.(validator.ValidationErrors)
-
- //customErrs := map[string]string{}
customErrs := make(map[string]string, len(errs))
for _, e := range errs {
// can translate each error one at a time.
customErrs[e.Namespace()] = e.Translate(trans)
-
}
-
return customErrs
}
return nil
--
GitLab