-
Notifications
You must be signed in to change notification settings - Fork 71
feat: align admin cmds #2045
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
freeznet
wants to merge
10
commits into
master
Choose a base branch
from
freeznet/align-admin-cmds
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
feat: align admin cmds #2045
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
5253b94
feat: upgrade pulsar-client-go v0.12.0
freeznet f1513a5
Revert "feat: upgrade pulsar-client-go v0.12.0"
freeznet acf900b
refactor(namespace): simplify cluster handling logic
freeznet 66ae3ef
feat: add multiple new namespace, topic, and schema management commands
freeznet 08c00dd
feat: add multiple admin getter commands for pulsarctl
freeznet ee5525a
test(topicpolicies): add tests for set-retention help
freeznet ad82a03
feat(topic): add support for removing schema validation
freeznet 5b30589
refactor(namespace): adjust flag handling in commands
freeznet 6c08dbf
feat(namespace): add admin HTTP client and utility functions
freeznet c55b147
fix: properly escape namespace segments in admin endpoint URLs
freeznet File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package brokers | ||
|
|
||
| import "github.com/streamnative/pulsarctl/pkg/cmdutils" | ||
|
|
||
| func leaderBrokerCmd(vc *cmdutils.VerbCmd) { | ||
| desc := cmdutils.LongDescription{} | ||
| desc.CommandUsedFor = "Get the information of the leader broker" | ||
| desc.CommandPermission = "This command requires super-user permissions." | ||
|
|
||
| var examples []cmdutils.Example | ||
| get := cmdutils.Example{ | ||
| Desc: desc.CommandUsedFor, | ||
| Command: "pulsarctl brokers leader-broker", | ||
| } | ||
| examples = append(examples, get) | ||
| desc.CommandExamples = examples | ||
|
|
||
| var out []cmdutils.Output | ||
| successOut := cmdutils.Output{ | ||
| Desc: "normal output", | ||
| Out: "{\n" + | ||
| " \"brokerId\": \"broker-1\",\n" + | ||
| " \"serviceUrl\": \"http://127.0.0.1:8080\"\n" + | ||
| "}", | ||
| } | ||
| out = append(out, successOut) | ||
| desc.CommandOutput = out | ||
|
|
||
| vc.SetDescription( | ||
| "leader-broker", | ||
| desc.CommandUsedFor, | ||
| desc.ToString(), | ||
| desc.ExampleToString(), | ||
| "leader-broker") | ||
|
|
||
| vc.SetRunFunc(func() error { | ||
| return doGetLeaderBroker(vc) | ||
| }) | ||
| vc.EnableOutputFlagSet() | ||
| } | ||
|
|
||
| func doGetLeaderBroker(vc *cmdutils.VerbCmd) error { | ||
| admin := cmdutils.NewPulsarClient() | ||
| info, err := admin.Brokers().GetLeaderBroker() | ||
| if err == nil { | ||
| oc := cmdutils.NewOutputContent().WithObject(info) | ||
| err = vc.OutputConfig.WriteOutput(vc.Command.OutOrStdout(), oc) | ||
| } | ||
| return err | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package brokers | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "net/http" | ||
| "net/http/httptest" | ||
| "testing" | ||
|
|
||
| "github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils" | ||
| "github.com/stretchr/testify/assert" | ||
|
|
||
| "github.com/streamnative/pulsarctl/pkg/cmdutils" | ||
| ) | ||
|
|
||
| func TestLeaderBroker(t *testing.T) { | ||
| oldURL := cmdutils.PulsarCtlConfig.WebServiceURL | ||
| defer func() { | ||
| cmdutils.PulsarCtlConfig.WebServiceURL = oldURL | ||
| }() | ||
|
|
||
| srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||
| assert.Equal(t, http.MethodGet, r.Method) | ||
| assert.Equal(t, "/admin/v2/brokers/leaderBroker", r.URL.Path) | ||
| _, _ = w.Write([]byte(`{"brokerId":"broker-1","serviceUrl":"http://127.0.0.1:8080"}`)) | ||
| })) | ||
| defer srv.Close() | ||
|
|
||
| cmdutils.PulsarCtlConfig.WebServiceURL = srv.URL | ||
|
|
||
| args := []string{"leader-broker"} | ||
| out, execErr, _, err := TestBrokersCommands(leaderBrokerCmd, args) | ||
| assert.Nil(t, err) | ||
| assert.Nil(t, execErr) | ||
|
|
||
| var info utils.BrokerInfo | ||
| err = json.Unmarshal(out.Bytes(), &info) | ||
| assert.Nil(t, err) | ||
| assert.Equal(t, "broker-1", info.BrokerID) | ||
| assert.Equal(t, "http://127.0.0.1:8080", info.ServiceURL) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package namespace | ||
|
|
||
| import ( | ||
| "io" | ||
| "net/http" | ||
| "net/url" | ||
| "path" | ||
| "strconv" | ||
| "strings" | ||
|
|
||
| pulsaradmin "github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin" | ||
| "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/streamnative/pulsarctl/pkg/cmdutils" | ||
| ) | ||
|
|
||
| func newNamespaceRESTClient() (*rest.Client, error) { | ||
| cfg := config.Config(*cmdutils.PulsarCtlConfig) | ||
| cfg.PulsarAPIVersion = config.V2 | ||
|
|
||
| authProvider, err := auth.GetAuthProvider(&cfg) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &rest.Client{ | ||
| ServiceURL: cfg.WebServiceURL, | ||
| VersionInfo: pulsaradmin.ReleaseVersion, | ||
| HTTPClient: &http.Client{ | ||
| Timeout: pulsaradmin.DefaultHTTPTimeOutDuration, | ||
| Transport: authProvider, | ||
| }, | ||
| }, nil | ||
| } | ||
|
|
||
| func namespaceAdminEndpoint(parts ...string) string { | ||
| escapedParts := make([]string, len(parts)) | ||
| for i, part := range parts { | ||
| escapedParts[i] = url.PathEscape(part) | ||
| } | ||
|
|
||
| return path.Join( | ||
| utils.MakeHTTPPath(config.V2.String(), "/namespaces"), | ||
| path.Join(escapedParts...), | ||
| ) | ||
| } | ||
|
|
||
| func readOptionalStringResponse(resp *http.Response) (*string, error) { | ||
| defer func() { | ||
| _ = resp.Body.Close() | ||
| }() | ||
|
|
||
| body, err := io.ReadAll(resp.Body) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| value := strings.TrimSpace(string(body)) | ||
| if value == "" || value == "null" { | ||
| return nil, nil | ||
| } | ||
|
|
||
| if unquoted, err := strconv.Unquote(value); err == nil { | ||
| value = unquoted | ||
| } | ||
|
|
||
| return &value, nil | ||
| } | ||
|
|
||
| func removeNamespaceProperty(ns utils.NameSpaceName, key string) (*string, error) { | ||
| client, err := newNamespaceRESTClient() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| endpoint := namespaceAdminEndpoint(ns.String(), "property", key) | ||
| resp, err := client.MakeRequest(http.MethodDelete, endpoint) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return readOptionalStringResponse(resp) | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.