From a0f2b5f591ee335a519b85995f2bcf694fc166d1 Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Mon, 27 Feb 2023 15:34:17 +0100 Subject: [PATCH] fix codacy --- client/cmd/status.go | 18 +++++++++--------- client/cmd/status_test.go | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/client/cmd/status.go b/client/cmd/status.go index 9310b898c..cb98aabf2 100644 --- a/client/cmd/status.go +++ b/client/cmd/status.go @@ -134,12 +134,12 @@ func statusFunc(cmd *cobra.Command, args []string) error { if detailFlag { statusOutputString = parseToFullDetailSummary(statusOutputOverview) } else if jsonFlag { - statusOutputString, err = parseToJson(statusOutputOverview) + statusOutputString, err = parseToJSON(statusOutputOverview) if err != nil { return err } } else if yamlFlag { - statusOutputString, err = parseToYaml(statusOutputOverview) + statusOutputString, err = parseToYAML(statusOutputOverview) if err != nil { return err } @@ -259,7 +259,7 @@ func mapPeers(peers []*proto.PeerState) peersStateOutput { peersStateDetail = append(peersStateDetail, peerState) } - sortPeersByIp(peersStateDetail) + sortPeersByIP(peersStateDetail) peersOverview := peersStateOutput{ Total: len(peersStateDetail), @@ -269,7 +269,7 @@ func mapPeers(peers []*proto.PeerState) peersStateOutput { return peersOverview } -func sortPeersByIp(peersStateDetail []peerStateDetailOutput) { +func sortPeersByIP(peersStateDetail []peerStateDetailOutput) { if len(peersStateDetail) > 0 { sort.SliceStable(peersStateDetail, func(i, j int) bool { iAddr, _ := netip.ParseAddr(peersStateDetail[i].IP) @@ -287,7 +287,7 @@ func parseInterfaceIP(interfaceIP string) string { return fmt.Sprintf("%s\n", ip) } -func parseToJson(overview statusOutputOverview) (string, error) { +func parseToJSON(overview statusOutputOverview) (string, error) { jsonBytes, err := json.Marshal(overview) if err != nil { return "", fmt.Errorf("json marshal failed") @@ -295,7 +295,7 @@ func parseToJson(overview statusOutputOverview) (string, error) { return string(jsonBytes), err } -func parseToYaml(overview statusOutputOverview) (string, error) { +func parseToYAML(overview statusOutputOverview) (string, error) { yamlBytes, err := yaml.Marshal(overview) if err != nil { return "", fmt.Errorf("yaml marshal failed") @@ -303,12 +303,12 @@ func parseToYaml(overview statusOutputOverview) (string, error) { return string(yamlBytes), nil } -func parseGeneralSummary(overview statusOutputOverview, showUrl bool) string { +func parseGeneralSummary(overview statusOutputOverview, showURL bool) string { managementConnString := "Disconnected" if overview.ManagementState.Connected { managementConnString = "Connected" - if showUrl { + if showURL { managementConnString = fmt.Sprintf("%s to %s", managementConnString, overview.ManagementState.URL) } } @@ -316,7 +316,7 @@ func parseGeneralSummary(overview statusOutputOverview, showUrl bool) string { signalConnString := "Disconnected" if overview.SignalState.Connected { signalConnString = "Connected" - if showUrl { + if showURL { signalConnString = fmt.Sprintf("%s to %s", signalConnString, overview.SignalState.URL) } } diff --git a/client/cmd/status_test.go b/client/cmd/status_test.go index b33d07c49..872e800b0 100644 --- a/client/cmd/status_test.go +++ b/client/cmd/status_test.go @@ -139,13 +139,13 @@ func TestSortingOfPeers(t *testing.T) { }, } - sortPeersByIp(peers) + sortPeersByIP(peers) assert.Equal(t, peers[3].IP, "192.168.178.104") } -func TestParsingToJson(t *testing.T) { - json, _ := parseToJson(overview) +func TestParsingToJSON(t *testing.T) { + json, _ := parseToJSON(overview) // @formatter:off expectedJson := "{" + @@ -202,8 +202,8 @@ func TestParsingToJson(t *testing.T) { assert.Equal(t, expectedJson, json) } -func TestParsingToYaml(t *testing.T) { - yaml, _ := parseToYaml(overview) +func TestParsingToYAML(t *testing.T) { + yaml, _ := parseToYAML(overview) expectedYaml := "peers:\n" + " total: 2\n" + @@ -295,10 +295,10 @@ func TestParsingToShortVersion(t *testing.T) { assert.Equal(t, expectedString, shortVersion) } -func TestParsingOfIp(t *testing.T) { +func TestParsingOfIP(t *testing.T) { 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) }