Skip to content

Dev #87

New issue

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

#

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

Already on GitHub? # to your account

Merged
merged 2 commits into from
Feb 26, 2024
Merged

Dev #87

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c4988f
Refactor configuration loading logic
ShocOne Feb 26, 2024
5f5491f
Update error message for incomplete http client configuration
ShocOne Feb 26, 2024
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
14 changes: 8 additions & 6 deletions httpclient/httpclient_client_configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@ func SetClientConfiguration(configFilePath string) (*ClientConfig, error) {
// Load config values from environment variables
loadConfigFromEnv(config)

// Load config values from file if necessary
if validateConfigCompletion(config) && configFilePath != "" {
log.Printf("Configuration values are incomplete from environment variables, attempting to load from config file: %s", configFilePath)
if err := config.loadConfigFromFile(configFilePath); err != nil {
log.Printf("Failed to load configuration from file: %s, error: %v", configFilePath, err)
return nil, err
// Check if the configuration is complete; if not, load from file
if !validateConfigCompletion(config) {
if configFilePath != "" {
if err := config.loadConfigFromFile(configFilePath); err != nil {
return nil, err
}
} else {
return nil, fmt.Errorf("http client configuration is incomplete. Required environment variables are missing, and no configuration file path is provided. Please set the necessary environment variables or provide a valid configuration file path")
}
}

Expand Down