Fixed failing tests because of config dir

	-- Mostly due to unset ConfigDir that should be a tempDir
	-- Adjusted some params and a few other tests as well

Author: Emma Turetsky

client/director_test.go

@@ -31,7 +31,9 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
+	"github.com/pelicanplatform/pelican/config"
 	"github.com/pelicanplatform/pelican/param"
 	"github.com/pelicanplatform/pelican/pelican_url"
 	"github.com/pelicanplatform/pelican/server_structs"
@@ -105,6 +107,10 @@ func TestQueryDirector(t *testing.T) {
 	server_utils.ResetTestState()
 	defer server_utils.ResetTestState()
 	viper.Set(param.Client_DirectorRetries.GetName(), 3)
+	// This test assumes the debugging level is at debug or higher
+	viper.Set(param.Debug.GetName(), true)
+	err := config.InitClient()
+	require.NoError(t, err)
 
 	type testCase struct {
 		name             string

cmd/plugin_test.go

@@ -64,6 +64,9 @@ import (
 var (
 	//go:embed resources/test-https-origin.yml
 	httpsOriginConfig string
+
+	//go:embed resources/public-test-origin.yml
+	publicTestOrigin string
 )
 
 // TestReadMultiTransfer test if we can read multiple transfers from stdin
@@ -494,11 +497,7 @@ func TestPluginMulti(t *testing.T) {
 
 	dirName := t.TempDir()
 
-	viper.Set("Logging.Level", "debug")
-	viper.Set("Origin.StorageType", "posix")
-	viper.Set("Origin.ExportVolumes", "/test")
-	viper.Set("Origin.EnablePublicReads", true)
-	fed := fed_test_utils.NewFedTest(t, "")
+	fed := fed_test_utils.NewFedTest(t, publicTestOrigin)
 	host := param.Server_Hostname.GetString() + ":" + strconv.Itoa(param.Server_WebPort.GetInt())
 
 	// Drop the testFileContent into the origin directory
@@ -846,12 +845,7 @@ func TestPluginRecursiveDownload(t *testing.T) {
 
 	dirName := t.TempDir()
 
-	viper.Set("Logging.Level", "debug")
-	viper.Set("Origin.StorageType", "posix")
-	viper.Set("Origin.FederationPrefix", "/test")
-	viper.Set("Origin.StoragePrefix", "/<THIS WILL BE OVERRIDDEN>")
-	viper.Set("Origin.EnablePublicReads", true)
-	fed := fed_test_utils.NewFedTest(t, "")
+	fed := fed_test_utils.NewFedTest(t, publicTestOrigin)
 	host := param.Server_Hostname.GetString() + ":" + strconv.Itoa(param.Server_WebPort.GetInt())
 
 	// Drop the testFileContent into the origin directory

cmd/resources/public-test-origin.yml

@@ -0,0 +1,12 @@
+# Origin export configuration to test full multi-export capabilities
+
+Origin:
+  # Things that configure the origin itself
+  StorageType: "posix"
+  EnableDirectReads: true
+  # The actual namespaces we export
+  Exports:
+    - StoragePrefix: /<SHOULD BE OVERRIDDEN>
+      FederationPrefix: /test
+      # Don't set Reads -- it should be toggled true by setting PublicReads
+      Capabilities: ["PublicReads", "Writes", "DirectReads", "Listings"]

config/config_test.go

@@ -569,8 +569,14 @@ func TestInitServerUrl(t *testing.T) {
 	t.Cleanup(func() {
 		ResetConfig()
 	})
+	initConfig := func() {
+		ResetConfig()
+		tempDir := t.TempDir()
+		viper.Set("ConfigDir", tempDir)
+	}
 
 	initDirectoryConfig := func() {
+		initConfig()
 		viper.Set("Director.MinStatResponse", 1)
 		viper.Set("Director.MaxStatResponse", 4)
 	}
@@ -637,6 +643,7 @@ func TestInitServerUrl(t *testing.T) {
 
 	t.Run("reg-url-default-to-web-url", func(t *testing.T) {
 		// We respect the URL value set directly by others. Won't remove 443 port
+		initConfig()
 		// If Server_ExternalWebUrl is not set, Federation_RegistryUrl defaults to https://<hostname>:<non-443-port>
 		// In this case, the port is 443, so Federation_RegistryUrl = https://example.com
 		viper.Set("Server.Hostname", mockHostname)
@@ -649,13 +656,15 @@ func TestInitServerUrl(t *testing.T) {
 
 		// If Server_ExternalWebUrl is explicitly set, Federation_RegistryUrl defaults to whatever it is
 		// But 443 port is stripped if provided
+		initConfig()
 		viper.Set("Server.ExternalWebUrl", mockWebUrlW443Port)
 		err = InitServer(ctx, server_structs.RegistryType)
 		require.NoError(t, err)
 		fedInfo, err = GetFederation(ctx)
 		require.NoError(t, err)
 		assert.Equal(t, mockWebUrlWoPort, fedInfo.RegistryEndpoint)
 
+		initConfig()
 		viper.Set("Server.ExternalWebUrl", mockWebUrlWoPort)
 		viper.Set("Federation.RegistryUrl", "https://example-registry.com")
 		err = InitServer(ctx, server_structs.RegistryType)
@@ -667,6 +676,7 @@ func TestInitServerUrl(t *testing.T) {
 
 	t.Run("broker-url-default-to-web-url", func(t *testing.T) {
 		// We respect the URL value set directly by others. Won't remove 443 port
+		initConfig()
 		// If Server_ExternalWebUrl is not set, Federation_BrokerUrl defaults to https://<hostname>:<non-443-port>
 		// In this case, the port is 443, so Federation_BrokerUrl = https://example.com
 		viper.Set("Server.Hostname", mockHostname)
@@ -679,13 +689,15 @@ func TestInitServerUrl(t *testing.T) {
 
 		// If Server_ExternalWebUrl is explicitly set, Federation_BrokerUrl defaults to whatever it is
 		// But 443 port is stripped if provided
+		initConfig()
 		viper.Set("Server.ExternalWebUrl", mockWebUrlW443Port)
 		err = InitServer(ctx, server_structs.BrokerType)
 		require.NoError(t, err)
 		fedInfo, err = GetFederation(ctx)
 		require.NoError(t, err)
 		assert.Equal(t, mockWebUrlWoPort, fedInfo.BrokerEndpoint)
 
+		initConfig()
 		viper.Set("Server.ExternalWebUrl", mockWebUrlWoPort)
 		viper.Set("Federation.BrokerUrl", "https://example-registry.com")
 		err = InitServer(ctx, server_structs.BrokerType)

director/fed_token_test.go

@@ -178,10 +178,6 @@ func TestCreateFedTok(t *testing.T) {
 	server_utils.ResetTestState()
 	defer server_utils.ResetTestState()
 
-	kDir := filepath.Join(t.TempDir(), "keys")
-	viper.Set(param.IssuerKeysDirectory.GetName(), kDir)
-	viper.Set("ConfigDir", t.TempDir())
-
 	testCases := []struct {
 		name            string
 		host            string
@@ -223,10 +219,14 @@ func TestCreateFedTok(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			// config.ResetFederationForTest()
 			w := httptest.NewRecorder()
 			c, _ := gin.CreateTestContext(w)
 
+			confDir := t.TempDir()
+			kDir := filepath.Join(confDir, "keys")
+			viper.Set(param.IssuerKeysDirectory.GetName(), kDir)
+			viper.Set("ConfigDir", confDir)
+
 			config.ResetFederationForTest()
 			fed := pelican_url.FederationDiscovery{
 				// Most of these aren't actually used by the test, but to prevent auto discovery

lotman/lotman_test.go

@@ -22,6 +22,7 @@ package lotman
 
 import (
 	"bytes"
+	"context"
 	_ "embed"
 	"encoding/json"
 	"fmt"
@@ -101,7 +102,7 @@ func setupLotmanFromConf(t *testing.T, readConfig bool, name string, discUrl str
 		// If we're not reading from the embedded yaml, grab the
 		// default configuration. We need _some_ configuration to work.
 		viper.Set("ConfigDir", t.TempDir())
-		config.InitServer(server_structs.CacheType)
+		config.InitServer(context.Background(), server_structs.CacheType)
 	}
 
 	tmpPathPattern := name + "*"
@@ -147,6 +148,7 @@ func TestLotmanInit(t *testing.T) {
 
 	t.Run("TestGoodInit", func(t *testing.T) {
 		viper.Set("Log.Level", "debug")
+		viper.Set("Cache.DataLocations", []string{})
 		server := getMockDiscoveryHost()
 		// Set the Federation.DiscoveryUrl to the test server's URL
 		// Lotman uses the discovered URLs/keys to determine some aspects of lot ownership