Skip to content

Commit 230c4f9

Browse files
authored
Merge pull request #87 from deploymenttheory/dev
Dev
2 parents 8ef6b92 + 5f5491f commit 230c4f9

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

httpclient/httpclient_client_configuration.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@ func SetClientConfiguration(configFilePath string) (*ClientConfig, error) {
3434
// Load config values from environment variables
3535
loadConfigFromEnv(config)
3636

37-
// Load config values from file if necessary
38-
if validateConfigCompletion(config) && configFilePath != "" {
39-
log.Printf("Configuration values are incomplete from environment variables, attempting to load from config file: %s", configFilePath)
40-
if err := config.loadConfigFromFile(configFilePath); err != nil {
41-
log.Printf("Failed to load configuration from file: %s, error: %v", configFilePath, err)
42-
return nil, err
37+
// Check if the configuration is complete; if not, load from file
38+
if !validateConfigCompletion(config) {
39+
if configFilePath != "" {
40+
if err := config.loadConfigFromFile(configFilePath); err != nil {
41+
return nil, err
42+
}
43+
} else {
44+
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")
4345
}
4446
}
4547

0 commit comments

Comments
 (0)