chore: format with gofumpt

Author: dtrckd

.golangci.yml

@@ -0,0 +1,4 @@
+# role to be defined.
+linters-settings:
+  lll:
+    line-length: 120  # Set your desired maximum line length here

cmd/notifier.go

@@ -24,9 +24,10 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/go-redis/redis/v8"
 	"log"
 
+	"github.com/go-redis/redis/v8"
+
 	"fractale/fractal6.go/graph"
 	"fractale/fractal6.go/graph/model"
 	"fractale/fractal6.go/web/middleware"
@@ -37,8 +38,8 @@ var REDIS_ADDRESS string = "localhost:6379"
 
 var cache *redis.Client = redis.NewClient(&redis.Options{
 	Addr: REDIS_ADDRESS,
-	//Password: "", // no password set
-	//DB:       0,  // use default DB
+	// Password: "", // no password set
+	// DB:       0,  // use default DB
 })
 
 var ctx = context.Background()
@@ -116,7 +117,7 @@ func processContractNotification(msg *redis.Message) {
 
 	// @deprecated
 	// Add a little sleep to wait for UpdateContractHook as it writes after publishing
-	//time.Sleep(1 * time.Second)
+	// time.Sleep(1 * time.Second)
 
 	// Push notification
 	if err := graph.PushContractNotifications(notif); err != nil {

cmd/root.go

@@ -21,11 +21,11 @@
 package cmd
 
 import (
+	"os"
+	"strings"
 	//"fmt"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"os"
-	"strings"
 
 	"fractale/fractal6.go/tools"
 	"fractale/fractal6.go/web/auth"
@@ -87,7 +87,7 @@ func init() {
 // Run the root command.
 func Run() {
 	if err := rootCmd.Execute(); err != nil {
-		//fmt.Fprintf(os.Stderr, "%v\n", err)
+		// fmt.Fprintf(os.Stderr, "%v\n", err)
 		os.Exit(-1)
 	}
 }

cmd/server.go

@@ -21,23 +21,25 @@
 package cmd
 
 import (
+	"log"
+	"net/http"
+	"time"
 	//"fmt"
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 	"github.com/rs/cors"
 	"github.com/spf13/viper"
-	"log"
-	"net/http"
-	"time"
 
 	"fractale/fractal6.go/web"
 	"fractale/fractal6.go/web/auth"
 	handle6 "fractale/fractal6.go/web/handlers"
 	middle6 "fractale/fractal6.go/web/middleware"
 )
 
-var tkMaster *auth.Jwt
-var buildMode string
+var (
+	tkMaster  *auth.Jwt
+	buildMode string
+)
 
 func init() {
 	// Get env mode
@@ -71,9 +73,9 @@ func RunServer() {
 	// for more ideas, see: https://developer.github.com/v3/#cross-origin-resource-sharing
 	cors := cors.New(cors.Options{
 		AllowedOrigins: allowedOrigins,
-		//AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
-		//AllowedHeaders:   []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"},
-		//ExposedHeaders:   []string{"Link"},
+		// AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
+		// AllowedHeaders:   []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"},
+		// ExposedHeaders:   []string{"Link"},
 		AllowCredentials: true,
 		MaxAge:           300, // Maximum value not ignored by any of major browsers
 	})
@@ -82,7 +84,7 @@ func RunServer() {
 	r.Use(middleware.RequestID)
 	r.Use(middleware.RealIP)
 	r.Use(cors.Handler)
-	//r.Use(middle6.RequestContextMiddleware) // Set context info
+	// r.Use(middle6.RequestContextMiddleware) // Set context info
 	// JWT   //r.Use(jwtauth.Verifier(tkMaster.GetAuth()))
 	r.Use(middle6.JwtVerifier(tkMaster.GetAuth())) // Seek, verify and validate JWT token
 	r.Use(middle6.JwtDecode)                       // Set user claims
@@ -106,7 +108,7 @@ func RunServer() {
 		}()
 		secured := r.Group(nil)
 		secured.Use(middle6.CheckBearer)
-		//secured.Handle("/metrics", promhttp.Handler()) // inclue Go collection metrics
+		// secured.Handle("/metrics", promhttp.Handler()) // inclue Go collection metrics
 		secured.Handle("/metrics", handle6.InstruHandler())
 	}
 
@@ -124,7 +126,7 @@ func RunServer() {
 
 	// Auth API
 	r.Group(func(r chi.Router) {
-		//r.Use(middle6.EnsurePostMethod)
+		// r.Use(middle6.EnsurePostMethod)
 		r.Route("/auth", func(r chi.Router) {
 			// User
 			r.Post("/signup", handle6.Signup)
@@ -151,13 +153,12 @@ func RunServer() {
 	// Rest API
 	r.Group(func(r chi.Router) {
 		r.Route("/q", func(r chi.Router) {
-
 			// Special recursive query
 			r.Group(func(r chi.Router) {
 				// Those data are not secured by now, and anyone can
 				// query them recursively, but as there are not sensitive
 				// and set them public for now.
-				//r.Use(middle6.CheckRecursiveQueryRights)
+				// r.Use(middle6.CheckRecursiveQueryRights)
 				r.Post("/sub_nodes", handle6.SubNodes)
 				r.Post("/sub_members", handle6.SubMembers)
 				r.Post("/top_labels", handle6.TopLabels)
@@ -170,7 +171,7 @@ func RunServer() {
 			r.Group(func(r chi.Router) {
 				// The filtering is done directly in the query resolver as
 				// doing it here required to rewrite the body, which seems difficult ?!
-				//r.Use(middle6.CheckTensionQueryRights)
+				// r.Use(middle6.CheckTensionQueryRights)
 				r.Post("/tensions_light", handle6.TensionsLight)
 				r.Post("/tensions_int", handle6.TensionsInt)
 				r.Post("/tensions_ext", handle6.TensionsExt)

cmd/user.go

@@ -22,17 +22,20 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/spf13/cobra"
 	"strings"
 
+	"github.com/spf13/cobra"
+
 	"fractale/fractal6.go/db"
 	"fractale/fractal6.go/graph/model"
 	"fractale/fractal6.go/tools"
 	"fractale/fractal6.go/web/auth"
 )
 
-var lang string
-var creds model.UserCreds
+var (
+	lang  string
+	creds model.UserCreds
+)
 
 var addUser = &cobra.Command{
 	Use:   "adduser USERNAME EMAIL PASSWORD [--lang LANG]",

db/dgraph.go

@@ -26,16 +26,18 @@ import (
 	"crypto/rsa"
 	"encoding/json"
 	"fmt"
-	"github.com/go-chi/jwtauth/v5"
-	"github.com/mitchellh/mapstructure"
-	"github.com/spf13/viper"
 	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
 	"strings"
 	"text/template"
 	"time"
+
+	"github.com/go-chi/jwtauth/v5"
+	"github.com/mitchellh/mapstructure"
+	"github.com/spf13/viper"
+
 	//"github.com/vektah/gqlparser/v2/gqlerror"
 	"github.com/dgraph-io/dgo/v200"
 	"github.com/dgraph-io/dgo/v200/protos/api"
@@ -46,10 +48,12 @@ import (
 	. "fractale/fractal6.go/tools"
 )
 
-var dgraphPrivateKey *rsa.PrivateKey
-var dgraphPublicKey *rsa.PublicKey
-var buildMode string
-var DOMAIN string
+var (
+	dgraphPrivateKey *rsa.PrivateKey
+	dgraphPublicKey  *rsa.PublicKey
+	buildMode        string
+	DOMAIN           string
+)
 
 // Database client
 var DB *Dgraph
@@ -162,8 +166,8 @@ func initDB() *Dgraph {
 		panic("Viper error: not host found")
 	} else {
 		// @DEBUG: log level, Viper!
-		//fmt.Println("Dgraph Graphql addr:", dgraphApiAddr)
-		//fmt.Println("Dgraph Grpc addr:", grpcAddr)
+		// fmt.Println("Dgraph Graphql addr:", dgraphApiAddr)
+		// fmt.Println("Dgraph Grpc addr:", grpcAddr)
 	}
 
 	return &Dgraph{
@@ -211,7 +215,7 @@ func (dg Dgraph) getDgraphClient() (dgClient *dgo.Dgraph, cancelFunc func()) {
 	}
 
 	dgClient = dgo.NewDgraphClient(api.NewDgraphClient(conn))
-	//ctx := context.Background()
+	// ctx := context.Background()
 
 	//// Perform login call. If the Dgraph cluster does not have ACL and
 	//// enterprise features enabled, this call should be skipped.
@@ -257,13 +261,13 @@ func (dg Dgraph) BuildGqlToken(uctx model.UserCtx, t time.Duration) string {
 		if *d.RoleType == model.RoleTypeOwner {
 			ownids = append(ownids, rid)
 			// Owner is also a member !
-			//continue
+			// continue
 		}
 		if _, v := check[rid]; !v {
 			// @DEBUG: if pending is not included here, invited user, or author of tension created with BOT
 			// won't be able to see on tensins. But, authorizing it, make give a visibity hole for private circle
 			// that can be seen by **self-invited** user.
-			//if *d.RoleType != model.RoleTypePending && *d.RoleType != model.RoleTypeRetired {
+			// if *d.RoleType != model.RoleTypePending && *d.RoleType != model.RoleTypeRetired {
 			if *d.RoleType != model.RoleTypeRetired {
 				check[rid] = true
 				rootids = append(rootids, rid)
@@ -295,7 +299,7 @@ func (dg Dgraph) BuildGqlToken(uctx model.UserCtx, t time.Duration) string {
 
 	// Create token
 	tkm := jwtauth.New("RS256", dgraphPrivateKey, dgraphPublicKey)
-	//tkm := jwtauth.New("HS256", []byte("checkJwkToken_or_pubkey"), []byte("checkJwkToken_or_pubkey"))
+	// tkm := jwtauth.New("HS256", []byte("checkJwkToken_or_pubkey"), []byte("checkJwkToken_or_pubkey"))
 	_, token, err := tkm.Encode(claims)
 	if err != nil {
 		panic("Dgraph JWT error: " + err.Error())
@@ -342,9 +346,9 @@ func (dg Dgraph) QueryDql(op string, maps map[string]string) (*api.Response, err
 		// @DEBUG LEVEL
 		fmt.Println(op)
 	}
-	//fmt.Println(string(q))
+	// fmt.Println(string(q))
 	res, err := txn.Query(ctx, q)
-	//fmt.Println(res)
+	// fmt.Println(res)
 	return res, err
 }
 
@@ -397,8 +401,8 @@ func (dg Dgraph) MutateWithQueryDql3(q QueryMut, maps map[string]string) (*api.R
 		mutations = append(mutations, &mu)
 	}
 
-	//fmt.Println(query)
-	//fmt.Println(mutations)
+	// fmt.Println(query)
+	// fmt.Println(mutations)
 
 	if len(q.M) == 0 {
 		return txn.Query(ctx, query)
@@ -426,9 +430,9 @@ func (dg Dgraph) QueryGql(uctx model.UserCtx, op string, reqInput map[string]str
 
 	// Send the dgraph request and follow the results
 	res := &GqlRes{}
-	//fmt.Println("request ->", string(q))
+	// fmt.Println("request ->", string(q))
 	err := dg.postql(uctx, []byte(q), res)
-	//fmt.Println("response ->", res)
+	// fmt.Println("response ->", res)
 	if err != nil {
 		return err
 	}
@@ -447,7 +451,7 @@ func (dg Dgraph) QueryGql(uctx model.UserCtx, op string, reqInput map[string]str
 				// @DEBUG: see bug #3c3f1f7
 				// Not needed since version 5.0.10 of elm-graphql that do not used hashes by defaut.
 				// Not that alias won be supported since we know to handle it with gqlgen resolver.
-				//CleanAliasedMapHook(),
+				// CleanAliasedMapHook(),
 				ToUnionHookFunc(),
 			),
 		}
@@ -463,7 +467,7 @@ func (dg Dgraph) QueryGql(uctx model.UserCtx, op string, reqInput map[string]str
 
 	if res.Errors != nil {
 		err, _ := json.Marshal(res.Errors)
-		//return fmt.Errorf(string(err))
+		// return fmt.Errorf(string(err))
 		return &GraphQLError{string(err)}
 	}
 	return err