Merge pull request #892 from humio/mike/fix_update_diffs

Fix types when comparing values between CR and GraphQL for agggregate…
humio · Dec 19, 2024 · e55f8a0 · e55f8a0
2 parents 4733d0c + 95c9207
commit e55f8a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/controllers/humioaggregatealert_controller.go b/controllers/humioaggregatealert_controller.go
@@ -234,7 +234,7 @@ func aggregateAlertAlreadyAsExpected(fromKubernetesCustomResource *humiov1alpha1
 	if diff := cmp.Diff(fromGraphQL.GetThrottleField(), fromKubernetesCustomResource.Spec.ThrottleField); diff != "" {
 		keyValues["throttleField"] = diff
 	}
-	if diff := cmp.Diff(fromGraphQL.GetThrottleTimeSeconds(), fromKubernetesCustomResource.Spec.ThrottleTimeSeconds); diff != "" {
+	if diff := cmp.Diff(fromGraphQL.GetThrottleTimeSeconds(), int64(fromKubernetesCustomResource.Spec.ThrottleTimeSeconds)); diff != "" {
 		keyValues["throttleTimeSeconds"] = diff
 	}
 	actionsFromGraphQL := humioapi.GetActionNames(fromGraphQL.GetActions())

diff --git a/controllers/humioparser_controller.go b/controllers/humioparser_controller.go
@@ -225,7 +225,7 @@ func (r *HumioParserReconciler) logErrorAndReturn(err error, msg string) error {
 func parserAlreadyAsExpected(fromKubernetesCustomResource *humiov1alpha1.HumioParser, fromGraphQL *humiographql.ParserDetails) (bool, map[string]string) {
 	keyValues := map[string]string{}
 
-	if diff := cmp.Diff(fromGraphQL.GetScript(), &fromKubernetesCustomResource.Spec.ParserScript); diff != "" {
+	if diff := cmp.Diff(fromGraphQL.GetScript(), fromKubernetesCustomResource.Spec.ParserScript); diff != "" {
 		keyValues["parserScript"] = diff
 	}
 	tagFieldsFromGraphQL := fromGraphQL.GetFieldsToTag()