From 7edc77cf7564bfafe732e83c118f8ff525102c18 Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Mon, 20 Jan 2025 10:05:28 +0100 Subject: [PATCH] build: Ensure constant format strings in fmt and printf calls Go 1.24 introduces stricter checks for format string validation. This commit fixes instances where non-constant format strings were used in calls to functions like `fmt.Errorf`, `fmt.Printf`, and similar. Signed-off-by: Mikel Olasagasti Uranga --- pkg/iac/scanners/terraform/parser/funcs/collection.go | 3 ++- pkg/iac/scanners/terraform/parser/funcs/crypto.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/iac/scanners/terraform/parser/funcs/collection.go b/pkg/iac/scanners/terraform/parser/funcs/collection.go index aea716d1c9b2..4f9c3ecaedf9 100644 --- a/pkg/iac/scanners/terraform/parser/funcs/collection.go +++ b/pkg/iac/scanners/terraform/parser/funcs/collection.go @@ -509,7 +509,8 @@ var SumFunc = function.New(&function.Spec{ ty := args[0].Type() if !ty.IsListType() && !ty.IsSetType() && !ty.IsTupleType() { - return cty.NilVal, function.NewArgErrorf(0, fmt.Sprintf("argument must be list, set, or tuple. Received %s", ty.FriendlyName())) + return cty.NilVal, function.NewArgErrorf(0, "argument must be list, set, or tuple. Received %s", ty.FriendlyName()) + } if !args[0].IsWhollyKnown() { diff --git a/pkg/iac/scanners/terraform/parser/funcs/crypto.go b/pkg/iac/scanners/terraform/parser/funcs/crypto.go index 76e5a7c13cfe..537d976706f4 100644 --- a/pkg/iac/scanners/terraform/parser/funcs/crypto.go +++ b/pkg/iac/scanners/terraform/parser/funcs/crypto.go @@ -175,7 +175,7 @@ var RsaDecryptFunc = function.New(&function.Spec{ default: errStr = fmt.Sprintf("invalid private key: %s", e) } - return cty.UnknownVal(cty.String), function.NewArgErrorf(1, errStr) + return cty.UnknownVal(cty.String), function.NewArgErrorf(1, "%s", errStr) } privateKey, ok := rawKey.(*rsa.PrivateKey) if !ok {