Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
84167fbd
Unverified
Commit
84167fbd
authored
Oct 25, 2023
by
Will Cory
Committed by
GitHub
Oct 25, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7745 from ethereum-optimism/10-18-feat_Throw_on_unknown_key_error
feat(indexer): Throw when unknown key in toml
parents
ed341cdc
821dd5e9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
1 deletion
+54
-1
config.go
indexer/config/config.go
+8
-1
config_test.go
indexer/config/config_test.go
+46
-0
No files found.
indexer/config/config.go
View file @
84167fbd
...
...
@@ -153,11 +153,18 @@ func LoadConfig(log log.Logger, path string) (Config, error) {
data
=
[]
byte
(
os
.
ExpandEnv
(
string
(
data
)))
log
.
Debug
(
"parsed config file"
,
"data"
,
string
(
data
))
if
_
,
err
:=
toml
.
Decode
(
string
(
data
),
&
cfg
);
err
!=
nil
{
md
,
err
:=
toml
.
Decode
(
string
(
data
),
&
cfg
)
if
err
!=
nil
{
log
.
Error
(
"failed to decode config file"
,
"err"
,
err
)
return
cfg
,
err
}
if
len
(
md
.
Undecoded
())
>
0
{
log
.
Error
(
"unknown fields in config file"
,
"fields"
,
md
.
Undecoded
())
err
=
fmt
.
Errorf
(
"unknown fields in config file: %v"
,
md
.
Undecoded
())
return
cfg
,
err
}
if
cfg
.
Chain
.
Preset
==
DevnetPresetId
{
preset
,
err
:=
DevnetPreset
()
if
err
!=
nil
{
...
...
indexer/config/config_test.go
View file @
84167fbd
...
...
@@ -257,3 +257,49 @@ func TestLocalDevnet(t *testing.T) {
require
.
Equal
(
t
,
devnetPreset
.
ChainConfig
.
L1Contracts
,
conf
.
Chain
.
L1Contracts
)
}
func
TestThrowsOnUnknownKeys
(
t
*
testing
.
T
)
{
logger
:=
testlog
.
Logger
(
t
,
log
.
LvlInfo
)
tmpfile
,
err
:=
os
.
CreateTemp
(
""
,
"test.toml"
)
require
.
NoError
(
t
,
err
)
defer
os
.
Remove
(
tmpfile
.
Name
())
defer
tmpfile
.
Close
()
testData
:=
`
[chain]
unknown_key = 420
preset = 420
[rpcs]
l1-rpc = "https://l1.example.com"
l2-rpc = "https://l2.example.com"
[db]
another_unknownKey = 420
host = "127.0.0.1"
port = 5432
user = "postgres"
password = "postgres"
name = "indexer"
[http]
host = "127.0.0.1"
port = 8080
[metrics]
host = "127.0.0.1"
port = 7300
`
data
:=
[]
byte
(
testData
)
err
=
os
.
WriteFile
(
tmpfile
.
Name
(),
data
,
0644
)
require
.
NoError
(
t
,
err
)
defer
os
.
Remove
(
tmpfile
.
Name
())
err
=
tmpfile
.
Close
()
require
.
NoError
(
t
,
err
)
_
,
err
=
LoadConfig
(
logger
,
tmpfile
.
Name
())
require
.
Error
(
t
,
err
)
require
.
Contains
(
t
,
err
.
Error
(),
"unknown fields in config file"
)
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment