add url

Author: labuladong

pulsaradmin/pkg/admin/brokers_test.go

@@ -18,10 +18,15 @@
 package admin
 
 import (
+	"encoding/json"
+	"net/http"
+	"net/url"
 	"os"
 	"testing"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/auth"
 	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/rest"
 	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
@@ -91,3 +96,53 @@ func TestUpdateDynamicConfiguration(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotEmpty(t, configurations)
 }
+
+func TestUpdateDynamicConfigurationWithCustomURL(t *testing.T) {
+	readFile, err := os.ReadFile("../../../integration-tests/tokens/admin-token")
+	assert.NoError(t, err)
+	cfg := &config.Config{
+		Token: string(readFile),
+	}
+
+	authProvider, err := auth.GetAuthProvider(cfg)
+	assert.NoError(t, err)
+
+	client := rest.Client{
+		ServiceURL:  cfg.WebServiceURL,
+		VersionInfo: ReleaseVersion,
+		HTTPClient: &http.Client{
+			Timeout:   DefaultHTTPTimeOutDuration,
+			Transport: authProvider,
+		},
+	}
+	u, err := url.Parse(cfg.WebServiceURL)
+	assert.NoError(t, err)
+
+	// example config value with '/'
+	value := `{"key/123":"https://example.com/"}`
+	encoded := url.QueryEscape(value)
+
+	resp, err := client.MakeRequestWithURL(http.MethodPost, &url.URL{
+		Scheme:  u.Scheme,
+		User:    u.User,
+		Host:    u.Host,
+		Path:    "/admin/v2/brokers/configuration/allowAutoSubscriptionCreation/" + value,
+		RawPath: "/admin/v2/brokers/configuration/allowAutoSubscriptionCreation/" + encoded,
+	})
+	assert.NoError(t, err)
+	assert.Equal(t, http.StatusOK, resp.StatusCode)
+
+	// get the config, check if it's updated
+	admin, err := New(cfg)
+	assert.NoError(t, err)
+	assert.NotNil(t, admin)
+
+	configurations, err := admin.Brokers().GetAllDynamicConfigurations()
+	assert.NoError(t, err)
+	assert.NotEmpty(t, configurations)
+
+	var m map[string]interface{}
+	err = json.Unmarshal([]byte(configurations["allowAutoSubscriptionCreation"]), &m)
+	assert.NoError(t, err)
+	assert.Equal(t, "https://example.com/", m["key/123"])
+}

pulsaradmin/pkg/rest/client.go

@@ -54,14 +54,20 @@ func (c *Client) newRequest(method, path string) (*request, error) {
 		return nil, err
 	}
 
+	urlOpt := &url.URL{
+		Scheme: base.Scheme,
+		User:   base.User,
+		Host:   base.Host,
+		Path:   endpoint(base.Path, u.Path),
+	}
+
+	return c.newRequestWithURL(method, urlOpt)
+}
+
+func (c *Client) newRequestWithURL(method string, urlOpt *url.URL) (*request, error) {
 	req := &request{
 		method: method,
-		url: &url.URL{
-			Scheme: base.Scheme,
-			User:   base.User,
-			Host:   base.Host,
-			Path:   endpoint(base.Path, u.Path),
-		},
+		url:    urlOpt,
 		params: make(url.Values),
 	}
 	return req, nil
@@ -104,6 +110,20 @@ func (c *Client) MakeRequest(method, endpoint string) (*http.Response, error) {
 	return resp, nil
 }
 
+func (c *Client) MakeRequestWithURL(method string, urlOpt *url.URL) (*http.Response, error) {
+	req, err := c.newRequestWithURL(method, urlOpt)
+	if err != nil {
+		return nil, err
+	}
+
+	resp, err := checkSuccessful(c.doRequest(req))
+	if err != nil {
+		return nil, err
+	}
+
+	return resp, nil
+}
+
 func (c *Client) Get(endpoint string, obj interface{}) error {
 	_, err := c.GetWithQueryParams(endpoint, obj, nil, true)
 	return err