Fix issues in migration and wrap logic

Author: coolwednesday

migration/migrate.go

@@ -100,7 +100,7 @@ func createMigrationFile(ctx *gofr.Context, migrationName string) error {
 		return err
 	}
 
-	defer file.Close()
+	defer func() { _ = file.Close() }()
 
 	err = migrationTemplate.Execute(file, migrationName)
 	if err != nil {
@@ -123,6 +123,8 @@ func createAllMigration(ctx *gofr.Context) error {
 		return err
 	}
 
+	defer func() { _ = f.Close() }()
+
 	d, err := os.ReadDir("./")
 	if err != nil {
 		return err
@@ -152,7 +154,7 @@ func getAllExistingMigrations(ctx *gofr.Context, existing map[string]string) (ma
 			return nil, err
 		}
 
-		defer file.Close()
+		defer func() { _ = file.Close() }()
 
 		scanner := bufio.NewScanner(file)
 		for scanner.Scan() {

wrap/grpc.go

@@ -184,7 +184,7 @@ type FileType struct {
 }
 
 // BuildGRPCGoFrClient generates gRPC client wrapper code based on a proto definition.
-func BuildGRPCGoFrClient(ctx *gofr.Context) (any, error) {
+func BuildGRPCGoFrClient(ctx *gofr.Context) (interface{}, error) {
 	gRPCClient := []FileType{
 		{FileSuffix: clientFileSuffix, CodeGenerator: generateGoFrClient},
 		{FileSuffix: clientHealthFile, CodeGenerator: generateGoFrClientHealth},
@@ -194,7 +194,7 @@ func BuildGRPCGoFrClient(ctx *gofr.Context) (any, error) {
 }
 
 // BuildGRPCGoFrServer generates gRPC client and server code based on a proto definition.
-func BuildGRPCGoFrServer(ctx *gofr.Context) (any, error) {
+func BuildGRPCGoFrServer(ctx *gofr.Context) (interface{}, error) {
 	gRPCServer := []FileType{
 		{FileSuffix: serverWrapperFileSuffix, CodeGenerator: generateGoFrServerWrapper},
 		{FileSuffix: serverHealthFile, CodeGenerator: generateGoFrServerHealthWrapper},
@@ -208,40 +208,40 @@ func BuildGRPCGoFrServer(ctx *gofr.Context) (any, error) {
 // generateWrapper executes the function for specified FileType to create GoFr integrated
 // gRPC server/client files with the required services in proto file and
 // specified suffix for every service specified in the proto file.
-func generateWrapper(ctx *gofr.Context, options ...FileType) (any, error) {
+func generateWrapper(ctx *gofr.Context, options ...FileType) (interface{}, error) {
 	protoPath := ctx.Param("proto")
 	if protoPath == "" {
 		ctx.Error(ErrNoProtoFile)
 	return nil, ErrNoProtoFile
 }
 
-definition, err := parseProtoFile(ctx, protoPath)
-if err != nil {
-	ctx.Errorf("Failed to parse proto file: %v", err)
-	return nil, err
-}
-
-imports := getImports(ctx, definition, protoPath)
-projectPath, packageName := getPackageAndProject(ctx, definition, protoPath)
-services := getServices(ctx, definition)
-requests := getRequests(ctx, services)
-
-for _, service := range services {
-	wrapperData := WrapperData{
-		Package:  packageName,
-		Service:  service.Name,
-		Methods:  service.Methods,
-		Requests: uniqueRequestTypes(ctx, service.Methods),
-		Source:   path.Base(protoPath),
-		Imports:  imports,
+	definition, err := parseProtoFile(ctx, protoPath)
+	if err != nil {
+		ctx.Errorf("Failed to parse proto file: %v", err)
+		return nil, err
 	}
 
-	if err := generateFiles(ctx, projectPath, service.Name, &wrapperData, requests, options...); err != nil {
-		return nil, err
+	imports := getImports(ctx, definition, protoPath)
+	projectPath, packageName := getPackageAndProject(ctx, definition, protoPath)
+	services := getServices(ctx, definition)
+	requests := getRequests(ctx, services)
+
+	for _, service := range services {
+		wrapperData := WrapperData{
+			Package:  packageName,
+			Service:  service.Name,
+			Methods:  service.Methods,
+			Requests: uniqueRequestTypes(ctx, service.Methods),
+			Source:   path.Base(protoPath),
+			Imports:  imports,
+		}
+
+		if err := generateFiles(ctx, projectPath, service.Name, &wrapperData, requests, options...); err != nil {
+			return nil, err
+		}
 	}
-}
 
-ctx.Info("Successfully generated all files for GoFr integrated gRPC servers/clients")
+	ctx.Info("Successfully generated all files for GoFr integrated gRPC servers/clients")
 
 	return "Successfully generated all files for GoFr integrated gRPC servers/clients", nil
 }
@@ -464,8 +464,8 @@ func getImports(ctx *gofr.Context, definition *proto.Proto, protoPath string) []
 			}
 
 			lastPiece := strings.LastIndex(packageName, ".")
-			formattedImport := fmt.Sprintf("%s \"%s\"", packageName[lastPiece+1:], packageSource)
-			imports = append(imports, fmt.Sprintf("%q", formattedImport))
+			formattedImport := fmt.Sprintf("%s %q", packageName[lastPiece+1:], packageSource)
+			imports = append(imports, formattedImport)
 		}
 	}
 

wrap/template.go

@@ -48,7 +48,7 @@ type {{ .Service }}ServerWithGofr interface {
 {{- if or .StreamsRequest .StreamsResponse }}
 	{{ .Name }}(*gofr.Context, {{ $.Service }}_{{ .Name }}Server) error
 {{- else }}
-	{{ .Name }}(*gofr.Context) (any, error)
+	{{ .Name }}(*gofr.Context) (interface{}, error)
 {{- end }}
 {{- end }}
 }
@@ -291,7 +291,7 @@ func (h *{{ .Service }}ServerWrapper) mustEmbedUnimplemented{{ .Service }}Server
 
 // Register{{ .Service }}ServerWithGofr registers the server
 func Register{{ .Service }}ServerWithGofr(app *gofr.App, srv {{ .Service }}ServerWithGofr) {
-	registerServerWithGofr(app, srv, func(s grpc.ServiceRegistrar, srv any) {
+	registerServerWithGofr(app, srv, func(s grpc.ServiceRegistrar, srv interface{}) {
 		wrapper := &{{ .Service }}ServerWrapper{
 			server: srv.({{ .Service }}ServerWithGofr),
 			healthServer: getOrCreateHealthServer(),
@@ -414,7 +414,7 @@ func (s *{{ $.Service }}GoFrServer) {{ .Name }}(ctx *gofr.Context, stream {{ $.S
 	return nil
 }
 {{- else }}
-func (s *{{ $.Service }}GoFrServer) {{ .Name }}(ctx *gofr.Context) (any, error) {
+func (s *{{ $.Service }}GoFrServer) {{ .Name }}(ctx *gofr.Context) (interface{}, error) {
 	return &{{ .Response }}{}, nil
 }
 {{- end }}
@@ -565,7 +565,7 @@ func getOrCreateHealthServer() *healthServer {
 	return globalHealthServer
 }
 
-func registerServerWithGofr(app *gofr.App, srv any, registerFunc func(grpc.ServiceRegistrar, any)) {
+func registerServerWithGofr(app *gofr.App, srv interface{}, registerFunc func(grpc.ServiceRegistrar, interface{})) {
 	var s grpc.ServiceRegistrar = app
 	h := getOrCreateHealthServer()