fix lint errors

vapor-ware · Sep 6, 2023 · c8c3869 · c8c3869
1 parent b3440bc
commit c8c3869
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/pkg/devices/power.go b/pkg/devices/power.go
@@ -26,6 +26,10 @@ func SnmpPowerRead(device *sdk.Device) (readings []*output.Reading, err error) {
 	var reading *output.Reading
 	if result.Data == nil {
 		reading, err = output.Watt.MakeReading(nil)
+		if err != nil {
+			return nil, err
+		}
+
 		readings = []*output.Reading{reading}
 		return readings, nil
 	}
@@ -40,6 +44,9 @@ func SnmpPowerRead(device *sdk.Device) (readings []*output.Reading, err error) {
 	// Create the reading.
 	// FIXME (etd): differentiate between watts/VA
 	reading, err = output.Watt.MakeReading(resultFloat)
+	if err != nil {
+		return nil, err
+	}
 
 	readings = []*output.Reading{reading}
 	return readings, nil

diff --git a/pkg/snmp/servers/galaxy_ups_test.go b/pkg/snmp/servers/galaxy_ups_test.go
@@ -36,8 +36,8 @@ func TestGalaxyUps(t *testing.T) {
 	assert.Equal(t, clientDeviceConfig.Version, "V3")
 	assert.Equal(t, clientDeviceConfig.Endpoint, "127.0.0.1")
 	assert.Equal(t, clientDeviceConfig.ContextName, "public")
-	thirtySeconds, _ := time.ParseDuration("30s")
-	assert.Equal(t, clientDeviceConfig.Timeout, thirtySeconds)
+	timeout, _ := time.ParseDuration("30s")
+	assert.Equal(t, clientDeviceConfig.Timeout, timeout)
 	assert.NotNil(t, clientDeviceConfig.SecurityParameters)
 	assert.Equal(t, clientDeviceConfig.SecurityParameters.AuthenticationProtocol, core.AuthenticationProtocol(3))
 	assert.Equal(t, clientDeviceConfig.SecurityParameters.PrivacyProtocol, core.PrivacyProtocol(3))
@@ -51,7 +51,7 @@ func TestGalaxyUps(t *testing.T) {
 	assert.Equal(t, serverDeviceConfig.Version, "V3")
 	assert.Equal(t, serverDeviceConfig.Endpoint, "127.0.0.1")
 	assert.Equal(t, serverDeviceConfig.ContextName, "public")
-	assert.Equal(t, serverDeviceConfig.Timeout, thirtySeconds)
+	assert.Equal(t, serverDeviceConfig.Timeout, timeout)
 	assert.NotNil(t, serverDeviceConfig.SecurityParameters)
 	assert.Equal(t, serverDeviceConfig.SecurityParameters.AuthenticationProtocol, core.AuthenticationProtocol(3))
 	assert.Equal(t, serverDeviceConfig.SecurityParameters.PrivacyProtocol, core.PrivacyProtocol(3))

diff --git a/pkg/snmp/servers/pxgms_ups_test.go b/pkg/snmp/servers/pxgms_ups_test.go
@@ -37,8 +37,8 @@ func TestPxgmsUps(t *testing.T) {
 	assert.Equal(t, clientDeviceConfig.Version, "V3")
 	assert.Equal(t, clientDeviceConfig.Endpoint, "127.0.0.1")
 	assert.Equal(t, clientDeviceConfig.ContextName, "public")
-	thirtySeconds, _ := time.ParseDuration("30s")
-	assert.Equal(t, clientDeviceConfig.Timeout, thirtySeconds)
+	timeout, _ := time.ParseDuration("30s")
+	assert.Equal(t, clientDeviceConfig.Timeout, timeout)
 	assert.NotNil(t, clientDeviceConfig.SecurityParameters)
 	assert.Equal(t, clientDeviceConfig.SecurityParameters.AuthenticationProtocol, core.AuthenticationProtocol(3))
 	assert.Equal(t, clientDeviceConfig.SecurityParameters.PrivacyProtocol, core.PrivacyProtocol(3))
@@ -52,7 +52,7 @@ func TestPxgmsUps(t *testing.T) {
 	assert.Equal(t, serverDeviceConfig.Version, "V3")
 	assert.Equal(t, serverDeviceConfig.Endpoint, "127.0.0.1")
 	assert.Equal(t, serverDeviceConfig.ContextName, "public")
-	assert.Equal(t, serverDeviceConfig.Timeout, thirtySeconds)
+	assert.Equal(t, serverDeviceConfig.Timeout, timeout)
 	assert.NotNil(t, serverDeviceConfig.SecurityParameters)
 	assert.Equal(t, serverDeviceConfig.SecurityParameters.AuthenticationProtocol, core.AuthenticationProtocol(3))
 	assert.Equal(t, serverDeviceConfig.SecurityParameters.PrivacyProtocol, core.PrivacyProtocol(3))

diff --git a/pkg/snmp/servers/snmp_server_factory.go b/pkg/snmp/servers/snmp_server_factory.go
@@ -2,15 +2,16 @@ package servers
 
 import (
 	"fmt"
-	log "github.com/sirupsen/logrus"
 	"strings"
+
+	log "github.com/sirupsen/logrus"
 )
 
 // CreateSnmpServer creates a SnmpServer from the configuration data model string.
 func CreateSnmpServer(data map[string]interface{}) (server *SnmpServer, err error) {
 	model, ok := data["model"].(string)
 	if !ok {
-		err = fmt.Errorf("No snmp server model")
+		err = fmt.Errorf("no snmp server model")
 		return
 	}
 
@@ -47,6 +48,6 @@ func CreateSnmpServer(data map[string]interface{}) (server *SnmpServer, err erro
 		return nil, err
 	}
 
-	err = fmt.Errorf("Unkown snmp server model: %v", model)
+	err = fmt.Errorf("unkown snmp server model: %v", model)
 	return
 }
diff --git a/pkg/snmp/servers/tripplite_ups_test.go b/pkg/snmp/servers/tripplite_ups_test.go
@@ -38,8 +38,8 @@ func TestTrippliteUps(t *testing.T) {
 	assert.Equal(t, clientDeviceConfig.Version, "V3")
 	assert.Equal(t, clientDeviceConfig.Endpoint, "127.0.0.1")
 	assert.Equal(t, clientDeviceConfig.ContextName, "public")
-	thirtySeconds, _ := time.ParseDuration("30s")
-	assert.Equal(t, clientDeviceConfig.Timeout, thirtySeconds)
+	timeout, _ := time.ParseDuration("30s")
+	assert.Equal(t, clientDeviceConfig.Timeout, timeout)
 	assert.NotNil(t, clientDeviceConfig.SecurityParameters)
 	assert.Equal(t, clientDeviceConfig.SecurityParameters.AuthenticationProtocol, core.AuthenticationProtocol(2))
 	assert.Equal(t, clientDeviceConfig.SecurityParameters.PrivacyProtocol, core.PrivacyProtocol(2))
@@ -53,7 +53,7 @@ func TestTrippliteUps(t *testing.T) {
 	assert.Equal(t, serverDeviceConfig.Version, "V3")
 	assert.Equal(t, serverDeviceConfig.Endpoint, "127.0.0.1")
 	assert.Equal(t, serverDeviceConfig.ContextName, "public")
-	assert.Equal(t, serverDeviceConfig.Timeout, thirtySeconds)
+	assert.Equal(t, serverDeviceConfig.Timeout, timeout)
 	assert.NotNil(t, serverDeviceConfig.SecurityParameters)
 	assert.Equal(t, serverDeviceConfig.SecurityParameters.AuthenticationProtocol, core.AuthenticationProtocol(2))
 	assert.Equal(t, serverDeviceConfig.SecurityParameters.PrivacyProtocol, core.PrivacyProtocol(2))