diff --git a/jwtHelper.go b/authhelper/jwtHelper.go
similarity index 98%
rename from jwtHelper.go
rename to authhelper/jwtHelper.go
index 69c976c91aeac1c4f388e9b57db6553a9e87a22b..9dec84f468954a2fc0412a06e1ac6a893b8b2ea3 100644
--- a/jwtHelper.go
+++ b/authhelper/jwtHelper.go
@@ -1,4 +1,4 @@
-package coreos
+package authhelper
import (
"fmt"
diff --git a/cacheHelper.go b/cachehelper/cacheHelper.go
similarity index 98%
rename from cacheHelper.go
rename to cachehelper/cacheHelper.go
index 422621864c74c5da05ce0dd09236e6e63015e247..b687e554c56f24cbc6df7e2530dcfa7a78fe54e4 100644
--- a/cacheHelper.go
+++ b/cachehelper/cacheHelper.go
@@ -1,4 +1,4 @@
-package coreos
+package cachehelper
import (
"fmt"
@@ -60,4 +60,4 @@ func GetLength() int {
//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())
-}
\ No newline at end of file
+}
diff --git a/configHelper.go b/confighelper/configHelper.go
similarity index 96%
rename from configHelper.go
rename to confighelper/configHelper.go
index 214cb1a9c4f82b00abb86157982e4f7c7d2d503e..49ca2e2ef41a265e63fb80d33d0104fdeef526fc 100644
--- a/configHelper.go
+++ b/confighelper/configHelper.go
@@ -1,4 +1,4 @@
-package coreos
+package confighelper
//InitViper function to initialize viper
func InitViper() {
diff --git a/dalFDB.go b/dalhelper/dalFDB.go
similarity index 61%
rename from dalFDB.go
rename to dalhelper/dalFDB.go
index ab6295c04b3e79e23395519d6e717fbbd85f2d68..b1a82abc54b4c9a258cef8fda5cbd14e41f48a89 100644
--- a/dalFDB.go
+++ b/dalhelper/dalFDB.go
@@ -1,21 +1,22 @@
-package coreos
+package dalhelper
import (
"fmt"
- "time"
+ "corelab.mkcl.org/MKCLOS/coredevelopmentplatform/coreospackage/filehelper"
+ "time"
)
//GetDataFromFDB gets data from FDB
func GetDataFromFDB(filePath string) ([]byte, error) {
- data, err := ReadFile(filePath)
- return data, err
+ data, errr := filehelper.ReadFile(filePath)
+ return data, errr
}
//SaveDataToFDB saves data to FDB
func SaveDataToFDB(filePath string, data []byte) error {
- err := WriteFile(filePath, data)
+ err := filehelper.WriteFile(filePath, data)
fmt.Println(err)
return err
}
@@ -23,6 +24,6 @@ func SaveDataToFDB(filePath string, data []byte) error {
//DeleteFileFromFDB deletes file to FDB
func DeleteFileFromFDB(filePath string) error {
newFilePath := filePath + "_deleted_" + time.Now().String()
- err := RenameFile(filePath, newFilePath)
+ err := filehelper.RenameFile(filePath, newFilePath)
return err
}
diff --git a/dalMySQL.go b/dalhelper/dalMySQL.go
similarity index 73%
rename from dalMySQL.go
rename to dalhelper/dalMySQL.go
index 3cd006ea59e26c60fe85f7d154e891bbcbc0b9f0..f835f1bc7ac396eaaebaa87accc4ebc81ac734a4 100644
--- a/dalMySQL.go
+++ b/dalhelper/dalMySQL.go
@@ -1,8 +1,10 @@
-package coreos
+package dalhelper
import (
"sync"
+ "corelab.mkcl.org/MKCLOS/coredevelopmentplatform/coreospackage/confighelper"
+
"github.com/gocraft/dbr"
)
@@ -14,7 +16,7 @@ var sqlOnce sync.Once
func GetSQLConnection() (*dbr.Connection, error) {
sqlOnce.Do(func() {
// create a connection db(e.g. "postgres", "mysql", or "sqlite3")
- connection, _ := dbr.Open("mysql", GetConfig("MysqlDSN"), nil)
+ connection, _ := dbr.Open("mysql", confighelper.GetConfig("MysqlDSN"), nil)
// connection.SetMaxIdleConns(10)
// connection.SetMaxOpenConns(5)
diff --git a/dalNoSQL.go b/dalhelper/dalNoSQL.go
similarity index 75%
rename from dalNoSQL.go
rename to dalhelper/dalNoSQL.go
index 4edbafd17f957297b2fcc50545fdb2377fe8dde3..9700bf888e245787a62ae8f3d6b0300f1e25af06 100644
--- a/dalNoSQL.go
+++ b/dalhelper/dalNoSQL.go
@@ -1,9 +1,11 @@
-package coreos
+package dalhelper
import (
"fmt"
"sync"
+ "corelab.mkcl.org/MKCLOS/coredevelopmentplatform/coreospackage/confighelper"
+
mgo "gopkg.in/mgo.v2"
)
@@ -14,12 +16,12 @@ var once sync.Once
func GetMongoConnection() *mgo.Session {
once.Do(func() {
Host := []string{
- GetConfig("MONGODSN"),
+ confighelper.GetConfig("MONGODSN"),
}
var (
Username = ""
Password = ""
- Database = GetConfig("DBNAME")
+ Database = confighelper.GetConfig("DBNAME")
)
session, err := mgo.DialWithInfo(&mgo.DialInfo{
diff --git a/dalRedis.go b/dalhelper/dalRedis.go
similarity index 57%
rename from dalRedis.go
rename to dalhelper/dalRedis.go
index a80ba700d6c43bf0d7477216b4f82c47d1e5dc1e..4e4bd63c2a85ac992722b6bbef152420c30eec2a 100644
--- a/dalRedis.go
+++ b/dalhelper/dalRedis.go
@@ -1,6 +1,8 @@
-package coreos
+package dalhelper
import (
+ "corelab.mkcl.org/MKCLOS/coredevelopmentplatform/coreospackage/confighelper"
+
"github.com/garyburd/redigo/redis"
)
@@ -11,7 +13,7 @@ func GetWorkPool() *redis.Pool {
MaxIdle: 5,
Wait: true,
Dial: func() (redis.Conn, error) {
- return redis.Dial("tcp", GetConfig("REDISDSN"), redis.DialDatabase(3))
+ return redis.Dial("tcp", confighelper.GetConfig("REDISDSN"), redis.DialDatabase(3))
},
}
return redisPool
diff --git a/dbconfig.go b/dalhelper/dbconfig.go
similarity index 94%
rename from dbconfig.go
rename to dalhelper/dbconfig.go
index 7279af75cab543fc94e3073b7184016804901b97..23e459e2b5e9edc7dfe6cf0e4f21679def29ebf3 100644
--- a/dbconfig.go
+++ b/dalhelper/dbconfig.go
@@ -1,4 +1,4 @@
-package coreos
+package dalhelper
import (
"os"
diff --git a/dbconfig_test.go b/dalhelper/dbconfig_test.go
similarity index 96%
rename from dbconfig_test.go
rename to dalhelper/dbconfig_test.go
index b5f02de1899b30a0ff4f5e911eda076a91f4825e..03836e884bd5e048112edf6a70aa4cbe73726974 100644
--- a/dbconfig_test.go
+++ b/dalhelper/dbconfig_test.go
@@ -1,4 +1,4 @@
-package coreos
+package dalhelper
import (
"os"
diff --git a/dataConvertor.go b/dataConvertor.go
deleted file mode 100644
index 77e9dd1d01eacf02349208591eda33c2400ce06d..0000000000000000000000000000000000000000
--- a/dataConvertor.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package coreos
-
-import (
- "encoding/json"
- "log"
-
- "gopkg.in/mgo.v2/bson"
-)
-
-//ConvertToJSON converts []bson to json
-// func ConvertToJSON(data []bson.M) string {
-// respBody, err := json.MarshalIndent(data, "", "")
-// if err != nil {
-// log.Fatal(err)
-// }
-// return string(respBody)
-// }
-//ConvertToJSON converts []bson to json
-func ConvertToJSON(data []bson.M) string {
- respBody, err := json.MarshalIndent(data, "", "")
- if err != nil {
- log.Fatal(err)
- }
- return string(respBody)
-}
diff --git a/downloadHelper.go b/downloadHelper.go
deleted file mode 100644
index 7e1eb3fdec877bb2e40c25d4909ff67df843bb66..0000000000000000000000000000000000000000
--- a/downloadHelper.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package coreos
-
-import "coreospackage/mkcldownload"
-
-//DownloadFile method
-func DownloadFile(downloadURL string, downloadLocation string, noOfThreads int) bool {
-
- url, resHeader := mkcldownload.GetFinalurl(downloadURL)
-
- var downloadStatus bool
-
- if mkcldownload.AcceptRanges(resHeader) {
-
- mkcldownload.NoOfFiles = noOfThreads
- mkcldownload.DownloadLocation = downloadLocation
- downloadStatus = mkcldownload.Download(url, mkcldownload.GetContentLength(resHeader))
- return downloadStatus
- }
-
- downloadStatus = mkcldownload.DownloadSingle(url)
- return downloadStatus
-
-}
-
-//ResumeFileDownload method
-func ResumeFileDownload(downloadURL string, downloadLocation string) bool {
-
- mkcldownload.DownloadLocation = downloadLocation
-
- url, resHeader := mkcldownload.GetFinalurl(downloadURL)
- var resumeStatus bool
- if mkcldownload.AcceptRanges(resHeader) {
- resumeStatus = mkcldownload.Resume(url, mkcldownload.GetContentLength(resHeader))
- }
-
- return resumeStatus
-}
diff --git a/mkcldownload/download.go b/downloadhelper/download.go
similarity index 99%
rename from mkcldownload/download.go
rename to downloadhelper/download.go
index 70f4458428e57ed11816a9df1a767621e6f04c9c..19755e1c28e2da613015d0dedea6966914dc3dcf 100644
--- a/mkcldownload/download.go
+++ b/downloadhelper/download.go
@@ -1,4 +1,4 @@
-package mkcldownload
+package downloadhelper
import (
"flag"
diff --git a/downloadhelper/downloadHelper.go b/downloadhelper/downloadHelper.go
new file mode 100644
index 0000000000000000000000000000000000000000..c81babb71c125f55a23dfa98b81a12a382354828
--- /dev/null
+++ b/downloadhelper/downloadHelper.go
@@ -0,0 +1,35 @@
+package downloadhelper
+
+//DownloadFile method
+func DownloadFile(downloadURL string, downloadLocation string, noOfThreads int) bool {
+
+ url, resHeader := GetFinalurl(downloadURL)
+
+ var downloadStatus bool
+
+ if AcceptRanges(resHeader) {
+
+ NoOfFiles = noOfThreads
+ DownloadLocation = downloadLocation
+ downloadStatus = Download(url, GetContentLength(resHeader))
+ return downloadStatus
+ }
+
+ downloadStatus = DownloadSingle(url)
+ return downloadStatus
+
+}
+
+//ResumeFileDownload method
+func ResumeFileDownload(downloadURL string, downloadLocation string) bool {
+
+ DownloadLocation = downloadLocation
+
+ url, resHeader := GetFinalurl(downloadURL)
+ var resumeStatus bool
+ if AcceptRanges(resHeader) {
+ resumeStatus = Resume(url, GetContentLength(resHeader))
+ }
+
+ return resumeStatus
+}
diff --git a/mkcldownload/download_helper.go b/downloadhelper/download_helper.go
similarity index 99%
rename from mkcldownload/download_helper.go
rename to downloadhelper/download_helper.go
index 033aa08021822d64bb6f598d5737ad231802194b..c023ee388e328a083f807e74bb4e37f68605072e 100644
--- a/mkcldownload/download_helper.go
+++ b/downloadhelper/download_helper.go
@@ -1,4 +1,4 @@
-package mkcldownload
+package downloadhelper
import (
"errors"
diff --git a/mkcldownload/fileutil.go b/downloadhelper/fileutil.go
similarity index 99%
rename from mkcldownload/fileutil.go
rename to downloadhelper/fileutil.go
index a453311046f57f910c6d64aa876f3a8bdb93a77b..a62026a2c15cd87931d932df97874ff1d54ffcfb 100644
--- a/mkcldownload/fileutil.go
+++ b/downloadhelper/fileutil.go
@@ -1,4 +1,4 @@
-package mkcldownload
+package downloadhelper
import (
"bytes"
diff --git a/mkcldownload/log.go b/downloadhelper/log.go
similarity index 99%
rename from mkcldownload/log.go
rename to downloadhelper/log.go
index 8323abf3656fe333aa13e39dd444dd7fab388d11..9d088c1c2ba37b5a9d12af03bf7eb2441f7e4469 100644
--- a/mkcldownload/log.go
+++ b/downloadhelper/log.go
@@ -1,4 +1,4 @@
-package mkcldownload
+package downloadhelper
import (
"encoding/binary"
diff --git a/mkcldownload/returnfunction.go b/downloadhelper/returnfunction.go
similarity index 53%
rename from mkcldownload/returnfunction.go
rename to downloadhelper/returnfunction.go
index fef2ca1fb44cda0b733e5b821caf26ce383ac63c..577a772cf6e86e3d6654128731f5b02aa7178b46 100644
--- a/mkcldownload/returnfunction.go
+++ b/downloadhelper/returnfunction.go
@@ -1,3 +1,3 @@
-package mkcldownload
+package downloadhelper
type ReturnStatus func()
diff --git a/mkcldownload/util.go b/downloadhelper/util.go
similarity index 98%
rename from mkcldownload/util.go
rename to downloadhelper/util.go
index 7a5ad643d10309767ee954ebdd22241b9d057247..49026aa9bff1a3f805523cded38d60bc5f736451 100644
--- a/mkcldownload/util.go
+++ b/downloadhelper/util.go
@@ -1,4 +1,4 @@
-package mkcldownload
+package downloadhelper
import (
"flag"
diff --git a/echoHelper.go b/echoHelper.go
deleted file mode 100644
index fd8fbe73cf92c4611607352ab3a63d383721c856..0000000000000000000000000000000000000000
--- a/echoHelper.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package coreos
-
-import (
- "sync"
-
- "github.com/labstack/echo"
-)
-
-var echoInstance *echo.Echo
-var echoOnce sync.Once
-
-//GetEcho method
-func GetEcho() *echo.Echo {
- echoOnce.Do(func() {
- e := echo.New()
-
- echoInstance = e
-
- })
- return echoInstance
-}
diff --git a/fileHelper.go b/filehelper/fileHelper.go
similarity index 99%
rename from fileHelper.go
rename to filehelper/fileHelper.go
index b443d6a992225e4f131785c8ee12e938678dd700..0ca81cbe11837ab9404d8bfed98c7dd81980d0ab 100644
--- a/fileHelper.go
+++ b/filehelper/fileHelper.go
@@ -1,4 +1,4 @@
-package coreos
+package filehelper
import (
"archive/zip"
diff --git a/loggingHelper.go b/logginghelper/loggingHelper.go
similarity index 92%
rename from loggingHelper.go
rename to logginghelper/loggingHelper.go
index b281fe0d8225ea2ecd3fdf3d9cfd6fef6c27b312..07401468c40f999887703cccb37856417f7258e9 100644
--- a/loggingHelper.go
+++ b/logginghelper/loggingHelper.go
@@ -1,4 +1,4 @@
-package coreos
+package logginghelper
import (
"os"
diff --git a/smsHelper.go b/notificationhelper/smsHelper.go
similarity index 97%
rename from smsHelper.go
rename to notificationhelper/smsHelper.go
index 3a0908c46700db755ac32e218c6703611b371fb6..49c81d7c8ea38e597b1ef97df905b909076e3f00 100644
--- a/smsHelper.go
+++ b/notificationhelper/smsHelper.go
@@ -1,4 +1,4 @@
-package coreos
+package notificationhelper
import (
"fmt"
diff --git a/compressionHelper.go b/securityhelper/compressionHelper.go
similarity index 90%
rename from compressionHelper.go
rename to securityhelper/compressionHelper.go
index 08fe9cebc09808c48e08ad7c752d4c4c726a7efb..54ab679aeca15395b7bba1a813820049ec7eb89e 100644
--- a/compressionHelper.go
+++ b/securityhelper/compressionHelper.go
@@ -1,4 +1,4 @@
-package coreos
+package securityhelper
import "github.com/DataDog/zstd"
diff --git a/securityHelper.go b/securityhelper/securityHelper.go
similarity index 94%
rename from securityHelper.go
rename to securityhelper/securityHelper.go
index 52acdb11b41c8a4e58dc43792c4287a1ed2f4b58..35cc43b1fe5c27679364424375fc7851ea1f3434 100644
--- a/securityHelper.go
+++ b/securityhelper/securityHelper.go
@@ -1,4 +1,4 @@
-package coreos
+package securityhelper
import (
"bytes"
diff --git a/validationHelper.go b/validationhelper/validationHelper.go
similarity index 94%
rename from validationHelper.go
rename to validationhelper/validationHelper.go
index b4b4a1251f210a7d46c00bfedf50c6c00e34537d..7742a12b1542d5517f28259b27efd9db58b90332 100644
--- a/validationHelper.go
+++ b/validationhelper/validationHelper.go
@@ -1,4 +1,4 @@
-package coreos
+package validationhelper
import (
"github.com/go-playground/locales/en"