Skip to content

Commit 15b0685

Browse files
committed
chore(lint): golangci-lint: fix various
1 parent 934dbf0 commit 15b0685

File tree

1 file changed

+26
-16
lines changed

1 file changed

+26
-16
lines changed

cmd/oas3validate/main.go

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package main
22

33
import (
4-
"fmt"
5-
"log"
4+
"log/slog"
65
"os"
76
"strings"
87

@@ -23,7 +22,8 @@ func main() {
2322
var opts Options
2423
_, err := flags.Parse(&opts)
2524
if err != nil {
26-
log.Fatal(err)
25+
slog.Error(err.Error())
26+
os.Exit(1)
2727
}
2828

2929
var spec *openapi3.Spec
@@ -33,35 +33,43 @@ func main() {
3333
} else {
3434
spec, err = openapi3.ReadFile(opts.SpecFileOAS3, true)
3535
}
36-
3736
if err != nil {
38-
log.Fatal(err)
37+
slog.Error(err.Error())
38+
os.Exit(2)
3939
}
4040

4141
sm := openapi3.SpecMore{Spec: spec}
4242

43-
log.Printf(
44-
"S_SPEC_VALID File [%s] Title [%s] Op Count [%d]",
45-
opts.SpecFileOAS3, spec.Info.Title, sm.OperationsCount())
43+
slog.Info(
44+
"validSpecInfo",
45+
"filename", opts.SpecFileOAS3,
46+
"title", spec.Info.Title,
47+
"opsCount", sm.OperationsCount())
4648

4749
sortBy := histogram.SortValueDesc
4850
ops := sm.OperationCountsByTag()
49-
ops.WriteTableASCII(os.Stdout,
51+
err = ops.WriteTableASCII(os.Stdout,
5052
[]string{"Tag", "Operation Count"}, sortBy, true)
53+
if err != nil {
54+
slog.Error(err.Error())
55+
os.Exit(3)
56+
}
5157

5258
ops2 := ops.ItemCounts(sortBy)
5359
err = fmtutil.PrintJSON(ops2)
5460
if err != nil {
55-
log.Fatal(err)
61+
slog.Error(err.Error())
62+
os.Exit(3)
5663
}
5764

5865
md := ops2.Markdown("1. Count: ", ", Category: ", true, true)
59-
fmt.Println(md)
66+
slog.Info(md)
6067
opts.XlsxWrite = strings.TrimSpace(opts.XlsxWrite)
6168
if len(opts.XlsxWrite) > 0 {
6269
err := sm.WriteFileXLSX(opts.XlsxWrite, nil, nil, nil)
6370
if err != nil {
64-
log.Fatal(err)
71+
slog.Error(err.Error())
72+
os.Exit(4)
6573
}
6674
}
6775

@@ -70,15 +78,17 @@ func main() {
7078
err := sm.WriteFileXLSXOperationStatusCodes(
7179
opts.WriteOpStatusCodeXlsx)
7280
if err != nil {
73-
log.Fatal(err)
81+
slog.Error(err.Error())
82+
os.Exit(5)
7483
}
7584
}
7685

7786
opIDs := sm.OperationIDs()
78-
fmt.Printf("OPERATION ID COUNT [%d]\n", len(opIDs))
87+
slog.Info("operationIDs", "count", len(opIDs))
7988

8089
endpoints := sm.PathMethods(true)
81-
fmt.Printf("ENDPOINT COUNT [%d]\n", len(endpoints))
90+
slog.Info("endpoints", "count", len(endpoints))
8291

83-
fmt.Println("DONE")
92+
slog.Info("DONE")
93+
os.Exit(0)
8494
}

0 commit comments

Comments
 (0)