Skip to content
This repository was archived by the owner on Apr 4, 2025. It is now read-only.

Implement Logrus instead of a custom logger inside the infra package. #4

Open
ValentinMontmirail wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Implement Logrus instead of a custom logger inside the infra package. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
762ef32
Updating packages to the latest versions
MontmirailValentin Dec 28, 2023
e62d350
Merge pull request #1 from ValentinMontmirail/upgradeMod
ValentinMontmirail Dec 28, 2023
3b11915
Implement Logrus instead of a custom logger inside the package. In su…
MontmirailValentin Dec 28, 2023
35532ec
Merge branch 'master' into feat/useLogrus
ValentinMontmirail Dec 28, 2023
4f5b7f9
Go.mod include logrus
ValentinMontmirail Dec 28, 2023
5884893
Update go.sum
ValentinMontmirail Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 51 additions & 36 deletions cmd/dfence.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,24 @@ package main
import (
"flag"
"fmt"
"io"
"os"
"strings"
"time"

"github.com/chavacava/dfence/internal/infra"
"github.com/chavacava/dfence/internal/policy"
"github.com/mattn/go-colorable"
"github.com/sirupsen/logrus"
"golang.org/x/tools/go/packages"

"github.com/fatih/color"
)

func main() {
policyFile := flag.String("policy", "dfence.json", "the policy file to enforce")
logLevel := flag.String("log", "error", "log level: none, error, warn, info, debug")
logLevel := flag.String("log", "error", "log level: none, trace, debug, info, warn, error")
mode := flag.String("mode", "check", "run mode (check or info)")
flag.Parse()

// Create a new instance of the logger. You can have any number of instances.
logger := buildlogger(*logLevel)

var err error
Expand Down Expand Up @@ -58,7 +60,49 @@ func main() {
}
}

func check(p policy.Policy, pkgs []*packages.Package, logger infra.Logger) error {
// buildlogger is a function that creates and configures a new instance of a logrus.Logger.
// It takes a string parameter 'level' which determines the logging level.
func buildlogger(level string) *logrus.Logger {
// Create a new instance of logrus.Logger
logger := logrus.New()

// Set the logger's formatter to logrus.TextFormatter with specific settings
logger.SetFormatter(&logrus.TextFormatter{
ForceColors: true, // Force colored output
FullTimestamp: true, // Enable full timestamp in logs
TimestampFormat: time.RFC3339, // Set the format of the timestamp
})

// Set the logger's output destination to the standard output, with support for color encoding
logrus.SetOutput(colorable.NewColorableStdout())

// Set the logger's level based on the 'level' parameter
switch level {
case "none":
// Discard all log messages
logger.Out = io.Discard
case "trace":
// Log all messages
logger.SetLevel(logrus.TraceLevel)
case "debug":
// Log debug, info, warning, error, fatal and panic level messages
logger.SetLevel(logrus.DebugLevel)
case "info":
// Log info, warning, error, fatal and panic level messages
logger.SetLevel(logrus.InfoLevel)
case "warn":
// Log warning, error, fatal and panic level messages
logger.SetLevel(logrus.WarnLevel)
case "error":
// Log error, fatal and panic level messages
logger.SetLevel(logrus.ErrorLevel)
}

// Return the configured logger
return logger
}

func check(p policy.Policy, pkgs []*packages.Package, logger *logrus.Logger) error {
checker, err := policy.NewChecker(p, pkgs, logger)
if err != nil {
logger.Fatalf("Unable to run the checker: %v", err)
Expand Down Expand Up @@ -94,7 +138,7 @@ func check(p policy.Policy, pkgs []*packages.Package, logger infra.Logger) error
return nil
}

func info(p policy.Policy, pkgs []*packages.Package, logger infra.Logger) error {
func info(p policy.Policy, pkgs []*packages.Package, logger *logrus.Logger) error {
for _, pkg := range pkgs {
pkgName := pkg.PkgPath
cs := p.GetApplicableConstraints(pkgName)
Expand All @@ -114,36 +158,7 @@ func info(p policy.Policy, pkgs []*packages.Package, logger infra.Logger) error
return nil
}

func buildlogger(level string) infra.Logger {
nop := func(string, ...interface{}) {}
debug, info, warn, err := nop, nop, nop, nop
switch level {
case "none":
// do nothing
case "debug":
debug = buildLoggerFunc("[DEBUG]\t", color.New(color.FgCyan))
fallthrough
case "info":
info = buildLoggerFunc("[INFO]\t", color.New(color.FgGreen))
fallthrough
case "warn":
warn = buildLoggerFunc("[WARN]\t", color.New(color.FgHiYellow))
fallthrough
default:
err = buildLoggerFunc("[ERROR]\t", color.New(color.FgHiRed))
}

fatal := buildLoggerFunc("[FATAL]\t", color.New(color.BgRed))
return infra.NewLogger(debug, info, warn, err, fatal)
}

func buildLoggerFunc(prefix string, c *color.Color) infra.LoggerFunc {
return func(msg string, vars ...interface{}) {
fmt.Println(c.Sprintf(prefix+msg, vars...))
}
}

func scanPackages(args []string, logger infra.Logger) ([]*packages.Package, error) {
func scanPackages(args []string, logger *logrus.Logger) ([]*packages.Package, error) {
var emptyResult = []*packages.Package{}

// Load packages and their dependencies.
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ require (
github.com/mattn/go-colorable v0.1.0 // indirect
github.com/mattn/go-isatty v0.0.4 // indirect
golang.org/x/tools v0.1.0
github.com/sirupsen/logrus v1.9.3
)
63 changes: 0 additions & 63 deletions internal/infra/log.go
View file
Open in desktop

This file was deleted.