SOPS-Diff v0.2.0

SOPS-Diff v0.2.0 Release Notes

What's New

Improved Git Conflict Resolution

• New --view-as-diff Flag: When resolving merge conflicts with the git-conflicts command, you can now use the --view-as-diff flag to see a Git-style diff view instead of traditional conflict markers. This makes complex conflicts easier to understand and resolve.

    sops-diff git-conflicts secrets.enc.yaml --view-as-diff

In Action

  git status
  On branch base
  You have unmerged paths.
    (fix conflicts and run "git commit")
    (use "git merge --abort" to abort the merge)
  
  Unmerged paths:
    (use "git add <file>..." to mark resolution)
          both modified:   secrets.enc.yaml

  sops-diff git-conflicts secrets.enc.yaml --view-as-diff
   
  Note: Git merge-file detected conflicts (this is expected)
  <<<<<<< /var/folders/c8/s759ckzs24n18m5w69gm0_1m0000gn/T/sops-merge-2526296091/ours
  SECRET_KEY: modified_in_branch1
  API_URL: https://api.example.com
  DEBUG_MODE: true
  EXTRA_1: extra_in_branch1
  DATABASE:
      USER: db_user
  =======
  SECRET_KEY: modified_in_branch2
  API_URL: https://api-v2.example.com
  DEBUG_MODE: false
  DATABASE:
      USER: db_user_new
  >>>>>>> /var/folders/c8/s759ckzs24n18m5w69gm0_1m0000gn/T/sops-merge-2526296091/theirs
      HOST: db.example.com
      PORT: 5432
  
  Note: The decrypted file contains sensitive information. Delete it when no longer needed.

• Enhanced Conflict Visualization: Better color-coding and formatting of conflict output to make identifying changes more intuitive.

Documentation Updates

• Updated documentation to include examples of the new diff view option
• Added comprehensive testing guide for merge conflict scenarios
• Expanded installation instructions with clearer platform-specific details

Upgrading

Linux (amd64)

curl -L https://github.com/saltydogtechnology/sops-diff/releases/download/v0.2.0/sops-diff-v0.2.0-linux-amd64.tar.gz | tar xz
sudo mv sops-diff-linux-amd64 /usr/local/bin/sops-diff

macOS (amd64)

curl -L https://github.com/saltydogtechnology/sops-diff/releases/download/v0.2.0/sops-diff-v0.2.0-darwin-amd64.tar.gz | tar xz
sudo mv sops-diff-darwin-amd64 /usr/local/bin/sops-diff

macOS (Apple Silicon)

curl -L https://github.com/saltydogtechnology/sops-diff/releases/download/v0.2.0/sops-diff-v0.2.0-darwin-arm64.tar.gz | tar xz
sudo mv sops-diff-darwin-arm64 /usr/local/bin/sops-diff

Windows

Download the appropriate binary from the releases page.

Getting Started with Merge Conflict Resolution

If you haven't already, set up Git integration:

# Configure Git to use SOPS-Diff for merge conflicts
sops-diff setup-git-merge-tool

# Add to your .gitattributes file
*.enc.yaml merge=sops
*.enc.json merge=sops
*.enc.env merge=sops

When you encounter merge conflicts in encrypted files, you now have two options:

# Traditional conflict marker view
sops-diff git-conflicts conflicted-file.enc.yaml

# New Git-style diff view
sops-diff git-conflicts conflicted-file.enc.yaml --view-as-diff

Compatibility

SOPS-Diff v0.2.0 is compatible with:

• SOPS v3.7.x or higher
• Git 2.20.0 or higher
• All major platforms (Linux, macOS, Windows)

Feedback

We're always looking to improve SOPS-Diff. If you encounter any issues or have suggestions for future improvements, please [open an issue] on our GitHub repository.

Thank you for using SOPS-Diff!

SOPS-Diff v0.1.1

SOPS-Diff v0.1.1

Installation

Linux (amd64)

curl -L https://github.com/saltydogtechnology/sops-diff/releases/download/v0.1.1/sops-diff-v0.1.1-linux-amd64.tar.gz | tar xz
sudo mv sops-diff-linux-amd64 /usr/local/bin/sops-diff

macOS (amd64)

curl -L https://github.com/saltydogtechnology/sops-diff/releases/download/v0.1.1/sops-diff-v0.1.1-darwin-amd64.tar.gz | tar xz
sudo mv sops-diff-darwin-amd64 /usr/local/bin/sops-diff

macOS (Apple Silicon)

curl -L https://github.com/saltydogtechnology/sops-diff/releases/download/v0.1.1/sops-diff-v0.1.1-darwin-arm64.tar.gz | tar xz
sudo mv sops-diff-darwin-arm64 /usr/local/bin/sops-diff

For Windows, download the appropriate zip file and extract the executable.

See full installation and usage instructions in the README.

SOPS-Diff v0.1.0

SOPS-Diff v0.1.0

• No changes

Installation

Linux (amd64)

curl -L https://github.com/saltydogtechnology/sops-diff/releases/download/v0.1.0/sops-diff-v0.1.0-linux-amd64.tar.gz | tar xz
sudo mv sops-diff-linux-amd64 /usr/local/bin/sops-diff

macOS (amd64)

curl -L https://github.com/saltydogtechnology/sops-diff/releases/download/v0.1.0/sops-diff-v0.1.0-darwin-amd64.tar.gz | tar xz
sudo mv sops-diff-darwin-amd64 /usr/local/bin/sops-diff

macOS (Apple Silicon)

curl -L https://github.com/saltydogtechnology/sops-diff/releases/download/v0.1.0/sops-diff-v0.1.0-darwin-arm64.tar.gz | tar xz
sudo mv sops-diff-darwin-arm64 /usr/local/bin/sops-diff

For Windows, download the appropriate zip file and extract the executable.

See full installation and usage instructions in the README.