X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pm-file-converter%2Fcomponents%2Fminiocollector%2Fminiocollector.go;h=24ff41f278f8d20d261f16503aafbb43a36ba7af;hb=HEAD;hp=1663194885024ceae4e8193a6b6148677d9450fa;hpb=5902c2dbd9980f771e56b2d582f57b163c9b742e;p=nonrtric%2Fplt%2Franpm.git

diff --git a/pm-file-converter/components/miniocollector/miniocollector.go b/pm-file-converter/components/miniocollector/miniocollector.go
index 1663194..24ff41f 100644
--- a/pm-file-converter/components/miniocollector/miniocollector.go
+++ b/pm-file-converter/components/miniocollector/miniocollector.go
@@ -24,10 +24,6 @@ import (
 	"compress/gzip"
 	"context"
 	"fmt"
-	jsoniter "github.com/json-iterator/go"
-	"github.com/minio/minio-go/v7"
-	"github.com/minio/minio-go/v7/pkg/credentials"
-	log "github.com/sirupsen/logrus"
 	"io"
 	"main/common/dataTypes"
 	"main/components/xmltransform"
@@ -35,9 +31,15 @@ import (
 	"os"
 	"strings"
 	"time"
+
+	jsoniter "github.com/json-iterator/go"
+	"github.com/minio/minio-go/v7"
+	"github.com/minio/minio-go/v7/pkg/credentials"
+	log "github.com/sirupsen/logrus"
 )
 
-func Xml_to_json_conv(evt_data *dataTypes.XmlFileEventHeader) string {
+// nolint
+func XmlToJsonConv(evtData *dataTypes.XmlFileEventHeader) string {
 	filestoreUser := os.Getenv("FILESTORE_USER")
 	filestorePwd := os.Getenv("FILESTORE_PWD")
 	filestoreServer := os.Getenv("FILESTORE_SERVER")
@@ -50,12 +52,12 @@ func Xml_to_json_conv(evt_data *dataTypes.XmlFileEventHeader) string {
 		log.Fatalln(err)
 	}
 	expiry := time.Second * 24 * 60 * 60 // 1 day.
-	objectName := evt_data.Name
-	bucketName := evt_data.ObjectStoreBucket
-	compresion := evt_data.Compression
+	objectName := evtData.Name
+	bucketName := evtData.ObjectStoreBucket
+	compresion := evtData.Compression
 	reqParams := make(url.Values)
 
-	xmlh, err := jsoniter.Marshal(evt_data)
+	xmlh, err := jsoniter.Marshal(evtData)
 	if err != nil {
 		fmt.Printf("Error: %s", err)
 		return ""
@@ -66,17 +68,18 @@ func Xml_to_json_conv(evt_data *dataTypes.XmlFileEventHeader) string {
 	if err != nil {
 		log.Fatalln(err)
 	}
-	file_bytes := xmltransform.Convert(presignedURL.String(), compresion, string(xmlh))
+	fileBytes := xmltransform.Convert(presignedURL.String(), compresion, string(xmlh))
 	newObjectName := objectName + "kafka-producer-pm-xml2json-0.json.gz"
 	var buf bytes.Buffer
-	err = gzipWrite(&buf, &file_bytes)
-	upload_object(s3Client, buf.Bytes(), newObjectName, "pm-files-json")
+	err = gzipWrite(&buf, &fileBytes)
+	uploadObject(s3Client, buf.Bytes(), newObjectName, "pm-files-json")
 	fmt.Println("")
 
 	return newObjectName
 }
 
-func upload_object(mc *minio.Client, b []byte, objectName string, fsbucket string) {
+// nolint
+func uploadObject(mc *minio.Client, b []byte, objectName string, fsbucket string) {
 	contentType := "application/json"
 	if strings.HasSuffix(objectName, ".gz") {
 		contentType = "application/gzip"
@@ -85,8 +88,8 @@ func upload_object(mc *minio.Client, b []byte, objectName string, fsbucket strin
 	// Upload the xml file with PutObject
 	r := bytes.NewReader(b)
 	tctx := context.Background()
-	if check_minio_bucket(mc, fsbucket) == false {
-		err := create_minio_bucket(mc, fsbucket)
+	if checkMinioBucket(mc, fsbucket) == false {
+		err := createMinioBucket(mc, fsbucket)
 		if err != nil {
 			log.Error("Cannot create bucket: ", fsbucket, ", ", err)
 			return
@@ -109,7 +112,8 @@ func upload_object(mc *minio.Client, b []byte, objectName string, fsbucket strin
 	}
 }
 
-func create_minio_bucket(mc *minio.Client, bucket string) error {
+// nolint
+func createMinioBucket(mc *minio.Client, bucket string) error {
 	tctx := context.Background()
 	err := mc.MakeBucket(tctx, bucket, minio.MakeBucketOptions{})
 	if err != nil {
@@ -127,7 +131,8 @@ func create_minio_bucket(mc *minio.Client, bucket string) error {
 	return nil
 }
 
-func check_minio_bucket(mc *minio.Client, bucket string) bool {
+// nolint
+func checkMinioBucket(mc *minio.Client, bucket string) bool {
 	tctx := context.Background()
 	exists, err := mc.BucketExists(tctx, bucket)
 	if err == nil && exists {
@@ -139,6 +144,7 @@ func check_minio_bucket(mc *minio.Client, bucket string) bool {
 }
 
 // Write gzipped data to a Writer
+// nolint
 func gzipWrite(w io.Writer, data *[]byte) error {
 	gw, err1 := gzip.NewWriterLevel(w, gzip.BestSpeed)