-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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.
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
Remove Explorer #10581
Remove Explorer #10581
Changes from 12 commits
3a27219
4953e55
3736612
0e6b260
0ebe982
9b69595
3856a7d
37267fe
faed1cd
4d989a0
b99d928
3b818f9
792c882
03008eb
605f41e
684664c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,16 +14,6 @@ BackupURL = "postgresql://user:[email protected]:5432/dbname?sslmode | |
# Environment variable: `CL_DATABASE_ALLOW_SIMPLE_PASSWORDS` | ||
AllowSimplePasswords = false # Default | ||
|
||
[Explorer] | ||
# AccessKey is the access key for authenticating with the Explorer. | ||
# | ||
# Environment variable: `CL_EXPLORER_ACCESS_KEY` | ||
AccessKey = "access_key" # Example | ||
# Secret is the secret for authenticating with the Explorer. | ||
# | ||
# Environment variable: `CL_EXPLORER_SECRET` | ||
Secret = "secret" # Example | ||
|
||
[Password] | ||
# Keystore is the password for the node's account. | ||
# | ||
|
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -129,28 +129,24 @@ func (s *Secrets) SetFrom(f *Secrets) (err error) { | |
err = multierr.Append(err, config.NamedMultiErrorList(err1, "Database")) | ||
} | ||
|
||
if err2 := s.Explorer.SetFrom(&f.Explorer); err2 != nil { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. /nit and a matter of preference - in the future when I revisit this file I'd spend some unnecessary time answering the question "why is err2 skipped?". If you'd like, perhaps update the ordering here There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @patrickhuie19 just pushed a commit for this |
||
err = multierr.Append(err, config.NamedMultiErrorList(err2, "Explorer")) | ||
if err2 := s.Password.SetFrom(&f.Password); err2 != nil { | ||
err = multierr.Append(err, config.NamedMultiErrorList(err2, "Password")) | ||
} | ||
|
||
if err3 := s.Password.SetFrom(&f.Password); err3 != nil { | ||
err = multierr.Append(err, config.NamedMultiErrorList(err3, "Password")) | ||
if err3 := s.Pyroscope.SetFrom(&f.Pyroscope); err3 != nil { | ||
err = multierr.Append(err, config.NamedMultiErrorList(err3, "Pyroscope")) | ||
} | ||
|
||
if err4 := s.Pyroscope.SetFrom(&f.Pyroscope); err4 != nil { | ||
err = multierr.Append(err, config.NamedMultiErrorList(err4, "Pyroscope")) | ||
if err4 := s.Prometheus.SetFrom(&f.Prometheus); err4 != nil { | ||
err = multierr.Append(err, config.NamedMultiErrorList(err4, "Prometheus")) | ||
} | ||
|
||
if err5 := s.Prometheus.SetFrom(&f.Prometheus); err5 != nil { | ||
err = multierr.Append(err, config.NamedMultiErrorList(err5, "Prometheus")) | ||
if err5 := s.Mercury.SetFrom(&f.Mercury); err5 != nil { | ||
err = multierr.Append(err, config.NamedMultiErrorList(err5, "Mercury")) | ||
} | ||
|
||
if err6 := s.Mercury.SetFrom(&f.Mercury); err6 != nil { | ||
err = multierr.Append(err, config.NamedMultiErrorList(err6, "Mercury")) | ||
} | ||
|
||
if err7 := s.Threshold.SetFrom(&f.Threshold); err7 != nil { | ||
err = multierr.Append(err, config.NamedMultiErrorList(err7, "Threshold")) | ||
if err6 := s.Threshold.SetFrom(&f.Threshold); err6 != nil { | ||
err = multierr.Append(err, config.NamedMultiErrorList(err6, "Threshold")) | ||
} | ||
|
||
_, err = utils.MultiErrorList(err) | ||
|
@@ -223,12 +219,6 @@ func (s *Secrets) setEnv() error { | |
s.Database.AllowSimplePasswords = new(bool) | ||
*s.Database.AllowSimplePasswords = true | ||
} | ||
if explorerKey := env.ExplorerAccessKey.Get(); explorerKey != "" { | ||
s.Explorer.AccessKey = &explorerKey | ||
} | ||
if explorerSecret := env.ExplorerSecret.Get(); explorerSecret != "" { | ||
s.Explorer.Secret = &explorerSecret | ||
} | ||
if keystorePassword := env.PasswordKeystore.Get(); keystorePassword != "" { | ||
s.Password.Keystore = &keystorePassword | ||
} | ||
|
This file was deleted.
This file was deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unrelated to the scope of this PR, but this is a pretty heavy API w/ a large number of the parameters coming from
cfg.TelemetryIngress()
- what do you think of plumbingticfg
as one parameter through instead?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sounds good to me, that would definitely clean things up a bit 🙂