feat(appeal): add variables to approver notification message

Author: Chief-Rishab

cli/job.go

@@ -40,8 +40,9 @@ func runJobCmd() *cobra.Command {
 		Short: "Fire a specific job",
 		Example: heredoc.Doc(`
 			$ guardian job run fetch_resources
-			$ guardian job run grant_expiration_reminder
-			$ guardian job run grant_expiration_revocation
+			$ guardian job run expiring_grant_notification
+			$ guardian job run revoke_expired_grants
+			$ guardian job run revoke_grants_by_user_criteria
 		`),
 		Args: cobra.ExactValidArgs(1),
 		ValidArgs: []string{

core/appeal/service.go

@@ -663,6 +663,14 @@ func (s *Service) AddApprover(ctx context.Context, appealID, approvalID, email s
 		s.logger.Error("failed to record audit log", "error", err)
 	}
 
+	duration := domain.PermanentDurationLabel
+	if !appeal.IsDurationEmpty() {
+		duration, err = utils.GetReadableDuration(appeal.Options.Duration)
+		if err != nil {
+			s.logger.Error("failed to get readable duration", "error", err, "appeal_id", appeal.ID)
+		}
+	}
+
 	if errs := s.notifier.Notify([]domain.Notification{
 		{
 			User: email,
@@ -677,6 +685,15 @@ func (s *Service) AddApprover(ctx context.Context, appealID, approvalID, email s
 					"requestor":     appeal.CreatedBy,
 					"appeal_id":     appeal.ID,
 					"account_id":    appeal.AccountID,
+					"account_type":  appeal.AccountType,
+					"provider_type": appeal.Resource.ProviderType,
+					"resource_type": appeal.Resource.Type,
+					"created_at":    appeal.CreatedAt,
+					"approval_step": approval.Name,
+					"actor":         email,
+					"details":       appeal.Details,
+					"duration":      duration,
+					"creator":       appeal.Creator,
 				},
 			},
 		},
@@ -873,6 +890,7 @@ func (s *Service) getApprovalNotifications(appeal *domain.Appeal) []domain.Notif
 						"actor":         approver,
 						"details":       appeal.Details,
 						"duration":      duration,
+						"creator":       appeal.Creator,
 					},
 				},
 			})

plugins/notifiers/slack/client_test.go

@@ -74,15 +74,26 @@ func (s *ClientTestSuite) TestNotify() {
 
 func (s *ClientTestSuite) TestParseMessage() {
 	s.setup()
+	s.messages = domain.NotificationMessages{
+		ApproverNotification: "[{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"You have an appeal created by *{{.requestor}}* requesting access to *{{.resource_name}}* with role *{{.role}}*. User's manager: {{.creator.manager_email}} and belongs to {{.creator.org_name}}.\\n Appeal ID: *{{.appeal_id}}*\"}}]",
+	}
 	s.Run("should be able to parse message", func() {
+		creator := map[string]interface{}{
+			"manager_email": "user-manager@example.com",
+			"org_name":      "test-org",
+		}
+
 		notificationMsg := domain.NotificationMessage{
-			Type: domain.NotificationTypeAppealRejected,
+			Type: domain.NotificationTypeApproverNotification,
 			Variables: map[string]interface{}{
 				"resource_name": "test-resource",
 				"role":          "test-role",
+				"creator":       creator,
+				"appeal_id":     "test-appeal-id",
+				"requestor":     "test-user",
 			},
 		}
-		expectedMsg := `[{"type":"section","text":{"type":"mrkdwn","text":"Your appeal to test-resource with role test-role has been rejected"}}]`
+		expectedMsg := `[{"type":"section","text":{"type":"mrkdwn","text":"You have an appeal created by *test-user* requesting access to *test-resource* with role *test-role*. User's manager: user-manager@example.com and belongs to test-org.\n Appeal ID: *test-appeal-id*"}}]`
 		message, err := slack.ParseMessage(notificationMsg, s.messages, embed.FS{})
 
 		s.Nil(err)