Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make markdown filename shorter #5899

Merged
merged 1 commit into from
Dec 12, 2024
Merged

make markdown filename shorter #5899

merged 1 commit into from
Dec 12, 2024

Conversation

dogancanbakir
Copy link
Member

@dogancanbakir dogancanbakir commented Dec 11, 2024

Proposed changes

Closes #5769

Checklist

  • Pull request is created against the dev branch
  • All checks passed (lint, unit/integration/regression tests etc.) with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)

Summary by CodeRabbit

  • New Features

    • Enhanced filename generation for markdown reports to ensure uniqueness by incorporating event host and appending a UUID.
  • Bug Fixes

    • Improved handling of filename collisions in markdown exports.
  • Documentation

    • Updated method signature for better clarity on filename creation.

@dogancanbakir dogancanbakir self-assigned this Dec 11, 2024
@auto-assign auto-assign bot requested a review from dwisiswant0 December 11, 2024 07:31
Copy link

coderabbitai bot commented Dec 11, 2024

Walkthrough

The changes in the pull request focus on modifying the createFileName function within the markdown.go file to enhance the uniqueness of generated filenames for markdown reports. A new import for the github.com/google/uuid package is introduced to append a UUID to the filename, which now incorporates the event's host. This adjustment aims to reduce filename collisions while maintaining the existing export functionality and file handling logic.

Changes

File Path Change Summary
pkg/reporting/exporters/markdown/markdown.go Updated createFileName function to include UUID in filenames; added import for github.com/google/uuid.

Assessment against linked issues

Objective Addressed Explanation
Change output file name strategy to avoid long names (#5769)

🐰 In the meadow where bunnies play,
Unique names hop in a joyful way!
With UUIDs now, no more long trails,
Each file a treasure, as the rabbit prevails!
So let’s cheer for the changes, hip-hip-hooray! 🌼


🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Experiment)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Outside diff range and nitpick comments (1)
pkg/reporting/exporters/markdown/markdown.go (1)

Line range hint 143-147: Consider full path length for Windows compatibility

The current implementation truncates filenames at 256 characters, but Windows has a 260-character limit for the full path. The sanitizeFilename function should consider:

  1. The base directory path length
  2. Any subdirectory path length (when using SortMode)
  3. The filename itself

Consider this enhancement:

-func sanitizeFilename(filename string) string {
+func sanitizeFilename(filename string, basePath string) string {
+    // Windows MAX_PATH is 260 chars
+    const maxWindowsPath = 260
+    
+    // Calculate available space for filename
+    baseLen := len(basePath) + 1  // +1 for path separator
+    maxFilenameLen := maxWindowsPath - baseLen
+    
     if len(filename) > 256 {
-        filename = filename[0:255]
+        filename = filename[0:maxFilenameLen]
     }
     return stringsutil.ReplaceAll(filename, "_", "?", "/", ">", "|", ":", ";", "*", "<", "\"", "'", " ")
 }

This would require updating the Export method to pass the full base path:

-    filename := sanitizeFilename(filenameBuilder.String())
+    fullPath := filepath.Join(exporter.directory, subdirectory)
+    filename := sanitizeFilename(filenameBuilder.String(), fullPath)
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between c731126 and 7c0da4d.

📒 Files selected for processing (1)
  • pkg/reporting/exporters/markdown/markdown.go (2 hunks)
🔇 Additional comments (2)
pkg/reporting/exporters/markdown/markdown.go (2)

9-9: LGTM: Good choice for generating unique identifiers

The addition of the uuid package is appropriate for ensuring unique filenames.


Line range hint 1-147: Verify existing usage patterns and test coverage

Let's verify the impact of these changes on existing code and tests.

✅ Verification successful

The changes appear safe to proceed

Based on the verification results:

  1. The markdown exporter is only used in pkg/reporting/reporting.go through the New() function
  2. The test coverage focuses on markdown utilities (table creation, headers) rather than the export functionality
  3. The changes introduce better organization through subdirectories based on severity/host/template without breaking the existing file generation logic
  4. The filename sanitization remains consistent with the existing implementation

The modifications enhance the organization of exported files while maintaining backward compatibility with the existing interface and usage patterns.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check for existing usage patterns and test coverage

# Look for direct usage of the Matched field in markdown generation
rg -l "event\.Matched.*\.md" --type go

# Check for existing test cases
rg -l "TestExport.*markdown" --type go

# Look for potential template ID patterns to understand typical filename lengths
ast-grep --pattern 'TemplateID: "$_"'

Length of output: 121


Script:

#!/bin/bash
# Let's try a different approach to verify the changes

# Check for existing test files for markdown exporter
fd "markdown.*test.*\.go$"

# Look for any markdown-related test files in the reporting directory
fd ".*test.*\.go$" pkg/reporting

# Check for usage of markdown exporter in the codebase
rg -A 3 "markdown\.New\(" --type go

# Look for any existing markdown files to understand the current structure
fd "\.md$"

Length of output: 1316


Script:

#!/bin/bash
# Let's examine the test file and current implementation

# Check the markdown utils test content
cat pkg/reporting/exporters/markdown/util/markdown_utils_test.go

# Look for any existing markdown exporter tests in the reporting tests
rg -A 5 "markdown.*Export" pkg/reporting/exporters/markdown/util/markdown_utils_test.go

# Check the reporting implementation for markdown usage patterns
rg -A 5 "markdown\.Export" pkg/reporting/reporting.go

Length of output: 2029

pkg/reporting/exporters/markdown/markdown.go Show resolved Hide resolved
Copy link
Member

@ehsandeep ehsandeep left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dogancanbakir we track / fix failing test as follow up issue, looks like it's being failed in all other PRs as well.

@ehsandeep ehsandeep merged commit 53ff9c5 into dev Dec 12, 2024
16 of 19 checks passed
@ehsandeep ehsandeep deleted the make_md_filename_shorter branch December 12, 2024 22:55
@dogancanbakir dogancanbakir mentioned this pull request Dec 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] The output file name is too long.
3 participants