From 4b764535c9a99f531953d59e07457cfd3feeb3de Mon Sep 17 00:00:00 2001 From: Bastian Beier Date: Thu, 9 Jan 2025 17:13:57 +0100 Subject: [PATCH] refactor: Make sonar happy --- services/notifications/pkg/email/composer.go | 4 +-- services/notifications/pkg/email/email.go | 2 +- services/notifications/pkg/service/shares.go | 20 +++++++------- services/notifications/pkg/service/spaces.go | 28 ++++++++++---------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/services/notifications/pkg/email/composer.go b/services/notifications/pkg/email/composer.go index 8bea2bd75e..73ff67fe90 100644 --- a/services/notifications/pkg/email/composer.go +++ b/services/notifications/pkg/email/composer.go @@ -79,7 +79,7 @@ func NewGroupedTextTemplate(gmt GroupedMessageTemplate, vars map[string]string, return gmt, err } - var bodyParts []string + bodyParts := make([]string, 0, len(mtsVars)) for i, mt := range mts { bodyPart, err := composeMessage(t.Get(mt.MessageBody), mtsVars[i]) if err != nil { @@ -108,7 +108,7 @@ func NewGroupedHTMLTemplate(gmt GroupedMessageTemplate, vars map[string]string, return gmt, err } - var bodyParts []string + bodyParts := make([]string, 0, len(mtsVars)) for i, mt := range mts { bodyPart, err := composeMessage(t.Get(mt.MessageBody), mtsVars[i]) if err != nil { diff --git a/services/notifications/pkg/email/email.go b/services/notifications/pkg/email/email.go index 7fa259bdd3..968fa78de5 100644 --- a/services/notifications/pkg/email/email.go +++ b/services/notifications/pkg/email/email.go @@ -82,7 +82,7 @@ func RenderGroupedEmailTemplate(gmt GroupedMessageTemplate, vars map[string]stri return nil, err } - var escapedMtsVars []map[string]string + escapedMtsVars := make([]map[string]string, 0, len(mtsVars)) for _, m := range mtsVars { escapedMtsVars = append(escapedMtsVars, escapeStringMap(m)) } diff --git a/services/notifications/pkg/service/shares.go b/services/notifications/pkg/service/shares.go index 455fa74e28..1c3b53c0fb 100644 --- a/services/notifications/pkg/service/shares.go +++ b/services/notifications/pkg/service/shares.go @@ -52,13 +52,13 @@ func (s eventsNotifier) prepareShareCreated(logger zerolog.Logger, e events.Shar gatewayClient, err := s.gatewaySelector.Next() if err != nil { logger.Error().Err(err).Msg("could not select next gateway client") - return + return owner, shareFolder, shareLink, ctx, err } ctx, err = utils.GetServiceUserContextWithContext(context.Background(), gatewayClient, s.serviceAccountID, s.serviceAccountSecret) if err != nil { logger.Error().Err(err).Msg("could not get service user context") - return + return owner, shareFolder, shareLink, ctx, err } resourceInfo, err := s.getResourceInfo(ctx, e.ItemID, &fieldmaskpb.FieldMask{Paths: []string{"name"}}) @@ -66,7 +66,7 @@ func (s eventsNotifier) prepareShareCreated(logger zerolog.Logger, e events.Shar logger.Error(). Err(err). Msg("could not stat resource") - return + return owner, shareFolder, shareLink, ctx, err } shareFolder = resourceInfo.Name @@ -75,7 +75,7 @@ func (s eventsNotifier) prepareShareCreated(logger zerolog.Logger, e events.Shar logger.Error(). Err(err). Msg("could not create link to the share") - return + return owner, shareFolder, shareLink, ctx, err } owner, err = utils.GetUserWithContext(ctx, e.Sharer, gatewayClient) @@ -83,10 +83,10 @@ func (s eventsNotifier) prepareShareCreated(logger zerolog.Logger, e events.Shar logger.Error(). Err(err). Msg("could not get user") - return + return owner, shareFolder, shareLink, ctx, err } - return + return owner, shareFolder, shareLink, ctx, err } func (s eventsNotifier) handleShareExpired(e events.ShareExpired, eventId string) { @@ -140,13 +140,13 @@ func (s eventsNotifier) prepareShareExpired(logger zerolog.Logger, e events.Shar gatewayClient, err := s.gatewaySelector.Next() if err != nil { logger.Error().Err(err).Msg("could not select next gateway client") - return + return shareFolder, ctx, err } ctx, err = utils.GetServiceUserContextWithContext(context.Background(), gatewayClient, s.serviceAccountID, s.serviceAccountSecret) if err != nil { logger.Error().Err(err).Msg("could not get service user context") - return + return shareFolder, ctx, err } resourceInfo, err := s.getResourceInfo(ctx, e.ItemID, &fieldmaskpb.FieldMask{Paths: []string{"name"}}) @@ -154,9 +154,9 @@ func (s eventsNotifier) prepareShareExpired(logger zerolog.Logger, e events.Shar logger.Error(). Err(err). Msg("could not stat resource") - return + return shareFolder, ctx, err } shareFolder = resourceInfo.GetName() - return + return shareFolder, ctx, err } diff --git a/services/notifications/pkg/service/spaces.go b/services/notifications/pkg/service/spaces.go index 8550bd05b9..8607acbafd 100644 --- a/services/notifications/pkg/service/spaces.go +++ b/services/notifications/pkg/service/spaces.go @@ -51,13 +51,13 @@ func (s eventsNotifier) prepareSpaceShared(logger zerolog.Logger, e events.Space gatewayClient, err := s.gatewaySelector.Next() if err != nil { logger.Error().Err(err).Msg("could not select next gateway client") - return + return executant, spaceName, shareLink, ctx, err } ctx, err = utils.GetServiceUserContextWithContext(context.Background(), gatewayClient, s.serviceAccountID, s.serviceAccountSecret) if err != nil { logger.Error().Err(err).Msg("could not get service user context") - return + return executant, spaceName, shareLink, ctx, err } executant, err = utils.GetUserWithContext(ctx, e.Executant, gatewayClient) @@ -65,7 +65,7 @@ func (s eventsNotifier) prepareSpaceShared(logger zerolog.Logger, e events.Space logger.Error(). Err(err). Msg("could not get user") - return + return executant, spaceName, shareLink, ctx, err } resourceID, err := storagespace.ParseID(e.ID.OpaqueId) @@ -73,7 +73,7 @@ func (s eventsNotifier) prepareSpaceShared(logger zerolog.Logger, e events.Space logger.Error(). Err(err). Msg("could not parse resourceid from ItemID ") - return + return executant, spaceName, shareLink, ctx, err } resourceInfo, err := s.getResourceInfo(ctx, &resourceID, nil) @@ -81,7 +81,7 @@ func (s eventsNotifier) prepareSpaceShared(logger zerolog.Logger, e events.Space logger.Error(). Err(err). Msg("could not get space info") - return + return executant, spaceName, shareLink, ctx, err } spaceName = resourceInfo.GetSpace().GetName() @@ -90,9 +90,9 @@ func (s eventsNotifier) prepareSpaceShared(logger zerolog.Logger, e events.Space logger.Error(). Err(err). Msg("could not create link to the share") - return + return executant, spaceName, shareLink, ctx, err } - return + return executant, spaceName, shareLink, ctx, err } func (s eventsNotifier) handleSpaceUnshared(e events.SpaceUnshared, eventId string) { @@ -136,13 +136,13 @@ func (s eventsNotifier) prepareSpaceUnshared(logger zerolog.Logger, e events.Spa gatewayClient, err := s.gatewaySelector.Next() if err != nil { logger.Error().Err(err).Msg("could not select next gateway client") - return + return executant, spaceName, shareLink, ctx, err } ctx, err = utils.GetServiceUserContextWithContext(context.Background(), gatewayClient, s.serviceAccountID, s.serviceAccountSecret) if err != nil { logger.Error().Err(err).Msg("could not get service user context") - return + return executant, spaceName, shareLink, ctx, err } executant, err = utils.GetUserWithContext(ctx, e.Executant, gatewayClient) @@ -150,7 +150,7 @@ func (s eventsNotifier) prepareSpaceUnshared(logger zerolog.Logger, e events.Spa logger.Error(). Err(err). Msg("could not get user") - return + return executant, spaceName, shareLink, ctx, err } resourceID, err := storagespace.ParseID(e.ID.OpaqueId) @@ -158,7 +158,7 @@ func (s eventsNotifier) prepareSpaceUnshared(logger zerolog.Logger, e events.Spa logger.Error(). Err(err). Msg("could not parse resourceid from ItemID ") - return + return executant, spaceName, shareLink, ctx, err } resourceInfo, err := s.getResourceInfo(ctx, &resourceID, nil) @@ -166,7 +166,7 @@ func (s eventsNotifier) prepareSpaceUnshared(logger zerolog.Logger, e events.Spa logger.Error(). Err(err). Msg("could not get space info") - return + return executant, spaceName, shareLink, ctx, err } spaceName = resourceInfo.GetSpace().GetName() @@ -175,9 +175,9 @@ func (s eventsNotifier) prepareSpaceUnshared(logger zerolog.Logger, e events.Spa logger.Error(). Err(err). Msg("could not create link to the share") - return + return executant, spaceName, shareLink, ctx, err } - return + return executant, spaceName, shareLink, ctx, err } func (s eventsNotifier) handleSpaceMembershipExpired(e events.SpaceMembershipExpired, eventId string) {