Remove go-kit/log

Author: migueleliasweb

go.mod

@@ -1,16 +1,13 @@
 module github.com/migueleliasweb/go-github-mock
 
-go 1.21
+go 1.23
 
 require (
 	github.com/buger/jsonparser v1.1.1
-	github.com/go-kit/log v0.2.1
 	github.com/google/go-github/v64 v64.0.0
 	github.com/gorilla/mux v1.8.0
+	golang.org/x/text v0.19.0
 	golang.org/x/time v0.3.0
 )
 
-require (
-	github.com/go-logfmt/logfmt v0.5.1 // indirect
-	github.com/google/go-querystring v1.1.0 // indirect
-)
+require github.com/google/go-querystring v1.1.0 // indirect

go.sum

@@ -1,9 +1,5 @@
 github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
-github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
-github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
-github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
-github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -13,6 +9,8 @@ github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

main.go

@@ -3,14 +3,12 @@ package main
 import (
 	"bytes"
 	"flag"
-	"fmt"
+	"log/slog"
 	"os"
 	"os/exec"
 
 	"github.com/buger/jsonparser"
 
-	"github.com/go-kit/log"
-	"github.com/go-kit/log/level"
 	"github.com/migueleliasweb/go-github-mock/src/gen"
 )
 
@@ -23,37 +21,31 @@ func init() {
 func main() {
 	flag.Parse()
 
-	var l log.Logger
-
-	l = log.NewLogfmtLogger(log.NewSyncWriter(os.Stdout))
-
-	l = log.With(l, "caller", log.DefaultCaller)
-
-	if debug {
-		l = level.NewFilter(l, level.AllowDebug())
-		level.Debug(l).Log("msg", "running in debug mode")
-	} else {
-		l = level.NewFilter(l, level.AllowInfo())
-	}
-
-	fetchAndWriteAPIDefinition(l)
+	fetchAndWriteAPIDefinition()
 }
 
 // type helper just to ensure uniqueness of the generated output
 type uniq map[string]struct{}
 
+// has will add `s` to the map whe not found
 func (u uniq) has(s string) bool {
-	_, ok := u[s]
-	return ok
-}
+	_, has := u[s]
 
-func fetchAndWriteAPIDefinition(l log.Logger) {
+	if !has {
+		u[s] = struct{}{}
+	}
+
+	return has
+}
 
+func fetchAndWriteAPIDefinition() {
 	buf := bytes.NewBuffer([]byte(gen.OUTPUT_FILE_HEADER))
+
 	u := make(uniq)
+
 	defs := [][]byte{
-		gen.FetchAPIDefinition(l, gen.GITHUB_OPENAPI_DEFINITION_LOCATION),
-		gen.FetchAPIDefinition(l, gen.GITHUB_OPENAPI_ENTERPRISE_DEFINITION_LOCATION),
+		gen.FetchAPIDefinition(gen.GITHUB_OPENAPI_DEFINITION_LOCATION),
+		// gen.FetchAPIDefinition(gen.GITHUB_OPENAPI_ENTERPRISE_DEFINITION_LOCATION),
 	}
 
 	for _, d := range defs {
@@ -75,14 +67,12 @@ func fetchAndWriteAPIDefinition(l log.Logger) {
 
 				for _, httpMethod := range httpMethods {
 					code := gen.FormatToGolangVarNameAndValue(
-						l,
 						gen.ScrapeResult{
 							HTTPMethod:      httpMethod,
 							EndpointPattern: endpointPattern,
 						},
 					)
 					if !u.has(code) {
-						u[code] = struct{}{}
 						buf.WriteString(code)
 					}
 				}
@@ -103,13 +93,13 @@ func fetchAndWriteAPIDefinition(l log.Logger) {
 
 	// to catch possible format errors
 	if err := exec.Command("gofmt", "-w", gen.OUTPUT_FILEPATH).Run(); err != nil {
-		level.Error(l).Log("msg", fmt.Sprintf("error executing gofmt: %s", err.Error()))
+		slog.Info("error executing gofmt", "err", err.Error())
 		errorsFound = true
 	}
 
 	// to catch everything else (hopefully)
 	if err := exec.Command("go", "vet", "./...").Run(); err != nil {
-		level.Error(l).Log("msg", fmt.Sprintf("error executing go vet: %s", err.Error()))
+		slog.Info("error executing go vet", "err", err.Error())
 		errorsFound = true
 	}
 

src/gen/gen.go

@@ -3,14 +3,14 @@ package gen
 import (
 	"fmt"
 	"io"
+	"log/slog"
 	"net/http"
 	"os"
 	"regexp"
 	"strings"
 
-	"github.com/go-kit/log"
-
-	"github.com/go-kit/log/level"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 )
 
 const GITHUB_OPENAPI_DEFINITION_LOCATION = "https://github.com/github/rest-api-description/blob/main/descriptions/api.github.com/api.github.com.json?raw=true"
@@ -24,17 +24,21 @@ const OUTPUT_FILE_HEADER = `package mock
 `
 const OUTPUT_FILEPATH = "src/mock/endpointpattern.go"
 
+// Replacing deprecated method strings.Title
+// requires a "Caser"
+var Title = cases.Title(language.English)
+
 type ScrapeResult struct {
 	HTTPMethod      string
 	EndpointPattern string
 }
 
-func FetchAPIDefinition(l log.Logger, d string) []byte {
+func FetchAPIDefinition(d string) []byte {
 	resp, err := http.Get(d)
 
 	if err != nil {
-		level.Error(l).Log(
-			"msg", "error fetching github's api definition",
+		slog.Info(
+			"error fetching github's api definition",
 			"err", err.Error(),
 		)
 
@@ -46,8 +50,8 @@ func FetchAPIDefinition(l log.Logger, d string) []byte {
 	bodyBytes, err := io.ReadAll(resp.Body)
 
 	if err != nil {
-		level.Error(l).Log(
-			"msg", "error fetching github's api definition",
+		slog.Info(
+			"error fetching github's api definition",
 			"err", err.Error(),
 		)
 
@@ -59,8 +63,8 @@ func FetchAPIDefinition(l log.Logger, d string) []byte {
 
 // FormatToGolangVarName generated the proper golang variable name
 // given a endpoint format from the API
-func FormatToGolangVarName(l log.Logger, sr ScrapeResult) string {
-	result := strings.Title(strings.ToLower(sr.HTTPMethod))
+func FormatToGolangVarName(sr ScrapeResult) string {
+	result := Title.String(strings.ToLower(sr.HTTPMethod))
 
 	if sr.EndpointPattern == "/" {
 		return result + "Slash"
@@ -89,7 +93,7 @@ func FormatToGolangVarName(l log.Logger, sr ScrapeResult) string {
 		splitPart := strings.Split(part, "_")
 
 		for _, p := range splitPart {
-			result = result + strings.Title(p)
+			result = result + Title.String(p)
 		}
 	}
 
@@ -106,15 +110,15 @@ func FormatToGolangVarName(l log.Logger, sr ScrapeResult) string {
 			result += "By"
 
 			for _, splitPart := range strings.Split(part, "_") {
-				result += strings.Title(splitPart)
+				result += Title.String(splitPart)
 			}
 		}
 	}
 
 	return result
 }
 
-func FormatToGolangVarNameAndValue(l log.Logger, sr ScrapeResult) string {
+func FormatToGolangVarNameAndValue(sr ScrapeResult) string {
 	sr = applyMutation(sr)
 
 	return fmt.Sprintf(
@@ -123,7 +127,7 @@ func FormatToGolangVarNameAndValue(l log.Logger, sr ScrapeResult) string {
 	Method:  "%s",
 }
 `,
-		FormatToGolangVarName(l, sr),
+		FormatToGolangVarName(sr),
 		sr.EndpointPattern,
 		strings.ToUpper(sr.HTTPMethod),
 	) + "\n"

src/gen/gen_test.go

@@ -2,8 +2,6 @@ package gen
 
 import (
 	"testing"
-
-	"github.com/go-kit/log"
 )
 
 func TestFormatToGolangVarName(t *testing.T) {
@@ -63,7 +61,7 @@ func TestFormatToGolangVarName(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := FormatToGolangVarName(log.NewNopLogger(), tt.sr); got != tt.want {
+			if got := FormatToGolangVarName(tt.sr); got != tt.want {
 				t.Errorf("formatToGolangVarName() = %v, want %v", got, tt.want)
 			}
 		})