add error logging for failed rollbacks and improve errors

service/policy/attributes/attributes.go

@@ -58,7 +58,7 @@ func (s AttributesService) CreateAttribute(ctx context.Context,
 		item, err := txClient.CreateAttribute(ctx, req.Msg)
 		if err != nil {
 			s.logger.Audit.PolicyCRUDFailure(ctx, auditParams)
-			return db.StatusifyError(err, db.ErrTextCreationFailed, slog.String("attribute", req.Msg.String()))
+			return err
 		}
 
 		s.logger.Debug("created new attribute definition", slog.String("name", req.Msg.GetName()))
@@ -71,7 +71,7 @@ func (s AttributesService) CreateAttribute(ctx context.Context,
 		return nil
 	})
 	if err != nil {
-		return nil, err
+		return nil, db.StatusifyError(err, db.ErrTextCreationFailed, slog.String("attribute", req.Msg.String()))
 	}
 
 	return connect.NewResponse(rsp), nil

service/policy/db/policy.go

@@ -39,13 +39,18 @@ func (c *PolicyDBClient) RunInTx(ctx context.Context, query func(txClient *Polic
 	if err != nil {
 		return fmt.Errorf("failed to begin DB transaction: %w", err)
 	}
-	//nolint:errcheck // ignore error per sqlc docs https://docs.sqlc.dev/en/stable/howto/transactions.html
-	defer tx.Rollback(ctx)
 
 	txClient := &PolicyDBClient{c.Client, c.logger, c.Queries.WithTx(tx), c.listCfg}
 
 	err = query(txClient)
 	if err != nil {
+		c.logger.WarnContext(ctx, "error during DB transaction, rolling back")
+
+		if rollbackErr := tx.Rollback(ctx); rollbackErr != nil {
+			// this should never happen, but if it does, we want to know about it
+			return fmt.Errorf("failed to rollback DB transaction for [%w]: %w", err, rollbackErr)
+		}
+
 		return err
 	}