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

feat: enhance WriteToFileAsJSON with pretty-printing support #783

Merged
merged 3 commits into from
Nov 15, 2024

Conversation

RoseSecurity
Copy link
Contributor

@RoseSecurity RoseSecurity commented Nov 15, 2024

what

  • Used the ConvertToJSON utility with json.MarshalIndent to produce formatted JSON
  • Indentation is set to two spaces (" ") for consistent readability

why

  • This PR improves the WriteToFileAsJSON function by introducing pretty-printing for JSON outputs. Previously, the function serialized JSON using a compact format, which could make the resulting files harder to read. With this change, all JSON written by this function will now be formatted with indentation, making it easier for developers and users to inspect and debug the generated files

  • This specifically addresses Pretty Json Formatting from auto backend generation #778 , which previously rendered auto-generated backends as:

{
   "terraform": {
   "backend": {
   "s3": {
   "acl": "bucket-owner-full-control",
   "bucket": "my-tfstate-bucket",
   "dynamodb_table": "some-dynamo-table",
   "encrypt": true,
   "key": "terraform.tfstate",
   "profile": "main",
   "region": "us-west-2",
   "workspace_key_prefix": "something"
}
}
}
}

With this addition, the output appears as:

{
  "terraform": {
    "backend": {
      "s3": {
        "acl": "bucket-owner-full-control",
        "bucket": "my-tfstate-bucket",
        "dynamodb_table": "some-dynamo-table",
        "encrypt": true,
        "key": "terraform.tfstate",
        "profile": "main",
        "region": "us-west-2",
        "workspace_key_prefix": "something"
      }
    }
  }
}

references

Summary by CodeRabbit

Summary by CodeRabbit

  • New Features
    • Enhanced JSON output formatting with indented structure for better readability.
  • Refactor
    • Simplified variable declarations for consistency in JSON handling functions.

@RoseSecurity RoseSecurity requested review from a team as code owners November 15, 2024 13:45
Copy link
Contributor

coderabbitai bot commented Nov 15, 2024

📝 Walkthrough
📝 Walkthrough
📝 Walkthrough
📝 Walkthrough

Walkthrough

The changes in this pull request focus on the pkg/utils/json_utils.go file, enhancing the JSON conversion and file writing functionalities. The WriteToFileAsJSON function now utilizes json.MarshalIndent for generating indented JSON output. Additionally, the writing process is streamlined by directly using the byte slice from json.MarshalIndent. The variable declarations in several functions have been updated for consistency, shifting from the var keyword to short variable declarations.

Changes

File Path Change Summary
pkg/utils/json_utils.go Updated WriteToFileAsJSON to use json.MarshalIndent for indented JSON output; simplified file writing. Changed variable declarations in ConvertToJSON, ConvertToJSONFast, and ConvertFromJSON to short variable declarations.

Suggested labels

minor


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 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 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 or @auto-summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai or @auto-title anywhere in the PR title to generate the title automatically.

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
Contributor

@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/utils/json_utils.go (1)

91-91: Consider extracting common jsoniter config.

While the short declaration is good, I notice that we have similar jsoniter configs repeated in multiple functions. Consider extracting this into a shared config variable.

package utils

import (...)

+var defaultJSONConfig = jsoniter.Config{
+    EscapeHTML:                    false,
+    MarshalFloatWith6Digits:       true,
+    ObjectFieldMustBeSimpleString: true,
+    SortMapKeys:                   true,
+    ValidateJsonRawMessage:        true,
+}

// ... rest of the file

This would reduce duplication and make config changes easier to maintain.

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 9acca77 and 4445d3a.

📒 Files selected for processing (1)
  • pkg/utils/json_utils.go (4 hunks)
🔇 Additional comments (2)
pkg/utils/json_utils.go (2)

58-58: LGTM! Clean variable declaration.

The short variable declaration style is idiomatic Go and improves readability.


74-74: LGTM! Consistent style.

The short variable declaration maintains consistency with the previous changes.

pkg/utils/json_utils.go Outdated Show resolved Hide resolved
@RoseSecurity RoseSecurity marked this pull request as draft November 15, 2024 14:02
@RoseSecurity RoseSecurity marked this pull request as ready for review November 15, 2024 14:42
@aknysh aknysh added the patch A minor, backward compatible change label Nov 15, 2024
Copy link
Member

@aknysh aknysh left a comment

Choose a reason for hiding this comment

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

thanks @RoseSecurity

@aknysh aknysh merged commit 81f6db2 into main Nov 15, 2024
30 checks passed
@aknysh aknysh deleted the pretty-print-autogenerated-backend-json branch November 15, 2024 19:04
Copy link

These changes were released in v1.106.1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
patch A minor, backward compatible change
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Pretty Json Formatting from auto backend generation
2 participants