From 800232c5e8ab41d06bf32734c3739c5d5d61e89a Mon Sep 17 00:00:00 2001 From: bnallapeta Date: Wed, 14 Aug 2024 16:47:01 +0530 Subject: [PATCH] fixing lint issues with logrus --- internal/pkg/handler/upgrade.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/internal/pkg/handler/upgrade.go b/internal/pkg/handler/upgrade.go index 1b0c0031..3423858d 100644 --- a/internal/pkg/handler/upgrade.go +++ b/internal/pkg/handler/upgrade.go @@ -112,9 +112,9 @@ func GetArgoRolloutRollingUpgradeFuncs() callbacks.RollingUpgradeFuncs { } func sendUpgradeWebhook(config util.Config, webhookUrl string) error { - message := fmt.Sprintf("Changes detected in '%s' of type '%s' in namespace '%s'", config.ResourceName, config.Type, config.Namespace) - message += fmt.Sprintf(", Sending webhook to '%s'", webhookUrl) - logrus.Infof(message) + logrus.Infof("Changes detected in '%s' of type '%s' in namespace '%s', Sending webhook to '%s'", + config.ResourceName, config.Type, config.Namespace, webhookUrl) + body, errs := sendWebhook(webhookUrl) if errs != nil { // return the first error @@ -239,7 +239,8 @@ func PerformRollingUpgrade(clients kube.Clients, config util.Config, upgradeFunc err = upgradeFuncs.UpdateFunc(clients, config.Namespace, i) if err != nil { message := fmt.Sprintf("Update for '%s' of type '%s' in namespace '%s' failed with error %v", resourceName, upgradeFuncs.ResourceType, config.Namespace, err) - logrus.Errorf(message) + logrus.Errorf("Update for '%s' of type '%s' in namespace '%s' failed with error %v", resourceName, upgradeFuncs.ResourceType, config.Namespace, err) + collectors.Reloaded.With(prometheus.Labels{"success": "false"}).Inc() if recorder != nil { recorder.Event(i, v1.EventTypeWarning, "ReloadFail", message) @@ -248,7 +249,9 @@ func PerformRollingUpgrade(clients kube.Clients, config util.Config, upgradeFunc } else { message := fmt.Sprintf("Changes detected in '%s' of type '%s' in namespace '%s'", config.ResourceName, config.Type, config.Namespace) message += fmt.Sprintf(", Updated '%s' of type '%s' in namespace '%s'", resourceName, upgradeFuncs.ResourceType, config.Namespace) - logrus.Infof(message) + + logrus.Infof("Changes detected in '%s' of type '%s' in namespace '%s'; updated '%s' of type '%s' in namespace '%s'", config.ResourceName, config.Type, config.Namespace, resourceName, upgradeFuncs.ResourceType, config.Namespace) + collectors.Reloaded.With(prometheus.Labels{"success": "true"}).Inc() alert_on_reload, ok := os.LookupEnv("ALERT_ON_RELOAD") if recorder != nil {