myriation/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Rename j

Browse source
This commit is contained in:
Kristoffer Dalby 2022-02-12 19:08:41 +00:00
parent c73b57e7dc
commit e18078d7f8
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/headscale/cli/utils.go
View file

@ -438,21 +438,21 @@ func getHeadscaleCLIClient() (context.Context, v1.HeadscaleServiceClient, *grpc.
} }
func SuccessOutput(result interface{}, override string, outputFormat string) { func SuccessOutput(result interface{}, override string, outputFormat string) {
var j []byte var jsonBytes []byte
var err error var err error
switch outputFormat { switch outputFormat {
case "json": case "json":
j, err = json.MarshalIndent(result, "", "\t") jsonBytes, err = json.MarshalIndent(result, "", "\t")
if err != nil { if err != nil {
log.Fatal().Err(err) log.Fatal().Err(err)
} }
case "json-line": case "json-line":
j, err = json.Marshal(result) jsonBytes, err = json.Marshal(result)
if err != nil { if err != nil {
log.Fatal().Err(err) log.Fatal().Err(err)
} }
case "yaml": case "yaml":
j, err = yaml.Marshal(result) jsonBytes, err = yaml.Marshal(result)
if err != nil { if err != nil {
log.Fatal().Err(err) log.Fatal().Err(err)
} }
@ -464,7 +464,7 @@ func SuccessOutput(result interface{}, override string, outputFormat string) {
} }
//nolint //nolint
fmt.Println(string(j)) fmt.Println(string(jsonBytes))
} }
func ErrorOutput(errResult error, override string, outputFormat string) { func ErrorOutput(errResult error, override string, outputFormat string) {