Merge pull request #1154 from jhiemstrawisc/issue-1110

Don't include scheme when setting XRDHOST for osdf origins
PelicanPlatform · Apr 24, 2024 · 726da48 · 726da48
2 parents 8ea0ecc + 6505ffb
commit 726da48
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/xrootd/xrootd_config.go b/xrootd/xrootd_config.go
@@ -671,9 +671,8 @@ func ConfigXrootd(ctx context.Context, origin bool) (string, error) {
 				return "", errors.Wrapf(err, "Failed to parse external web URL: %s", externalWebUrl)
 			}
 
-			// Strip the port number from the URL
-			externalWebUrl.Host = externalWebUrl.Hostname()
-			if err := os.Setenv("XRDHOST", externalWebUrl.String()); err != nil {
+			// Strip the scheme and port number from the URL and use to set XRDHOST
+			if err := os.Setenv("XRDHOST", externalWebUrl.Hostname()); err != nil {
 				return "", err
 			}
 		}

diff --git a/xrootd/xrootd_config_test.go b/xrootd/xrootd_config_test.go
@@ -256,7 +256,7 @@ func TestXrootDOriginConfig(t *testing.T) {
 		configPath, err := ConfigXrootd(ctx, true)
 		require.NoError(t, err)
 		assert.NotNil(t, configPath)
-		assert.Equal(t, "https://my-xrootd.com", os.Getenv("XRDHOST"))
+		assert.Equal(t, "my-xrootd.com", os.Getenv("XRDHOST"))
 
 		viper.Reset()
 	})
@@ -273,7 +273,7 @@ func TestXrootDOriginConfig(t *testing.T) {
 		configPath, err := ConfigXrootd(ctx, true)
 		require.NoError(t, err)
 		assert.NotNil(t, configPath)
-		assert.Equal(t, "https://my-xrootd.com", os.Getenv("XRDHOST"))
+		assert.Equal(t, "my-xrootd.com", os.Getenv("XRDHOST"))
 
 		viper.Reset()
 	})