Merge branch 'SG_Go1.21.10' into 'devbranch'

#29 Added Golang 1.21.10 support and also updated GRPC package.

See merge request !292

configmdl/configmdl.go

@@ -5,7 +5,6 @@ import (
 	"corelab.mkcl.org/MKCLOS/coredevelopmentplatform/corepkgv2/filemdl"
 	"corelab.mkcl.org/MKCLOS/coredevelopmentplatform/corepkgv2/securitymdl"
 	"github.com/BurntSushi/toml"
-	pellgotoml "github.com/pelletier/go-toml"
 )
 
 // InitConfig initConfig
@@ -39,7 +38,8 @@ func InitConfigSecure(fpath string, config interface{}, key []byte) (toml.MetaDa
 
 // SaveConfig - SaveConfig
 func SaveConfig(fpath string, config interface{}) error {
-	bytes, tomlMarshalError := pellgotoml.Marshal(config)
+	// bytes, tomlMarshalError := pellgotoml.Marshal(config)
+	bytes, tomlMarshalError := toml.Marshal(config)
 	if errormdl.CheckErr(tomlMarshalError) != nil {
 		return errormdl.CheckErr(tomlMarshalError)
 	}
@@ -52,7 +52,7 @@ func SaveConfig(fpath string, config interface{}) error {
 
 // SaveConfigSecure - SaveConfigSecure
 func SaveConfigSecure(fpath string, config interface{}, key []byte) error {
-	configBytes, tomlMarshalError := pellgotoml.Marshal(config)
+	configBytes, tomlMarshalError := toml.Marshal(config)
 	if errormdl.CheckErr(tomlMarshalError) != nil {
 		return errormdl.CheckErr(tomlMarshalError)
 	}

go.mod

 module corelab.mkcl.org/MKCLOS/coredevelopmentplatform/corepkgv2
 
-go 1.20
+go 1.21.10
 
 require (
-	github.com/BurntSushi/toml v1.3.2
+	github.com/BurntSushi/toml v1.4.0
 	github.com/OneOfOne/xxhash v1.2.8
 	github.com/ahmetb/go-linq/v3 v3.2.0
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
 	github.com/aymerick/raymond v2.0.2+incompatible
 	github.com/boltdb/bolt v1.3.1
 	github.com/codenotary/immudb v1.5.0
+	github.com/davecgh/go-spew v1.1.1
 	github.com/denisenkom/go-mssqldb v0.12.3
 	github.com/dgraph-io/dgo/v2 v2.2.0
-	github.com/gin-gonic/gin v1.9.1
-	github.com/go-ldap/ldap/v3 v3.4.5
+	github.com/gin-gonic/gin v1.10.0
+	github.com/go-ldap/ldap/v3 v3.4.8
 	github.com/go-redis/redis/v7 v7.4.1
-	github.com/go-sql-driver/mysql v1.7.1
-	github.com/gocraft/dbr/v2 v2.7.5
-	github.com/golang/protobuf v1.5.3
-	github.com/hashicorp/go-version v1.6.0
+	github.com/go-sql-driver/mysql v1.8.1
+	github.com/gocraft/dbr/v2 v2.7.6
+	github.com/golang-jwt/jwt/v5 v5.2.1
+	github.com/golang/protobuf v1.5.4
+	github.com/hashicorp/go-version v1.7.0
 	github.com/juju/fslock v0.0.0-20160525022230-4d5c94c67b4b
-	github.com/klauspost/compress v1.16.7
+	github.com/klauspost/compress v1.17.9
 	github.com/lithammer/fuzzysearch v1.1.8
 	github.com/noaway/heartbeat v0.0.0-20160401014313-9ba9a606fca3
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/pelletier/go-toml v1.9.5
 	github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7
 	github.com/pquerna/otp v1.4.0
 	github.com/processout/grpc-go-pool v1.2.1
 	github.com/qiangxue/fasthttp-routing v0.0.0-20160225050629-6ccdc2a18d87
 	github.com/segmentio/ksuid v1.0.4
-	github.com/shurcooL/go-goon v1.0.0
-	github.com/stretchr/testify v1.8.4
-	github.com/tidwall/buntdb v1.3.0
-	github.com/tidwall/gjson v1.16.0
+	github.com/stretchr/testify v1.9.0
+	github.com/tidwall/buntdb v1.3.1
+	github.com/tidwall/gjson v1.17.1
 	github.com/tidwall/sjson v1.2.5
-	github.com/valyala/fasthttp v1.49.0
+	github.com/valyala/fasthttp v1.55.0
 	github.com/zhouzhuojie/conditions v0.2.3
-	go.mongodb.org/mongo-driver v1.9.1
-	go.uber.org/zap v1.21.0
-	golang.org/x/crypto v0.11.0
-	google.golang.org/grpc v1.56.2
+	go.mongodb.org/mongo-driver v1.16.0
+	go.uber.org/zap v1.27.0
+	golang.org/x/crypto v0.25.0
+	google.golang.org/grpc v1.65.0
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
@@ -49,47 +49,50 @@ require (
 )
 
 require (
+	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
 	github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
 	github.com/aead/chacha20poly1305 v0.0.0-20201124145622-1a5aba2a8b29 // indirect
 	github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect
-	github.com/andybalholm/brotli v1.0.5 // indirect
+	github.com/andybalholm/brotli v1.1.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
-	github.com/bytedance/sonic v1.9.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/bytedance/sonic v1.11.6 // indirect
+	github.com/bytedance/sonic/loader v0.1.1 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/cloudwego/base64x v0.1.4 // indirect
+	github.com/cloudwego/iasm v0.2.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
+	github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
 	github.com/go-ozzo/ozzo-routing v2.1.4+incompatible // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.14.0 // indirect
-	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/go-playground/validator/v10 v10.20.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/golang-jwt/jwt/v5 v5.0.0
 	github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
 	github.com/golang/gddo v0.0.0-20210115222349-20d68f94ee1f // indirect
-	github.com/golang/snappy v0.0.1 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.0.1 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
-	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/o1egl/paseto v1.0.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.12.2 // indirect
@@ -98,8 +101,7 @@ require (
 	github.com/prometheus/procfs v0.7.3 // indirect
 	github.com/rogpeppe/go-internal v1.9.0 // indirect
 	github.com/rs/xid v1.5.0 // indirect
-	github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636 // indirect
-	github.com/spf13/afero v1.9.3 // indirect
+	github.com/spf13/afero v1.10.0 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/cobra v1.6.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -113,25 +115,25 @@ require (
 	github.com/tidwall/rtred v0.1.2 // indirect
 	github.com/tidwall/tinyqueue v0.1.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.11 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
-	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/net v0.12.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/term v0.12.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	golang.org/x/arch v0.8.0 // indirect
+	golang.org/x/net v0.27.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/sys v0.22.0 // indirect
+	golang.org/x/term v0.22.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
+	google.golang.org/genproto v0.0.0-20240701130421-f6361c86f094 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

grpcbuildermdl/grpcbuildermdl.proto

 syntax = "proto3";
 
 package grpcbuildermdl;
-option go_package = "grpcbuildermdl";
+option go_package = "/grpcbuildermdl";
 
 message GRPCMessage {
     string name =1 ;

grpcbuildermdl/grpcbuildermdl_grpc.pb.go

+// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
+// versions:
+// - protoc-gen-go-grpc v1.2.0
+// - protoc             v3.6.1
+// source: grpcbuildermdl.proto
+
+package grpcbuildermdl
+
+import (
+	context "context"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
+)
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
+const _ = grpc.SupportPackageIsVersion7
+
+// GRPCServiceClient is the client API for GRPCService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
+type GRPCServiceClient interface {
+	GRPCHandler(ctx context.Context, in *GRPCRequest, opts ...grpc.CallOption) (*GRPCByteResponse, error)
+}
+
+type gRPCServiceClient struct {
+	cc grpc.ClientConnInterface
+}
+
+func NewGRPCServiceClient(cc grpc.ClientConnInterface) GRPCServiceClient {
+	return &gRPCServiceClient{cc}
+}
+
+func (c *gRPCServiceClient) GRPCHandler(ctx context.Context, in *GRPCRequest, opts ...grpc.CallOption) (*GRPCByteResponse, error) {
+	out := new(GRPCByteResponse)
+	err := c.cc.Invoke(ctx, "/grpcbuildermdl.GRPCService/GRPCHandler", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// GRPCServiceServer is the server API for GRPCService service.
+// All implementations must embed UnimplementedGRPCServiceServer
+// for forward compatibility
+type GRPCServiceServer interface {
+	GRPCHandler(context.Context, *GRPCRequest) (*GRPCByteResponse, error)
+	mustEmbedUnimplementedGRPCServiceServer()
+}
+
+// UnimplementedGRPCServiceServer must be embedded to have forward compatible implementations.
+type UnimplementedGRPCServiceServer struct {
+}
+
+func (UnimplementedGRPCServiceServer) GRPCHandler(context.Context, *GRPCRequest) (*GRPCByteResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GRPCHandler not implemented")
+}
+func (UnimplementedGRPCServiceServer) mustEmbedUnimplementedGRPCServiceServer() {}
+
+// UnsafeGRPCServiceServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to GRPCServiceServer will
+// result in compilation errors.
+type UnsafeGRPCServiceServer interface {
+	mustEmbedUnimplementedGRPCServiceServer()
+}
+
+func RegisterGRPCServiceServer(s grpc.ServiceRegistrar, srv GRPCServiceServer) {
+	s.RegisterService(&GRPCService_ServiceDesc, srv)
+}
+
+func _GRPCService_GRPCHandler_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GRPCRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GRPCServiceServer).GRPCHandler(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/grpcbuildermdl.GRPCService/GRPCHandler",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GRPCServiceServer).GRPCHandler(ctx, req.(*GRPCRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+// GRPCService_ServiceDesc is the grpc.ServiceDesc for GRPCService service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var GRPCService_ServiceDesc = grpc.ServiceDesc{
+	ServiceName: "grpcbuildermdl.GRPCService",
+	HandlerType: (*GRPCServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "GRPCHandler",
+			Handler:    _GRPCService_GRPCHandler_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "grpcbuildermdl.proto",
+}
+
+// GRPCCheckClient is the client API for GRPCCheck service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
+type GRPCCheckClient interface {
+	GRPCCheck(ctx context.Context, in *GRPCRequest, opts ...grpc.CallOption) (*GRPCResponse, error)
+}
+
+type gRPCCheckClient struct {
+	cc grpc.ClientConnInterface
+}
+
+func NewGRPCCheckClient(cc grpc.ClientConnInterface) GRPCCheckClient {
+	return &gRPCCheckClient{cc}
+}
+
+func (c *gRPCCheckClient) GRPCCheck(ctx context.Context, in *GRPCRequest, opts ...grpc.CallOption) (*GRPCResponse, error) {
+	out := new(GRPCResponse)
+	err := c.cc.Invoke(ctx, "/grpcbuildermdl.GRPCCheck/GRPCCheck", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// GRPCCheckServer is the server API for GRPCCheck service.
+// All implementations must embed UnimplementedGRPCCheckServer
+// for forward compatibility
+type GRPCCheckServer interface {
+	GRPCCheck(context.Context, *GRPCRequest) (*GRPCResponse, error)
+	mustEmbedUnimplementedGRPCCheckServer()
+}
+
+// UnimplementedGRPCCheckServer must be embedded to have forward compatible implementations.
+type UnimplementedGRPCCheckServer struct {
+}
+
+func (UnimplementedGRPCCheckServer) GRPCCheck(context.Context, *GRPCRequest) (*GRPCResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GRPCCheck not implemented")
+}
+func (UnimplementedGRPCCheckServer) mustEmbedUnimplementedGRPCCheckServer() {}
+
+// UnsafeGRPCCheckServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to GRPCCheckServer will
+// result in compilation errors.
+type UnsafeGRPCCheckServer interface {
+	mustEmbedUnimplementedGRPCCheckServer()
+}
+
+func RegisterGRPCCheckServer(s grpc.ServiceRegistrar, srv GRPCCheckServer) {
+	s.RegisterService(&GRPCCheck_ServiceDesc, srv)
+}
+
+func _GRPCCheck_GRPCCheck_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GRPCRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GRPCCheckServer).GRPCCheck(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/grpcbuildermdl.GRPCCheck/GRPCCheck",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GRPCCheckServer).GRPCCheck(ctx, req.(*GRPCRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+// GRPCCheck_ServiceDesc is the grpc.ServiceDesc for GRPCCheck service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var GRPCCheck_ServiceDesc = grpc.ServiceDesc{
+	ServiceName: "grpcbuildermdl.GRPCCheck",
+	HandlerType: (*GRPCCheckServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "GRPCCheck",
+			Handler:    _GRPCCheck_GRPCCheck_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "grpcbuildermdl.proto",
+}

loggermdl/loggerdefault.go

+//go:build !prod
 // +build !prod
 
 //@author  Ajit Jagtap
@@ -10,8 +11,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/davecgh/go-spew/spew"
 	logging "github.com/op/go-logging"
-	goon "github.com/shurcooL/go-goon"
 )
 
 var log = logging.MustGetLogger("mkcllogger")
@@ -113,7 +114,7 @@ func LogSpot(args ...interface{}) {
 // LogVars Prints variables with formatting
 func LogVars(xvars ...interface{}) {
 	for _, i := range xvars {
-		goon.Dump(i)
+		spew.Dump(i)
 	}
 }
 

routebuildermdl/grpcservermdl.go

@@ -16,7 +16,10 @@ import (
 )
 
 // Server server
-type Server struct{}
+type Server struct {
+	grpcbuildermdl.UnimplementedGRPCCheckServer
+	grpcbuildermdl.UnimplementedGRPCServiceServer
+}
 
 // GRPCInit init
 func GRPCInit(GRPCPort net.Listener) {