Merge pull request #37 from BugFixes/lotsOFix

lots of various fixes

.github/workflows/pull.yml

@@ -23,6 +23,23 @@ jobs:
           fetch-depth: 1
       - name: test
         run: go test -v -race -bench=./... -benchmem -timeout=120s -bench=./... ./...
+  qodana:
+    runs-on: ubuntu-latest
+    needs:
+      - test
+    permissions:
+      contents: write
+      pull-requests: write
+      checks: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
+          fetch-depth: 0  # a full history is required for pull request analysis
+      - name: 'Qodana Scan'
+        uses: JetBrains/[email protected]
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
   automerge:
     needs:
       - test

logs/logging.go

@@ -19,17 +19,6 @@ const (
 	defaultSkipDepth = 3
 )
 
-func (b BugFixes) Unwrap(e error) error {
-	u, ok := e.(interface {
-		Unwrap() error
-	})
-	if !ok {
-		return nil
-	}
-
-	return u.Unwrap()
-}
-
 type BugFixes struct {
 	FormattedLog string `json:"log"`
 	Level        string `json:"level"`
@@ -47,7 +36,7 @@ type BugFixes struct {
 	SkipDepthOverride int
 }
 
-func NewBugFixes(b BugFixes, err error) error {
+func NewBugFixes(err error) error {
 	if err == nil {
 		return nil
 	}
@@ -123,7 +112,18 @@ func ConvertLevelFromString(s string) int {
 	}
 }
 
-func (b *BugFixes) skipDepth(depth int) {
+func (b BugFixes) UnwrapIt(e error) error {
+	u, ok := e.(interface {
+		Unwrap() error
+	})
+	if !ok {
+		return nil
+	}
+
+	return u.Unwrap()
+}
+
+func (b BugFixes) skipDepth(depth int) {
 	_, file, line, _ := runtime.Caller(depth)
 	b.File = file
 	b.LineNumber = line
@@ -168,7 +168,7 @@ func (b BugFixes) DoReporting() {
 	b.sendLog()
 }
 
-func (b *BugFixes) logFormat() {
+func (b BugFixes) logFormat() {
 	out := bytes.Buffer{}
 	lf := logfmt.NewEncoder(&out)
 

logs/logging_test.go

@@ -0,0 +1,56 @@
+package logs_test
+
+import (
+	"errors"
+	"fmt"
+	"github.com/bugfixes/go-bugfixes/logs"
+	"testing"
+)
+
+func TestUnwrap(t *testing.T) {
+	err := fmt.Errorf("%w error", errors.New("error"))
+	wrappedError := logs.BugFixes{
+		Err: err,
+	}
+	unwrappedError := wrappedError.UnwrapIt(err)
+
+	if unwrappedError.Error() != "error" {
+		t.Fatalf("Expected unwrapped error message to be 'error' instead got %v", unwrappedError.Error())
+	}
+}
+
+func TestNewBugFixes(t *testing.T) {
+	err := errors.New("error")
+	bugFixesError := logs.NewBugFixes(err)
+
+	if bugFixesError == nil {
+		t.Fatal("Expected BugFixes error to be 'error'")
+	}
+}
+
+func TestConvertLevelFromString(t *testing.T) {
+	tests := []struct {
+		input  string
+		output int
+	}{
+		{"log", 1},
+		{"debug", 1},
+		{"info", 2},
+		{"warn", 3},
+		{"error", 4},
+		{"crash", 5},
+		{"panic", 5},
+		{"fatal", 5},
+		{"unknown", 9},
+		{"10", 9},
+		{"unrecognized", 9},
+	}
+
+	for _, test := range tests {
+		converted := logs.ConvertLevelFromString(test.input)
+
+		if converted != test.output {
+			t.Fatalf("Expected '%v' to convert to %d, got %d", test.input, test.output, converted)
+		}
+	}
+}

logs/logs.go

@@ -6,57 +6,6 @@ import (
 	"strings"
 )
 
-//func SkipLog(level string) bool {
-//	type LogLevel struct {
-//		String string
-//		Int    int
-//	}
-//	logLevels := []LogLevel{
-//		{"log", 0},
-//		{"debug", 1},
-//		{"info", 2},
-//		{"warn", 3},
-//		{"error", 4},
-//		{"fatal", 5},
-//		{"unknown", 9},
-//	}
-//
-//	// default log level
-//	logLevel := 0
-//	appLogLevel := 0
-//
-//	logLevelAppRead := os.Getenv("LOG_LEVEL")
-//	if logLevelAppRead != "" {
-//		i, err := strconv.Atoi(logLevelAppRead)
-//		if err != nil {
-//			appLogLevel = 0
-//		} else {
-//			appLogLevel = i
-//		}
-//	}
-//	i, err := strconv.Atoi(level)
-//	if err != nil {
-//		logLevel = 0
-//	} else {
-//		logLevel = i
-//	}
-//
-//	for _, logLevel := range logLevels {
-//		if logLevel.String == level {
-//			return false
-//		}
-//		if logLevel.Int == appLogLevel {
-//			return false
-//		}
-//	}
-//
-//	if logLevel >= appLogLevel {
-//		return false
-//	}
-//
-//	return true
-//}
-
 func Local(skipDepthOverride ...int) BugFixes {
 	if len(skipDepthOverride) > 0 && skipDepthOverride[0] != 0 {
 		return BugFixes{
@@ -96,16 +45,16 @@ func Errorf(format string, inputs ...interface{}) error {
 
 // </editor-fold>
 
-// <editor-fold desc="Info">
+// Info <editor-fold desc="Info">
 func (b BugFixes) Info(inputs ...interface{}) string {
 	format := strings.Repeat("%v, ", len(inputs))
 	format = strings.TrimRight(format, ", ") // remove trailing comma and space
 	return b.Infof(format, inputs...)
 }
-func Info(inputs ...interface{}) {
+func Info(inputs ...interface{}) string {
 	format := strings.Repeat("%v, ", len(inputs))
 	format = strings.TrimRight(format, ", ") // remove trailing comma and space
-	Infof(format, inputs...)
+	return Infof(format, inputs...)
 }
 func (b BugFixes) Infof(format string, inputs ...interface{}) string {
 	b.Level = "info"
@@ -122,7 +71,7 @@ func Infof(format string, inputs ...interface{}) string {
 
 // </editor-fold>
 
-// <editor-fold desc="Debug">
+// Debug <editor-fold desc="Debug">
 func (b BugFixes) Debug(inputs ...interface{}) string {
 	format := strings.Repeat("%v, ", len(inputs))
 	format = strings.TrimRight(format, ", ") // remove trailing comma and space
@@ -149,7 +98,7 @@ func Debugf(format string, inputs ...interface{}) string {
 
 // </editor-fold>
 
-// <editor-fold desc="Log">
+// Log <editor-fold desc="Log">
 func (b BugFixes) Log(inputs ...interface{}) string {
 	format := strings.Repeat("%v, ", len(inputs))
 	format = strings.TrimRight(format, ", ") // remove trailing comma and space
@@ -175,7 +124,7 @@ func Logf(format string, inputs ...interface{}) string {
 
 // </editor-fold>
 
-// <editor-fold desc="Warn">
+// Warn <editor-fold desc="Warn">
 func (b BugFixes) Warn(inputs ...interface{}) string {
 	format := strings.Repeat("%v, ", len(inputs))
 	format = strings.TrimRight(format, ", ") // remove trailing comma and space