Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added logging configuration #32

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

Added logging configuration #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6150b15
Added logging configuration
shahariaazam Apr 7, 2023
dc929dd
Merge branch 'master' into 31-add-configurable-logging
shahariaazam Apr 8, 2023
1d4284b
Added tests for NewLogging()
shahariaazam Apr 8, 2023
2a68519
Added test for IsExists() util method
shahariaazam Apr 8, 2023
191dee6
Reduced un-necessary code in util function
shahariaazam Apr 8, 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
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 @@ -15,6 +15,7 @@ require (
github.com/google/uuid v1.3.0
github.com/kyokomi/emoji v2.2.4+incompatible
github.com/lib/pq v1.10.7
github.com/sirupsen/logrus v1.9.0
github.com/spf13/cobra v1.6.1
github.com/stretchr/testify v1.8.2
golang.org/x/oauth2 v0.6.0
Expand Down
4 changes: 4 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
Expand All @@ -88,6 +90,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
Expand All @@ -114,6 +117,7 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
Expand Down
29 changes: 28 additions & 1 deletion pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
// Package config read and validate config file
// Package logginConfig read and validate logginConfig file
package config

import (
"fmt"
"io/ioutil"

"github.com/shahariaazam/teredix/pkg/util"

"github.com/shahariaazam/teredix/pkg"

"gopkg.in/yaml.v3"
Expand Down Expand Up @@ -67,13 +69,19 @@ type Relation struct {
RelationCriteria []RelationCriteria `yaml:"criteria"`
}

type Logging struct {
Format string `yaml:"format"`
Level string `yaml:"level"`
}

// AppConfig provides configuration for the tools
type AppConfig struct {
Organization Organization `yaml:"organization"`
Discovery Discovery `yaml:"discovery"`
Storage Storage `yaml:"storage"`
Sources map[string]Source `yaml:"source"`
Relation Relation `yaml:"relations"`
Logging Logging `yaml:"logging"`
}

// Load loads configuration file
Expand Down Expand Up @@ -133,6 +141,11 @@ func Validate(c *AppConfig) error {
return err
}

err = c.validateLoggingConfiguration(c.Logging)
if err != nil {
return err
}

return nil
}

Expand Down Expand Up @@ -326,3 +339,17 @@ func (c *AppConfig) validateRelationCriteria(criteria RelationCriteria) error {
}
return nil
}

func (c *AppConfig) validateLoggingConfiguration(loggingConfig Logging) error {
validFormat := []string{"text", "json"}
if !util.IsExist(loggingConfig.Format, validFormat) {
return fmt.Errorf("'%s' log format is not supported", loggingConfig.Format)
}

validLevel := []string{"info", "debug", "warning", "error"}
if !util.IsExist(loggingConfig.Level, validLevel) {
return fmt.Errorf("'%s' log level is not supported", loggingConfig.Level)
}

return nil
}
Loading