Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pulsaradmin/pkg/admin/brokers.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package admin
import (
"context"
"fmt"
"net/url"
"strings"

"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
Expand Down Expand Up @@ -187,7 +188,7 @@ func (b *broker) UpdateDynamicConfiguration(configName, configValue string) erro
}

func (b *broker) UpdateDynamicConfigurationWithContext(ctx context.Context, configName, configValue string) error {
value := fmt.Sprintf("/configuration/%s/%s", configName, configValue)
value := fmt.Sprintf("/configuration/%s/%s", configName, url.PathEscape(configValue))
endpoint := b.pulsar.endpointWithFullPath(b.basePath, value)
return b.pulsar.Client.PostWithContext(ctx, endpoint, nil)
}
Expand Down
37 changes: 37 additions & 0 deletions pulsaradmin/pkg/admin/brokers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,27 @@ package admin
import (
"context"
"encoding/json"
"io"
"net/http"
"net/url"
"os"
"strings"
"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"
"github.com/stretchr/testify/require"
)

type roundTripFunc func(*http.Request) (*http.Response, error)

func (f roundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
return f(req)
}

func TestBrokerHealthCheckWithTopicVersion(t *testing.T) {
readFile, err := os.ReadFile("../../../integration-tests/tokens/admin-token")
assert.NoError(t, err)
Expand Down Expand Up @@ -98,6 +107,34 @@ func TestUpdateDynamicConfiguration(t *testing.T) {
assert.NotEmpty(t, configurations)
}

func TestUpdateDynamicConfigurationEscapesConfigValue(t *testing.T) {
admin := &pulsarClient{
APIVersion: config.V2,
Client: &rest.Client{
ServiceURL: "http://example.com",
HTTPClient: &http.Client{
Transport: roundTripFunc(func(r *http.Request) (*http.Response, error) {
require.Equal(t, http.MethodPost, r.Method)
require.Equal(
t,
"/admin/v2/brokers/configuration/testConfigName/public%2Fdefault",
r.URL.EscapedPath(),
)
return &http.Response{
StatusCode: http.StatusNoContent,
Body: io.NopCloser(strings.NewReader("")),
Header: make(http.Header),
Request: r,
}, nil
}),
},
},
}

err := admin.Brokers().UpdateDynamicConfiguration("testConfigName", "public/default")
require.NoError(t, err)
}

func TestUpdateDynamicConfigurationWithCustomURL(t *testing.T) {
readFile, err := os.ReadFile("../../../integration-tests/tokens/admin-token")
assert.NoError(t, err)
Expand Down
4 changes: 4 additions & 0 deletions pulsaradmin/pkg/rest/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ func (c *Client) newRequest(method, path string) (*request, error) {
User: base.User,
Host: base.Host,
Path: endpoint(base.Path, u.Path),
RawPath: endpoint(
base.EscapedPath(),
u.EscapedPath(),
),
Comment on lines 64 to +68
},
params: make(url.Values),
}
Expand Down
Loading