Rename writebackhost to putendpoint

client/director.go

@@ -74,7 +74,7 @@ func CreateNsFromDirectorResp(dirResp *http.Response) (namespace namespaces.Name
 	namespace.UseTokenOnRead, _ = strconv.ParseBool(xPelicanNamespace["require-token"])
 	namespace.ReadHTTPS, _ = strconv.ParseBool(xPelicanNamespace["readhttps"])
 	namespace.DirListHost = xPelicanNamespace["collections-url"]
-	namespace.WritebackHost = xPelicanNamespace["writebackhost"]
+	namespace.PutEndpoint = xPelicanNamespace["putendpoint"]
 
 	var xPelicanAuthorization map[string]string
 	if len(dirResp.Header.Values("X-Pelican-Authorization")) > 0 {

client/handle_http.go

@@ -835,13 +835,13 @@ func UploadFile(src string, origDest *url.URL, token string, namespace namespace
 	}
 
 	// Parse the writeback host as a URL
-	writebackhostUrl, err := url.Parse(namespace.WritebackHost)
+	putEndpointUrl, err := url.Parse(namespace.PutEndpoint)
 	if err != nil {
 		return 0, err
 	}
 
 	dest := &url.URL{
-		Host:   writebackhostUrl.Host,
+		Host:   putEndpointUrl.Host,
 		Scheme: "https",
 		Path:   origDest.Path,
 	}
@@ -1089,11 +1089,11 @@ func StatHttp(dest *url.URL, namespace namespaces.Namespace) (uint64, error) {
 	}
 
 	// Parse the writeback host as a URL
-	writebackhostUrl, err := url.Parse(namespace.WritebackHost)
+	putEndpointUrl, err := url.Parse(namespace.PutEndpoint)
 	if err != nil {
 		return 0, err
 	}
-	dest.Host = writebackhostUrl.Host
+	dest.Host = putEndpointUrl.Host
 	dest.Scheme = "https"
 
 	canDisableProxy := CanDisableProxy()

client/handle_http_test.go

@@ -389,7 +389,7 @@ func TestFullUpload(t *testing.T) {
 	testURL, err := url.Parse(ts.URL)
 	assert.NoError(t, err, "Error parsing test URL")
 	testNamespace := namespaces.Namespace{
-		WritebackHost: "https://" + testURL.Host,
+		PutEndpoint: "https://" + testURL.Host,
 	}
 
 	// Upload the file

director/advertise.go

@@ -78,7 +78,7 @@ func AdvertiseOSDF() error {
 		nsAd.RequireToken = ns.UseTokenOnRead
 		nsAd.Path = ns.Path
 		nsAd.DirlistHost = ns.DirlistHost
-		nsAd.WritebackHost = ns.WritebackHost
+		nsAd.PutEndpoint = ns.PutEndpoint
 		issuerURL, err := url.Parse(ns.CredentialGeneration.Issuer)
 		if err != nil {
 			log.Warningf("Invalid URL %v when parsing topology response: %v\n", ns.CredentialGeneration.Issuer, err)

director/cache_ads.go

@@ -43,7 +43,7 @@ type (
 		BasePath      string       `json:"basePath"`
 		VaultServer   string       `json:"vaultServer"`
 		DirlistHost   string       `json:"dirlisthost"`
-		WritebackHost string       `json:"writebackhost"`
+		PutEndpoint   string       `json:"writebackhost"`
 	}
 
 	ServerAd struct {

director/redirect.go

@@ -227,8 +227,8 @@ func RedirectToCache(ginCtx *gin.Context) {
 			ginCtx.Writer.Header()["X-Pelican-Token-Generation"] = []string{tokenGen}
 		}
 	}
-	ginCtx.Writer.Header()["X-Pelican-Namespace"] = []string{fmt.Sprintf("namespace=%s, require-token=%v, collections-url=%s, writebackhost=%s",
-		namespaceAd.Path, namespaceAd.RequireToken, namespaceAd.DirlistHost, namespaceAd.WritebackHost)}
+	ginCtx.Writer.Header()["X-Pelican-Namespace"] = []string{fmt.Sprintf("namespace=%s, require-token=%v, collections-url=%s, putendpoint=%s",
+		namespaceAd.Path, namespaceAd.RequireToken, namespaceAd.DirlistHost, namespaceAd.PutEndpoint)}
 
 	// Note we only append the `authz` query parameter in the case of the redirect response and not the
 	// duplicate link metadata above.  This is purposeful: the Link header might get too long if we repeat

namespaces/namespaces.go

@@ -86,7 +86,7 @@ type Namespace struct {
 	Issuer               string                `json:"issuer"`
 	ReadHTTPS            bool                  `json:"readhttps"`
 	UseTokenOnRead       bool                  `json:"usetokenonread"`
-	WritebackHost        string                `json:"writebackhost"`
+	PutEndpoint          string                `json:"writebackhost"`
 	DirListHost          string                `json:"dirlisthost"`
 }
 

namespaces/namespaces_test.go

@@ -175,7 +175,7 @@ func TestFullNamespace(t *testing.T) {
 	assert.Equal(t, true, ns.ReadHTTPS)
 	assert.Equal(t, true, ns.UseTokenOnRead)
 	assert.Equal(t, "/ospool/PROTECTED", ns.Path)
-	assert.Equal(t, "https://origin-auth2001.chtc.wisc.edu:1095", ns.WritebackHost)
+	assert.Equal(t, "https://origin-auth2001.chtc.wisc.edu:1095", ns.PutEndpoint)
 
 }
 

origin_ui/advertise.go

@@ -63,7 +63,7 @@ func (server *OriginServer) CreateAdvertisement(name string, originUrl string, o
 		Strategy:      "OAuth2",
 		BasePath:      prefix,
 		// TODO: This is set to the origin for now needs to become configurable
-		WritebackHost: originUrl,
+		PutEndpoint: originUrl,
 	}
 	ad = director.OriginAdvertise{
 		Name:       name,

utils/web_utils.go

@@ -56,7 +56,7 @@ type (
 		Path                 string               `json:"path"`
 		ReadHTTPS            bool                 `json:"readhttps"`
 		UseTokenOnRead       bool                 `json:"usetokenonread"`
-		WritebackHost        string               `json:"writebackhost"`
+		PutEndpoint          string               `json:"writebackhost"`
 	}
 
 	TopologyNamespacesJSON struct {