extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-19 17:31:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix codacy

Browse Source
This commit is contained in:
Pascal Fischer 2023-02-27 15:34:17 +01:00
parent 0350faf75d
commit a0f2b5f591
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/cmd/status.go
View File

@ -134,12 +134,12 @@ func statusFunc(cmd *cobra.Command, args []string) error {
if detailFlag { if detailFlag {
statusOutputString = parseToFullDetailSummary(statusOutputOverview) statusOutputString = parseToFullDetailSummary(statusOutputOverview)
} else if jsonFlag { } else if jsonFlag {
statusOutputString, err = parseToJson(statusOutputOverview) statusOutputString, err = parseToJSON(statusOutputOverview)
if err != nil { if err != nil {
return err return err
} }
} else if yamlFlag { } else if yamlFlag {
statusOutputString, err = parseToYaml(statusOutputOverview) statusOutputString, err = parseToYAML(statusOutputOverview)
if err != nil { if err != nil {
return err return err
} }
@ -259,7 +259,7 @@ func mapPeers(peers []*proto.PeerState) peersStateOutput {
peersStateDetail = append(peersStateDetail, peerState) peersStateDetail = append(peersStateDetail, peerState)
} }
sortPeersByIp(peersStateDetail) sortPeersByIP(peersStateDetail)
peersOverview := peersStateOutput{ peersOverview := peersStateOutput{
Total: len(peersStateDetail), Total: len(peersStateDetail),
@ -269,7 +269,7 @@ func mapPeers(peers []*proto.PeerState) peersStateOutput {
return peersOverview return peersOverview
} }
func sortPeersByIp(peersStateDetail []peerStateDetailOutput) { func sortPeersByIP(peersStateDetail []peerStateDetailOutput) {
if len(peersStateDetail) > 0 { if len(peersStateDetail) > 0 {
sort.SliceStable(peersStateDetail, func(i, j int) bool { sort.SliceStable(peersStateDetail, func(i, j int) bool {
iAddr, _ := netip.ParseAddr(peersStateDetail[i].IP) iAddr, _ := netip.ParseAddr(peersStateDetail[i].IP)
@ -287,7 +287,7 @@ func parseInterfaceIP(interfaceIP string) string {
return fmt.Sprintf("%s\n", ip) return fmt.Sprintf("%s\n", ip)
} }
func parseToJson(overview statusOutputOverview) (string, error) { func parseToJSON(overview statusOutputOverview) (string, error) {
jsonBytes, err := json.Marshal(overview) jsonBytes, err := json.Marshal(overview)
if err != nil { if err != nil {
return "", fmt.Errorf("json marshal failed") return "", fmt.Errorf("json marshal failed")
@ -295,7 +295,7 @@ func parseToJson(overview statusOutputOverview) (string, error) {
return string(jsonBytes), err return string(jsonBytes), err
} }
func parseToYaml(overview statusOutputOverview) (string, error) { func parseToYAML(overview statusOutputOverview) (string, error) {
yamlBytes, err := yaml.Marshal(overview) yamlBytes, err := yaml.Marshal(overview)
if err != nil { if err != nil {
return "", fmt.Errorf("yaml marshal failed") return "", fmt.Errorf("yaml marshal failed")
@ -303,12 +303,12 @@ func parseToYaml(overview statusOutputOverview) (string, error) {
return string(yamlBytes), nil return string(yamlBytes), nil
} }
func parseGeneralSummary(overview statusOutputOverview, showUrl bool) string { func parseGeneralSummary(overview statusOutputOverview, showURL bool) string {
managementConnString := "Disconnected" managementConnString := "Disconnected"
if overview.ManagementState.Connected { if overview.ManagementState.Connected {
managementConnString = "Connected" managementConnString = "Connected"
if showUrl { if showURL {
managementConnString = fmt.Sprintf("%s to %s", managementConnString, overview.ManagementState.URL) managementConnString = fmt.Sprintf("%s to %s", managementConnString, overview.ManagementState.URL)
} }
} }
@ -316,7 +316,7 @@ func parseGeneralSummary(overview statusOutputOverview, showUrl bool) string {
signalConnString := "Disconnected" signalConnString := "Disconnected"
if overview.SignalState.Connected { if overview.SignalState.Connected {
signalConnString = "Connected" signalConnString = "Connected"
if showUrl { if showURL {
signalConnString = fmt.Sprintf("%s to %s", signalConnString, overview.SignalState.URL) signalConnString = fmt.Sprintf("%s to %s", signalConnString, overview.SignalState.URL)
} }
} }

16
client/cmd/status_test.go
View File

@ -139,13 +139,13 @@ func TestSortingOfPeers(t *testing.T) {
}, },
} }
sortPeersByIp(peers) sortPeersByIP(peers)
assert.Equal(t, peers[3].IP, "192.168.178.104") assert.Equal(t, peers[3].IP, "192.168.178.104")
} }
func TestParsingToJson(t *testing.T) { func TestParsingToJSON(t *testing.T) {
json, _ := parseToJson(overview) json, _ := parseToJSON(overview)
// @formatter:off // @formatter:off
expectedJson := "{" + expectedJson := "{" +
@ -202,8 +202,8 @@ func TestParsingToJson(t *testing.T) {
assert.Equal(t, expectedJson, json) assert.Equal(t, expectedJson, json)
} }
func TestParsingToYaml(t *testing.T) { func TestParsingToYAML(t *testing.T) {
yaml, _ := parseToYaml(overview) yaml, _ := parseToYAML(overview)
expectedYaml := "peers:\n" + expectedYaml := "peers:\n" +
" total: 2\n" + " total: 2\n" +
@ -295,10 +295,10 @@ func TestParsingToShortVersion(t *testing.T) {
assert.Equal(t, expectedString, shortVersion) assert.Equal(t, expectedString, shortVersion)
} }
func TestParsingOfIp(t *testing.T) { func TestParsingOfIP(t *testing.T) {
InterfaceIp := "192.168.178.123/16" InterfaceIp := "192.168.178.123/16"
parsedId := parseInterfaceIP(InterfaceIp) parsedIP := parseInterfaceIP(InterfaceIp)
assert.Equal(t, "192.168.178.123\n", parsedId) assert.Equal(t, "192.168.178.123\n", parsedIP)
} }