diff --git a/cmd/raml/go.mod b/cmd/raml/go.mod index 4a0150a..c336179 100644 --- a/cmd/raml/go.mod +++ b/cmd/raml/go.mod @@ -3,8 +3,9 @@ module github.com/acronis/go-raml/cmd/raml go 1.23.0 require ( - github.com/acronis/go-raml v0.11.0 - github.com/acronis/go-stacktrace v0.2.0 + github.com/acronis/go-raml v0.14.0 + github.com/acronis/go-stacktrace v0.4.0 + github.com/acronis/go-stacktrace/slogex v0.3.0 github.com/dusted-go/logging v1.3.0 github.com/samber/slog-formatter v1.1.0 github.com/spf13/cobra v1.8.1 diff --git a/cmd/raml/go.sum b/cmd/raml/go.sum index f3c6166..86778fa 100644 --- a/cmd/raml/go.sum +++ b/cmd/raml/go.sum @@ -1,7 +1,9 @@ -github.com/acronis/go-raml v0.11.0 h1:wzpVC9EEY2QnneI0Me5yaK6yvyd+rQ1OpklXTn14G1w= -github.com/acronis/go-raml v0.11.0/go.mod h1:sZQ+e5lepkFm9pta+FAzNIxjFgdg6kS2tq0ClCRC5jM= -github.com/acronis/go-stacktrace v0.2.0 h1:aUME2BnO2WwBpmidhSq+C2cCm6T0i7u1mwraetKPyjQ= -github.com/acronis/go-stacktrace v0.2.0/go.mod h1:FOvjPOpMOpJhNgt2adD+FEnOpzcOzUBeiRkPaAd2aLQ= +github.com/acronis/go-raml v0.14.0 h1:jdmIjRITDpO9W5PD3R7tZEdemyg+3nomwLJXN9GHHMc= +github.com/acronis/go-raml v0.14.0/go.mod h1:b7A+r3k7Mk07ei/Oa2PFmrKEbh6AqZ7OI8baFYUQMjc= +github.com/acronis/go-stacktrace v0.4.0 h1:rL+6LxDnQ1/KcaCvF6ftC1Hjg91rjuPjPxS7+xH81xk= +github.com/acronis/go-stacktrace v0.4.0/go.mod h1:7Yf4nTbD//u5yR21BhiLzitxh8lU8Vb8SakHhoRAyqQ= +github.com/acronis/go-stacktrace/slogex v0.3.0 h1:PdHLMwPql8V7ZnmzzfCuZsrP7xCDpqfyNSfGDu8+OgI= +github.com/acronis/go-stacktrace/slogex v0.3.0/go.mod h1:iahItfhMndrugljHM87vXza344Lqu7YF4wMUNapf6xw= github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ= github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw= github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk= diff --git a/cmd/raml/raml.go b/cmd/raml/raml.go index c7397f2..6797873 100644 --- a/cmd/raml/raml.go +++ b/cmd/raml/raml.go @@ -9,6 +9,7 @@ import ( "os/signal" "github.com/acronis/go-stacktrace" + "github.com/acronis/go-stacktrace/slogex" "github.com/spf13/cobra" ) @@ -99,7 +100,7 @@ func mainFn() int { if ensureDuplicates { stOpts = append(stOpts, stacktrace.WithEnsureDuplicates()) } - slog.Error("Command failed", stacktrace.ErrToSlogAttr(cmdErr.Inner, stOpts...)) + slog.Error("Command failed", slogex.ErrToSlogAttr(cmdErr.Inner, stOpts...)) } else { _ = rootCmd.Usage() } diff --git a/cmd/raml/validate.go b/cmd/raml/validate.go index 4ee6af8..e1edfde 100644 --- a/cmd/raml/validate.go +++ b/cmd/raml/validate.go @@ -7,6 +7,7 @@ import ( "github.com/acronis/go-raml" "github.com/acronis/go-stacktrace" + "github.com/acronis/go-stacktrace/slogex" ) type ValidateOptions struct { @@ -35,7 +36,7 @@ func (v ValidateCommand) Execute(ctx context.Context) error { slog.Info("Validating RAML...", slog.String("path", arg)) _, err = raml.ParseFromPathCtx(ctx, arg, raml.OptWithUnwrap(), raml.OptWithValidate()) if err != nil { - slog.Error("RAML is invalid", stacktrace.ErrToSlogAttr(err, stOpts...)) + slog.Error("RAML is invalid", slogex.ErrToSlogAttr(err, stOpts...)) } else { slog.Info("RAML is valid", slog.String("path", arg)) }