Fix gometalinter issues (kovetskiy#24)

* golint: Fix don't use underscores in Go names issues See, $ gometalinter --disable-all --enable golint | grep under hosts_test.go:14:2:warning: don't use underscores in Go names; const hosts_get should be hostsGet (golint) hosts_test.go:103:2:warning: don't use underscores in Go names; const hosts_remove should be hostsRemove (golint) maintenances_test.go:15:2:warning: don't use underscores in Go names; const maintenance_get should be maintenanceGet (golint) maintenances_test.go:52:2:warning: don't use underscores in Go names; const maintenances_remove should be maintenancesRemove (golint) maintenances_test.go:66:2:warning: don't use underscores in Go names; const maintenance_create should be maintenanceCreate (golint) zabbix_issue18_test.go:13:2:warning: don't use underscores in Go names; const issue18_data should be issue18Data (golint) Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com> * golint: Fix some trivial issues See, $ gometalinter --disable-all --enable golint | grep -v comment responses.go:34:6:warning: type ResponseApiVersion should be ResponseAPIVersion (golint) zabbix.go:163:23:warning: method GetApiVersion should be GetAPIVersion (golint) Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com> * gosec: Print unhandled errors to debug output See, warning: Errors unhandled.,LOW,HIGH (gosec) Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com> * responses.go: fix misspelling of "maintenance" (misspell) Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com> * zabbix.go: Fix spelling issue Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com> * Fix vetting issues See, $ gometalinter --disable-all --enable vet item.go:42:3:error: unreachable code (vet) zabbix.go:593:3:error: unreachable code (vet) Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>
dmd · Oct 12, 2019 · 9961c3a · 9961c3a
1 parent 0788e5f
commit 9961c3a
Show file tree

Hide file tree

Showing 17 changed files with 114 additions and 54 deletions.
diff --git a/handle_hosts.go b/handle_hosts.go
@@ -52,7 +52,10 @@ func handleHosts(
 
 		}
 		if len(hostsTable) > 0 {
-			printHostsTable(hostsTable)
+			err = printHostsTable(hostsTable)
+			if err != nil {
+				debugf("Error: %+v", err)
+			}
 		}
 
 	}
@@ -96,7 +99,10 @@ func handleRemoveHosts(
 		)
 	}
 
-	printHostsTable(hosts)
+	err = printHostsTable(hosts)
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 
 	if confirmation {
 		if !confirmHost("removing", removeHost) {
@@ -147,9 +153,7 @@ func searchHosts(zabbix *Zabbix, hostname string) ([]Host, error) {
 	return hosts, err
 }
 
-func printHostsTable(
-	hosts []Host,
-) error {
+func printHostsTable(hosts []Host) error {
 
 	var lines = [][]string{}
 
@@ -178,6 +182,9 @@ func confirmHost(messages, host string) bool {
 		host,
 	)
 
-	fmt.Scanln(&value)
+	_, err := fmt.Scanln(&value)
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 	return value == "" || value == "Y" || value == "y"
 }
diff --git a/handle_latest_data.go b/handle_latest_data.go
@@ -163,7 +163,10 @@ func handleLatestData(
 		fmt.Println(zabbix.GetNormalGraphURL(matchedItemIDs))
 
 	default:
-		table.Flush()
+		err = table.Flush()
+		if err != nil {
+			debugf("Error: %+v", err)
+		}
 	}
 
 	return nil

diff --git a/handle_maintenances.go b/handle_maintenances.go
@@ -145,7 +145,10 @@ func handleAddMaintenance(
 		}
 	}
 
-	printHostsTable(hosts)
+	err = printHostsTable(hosts)
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 
 	if confirmation {
 		if !confirmMaintenance("create", addMaintenance) {
@@ -256,7 +259,10 @@ func handleUpdateMaintenance(
 		}
 	}
 
-	printHostsTable(hosts)
+	err = printHostsTable(hosts)
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 
 	if confirmation {
 		if fromStdin {
@@ -318,7 +324,10 @@ func handleRemoveMaintenance(
 		)
 	}
 
-	printMaintenancesTable(maintenances, pattern, extend)
+	err = printMaintenancesTable(maintenances, pattern, extend)
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 
 	if confirmation {
 		if !confirmMaintenance("removing", removeMaintenance) {
@@ -428,16 +437,15 @@ func handleListMaintenances(
 		)
 	}
 
-	printMaintenancesTable(maintenances, pattern, extend)
-
+	err = printMaintenancesTable(maintenances, pattern, extend)
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 	return nil
 }
 
-func printMaintenancesTable(
-	maintenances []Maintenance,
-	pattern string,
-	extend bool,
-) error {
+func printMaintenancesTable(maintenances []Maintenance, pattern string,
+	extend bool) error {
 
 	var lines = [][]string{}
 
@@ -660,6 +668,9 @@ func confirmMaintenance(messages, maintenance string) bool {
 		maintenance,
 	)
 
-	fmt.Scanln(&value)
+	_, err := fmt.Scanln(&value)
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 	return value == "" || value == "Y" || value == "y"
 }
diff --git a/handle_triggers.go b/handle_triggers.go
@@ -259,6 +259,9 @@ func parseParams(args map[string]interface{}) (Params, error) {
 func confirmAcknowledge() bool {
 	var value string
 	fmt.Fprintf(os.Stderr, "\n:: Proceed with acknowledge? [Y/n]: ")
-	fmt.Scanln(&value)
+	_, err := fmt.Scanln(&value)
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 	return value == "" || value == "Y" || value == "y"
 }
diff --git a/handle_users_groups.go b/handle_users_groups.go
@@ -64,7 +64,10 @@ func handleUsersGroups(
 		found = true
 	}
 
-	table.Flush()
+	err = table.Flush()
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 
 	if !found || (addUser == "" && removeUser == "") {
 		return nil
@@ -222,7 +225,10 @@ func confirmAdding(user string) bool {
 		"\n:: Proceed with adding user %s to specified groups? [Y/n]: ",
 		user,
 	)
-	fmt.Scanln(&value)
+	_, err := fmt.Scanln(&value)
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 	return value == "" || value == "Y" || value == "y"
 }
 
@@ -233,6 +239,9 @@ func confirmRemoving(user string) bool {
 		"\n:: Proceed with removing user %s from specified groups? [Y/n]: ",
 		user,
 	)
-	fmt.Scanln(&value)
+	_, err := fmt.Scanln(&value)
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 	return value == "" || value == "Y" || value == "y"
 }
diff --git a/history.go b/history.go
@@ -22,7 +22,10 @@ func (history *History) String() string {
 }
 
 func (history *History) date() time.Time {
-	date, _ := strconv.ParseInt(history.Clock, 10, 64)
+	date, err := strconv.ParseInt(history.Clock, 10, 64)
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 	return time.Unix(date, 0)
 }
 

diff --git a/hosts_test.go b/hosts_test.go
@@ -11,7 +11,7 @@ import (
 
 const (
 	// https://www.zabbix.com/documentation/3.4/manual/api/reference/host/get
-	hosts_get = `
+	hostsGet = `
 {
     "jsonrpc": "2.0",
     "result": [
@@ -100,7 +100,7 @@ const (
 }`
 
 	// https://www.zabbix.com/documentation/3.4/manual/api/reference/host/delete
-	hosts_remove = `
+	hostsRemove = `
 {
     "jsonrpc": "2.0",
     "result": {
@@ -118,7 +118,7 @@ func TestHostsGet(t *testing.T) {
 
 	testserver := httptest.NewServer(http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
-			fmt.Fprint(w, hosts_get)
+			fmt.Fprint(w, hostsGet)
 		},
 	))
 	defer testserver.Close()
@@ -143,7 +143,7 @@ func TestHostsRemove(t *testing.T) {
 
 	testserver := httptest.NewServer(http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
-			fmt.Fprint(w, hosts_remove)
+			fmt.Fprint(w, hostsRemove)
 		},
 	))
 	defer testserver.Close()

diff --git a/httptest.go b/httptest.go
@@ -35,7 +35,10 @@ func (check *HTTPTest) DateTime() string {
 }
 
 func (check *HTTPTest) date() time.Time {
-	date, _ := strconv.ParseInt(check.NextCheck, 10, 64)
+	date, err := strconv.ParseInt(check.NextCheck, 10, 64)
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 	return time.Unix(date, 0)
 }
 

diff --git a/item.go b/item.go
@@ -39,12 +39,14 @@ func (item *Item) getLastClock() string {
 		return fmt.Sprint(int64(typed))
 	default:
 		panic("asdasdasd")
-		return "0"
 	}
 }
 
 func (item *Item) date() time.Time {
-	date, _ := strconv.ParseInt(item.getLastClock(), 10, 64)
+	date, err := strconv.ParseInt(item.getLastClock(), 10, 64)
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 	return time.Unix(date, 0)
 }
 

diff --git a/maintenance.go b/maintenance.go
@@ -48,6 +48,9 @@ func (maintenance *Maintenance) GetStatus() string {
 }
 
 func (maintenance *Maintenance) GetDateTime(unixtime string) string {
-	date, _ := strconv.ParseInt(unixtime, 10, 64)
+	date, err := strconv.ParseInt(unixtime, 10, 64)
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 	return time.Unix(date, 0).Format("2006-01-02 15:04:05")
 }
diff --git a/maintenances_test.go b/maintenances_test.go
@@ -12,7 +12,7 @@ import (
 
 const (
 	// https://www.zabbix.com/documentation/3.4/manual/api/reference/maintenance/get
-	maintenance_get = `
+	maintenanceGet = `
 {
     "jsonrpc": "2.0",
     "result": [
@@ -49,7 +49,7 @@ const (
 }`
 
 	// https://www.zabbix.com/documentation/3.4/manual/api/reference/maintenance/delete
-	maintenances_remove = `
+	maintenancesRemove = `
 {
     "jsonrpc": "2.0",
     "result": {
@@ -63,7 +63,7 @@ const (
 `
 
 	// https://www.zabbix.com/documentation/3.4/manual/api/reference/maintenance/create
-	maintenance_create = `
+	maintenanceCreate = `
 {
     "jsonrpc": "2.0",
     "result": {
@@ -81,7 +81,7 @@ func TestMaintenanceGet(t *testing.T) {
 
 	testserver := httptest.NewServer(http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
-			fmt.Fprint(w, maintenance_get)
+			fmt.Fprint(w, maintenanceGet)
 		},
 	))
 	defer testserver.Close()
@@ -109,7 +109,7 @@ func TestMaintenanceRemove(t *testing.T) {
 
 	testserver := httptest.NewServer(http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
-			fmt.Fprint(w, maintenances_remove)
+			fmt.Fprint(w, maintenancesRemove)
 		},
 	))
 	defer testserver.Close()
@@ -135,7 +135,7 @@ func TestMaintenanceCreate(t *testing.T) {
 
 	testserver := httptest.NewServer(http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
-			fmt.Fprint(w, maintenance_create)
+			fmt.Fprint(w, maintenanceCreate)
 		},
 	))
 	defer testserver.Close()

diff --git a/responses.go b/responses.go
@@ -31,7 +31,7 @@ type ResponseLogin struct {
 	Token string `json:"result"`
 }
 
-type ResponseApiVersion struct {
+type ResponseAPIVersion struct {
 	ResponseRaw
 	Version string `json:"result"`
 }
@@ -46,7 +46,7 @@ type ResponseMaintenances struct {
 	Data []Maintenance `json:"result"`
 }
 
-// Response Create/Delete maintenace
+// Response Create/Delete maintenance
 type ResponseMaintenancesArray struct {
 	ResponseRaw
 	Data Maintenances `json:"result"`

diff --git a/search.go b/search.go
@@ -51,9 +51,10 @@ func getSearchPattern(query []string) string {
 }
 
 func matchPattern(pattern, target string) bool {
-	match, _ := regexp.MatchString(
-		strings.ToLower(pattern),
-		strings.ToLower(target),
-	)
+	match, err := regexp.MatchString(strings.ToLower(pattern),
+		strings.ToLower(target))
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 	return match
 }
diff --git a/timeperiod.go b/timeperiod.go
@@ -34,11 +34,17 @@ func (timeperiod *Timeperiod) GetType() string {
 }
 
 func (timeperiod *Timeperiod) GetStartDate() string {
-	date, _ := strconv.ParseInt(timeperiod.StartDate, 10, 64)
+	date, err := strconv.ParseInt(timeperiod.StartDate, 10, 64)
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 	return time.Unix(date, 0).Format("2006-01-02 15:04:05")
 }
 
 func (timeperiod *Timeperiod) GetPeriodMinute() int64 {
-	period, _ := strconv.ParseInt(timeperiod.Period, 10, 64)
+	period, err := strconv.ParseInt(timeperiod.Period, 10, 64)
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 	return (period / 60)
 }
diff --git a/trigger.go b/trigger.go
@@ -54,7 +54,10 @@ func (trigger *Trigger) StatusProblem() string {
 }
 
 func (trigger *Trigger) Severity() Severity {
-	value, _ := strconv.Atoi(trigger.Priority)
+	value, err := strconv.Atoi(trigger.Priority)
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 	return Severity(value)
 }
 
@@ -85,7 +88,10 @@ func (trigger *Trigger) Age() string {
 }
 
 func (trigger *Trigger) date() time.Time {
-	date, _ := strconv.ParseInt(trigger.LastChange, 10, 64)
+	date, err := strconv.ParseInt(trigger.LastChange, 10, 64)
+	if err != nil {
+		debugf("Error: %+v", err)
+	}
 	return time.Unix(date, 0)
 }