From 8663d3b7e65f3f2b04464a724122a51c440284fb Mon Sep 17 00:00:00 2001 From: Alec Hinh Date: Fri, 24 May 2024 11:33:10 -0500 Subject: [PATCH] Set the JQ execution timeout parameter to its default 1s value Signed-off-by: Alec Hinh --- pkg/checks/diff/diff.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/checks/diff/diff.go b/pkg/checks/diff/diff.go index 564d227f..68391a60 100644 --- a/pkg/checks/diff/diff.go +++ b/pkg/checks/diff/diff.go @@ -6,6 +6,7 @@ import ( "fmt" "io" "strings" + "time" cmdutil "github.com/argoproj/argo-cd/v2/cmd/util" "github.com/argoproj/argo-cd/v2/controller" @@ -197,7 +198,9 @@ func generateDiff(ctx context.Context, request checks.Request, argoSettings *set } ignoreAggregatedRoles := false - ignoreNormalizerOpts := normalizers.IgnoreNormalizerOpts{} + ignoreNormalizerOpts := normalizers.IgnoreNormalizerOpts{ + JQExecutionTimeout: 1 * time.Second, + } diffConfig, err := argodiff.NewDiffConfigBuilder(). WithLogger(zerologr.New(&log.Logger)). WithDiffSettings(request.App.Spec.IgnoreDifferences, overrides, ignoreAggregatedRoles, ignoreNormalizerOpts).