upgrade Go to v1.24, trunk upgrade and golangci upgrade to v2

mangalaman93 · mangalaman93 · commit c1cd2527390e · 2025-04-24T10:56:58.000+05:30
diff --git a/.trunk/configs/.golangci.json b/.trunk/configs/.golangci.json
@@ -1,5 +1,19 @@
 {
+  "formatters": {
+    "exclusions": {
+      "generated": "lax",
+      "paths": ["third_party$", "builtin$", "examples$"]
+    }
+  },
+  "linters": {
+    "exclusions": {
+      "generated": "lax",
+      "paths": ["third_party$", "builtin$", "examples$"],
+      "presets": ["comments", "common-false-positives", "legacy", "std-error-handling"]
+    }
+  },
   "run": {
     "build-tags": ["integration"]
-  }
+  },
+  "version": "2"
 }
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -2,19 +2,19 @@
 # To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
 version: 0.1
 cli:
-  version: 1.22.11
+  version: 1.22.12
 
 # Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins)
 plugins:
   sources:
     - id: trunk
-      ref: v1.6.7
+      ref: v1.6.8
       uri: https://github.com/trunk-io/plugins
 
 # Many linters and tools depend on runtimes - configure them here. (https://docs.trunk.io/runtimes)
 runtimes:
   enabled:
-    - go@1.23.8
+    - go@1.24.2
     - node@18.20.5
     - python@3.10.8
 
@@ -26,23 +26,23 @@ lint:
         - contrib/**
         - protos/pb/pb.pb.go
   enabled:
-    - trivy@0.61.0
+    - golangci-lint2@2.1.2
+    - trivy@0.61.1
     - actionlint@1.7.7
-    - checkov@3.2.395
+    - checkov@3.2.407
     - dotenv-linter@3.3.0
     - git-diff-check
     - gofmt@1.20.4
-    - golangci-lint@1.64.8
     - hadolint@2.12.1-beta
     - markdownlint@0.44.0
-    - osv-scanner@2.0.0
+    - osv-scanner@2.0.1
     - oxipng@9.1.4
     - prettier@3.5.3
-    - renovate@39.222.4
+    - renovate@39.254.3
     - shellcheck@0.10.0
     - shfmt@3.6.0
     - tflint@0.56.0
-    - trufflehog@3.88.20
+    - trufflehog@3.88.25
     - yamllint@1.37.0
 actions:
   enabled:
diff --git a/dgraph/cmd/live/batch.go b/dgraph/cmd/live/batch.go
@@ -116,7 +116,7 @@ func handleError(err error, isRetry bool) {
 			" Will retry after %s.\n", err, dur.Round(time.Second))
 		time.Sleep(dur)
 	case strings.Contains(s.Message(), "x509"):
-		x.Fatalf(s.Message())
+		x.Fatalf("%v", s.Message())
 	case s.Code() == codes.Aborted:
 		if !isRetry && opt.verbose {
 			fmt.Printf("Transaction aborted. Will retry in background.\n")
@@ -335,7 +335,7 @@ func (l *loader) conflictKeysForNQuad(nq *api.NQuad) ([]uint64, error) {
 	}
 
 	if len(errs) > 0 {
-		return keys, fmt.Errorf(strings.Join(errs, "\n"))
+		return keys, fmt.Errorf("%v", strings.Join(errs, "\n"))
 	}
 	return keys, nil
 }
diff --git a/dgraph/cmd/live/run.go b/dgraph/cmd/live/run.go
@@ -829,7 +829,7 @@ func run() error {
 	for _, file := range filesList {
 		file = strings.Trim(file, " \t")
 		go func(file string) {
-			errCh <- errors.Wrapf(l.processFile(ctx, fs, file, opt.key), file)
+			errCh <- errors.Wrap(l.processFile(ctx, fs, file, opt.key), file)
 		}(file)
 	}
 
diff --git a/dql/parser.go b/dql/parser.go
@@ -507,7 +507,7 @@ func substituteVariables(gq *GraphQuery, vmap varMap) error {
 			}
 			depth, err := strconv.ParseUint(val.Value, 0, 64)
 			if err != nil {
-				return errors.Wrapf(err, varName+" should be type of integer")
+				return errors.Wrapf(err, "%v should be type of integer", varName)
 			}
 			gq.RecurseArgs.Depth = depth
 		}
@@ -521,7 +521,7 @@ func substituteVariables(gq *GraphQuery, vmap varMap) error {
 			}
 			allowLoop, err := strconv.ParseBool(val.Value)
 			if err != nil {
-				return errors.Wrapf(err, varName+"should be type of boolean")
+				return errors.Wrapf(err, "%v should be type of boolean", varName)
 			}
 			gq.RecurseArgs.AllowLoop = allowLoop
 		}
diff --git a/edgraph/server.go b/edgraph/server.go
@@ -643,7 +643,7 @@ func (s *Server) doMutate(ctx context.Context, qc *queryContext, resp *api.Respo
 			trace.WithAttributes(attribute.String("err", err.Error())))
 
 		if err == dgo.ErrAborted {
-			err = status.Errorf(codes.Aborted, err.Error())
+			err = status.Error(codes.Aborted, err.Error())
 			resp.Txn.Aborted = true
 		}
 
@@ -1842,7 +1842,7 @@ func (s *Server) CommitOrAbort(ctx context.Context, tc *api.TxnContext) (*api.Tx
 			return tctx, nil
 		}
 
-		return tctx, status.Errorf(codes.Aborted, err.Error())
+		return tctx, status.Error(codes.Aborted, err.Error())
 	}
 	tctx.StartTs = tc.StartTs
 	tctx.CommitTs = commitTs
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/hypermodeinc/dgraph/v25
 
-go 1.23.8
+go 1.24.2
 
 require (
 	contrib.go.opencensus.io/exporter/prometheus v0.4.2
diff --git a/graphql/e2e/custom_logic/cmd/go.mod b/graphql/e2e/custom_logic/cmd/go.mod
@@ -1,6 +1,6 @@
 module github.com/hypermodeinc/dgraph/graphql/e2e/custom_logic/cmd
 
-go 1.23.6
+go 1.24.2
 
 require (
 	github.com/graph-gophers/graphql-go v1.6.0
diff --git a/graphql/resolve/mutation_rewriter.go b/graphql/resolve/mutation_rewriter.go
@@ -1442,7 +1442,7 @@ func rewriteObject(
 								if queryAuthSelector(typ) == nil {
 									retErrors = append(retErrors, existenceError)
 								} else {
-									retErrors = append(retErrors, x.GqlErrorf("GraphQL debug: "+existenceError.Error()))
+									retErrors = append(retErrors, x.GqlErrorf("GraphQL debug: %v", existenceError.Error()))
 								}
 
 								return nil, "", retErrors
@@ -1491,7 +1491,7 @@ func rewriteObject(
 							if queryAuthSelector(typ) == nil {
 								retErrors = append(retErrors, existenceError)
 							} else {
-								retErrors = append(retErrors, x.GqlErrorf("GraphQL debug: "+existenceError.Error()))
+								retErrors = append(retErrors, x.GqlErrorf("GraphQL debug: %v", existenceError.Error()))
 							}
 							return nil, "", retErrors
 						}
diff --git a/graphql/resolve/resolver_error_test.go b/graphql/resolve/resolver_error_test.go
@@ -145,7 +145,7 @@ func complete(t *testing.T, gqlSchema schema.Schema, gqlQuery, dgResponse string
 	err = schema.Unmarshal([]byte(dgResponse), &res)
 	if err != nil {
 		// TODO(abhimanyu): check if should port the test which requires this to e2e
-		resp.Errors = x.GqlErrorList{x.GqlErrorf(err.Error()).WithLocations(op.Queries()[0].Location())}
+		resp.Errors = x.GqlErrorList{x.GqlErrorf("%v", err.Error()).WithLocations(op.Queries()[0].Location())}
 	}
 
 	// TODO(abhimanyu): completion can really be checked only for a single query,
diff --git a/graphql/schema/auth.go b/graphql/schema/auth.go
@@ -445,7 +445,7 @@ func getRBACQuery(typ *ast.Definition, rule string) (*RBACQuery, error) {
 func validateRBACQuery(typ *ast.Definition, rbacQuery *RBACQuery) error {
 	// validate rule operators
 	if ok, reason := validateRBACOperators(typ, rbacQuery); !ok {
-		return gqlerror.Errorf(reason)
+		return gqlerror.Errorf("%v", reason)
 	}
 
 	// validate variable name
diff --git a/graphql/schema/rules.go b/graphql/schema/rules.go
@@ -431,30 +431,22 @@ func dataTypeCheck(schema *ast.Schema, defn *ast.Definition) gqlerror.List {
 
 func nameCheck(schema *ast.Schema, defn *ast.Definition) gqlerror.List {
 	if defn.Kind != ast.Scalar && isReservedKeyWord(defn.Name) {
-		var errMesg string
-
 		if isQueryOrMutationType(defn) {
 			for _, fld := range defn.Fields {
 				// If we find any query or mutation field defined without a @custom/@lambda
 				// directive, that is an error for us.
 				if !hasCustomOrLambda(fld) {
-					errMesg = "GraphQL Query and Mutation types are only allowed to have fields " +
-						"with @custom/@lambda directive. Other fields are built automatically for" +
-						" you. Found " + defn.Name + " " + fld.Name + " without @custom/@lambda."
-					break
+					return []*gqlerror.Error{gqlerror.ErrorPosf(defn.Position,
+						"GraphQL Query and Mutation types are only allowed to have fields "+
+							"with @custom/@lambda directive. Other fields are built automatically for"+
+							" you. Found %v %v without @custom/@lambda.", defn.Name, fld.Name)}
 				}
 			}
-			if errMesg == "" {
-				return nil
-			}
 		} else {
-			errMesg = fmt.Sprintf(
+			return []*gqlerror.Error{gqlerror.ErrorPosf(defn.Position,
 				"%s is a reserved word, so you can't declare a type with this name. "+
-					"Pick a different name for the type.", defn.Name,
-			)
+					"Pick a different name for the type.", defn.Name)}
 		}
-
-		return []*gqlerror.Error{gqlerror.ErrorPosf(defn.Position, errMesg)}
 	}
 
 	return nil
diff --git a/posting/list.go b/posting/list.go
@@ -1129,7 +1129,7 @@ func (l *List) iterate(readTs uint64, afterUid uint64, f func(obj *pb.Posting) e
 	// pitr iterates through immutable postings
 	err = pitr.seek(l, afterUid, deleteBelowTs)
 	if err != nil {
-		return errors.Wrapf(err, "cannot initialize iterator when calling List.iterate "+l.print())
+		return errors.Wrapf(err, "cannot initialize iterator when calling List.iterate %v", l.print())
 	}
 
 loop:
diff --git a/systest/backup/encryption/backup_test.go b/systest/backup/encryption/backup_test.go
@@ -42,10 +42,9 @@ var (
 )
 
 func TestBackupMinioE(t *testing.T) {
-	t.Skip()
-	backupDst = "minio://minio:9001/dgraph-backup?secure=false"
+	backupDst = "s3://minio:9001/dgraph-backup?secure=false"
 	addr := testutil.ContainerAddr("minio", 9001)
-	localBackupDst = "minio://" + addr + "/dgraph-backup?secure=false"
+	localBackupDst = "s3://" + addr + "/dgraph-backup?secure=false"
 
 	conf := viper.GetViper()
 	conf.Set("tls", fmt.Sprintf("ca-cert=%s; server-name=%s; internal-port=%v;",
diff --git a/t/Makefile b/t/Makefile
@@ -6,7 +6,7 @@
 # linux || darwin
 GOOS          ?= $(shell go env GOOS)
 GOPATH        ?= $(shell go env GOPATH)
-MIN_GO_VERSION = "1.23.6"
+MIN_GO_VERSION = "1.24.2"
 
 all: test
 
diff --git a/testutil/bulk.go b/testutil/bulk.go
@@ -65,7 +65,7 @@ func LiveLoad(opts LiveOpts) error {
 	if err != nil {
 		fmt.Printf("Error %v\n", err)
 		fmt.Printf("Output %v\n", string(out))
-		return errors.Wrapf(err, string(out))
+		return errors.Wrap(err, string(out))
 	}
 	if CheckIfRace(out) {
 		return errors.New("race condition detected. check logs for more details")
diff --git a/testutil/client.go b/testutil/client.go
@@ -358,7 +358,7 @@ func HttpLogin(params *LoginParams) (*HttpToken, error) {
 	}
 
 	if len(gqlResp.Errors) > 0 {
-		return nil, errors.Errorf(gqlResp.Errors.Error())
+		return nil, errors.Errorf("%v", gqlResp.Errors.Error())
 	}
 
 	if gqlResp.Data == nil {
diff --git a/testutil/multi_tenancy.go b/testutil/multi_tenancy.go
@@ -78,7 +78,7 @@ func ResetPassword(t *testing.T, token *HttpToken, userID, newPass string, nsID
 	resp := MakeRequest(t, token, params)
 
 	if len(resp.Errors) > 0 {
-		return "", errors.Errorf(resp.Errors.Error())
+		return "", errors.Errorf("%v", resp.Errors.Error())
 	}
 
 	var result struct {
@@ -116,7 +116,7 @@ func CreateNamespaceWithRetry(t *testing.T, token *HttpToken) (uint64, error) {
 				time.Sleep(100 * time.Millisecond)
 				continue
 			}
-			return 0, errors.Errorf(resp.Errors.Error())
+			return 0, errors.Errorf("%v", resp.Errors.Error())
 		}
 		break
 	}
@@ -150,7 +150,7 @@ func DeleteNamespace(t *testing.T, token *HttpToken, nsID uint64) error {
 	}
 	resp := MakeRequest(t, token, params)
 	if len(resp.Errors) > 0 {
-		return errors.Errorf(resp.Errors.Error())
+		return errors.Errorf("%v", resp.Errors.Error())
 	}
 	var result struct {
 		DeleteNamespace struct {
diff --git a/worker/draft.go b/worker/draft.go
@@ -608,7 +608,7 @@ func (n *node) applyMutations(ctx context.Context, proposal *pb.Proposal) (rerr
 			if errs == nil {
 				errs = errors.New("Got error while running mutation")
 			}
-			errs = errors.Wrapf(err, errs.Error())
+			errs = errors.Wrap(err, errs.Error())
 		}
 	}
 	return errs
diff --git a/worker/groups.go b/worker/groups.go
@@ -770,7 +770,7 @@ func (g *groupi) doSendMembership(tablets map[string]*pb.Tablet) error {
 	if string(reply.GetData()) == "OK" {
 		return nil
 	}
-	return errors.Errorf(string(reply.GetData()))
+	return errors.Errorf("%v", string(reply.GetData()))
 }
 
 // sendMembershipUpdates sends the membership update to Zero leader. If this Alpha is the leader, it
diff --git a/worker/mutation.go b/worker/mutation.go
@@ -38,7 +38,7 @@ import (
 var (
 	// ErrNonExistentTabletMessage is the error message sent when no tablet is serving a predicate.
 	ErrNonExistentTabletMessage = "Requested predicate is not being served by any tablet"
-	errNonExistentTablet        = errors.Errorf(ErrNonExistentTabletMessage)
+	errNonExistentTablet        = errors.Errorf("%v", ErrNonExistentTabletMessage)
 	errUnservedTablet           = errors.Errorf("Tablet isn't being served by this instance")
 )
 
diff --git a/x/error.go b/x/error.go
@@ -44,7 +44,7 @@ func Checkf(err error, format string, args ...interface{}) {
 // CheckfNoTrace is Checkf without a stack trace.
 func CheckfNoTrace(err error) {
 	if err != nil {
-		log.Fatalf(err.Error())
+		log.Fatal(err.Error())
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ func handleError(err error, isRetry bool) {`
`116`	`116`	`" Will retry after %s.\n", err, dur.Round(time.Second))`
`117`	`117`	`time.Sleep(dur)`
`118`	`118`	`case strings.Contains(s.Message(), "x509"):`
`119`		`- x.Fatalf(s.Message())`
	`119`	`+ x.Fatalf("%v", s.Message())`
`120`	`120`	`case s.Code() == codes.Aborted:`
`121`	`121`	`if !isRetry && opt.verbose {`
`122`	`122`	`fmt.Printf("Transaction aborted. Will retry in background.\n")`
`@@ -335,7 +335,7 @@ func (l loader) conflictKeysForNQuad(nq api.NQuad) ([]uint64, error) {`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`if len(errs) > 0 {`
`338`		`- return keys, fmt.Errorf(strings.Join(errs, "\n"))`
	`338`	`+ return keys, fmt.Errorf("%v", strings.Join(errs, "\n"))`
`339`	`339`	`}`
`340`	`340`	`return keys, nil`
`341`	`341`	`}`
Original file line number	Diff line number	Diff line change
`@@ -829,7 +829,7 @@ func run() error {`
`829`	`829`	`for _, file := range filesList {`
`830`	`830`	`file = strings.Trim(file, " \t")`
`831`	`831`	`go func(file string) {`
`832`		`- errCh <- errors.Wrapf(l.processFile(ctx, fs, file, opt.key), file)`
	`832`	`+ errCh <- errors.Wrap(l.processFile(ctx, fs, file, opt.key), file)`
`833`	`833`	`}(file)`
`834`	`834`	`}`
`835`	`835`
Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,7 @@ func substituteVariables(gq *GraphQuery, vmap varMap) error {`
`507`	`507`	`}`
`508`	`508`	`depth, err := strconv.ParseUint(val.Value, 0, 64)`
`509`	`509`	`if err != nil {`
`510`		`- return errors.Wrapf(err, varName+" should be type of integer")`
	`510`	`+ return errors.Wrapf(err, "%v should be type of integer", varName)`
`511`	`511`	`}`
`512`	`512`	`gq.RecurseArgs.Depth = depth`
`513`	`513`	`}`
`@@ -521,7 +521,7 @@ func substituteVariables(gq *GraphQuery, vmap varMap) error {`
`521`	`521`	`}`
`522`	`522`	`allowLoop, err := strconv.ParseBool(val.Value)`
`523`	`523`	`if err != nil {`
`524`		`- return errors.Wrapf(err, varName+"should be type of boolean")`
	`524`	`+ return errors.Wrapf(err, "%v should be type of boolean", varName)`
`525`	`525`	`}`
`526`	`526`	`gq.RecurseArgs.AllowLoop = allowLoop`
`527`	`527`	`}`
Original file line number	Diff line number	Diff line change
`@@ -643,7 +643,7 @@ func (s Server) doMutate(ctx context.Context, qc queryContext, resp *api.Respo`
`643`	`643`	`trace.WithAttributes(attribute.String("err", err.Error())))`
`644`	`644`
`645`	`645`	`if err == dgo.ErrAborted {`
`646`		`- err = status.Errorf(codes.Aborted, err.Error())`
	`646`	`+ err = status.Error(codes.Aborted, err.Error())`
`647`	`647`	`resp.Txn.Aborted = true`
`648`	`648`	`}`
`649`	`649`
`@@ -1842,7 +1842,7 @@ func (s Server) CommitOrAbort(ctx context.Context, tc api.TxnContext) (*api.Tx`
`1842`	`1842`	`return tctx, nil`
`1843`	`1843`	`}`
`1844`	`1844`
`1845`		`- return tctx, status.Errorf(codes.Aborted, err.Error())`
	`1845`	`+ return tctx, status.Error(codes.Aborted, err.Error())`
`1846`	`1846`	`}`
`1847`	`1847`	`tctx.StartTs = tc.StartTs`
`1848`	`1848`	`tctx.CommitTs = commitTs`
Original file line number	Diff line number	Diff line change
`@@ -1442,7 +1442,7 @@ func rewriteObject(`
`1442`	`1442`	`if queryAuthSelector(typ) == nil {`
`1443`	`1443`	`retErrors = append(retErrors, existenceError)`
`1444`	`1444`	`} else {`
`1445`		`- retErrors = append(retErrors, x.GqlErrorf("GraphQL debug: "+existenceError.Error()))`
	`1445`	`+ retErrors = append(retErrors, x.GqlErrorf("GraphQL debug: %v", existenceError.Error()))`
`1446`	`1446`	`}`
`1447`	`1447`
`1448`	`1448`	`return nil, "", retErrors`
`@@ -1491,7 +1491,7 @@ func rewriteObject(`
`1491`	`1491`	`if queryAuthSelector(typ) == nil {`
`1492`	`1492`	`retErrors = append(retErrors, existenceError)`
`1493`	`1493`	`} else {`
`1494`		`- retErrors = append(retErrors, x.GqlErrorf("GraphQL debug: "+existenceError.Error()))`
	`1494`	`+ retErrors = append(retErrors, x.GqlErrorf("GraphQL debug: %v", existenceError.Error()))`
`1495`	`1495`	`}`
`1496`	`1496`	`return nil, "", retErrors`
`1497`	`1497`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ func complete(t *testing.T, gqlSchema schema.Schema, gqlQuery, dgResponse string`
`145`	`145`	`err = schema.Unmarshal([]byte(dgResponse), &res)`
`146`	`146`	`if err != nil {`
`147`	`147`	`// TODO(abhimanyu): check if should port the test which requires this to e2e`
`148`		`- resp.Errors = x.GqlErrorList{x.GqlErrorf(err.Error()).WithLocations(op.Queries()[0].Location())}`
	`148`	`+ resp.Errors = x.GqlErrorList{x.GqlErrorf("%v", err.Error()).WithLocations(op.Queries()[0].Location())}`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`// TODO(abhimanyu): completion can really be checked only for a single query,`