Fix non-constant format string errors

go 1.26.1 no like

Author: matthewmcneely

chunker/rdf_state.go

@@ -147,7 +147,7 @@ func lexText(l *lex.Lexer) lex.StateFn {
 // Assumes that caller has consumed initial '<'
 func lexIRIRef(l *lex.Lexer, styp lex.ItemType, sfn lex.StateFn) lex.StateFn {
 	if err := lex.IRIRef(l, styp); err != nil {
-		return l.Errorf(err.Error())
+		return l.Errorf("%s", err.Error())
 	}
 	return sfn
 }
@@ -384,7 +384,7 @@ forLoop:
 			return nil
 		case r == quote:
 			if err := l.LexQuotedString(); err != nil {
-				return l.Errorf(err.Error())
+				return l.Errorf("%s", err.Error())
 			}
 			l.Emit(itemText)
 		default:

dql/state.go

@@ -131,7 +131,7 @@ func lexContent(l *lex.Lexer, leftRune, rightRune rune, returnTo lex.StateFn) le
 			return l.Errorf("Matching brackets not found")
 		case quote:
 			if err := l.LexQuotedString(); err != nil {
-				return l.Errorf(err.Error())
+				return l.Errorf("%s", err.Error())
 			}
 		case leftRune:
 			depth++
@@ -291,7 +291,7 @@ func lexFuncOrArg(l *lex.Lexer) lex.StateFn {
 			{
 				empty = false
 				if err := l.LexQuotedString(); err != nil {
-					return l.Errorf(err.Error())
+					return l.Errorf("%s", err.Error())
 				}
 				l.Emit(itemName)
 			}
@@ -449,7 +449,7 @@ func lexQuery(l *lex.Lexer) lex.StateFn {
 
 func lexIRIRef(l *lex.Lexer) lex.StateFn {
 	if err := lex.IRIRef(l, itemName); err != nil {
-		return l.Errorf(err.Error())
+		return l.Errorf("%s", err.Error())
 	}
 	return l.Mode
 }

graphql/e2e/common/common.go

@@ -55,14 +55,14 @@ var (
 	retryableCreateNamespaceErrors = append(retryableUpdateGQLSchemaErrors,
 		"is not indexed",
 	)
-
-	safelyUpdateGQLSchemaErr = "New Counter: %v, Old Counter: %v.\n" +
-		"Schema update counter didn't increment, " +
-		"indicating that the GraphQL layer didn't get the updated schema even after 10" +
-		" retries. The most probable cause is the new GraphQL schema is same as the old" +
-		" GraphQL schema."
 )
 
+const safelyUpdateGQLSchemaErr = "New Counter: %v, Old Counter: %v.\n" +
+	"Schema update counter didn't increment, " +
+	"indicating that the GraphQL layer didn't get the updated schema even after 10" +
+	" retries. The most probable cause is the new GraphQL schema is same as the old" +
+	" GraphQL schema."
+
 // GraphQLParams is parameters for constructing a GraphQL query - that's
 // http POST with this body, or http GET with this in the query string.
 //

query/outputnode_graphql.go

@@ -84,7 +84,7 @@ func (genc *graphQLEncoder) encode(encInp encodeInput) bool {
 		val, err := genc.getScalarVal(encInp.fj)
 		if err != nil {
 			genc.errs = append(genc.errs, encInp.parentField.GqlErrorf(encInp.parentPath,
-				err.Error()))
+				"%s", err.Error()))
 			// return false so that the caller can appropriately handle null writing.
 			return false
 		}
@@ -592,7 +592,7 @@ func (genc *graphQLEncoder) writeCustomField(curSelection gqlSchema.Field,
 
 		// if there was an error getting the value, append the error
 		genc.errs = append(genc.errs, curSelection.GqlErrorf(append(parentPath,
-			curSelection.ResponseName()), err.Error()))
+			curSelection.ResponseName()), "%s", err.Error()))
 	}
 
 	// if no custom fastJson node was found or there was error getting the value, return false
@@ -652,7 +652,7 @@ func (genc *graphQLEncoder) processCustomFields(field gqlSchema.Field, n fastJso
 				for _, parent := range res.parents {
 					childNode, err := genc.makeCustomNode(childAttr, res.childVal)
 					if err != nil {
-						genc.errCh <- x.GqlErrorList{res.childField.GqlErrorf(nil, err.Error())}
+						genc.errCh <- x.GqlErrorList{res.childField.GqlErrorf(nil, "%s", err.Error())}
 						continue
 					}
 					childNode.next = parent.child
@@ -740,7 +740,7 @@ func (genc *graphQLEncoder) resolveCustomField(childField gqlSchema.Field,
 
 	fconf, err := childField.CustomHTTPConfig()
 	if err != nil {
-		genc.errCh <- x.GqlErrorList{childField.GqlErrorf(nil, err.Error())}
+		genc.errCh <- x.GqlErrorList{childField.GqlErrorf(nil, "%s", err.Error())}
 		return
 	}
 	// for resolving a custom field, we need to carry out following steps:
@@ -1116,7 +1116,7 @@ func (genc *graphQLEncoder) completeRootAggregateQuery(fj fastJsonNode, query gq
 			val, err = genc.getScalarVal(genc.children(fj))
 			if err != nil {
 				genc.errs = append(genc.errs, f.GqlErrorf(append(qryPath,
-					f.ResponseName()), err.Error()))
+					f.ResponseName()), "%s", err.Error()))
 				// all aggregate properties are nullable, so no special checks are required
 				val = gqlSchema.JsonNull
 			}
@@ -1191,7 +1191,7 @@ func (genc *graphQLEncoder) completeAggregateChildren(fj fastJsonNode,
 			val, err = genc.getScalarVal(fj)
 			if err != nil {
 				genc.errs = append(genc.errs, f.GqlErrorf(append(fieldPath,
-					f.ResponseName()), err.Error()))
+					f.ResponseName()), "%s", err.Error()))
 				// all aggregate properties are nullable, so no special checks are required
 				val = gqlSchema.JsonNull
 			}