Fix new semgrep issues (#350)

* Fix some semgrep issues.

* Fix semgrep issue in 'vault.go'.

Author: nickeskov

cmd/bots/discord/discord.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	stderrs "errors"
 	"flag"
 	"log"
 	"os"
@@ -89,7 +90,7 @@ func runDiscordBot() error {
 	logger, atom, err := tools.SetupZapLogger(cfg.logLevel, cfg.development)
 	if err != nil {
 		log.Printf("Failed to setup zap logger: %v", err)
-		return common.ErrInvalidParameters
+		return stderrs.Join(common.ErrInvalidParameters, err)
 	}
 
 	defer func(zap *zap.Logger) {
@@ -156,8 +157,7 @@ func runDiscordBot() error {
 		return err
 	}
 	defer func() {
-		closeErr := discordBotEnv.Bot.Close()
-		if err != nil {
+		if closeErr := discordBotEnv.Bot.Close(); closeErr != nil {
 			logger.Error("failed to close discord bot web socket", zap.Error(closeErr))
 		}
 	}()

cmd/bots/internal/common/environment.go

@@ -487,7 +487,7 @@ func (tgEnv *TelegramBotEnvironment) UnsubscribeFromAlert(alertType entities.Ale
 	}
 	err := alertSub.subscription.Unsubscribe()
 	if err != nil {
-		return errors.New("failed to unsubscribe from alert")
+		return errors.Wrap(err, "failed to unsubscribe from alert")
 	}
 	ok = tgEnv.IsAlreadySubscribed(alertType)
 	if !ok {

cmd/bots/telegram/telegram.go

@@ -104,7 +104,7 @@ func runTelegramBot() error {
 	logger, atom, err := tools.SetupZapLogger(cfg.logLevel, cfg.development)
 	if err != nil {
 		log.Printf("Failed to setup zap logger: %v", err)
-		return common.ErrInvalidParameters
+		return errors.Join(common.ErrInvalidParameters, err)
 	}
 
 	defer func(zap *zap.Logger) {

cmd/nodemon/nodemon.go

@@ -127,7 +127,7 @@ func (c *nodemonL2Config) validate(logger *zap.Logger) error {
 	}
 	if err := validateURLs(urls); err != nil {
 		logger.Error("Invalid L2 node URL", zap.Error(err))
-		return errInvalidParameters
+		return stderrs.Join(errInvalidParameters, err)
 	}
 	for i, nodeName := range names {
 		if nodeName == "" {
@@ -321,7 +321,7 @@ func run() error {
 	logger, atom, err := tools.SetupZapLogger(cfg.logLevel, cfg.development)
 	if err != nil {
 		log.Printf("Failed to setup zap logger: %v", err)
-		return errInvalidParameters
+		return stderrs.Join(errInvalidParameters, err)
 	}
 	defer func(zap *zap.Logger) {
 		if syncErr := zap.Sync(); syncErr != nil {

pkg/clients/vault.go

@@ -2,6 +2,7 @@ package clients
 
 import (
 	"context"
+	stderrs "errors"
 
 	vault "github.com/hashicorp/vault/api"
 	auth "github.com/hashicorp/vault/api/auth/userpass"
@@ -34,6 +35,8 @@ func NewVaultSimpleClient(ctx context.Context, logger *zap.Logger, addr, user, p
 	return client, nil
 }
 
+var errWatcherRenewFailed = errors.New("token renewal failed")
+
 // Once you've set the token for your Vault client, you will need to
 // periodically renew its lease.
 //
@@ -58,7 +61,7 @@ func renewToken(ctx context.Context, logger *zap.Logger, client *vault.Client, u
 		}
 		logger.Info("Successfully authenticated to Vault", zap.String("request_id", vaultLoginResp.RequestID))
 		tokenErr := manageTokenLifecycle(ctx, logger, client, vaultLoginResp)
-		if tokenErr != nil && !errors.Is(tokenErr, context.Canceled) {
+		if tokenErr != nil && !errors.Is(tokenErr, context.Canceled) && !errors.Is(tokenErr, errWatcherRenewFailed) {
 			logger.Fatal("unable to start managing token lifecycle", zap.Error(tokenErr))
 		}
 	}
@@ -99,7 +102,7 @@ func manageTokenLifecycle(ctx context.Context, logger *zap.Logger, client *vault
 		case renewErr := <-watcher.DoneCh():
 			if renewErr != nil {
 				logger.Error("Failed to renew vault token. Re-attempting login.", zap.Error(renewErr))
-				return nil
+				return stderrs.Join(errWatcherRenewFailed, renewErr)
 			}
 			// This occurs once the token has reached max TTL.
 			logger.Info("Vault token can no longer be renewed. Re-attempting login.")