This repository has been archived by the owner on Jun 1, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 12
PMM-5194 Tunnels #141
Draft
AlekSi
wants to merge
5
commits into
main
Choose a base branch
from
PMM-5194-tunnels
base: main
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.
Draft
PMM-5194 Tunnels #141
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
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 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains 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 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 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,113 @@ | ||
// pmm-admin | ||
// Copyright 2019 Percona LLC | ||
// | ||
// Licensed 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 inventory | ||
|
||
import ( | ||
"bytes" | ||
"fmt" | ||
"strconv" | ||
"strings" | ||
"text/tabwriter" | ||
|
||
"github.com/percona/pmm/api/inventorypb/json/client" | ||
"github.com/percona/pmm/api/inventorypb/json/client/tunnels" | ||
|
||
"github.com/percona/pmm-admin/commands" | ||
) | ||
|
||
type listResultTunnel struct { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🚫 [golangci-lint] reported by reviewdog 🐶 |
||
TunnelID string `json:"tunnel_id"` | ||
ListenAgentID string `json:"listen_agent_id"` | ||
ListenPort uint16 `json:"listen_port"` | ||
ConnectAgentID string `json:"connect_agent_id"` | ||
ConnectPort uint16 `json:"connect_port"` | ||
} | ||
|
||
type listTunnelsResult struct { | ||
Tunnels []listResultTunnel `json:"tunnels"` | ||
} | ||
|
||
func (res *listTunnelsResult) Result() {} | ||
|
||
func (res *listTunnelsResult) String() string { | ||
if len(res.Tunnels) == 0 { | ||
return "No tunnels." | ||
} | ||
|
||
var buf bytes.Buffer | ||
w := tabwriter.NewWriter(&buf, 0, 0, 3, ' ', 0) | ||
header := strings.Join([]string{ | ||
"ID", | ||
"Listen Agent ID", | ||
"Listen port", | ||
"Connect Agent ID", | ||
"Connect port", | ||
}, "\t") | ||
fmt.Fprintln(w, header) | ||
for _, t := range res.Tunnels { | ||
line := strings.Join([]string{ | ||
t.TunnelID, | ||
t.ListenAgentID, | ||
strconv.Itoa(int(t.ListenPort)), | ||
t.ConnectAgentID, | ||
strconv.Itoa(int(t.ConnectPort)), | ||
}, "\t") | ||
fmt.Fprintln(w, line) | ||
} | ||
_ = w.Flush() | ||
|
||
return buf.String() | ||
} | ||
|
||
type listTunnelsCommand struct { | ||
filters tunnels.ListTunnelsBody | ||
} | ||
|
||
func (cmd *listTunnelsCommand) Run() (commands.Result, error) { | ||
params := &tunnels.ListTunnelsParams{ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🚫 [golangci-lint] reported by reviewdog 🐶 |
||
Body: cmd.filters, | ||
Context: commands.Ctx, | ||
} | ||
tunnelsRes, err := client.Default.Tunnels.ListTunnels(params) | ||
if err != nil { | ||
return nil, err | ||
} | ||
|
||
tunnelsList := make([]listResultTunnel, len(tunnelsRes.Payload.Tunnel)) | ||
for i, t := range tunnelsRes.Payload.Tunnel { | ||
tunnelsList[i] = listResultTunnel{ | ||
TunnelID: t.TunnelID, | ||
ListenAgentID: t.ListenAgentID, | ||
ListenPort: uint16(t.ListenPort), | ||
ConnectAgentID: t.ConnectAgentID, | ||
ConnectPort: uint16(t.ConnectPort), | ||
} | ||
} | ||
|
||
return &listTunnelsResult{ | ||
Tunnels: tunnelsList, | ||
}, nil | ||
} | ||
|
||
// register command | ||
var ( | ||
ListTunnels = new(listTunnelsCommand) | ||
ListTunnelsC = inventoryListC.Command("tunnels", "Show tunnels in inventory").Hide(hide) | ||
) | ||
|
||
func init() { | ||
ListTunnelsC.Flag("pmm-agent-id", "Filter by pmm-agent identifier").StringVar(&ListTunnels.filters.AgentID) | ||
} |
This file contains 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 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
34 changes: 33 additions & 1 deletion
34
vendor/github.com/percona/pmm/api/agentlocalpb/json/client/agent_local/status2_responses.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [golangci-lint] reported by reviewdog 🐶
exported type
TunnelStatus
should have comment or be unexported (golint)