Skip to content

Commit 7953a80

Browse files
sysulqsysulq
authored
feat: use koanf instead of viper (#261)
1 parent 0ad279d commit 7953a80

File tree

10 files changed

+160
-130
lines changed

10 files changed

+160
-130
lines changed

‎go.mod

+11-14
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,16 @@ require (
1111
github.com/fatih/color v1.18.0
1212
github.com/fsnotify/fsnotify v1.8.0
1313
github.com/go-playground/validator/v10 v10.23.0
14+
github.com/knadh/koanf/parsers/json v0.1.0
15+
github.com/knadh/koanf/parsers/toml/v2 v2.1.0
16+
github.com/knadh/koanf/parsers/yaml v0.1.0
17+
github.com/knadh/koanf/providers/env v1.0.0
18+
github.com/knadh/koanf/providers/file v1.1.2
19+
github.com/knadh/koanf/v2 v2.1.2
1420
github.com/samber/lo v1.47.0
1521
github.com/shirou/gopsutil/v3 v3.24.5
1622
github.com/sony/gobreaker v1.0.0
1723
github.com/spf13/cobra v1.8.1
18-
github.com/spf13/viper v1.19.0
1924
github.com/stretchr/testify v1.10.0
2025
go.opentelemetry.io/contrib/bridges/otelslog v0.7.0
2126
go.opentelemetry.io/contrib/exporters/autoexport v0.57.0
@@ -46,34 +51,29 @@ require (
4651
github.com/go-ole/go-ole v1.3.0 // indirect
4752
github.com/go-playground/locales v0.14.1 // indirect
4853
github.com/go-playground/universal-translator v0.18.1 // indirect
54+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
4955
github.com/google/uuid v1.6.0 // indirect
5056
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
51-
github.com/hashicorp/hcl v1.0.0 // indirect
5257
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5358
github.com/klauspost/compress v1.17.11 // indirect
59+
github.com/knadh/koanf/maps v0.1.1 // indirect
5460
github.com/leodido/go-urn v1.4.0 // indirect
5561
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
56-
github.com/magiconair/properties v1.8.7 // indirect
5762
github.com/mattn/go-colorable v0.1.13 // indirect
5863
github.com/mattn/go-isatty v0.0.20 // indirect
59-
github.com/mitchellh/mapstructure v1.5.0 // indirect
64+
github.com/mitchellh/copystructure v1.2.0 // indirect
65+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
6066
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
61-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
67+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
6268
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6369
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
6470
github.com/prometheus/client_golang v1.20.5 // indirect
6571
github.com/prometheus/client_model v0.6.1 // indirect
6672
github.com/prometheus/common v0.60.1 // indirect
6773
github.com/prometheus/procfs v0.15.1 // indirect
68-
github.com/sagikazarmark/locafero v0.6.0 // indirect
69-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
7074
github.com/shirou/gopsutil/v4 v4.24.10 // indirect
7175
github.com/shoenig/go-m1cpu v0.1.6 // indirect
72-
github.com/sourcegraph/conc v0.3.0 // indirect
73-
github.com/spf13/afero v1.11.0 // indirect
74-
github.com/spf13/cast v1.7.0 // indirect
7576
github.com/spf13/pflag v1.0.5 // indirect
76-
github.com/subosito/gotenv v1.6.0 // indirect
7777
github.com/tklauser/go-sysconf v0.3.14 // indirect
7878
github.com/tklauser/numcpus v0.9.0 // indirect
7979
github.com/yusufpapurcu/wmi v1.2.4 // indirect
@@ -90,9 +90,7 @@ require (
9090
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0 // indirect
9191
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 // indirect
9292
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
93-
go.uber.org/multierr v1.11.0 // indirect
9493
golang.org/x/crypto v0.30.0 // indirect
95-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
9694
golang.org/x/mod v0.22.0 // indirect
9795
golang.org/x/net v0.32.0 // indirect
9896
golang.org/x/sync v0.10.0 // indirect
@@ -101,6 +99,5 @@ require (
10199
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
102100
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
103101
google.golang.org/protobuf v1.35.1 // indirect
104-
gopkg.in/ini.v1 v1.67.0 // indirect
105102
gopkg.in/yaml.v3 v3.0.1 // indirect
106103
)

‎go.sum

+30-30
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/
1919
github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
2020
github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
2121
github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
22-
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
23-
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
2422
github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
2523
github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
2624
github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4=
@@ -41,6 +39,8 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
4139
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
4240
github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL8sThn8IHr/sO+o=
4341
github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
42+
github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
43+
github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
4444
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
4545
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
4646
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
@@ -49,12 +49,24 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
4949
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
5050
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 h1:ad0vkEBuk23VJzZR9nkLVG0YAoN9coASF1GusYX6AlU=
5151
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0/go.mod h1:igFoXX2ELCW06bol23DWPB5BEWfZISOzSP5K2sbLea0=
52-
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
53-
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
5452
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
5553
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
5654
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
5755
github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
56+
github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
57+
github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
58+
github.com/knadh/koanf/parsers/json v0.1.0 h1:dzSZl5pf5bBcW0Acnu20Djleto19T0CfHcvZ14NJ6fU=
59+
github.com/knadh/koanf/parsers/json v0.1.0/go.mod h1:ll2/MlXcZ2BfXD6YJcjVFzhG9P0TdJ207aIBKQhV2hY=
60+
github.com/knadh/koanf/parsers/toml/v2 v2.1.0 h1:EUdIKIeezfDj6e1ABDhIjhbURUpyrP1HToqW6tz8R0I=
61+
github.com/knadh/koanf/parsers/toml/v2 v2.1.0/go.mod h1:0KtwfsWJt4igUTQnsn0ZjFWVrP80Jv7edTBRbQFd2ho=
62+
github.com/knadh/koanf/parsers/yaml v0.1.0 h1:ZZ8/iGfRLvKSaMEECEBPM1HQslrZADk8fP1XFUxVI5w=
63+
github.com/knadh/koanf/parsers/yaml v0.1.0/go.mod h1:cvbUDC7AL23pImuQP0oRw/hPuccrNBS2bps8asS0CwY=
64+
github.com/knadh/koanf/providers/env v1.0.0 h1:ufePaI9BnWH+ajuxGGiJ8pdTG0uLEUWC7/HDDPGLah0=
65+
github.com/knadh/koanf/providers/env v1.0.0/go.mod h1:mzFyRZueYhb37oPmC1HAv/oGEEuyvJDA98r3XAa8Gak=
66+
github.com/knadh/koanf/providers/file v1.1.2 h1:aCC36YGOgV5lTtAFz2qkgtWdeQsgfxUkxDOe+2nQY3w=
67+
github.com/knadh/koanf/providers/file v1.1.2/go.mod h1:/faSBcv2mxPVjFrXck95qeoyoZ5myJ6uxN8OOVNJJCI=
68+
github.com/knadh/koanf/v2 v2.1.2 h1:I2rtLRqXRy1p01m/utEtpZSSA6dcJbgGVuE27kW2PzQ=
69+
github.com/knadh/koanf/v2 v2.1.2/go.mod h1:Gphfaen0q1Fc1HTgJgSTC4oRX9R2R5ErYMZJy8fLJBo=
5870
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
5971
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
6072
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -65,19 +77,19 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
6577
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
6678
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 h1:7UMa6KCCMjZEMDtTVdcGu0B1GmmC7QJKiCCjyTAWQy0=
6779
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
68-
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
69-
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
7080
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
7181
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
7282
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
7383
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
7484
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
75-
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
76-
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
85+
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
86+
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
87+
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
88+
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
7789
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
7890
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
79-
github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
80-
github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
91+
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
92+
github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
8193
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
8294
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
8395
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -94,10 +106,6 @@ github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoG
94106
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
95107
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
96108
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
97-
github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3N51bwOk=
98-
github.com/sagikazarmark/locafero v0.6.0/go.mod h1:77OmuIc6VTraTXKXIs/uvUxKGUXjE1GbemJYHqdNjX0=
99-
github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
100-
github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
101109
github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc=
102110
github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU=
103111
github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
@@ -110,24 +118,21 @@ github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
110118
github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
111119
github.com/sony/gobreaker v1.0.0 h1:feX5fGGXSl3dYd4aHZItw+FpHLvvoaqkawKjVNiFMNQ=
112120
github.com/sony/gobreaker v1.0.0/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
113-
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
114-
github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
115-
github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
116-
github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
117-
github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w=
118-
github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
119121
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
120122
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
121123
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
122124
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
123-
github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
124-
github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg=
125125
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
126+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
127+
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
128+
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
126129
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
130+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
131+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
132+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
133+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
127134
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
128135
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
129-
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
130-
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
131136
github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
132137
github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
133138
github.com/tklauser/numcpus v0.9.0 h1:lmyCHtANi8aRUgkckBgoDk1nHCux3n2cgkJLXdQGPDo=
@@ -186,12 +191,8 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
186191
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
187192
go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
188193
go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
189-
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
190-
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
191194
golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
192195
golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
193-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
194-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
195196
golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
196197
golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
197198
golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
@@ -220,7 +221,6 @@ google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojt
220221
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
221222
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
222223
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
223-
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
224-
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
224+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
225225
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
226226
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎kod.go

+36-27
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,13 @@ import (
1212
"sync"
1313
"time"
1414

15+
"github.com/knadh/koanf/parsers/json"
16+
"github.com/knadh/koanf/parsers/toml/v2"
17+
"github.com/knadh/koanf/parsers/yaml"
18+
"github.com/knadh/koanf/providers/env"
19+
"github.com/knadh/koanf/providers/file"
20+
"github.com/knadh/koanf/v2"
1521
"github.com/samber/lo"
16-
"github.com/spf13/viper"
1722
"go.opentelemetry.io/contrib/bridges/otelslog"
1823
"go.opentelemetry.io/contrib/exporters/autoexport"
1924
"go.opentelemetry.io/contrib/instrumentation/host"
@@ -353,8 +358,8 @@ type Kod struct {
353358

354359
config kodConfig
355360

356-
viper *viper.Viper
357-
log *slog.Logger
361+
cfg *koanf.Koanf
362+
log *slog.Logger
358363

359364
hooker *hooks.Hooker
360365

@@ -470,40 +475,44 @@ func (k *Kod) parseConfig(filename string) error {
470475
}
471476
}
472477

473-
vip := viper.New()
474-
vip.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
475-
vip.AutomaticEnv()
476-
vip.SetConfigFile(filename)
477-
vip.AddConfigPath(".")
478+
c := koanf.New(".")
479+
err := c.Load(env.Provider("KOD_", ".", func(s string) string {
480+
return strings.Replace(strings.ToLower(s), "_", ".", -1)
481+
}), nil)
482+
if err != nil {
483+
return fmt.Errorf("load env config: %w", err)
484+
}
485+
486+
// get ext
487+
ext := filepath.Ext(filename)
488+
switch ext {
489+
case ".toml":
490+
err = c.Load(file.Provider(filename), toml.Parser())
491+
case ".yaml":
492+
err = c.Load(file.Provider(filename), yaml.Parser())
493+
case ".json":
494+
err = c.Load(file.Provider(filename), json.Parser())
495+
default:
496+
return fmt.Errorf("read config file: Unsupported Config Type %q", ext)
497+
}
478498

479-
err := vip.ReadInConfig()
480499
if err != nil {
481500
switch err.(type) {
482-
case viper.ConfigFileNotFoundError, *fs.PathError:
483-
if !noConfigProvided {
501+
case *fs.PathError:
502+
if noConfigProvided {
484503
fmt.Fprintln(os.Stderr, "failed to load config file, use default config")
504+
} else {
505+
return fmt.Errorf("read config file: %w", err)
485506
}
486507
default:
487508
return fmt.Errorf("read config file: %w", err)
488509
}
489510
}
490511

491-
k.viper = vip
492-
493-
if vip.Get("kod.name") != nil {
494-
k.config.Name = vip.GetString("kod.name")
495-
}
496-
497-
if vip.Get("kod.version") != nil {
498-
k.config.Version = vip.GetString("kod.version")
499-
}
500-
501-
if vip.Get("kod.env") != nil {
502-
k.config.Env = vip.GetString("kod.env")
503-
}
504-
505-
if vip.Get("kod.log_level") != nil {
506-
lo.Must0(k.config.LogLevel.UnmarshalText([]byte(vip.GetString("kod.log_level"))))
512+
k.cfg = c
513+
err = c.Unmarshal("kod", &k.config)
514+
if err != nil {
515+
return fmt.Errorf("unmarshal config: %w", err)
507516
}
508517

509518
return nil

‎kod_test.go

+10-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package kod
22

33
import (
44
"context"
5-
"os"
65
"testing"
76

87
"github.com/stretchr/testify/assert"
@@ -26,6 +25,13 @@ func TestConfigNoSuffix(t *testing.T) {
2625
assert.EqualError(t, k.parseConfig("nosuffix"), "read config file: Unsupported Config Type \"\"")
2726
}
2827

28+
func TestConfigNoFile(t *testing.T) {
29+
k, err := newKod(context.Background())
30+
assert.Nil(t, err)
31+
32+
assert.EqualError(t, k.parseConfig("notfound.yaml"), "read config file: open notfound.yaml: no such file or directory")
33+
}
34+
2935
func TestConfigEnv(t *testing.T) {
3036
k, err := newKod(context.Background())
3137
assert.Nil(t, err)
@@ -34,9 +40,9 @@ func TestConfigEnv(t *testing.T) {
3440
assert.Equal(t, k.config.Version, "")
3541
assert.Equal(t, k.config.Env, "local")
3642

37-
os.Setenv("KOD_NAME", "test")
38-
os.Setenv("KOD_VERSION", "1.0.0")
39-
os.Setenv("KOD_ENV", "dev")
43+
t.Setenv("KOD_NAME", "test")
44+
t.Setenv("KOD_VERSION", "1.0.0")
45+
t.Setenv("KOD_ENV", "dev")
4046

4147
k, err = newKod(context.Background())
4248
assert.Nil(t, err)

‎registry.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,7 @@ func (k *Kod) setConfig(name string, cfg any) error {
151151
return err
152152
}
153153

154-
if name == "" {
155-
return k.viper.Unmarshal(cfg)
156-
}
157-
158-
return k.viper.UnmarshalKey(name, cfg)
154+
return k.cfg.Unmarshal(name, cfg)
159155
}
160156

161157
func fillLog(name string, obj any, log *slog.Logger) error {

0 commit comments

Comments
 (0)