Init config refactor #2035
Open
Init config refactor #2035
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was
linked to
issues
Feb 21, 2025
turetske
force-pushed
the
init-config-refactor
branch
2 times, most recently
from
42bf05f to
f55f544
Compare
Saartank
reviewed
Mar 5, 2025
There was a problem hiding this comment.
With this change, the log file initialization code runs when InitServer is executed. However, some code is executed before InitServer is reached. Because of this, all logs generated before InitServer runs will be output to the console even if the log file is configured. This could be problematic if something goes wrong before InitServer is reached, as the log file would not contain the relevant information.
jhiemstrawisc
requested changes
Mar 6, 2025
turetske
force-pushed
the
init-config-refactor
branch
from
f55f544 to
40118c7
Compare
turetske
force-pushed
the
init-config-refactor
branch
from
40118c7 to
9e7b6d0
Compare
turetske
requested review from
Saartank and
jhiemstrawisc
and removed request for
Saartank
jhiemstrawisc
requested changes
Apr 14, 2025
jhiemstrawisc
requested changes
Apr 17, 2025
turetske
force-pushed
the
init-config-refactor
branch
from
787ec30 to
3b0c518
Compare
turetske
force-pushed
the
init-config-refactor
branch
from
2c139bc to
11d53b7
Compare
jhiemstrawisc
requested changes
Jun 13, 2025
|
Bumping this to the 7.18 milestone since it's not critical for 7.17 (which we'd like to release today), but we can still try to merge soon before there's time to accumulate more merge conflicts. |
added 17 commits
June 26, 2025 16:23
-- Moved InitConfig into InitServer and InitClient -- Replaced calls of InitConfig with InitServer and InitClient where possible -- Removed calls to InitConfigDir where possible -- Adjusted the tests where needed due to the changes made
-- Mostly due to unset ConfigDir that should be a tempDir -- Adjusted some params and a few other tests as well
turetske
force-pushed
the
init-config-refactor
branch
from
9047a7b to
4887d9c
Compare
jhiemstrawisc
requested changes
Jun 26, 2025
| @@ -1275,12 +1291,10 @@ func InitServer(ctx context.Context, currentServers server_structs.ServerType) e | |||
| webConfigPath := param.Server_WebConfigFile.GetString() | |||
| if webConfigPath != "" { | |||
| if err := os.MkdirAll(filepath.Dir(webConfigPath), 0700); err != nil { | |||
| logging.FlushLogs(true) | |||
There was a problem hiding this comment.
I think we still need the log flush here -- otherwise we throw away any logs up until this point when the error is triggered.
| cobra.CheckErr(errors.Wrapf(err, "failed to create directory for web config file at %s", webConfigPath)) | ||
| } | ||
| } | ||
| if err := setWebConfigOverride(viper.GetViper(), webConfigPath); err != nil { | ||
| logging.FlushLogs(true) |
|
By the way, the failing tests look like a bug I must have introduced to main recently. I'll dig into it. |
jhiemstrawisc
added a commit
to jhiemstrawisc/pelican
that referenced
this pull request
Jun 27, 2025
Some tests use IP addresses from http test servers for various Pelican server configs (e.g. 'Server.ExternalWebUrl'). When we do this, the certificates Pelican generates for itself are invalid because they contain a SAN that says the IP is a DNS entry. This was exposed in tests for PelicanPlatform#2035 after it picked up the new verification code that checks the cert against configured hostnames.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Moved InitConfig into InitServer and InitClient and adjusts the tests as needed.
Also made InitConfigDir platform agnostic.
Ideally, I would like to be able to make InitConfig private, but its use in the cmd/config_printer test makes that impossible.
I'm worried InitConfig will keep being used in tests until we figure out a solution for that if the author/reviewer don't catch it organically.