fix bug with initconfig and updated test

config/config.go

@@ -295,6 +295,7 @@ func GetTransport() *http.Transport {
 }
 
 func InitConfig() {
+	viper.SetConfigType("yaml")
 	// 1) Set up defaults.yaml
 	err := viper.MergeConfig(strings.NewReader(defaultsYaml))
 	if err != nil {
@@ -308,8 +309,8 @@ func InitConfig() {
 			cobra.CheckErr(err)
 		}
 	}
-	if viper.GetString("config") != "" {
-		viper.SetConfigFile(viper.GetString("config"))
+	if configFile := viper.GetString("config"); configFile != "" {
+		viper.SetConfigFile(configFile)
 	} else {
 		home, err := os.UserHomeDir()
 		if err != nil {
@@ -323,7 +324,7 @@ func InitConfig() {
 		viper.SetConfigName("pelican")
 	}
 
-	viper.SetEnvPrefix(GetPreferredPrefix())
+	viper.SetEnvPrefix(prefix)
 	viper.AutomaticEnv()
 	// This line allows viper to use an env var like ORIGIN_VALUE to override the viper string "Origin.Value"
 	viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))

config/config_test.go

@@ -113,22 +113,38 @@ func TestDialerTimeout(t *testing.T) {
 	viper.Set("Transport.Dialer.Timeout", time.Second*10)
 }
 
-func TestDefaultsYaml(t *testing.T) {
-	InitConfig() // should set up pelican.yaml and defaults.yaml
-	// create a temp config file to use
+func TestInitConfig(t *testing.T) {
+	// Set prefix to OSDF to ensure that config is being set
+	testingPreferredPrefix = "OSDF"
+
+	InitConfig() // Should set up pelican.yaml, osdf.yaml and defaults.yaml
+
+	// Create a temp config file to use
 	tempCfgFile, err := os.CreateTemp("", "pelican-*.yaml")
+	viper.Set("config", tempCfgFile.Name())
 	if err != nil {
 		t.Fatalf("Failed to make temp file: %v", err)
 	}
-	// Check if debug is false
-	assert.False(t, param.Debug.GetBool())
-	assert.False(t, viper.GetBool("Debug"))
-	viper.Set("Debug", true) // should write to temp config file (should have higher priority like how pelican.yaml behaves)
+
+	// Check if server address is correct by defaults.yaml
+	assert.True(t, param.Server_Address.GetString() == "0.0.0.0")
+	// Check that Federation Discovery url is correct by osdf.yaml
+	assert.True(t, param.Federation_DiscoveryUrl.GetString() == "osg-htc.org")
+
+	viper.Set("Server.Address", "1.1.1.1") // should write to temp config file
 	if err := viper.WriteConfigAs(tempCfgFile.Name()); err != nil {
 		t.Fatalf("Failed to write to config file: %v", err)
 	}
-	// Check if debug was set and is now true
-	assert.True(t, param.Debug.GetBool())
-	assert.True(t, viper.GetBool("Debug"))
 	viper.Reset()
+	viper.Set("config", tempCfgFile.Name()) // Set the temp file as the new 'pelican.yaml'
+	InitConfig()
+
+	// Check if server address overrides the default
+	assert.True(t, param.Server_Address.GetString() == "1.1.1.1")
+	viper.Reset()
+
+	//Test if prefix is not set, should not be able to find osdfYaml configuration
+	testingPreferredPrefix = ""
+	InitConfig()
+	assert.True(t, param.Federation_DiscoveryUrl.GetString() == "")
 }