more fixes

Author: mangalaman93

.trunk/configs/.golangci.json

@@ -13,7 +13,7 @@
     }
   },
   "run": {
-    "build-tags": ["integration"]
+    "build-tags": ["integration", "integration2", "upgrade"]
   },
   "version": "2"
 }

edgraph/access.go

@@ -77,15 +77,15 @@ func (s *Server) Login(ctx context.Context,
 		errMsg := fmt.Sprintf("unable to get access jwt (userid=%s,addr=%s):%v",
 			user.UserID, addr, err)
 		glog.Errorf(errMsg)
-		return nil, errors.Errorf(errMsg)
+		return nil, errors.Errorf("%v", errMsg)
 	}
 
 	refreshJwt, err := getRefreshJwt(user.UserID, user.Namespace)
 	if err != nil {
 		errMsg := fmt.Sprintf("unable to get refresh jwt (userid=%s,addr=%s):%v",
 			user.UserID, addr, err)
 		glog.Errorf(errMsg)
-		return nil, errors.Errorf(errMsg)
+		return nil, errors.Errorf("%v", errMsg)
 	}
 
 	loginJwt := api.Jwt{
@@ -98,7 +98,7 @@ func (s *Server) Login(ctx context.Context,
 		errMsg := fmt.Sprintf("unable to marshal jwt (userid=%s,addr=%s):%v",
 			user.UserID, addr, err)
 		glog.Errorf(errMsg)
-		return nil, errors.Errorf(errMsg)
+		return nil, errors.Errorf("%v", errMsg)
 	}
 	resp.Json = jwtBytes
 	return resp, nil

graphql/schema/rules.go

@@ -878,7 +878,7 @@ func hasInverseValidation(sch *ast.Schema, typ *ast.Definition,
 	}
 
 	if errMsg := isInverse(sch, typ.Name, field.Name, invTypeName, invField); errMsg != "" {
-		errs = append(errs, gqlerror.ErrorPosf(dir.Position, errMsg))
+		errs = append(errs, gqlerror.ErrorPosf(dir.Position, "%v", errMsg))
 		return errs
 	}
 

graphql/schema/validation_rules.go

@@ -127,9 +127,9 @@ func directiveArgumentsCheck(observers *validator.Events, addError validator.Add
 						" You can only use fields in cascade which are in type `%s`", value, typName, typName)
 					if isVariable {
 						validatorPath = append(validatorPath, ast.PathName(v))
-						err = gqlerror.ErrorPathf(validatorPath, err).Error()
+						err = gqlerror.ErrorPathf(validatorPath, "%v", err).Error()
 					}
-					addError(validator.Message(err), validator.At(directive.Position))
+					addError(validator.Message("%v", err), validator.At(directive.Position))
 					return
 				}
 
@@ -182,7 +182,7 @@ func intRangeCheck(observers *validator.Events, addError validator.AddErrFunc) {
 			if value.Kind == ast.IntValue || value.Kind == ast.StringValue {
 				_, err := strconv.ParseUint(value.Raw, 10, 64)
 				if err != nil {
-					addError(validator.Message(err.Error()), validator.At(value.Position))
+					addError(validator.Message("%v", err.Error()), validator.At(value.Position))
 				}
 				// UInt64 values parsed from query text would be propagated as strings internally
 				value.Kind = ast.StringValue