Skip to content

Added json formatting flag #18

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added json formatting flag #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions cmd/export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const (
OutputFileMode = 0644
)

func Export(path, file, metad, ver string) error {
func Export(path, file, metad, ver string, formatJson bool) error {
v, err := vault.NewClient()
if v == nil || err != nil {
if err != nil {
Expand Down Expand Up @@ -68,10 +68,19 @@ func Export(path, file, metad, ver string) error {

// Convert to json and write to a file
export := Wrap{Data: items}
out, err := json.Marshal(&export)
if err != nil {
fmt.Println(err)
var out []byte
if formatJson {
out, err = json.MarshalIndent(&export, "", " ")
if err != nil {
fmt.Println(err)
}
} else {
out, err = json.Marshal(&export)
if err != nil {
fmt.Println(err)
}
}

abs, err := filepath.Abs(file)
if err != nil {
fmt.Println(err)
Expand Down
2 changes: 1 addition & 1 deletion it/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func TestMigrator__integration(t *testing.T) {
t.Fatal(err)
}
defer os.Remove(tmp.Name())
err = commands.Export("secret/", tmp.Name(), "", "1")
err = commands.Export("secret/", tmp.Name(), "", "1", false)
if err != nil {
t.Fatal(err)
}
Expand Down
5 changes: 4 additions & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ var (

// Output the version
version = flag.Bool("version", false, "Output the version number")

// JSON formatting
formatJson = flag.Bool("pretty", true, "Format JSON output")
)

const Version = "0.2.1-dev"
Expand All @@ -46,7 +49,7 @@ func main() {
if empty(ex, file) {
exit()
}
err := cmd.Export(*ex, *file, *md, *vr)
err := cmd.Export(*ex, *file, *md, *vr, *formatJson)
if err != nil {
fmt.Println(err)
os.Exit(1)
Expand Down