Minor linter and typo fixes

DerAndereAndi · DerAndereAndi · commit 909839c3757f · 2024-04-09T18:30:10.000+02:00
diff --git a/.golangci.yml b/.golangci.yml
@@ -0,0 +1,58 @@
+run:
+  # timeout for analysis, e.g. 30s, 5m, default is 1m
+  timeout: 5m
+
+  # include test files or not, default is true
+  tests: true
+
+  # by default isn't set. If set we pass it to "go list -mod={option}". From "go help modules":
+  # If invoked with -mod=readonly, the go command is disallowed from the implicit
+  # automatic updating of go.mod described above. Instead, it fails when any changes
+  # to go.mod are needed. This setting is most useful to check that go.mod does
+  # not need updates, such as in a continuous integration and testing system.
+  # If invoked with -mod=vendor, the go command assumes that the vendor
+  # directory holds the correct copies of dependencies and ignores
+  # the dependency descriptions in go.mod.
+  modules-download-mode: readonly
+
+# output configuration options
+output:
+  # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
+  formats:
+    - format: colored-line-number
+
+linters:
+  enable:
+    - bodyclose
+    - errcheck
+    - errorlint
+    - gocheckcompilerdirectives
+    - gochecknoinits
+    - gochecksumtype
+    - goconst
+    - gofmt
+    - gosimple
+    - gosec
+    - govet
+    - nilerr
+    - nilnil
+    - staticcheck
+    - typecheck
+    - unused
+    - whitespace
+
+issues:
+  # Excluding configuration per-path, per-linter, per-text and per-source
+  exclude-rules:
+    # Exclude some linters from running on tests files.
+    - path: _test\.go
+      linters:
+        - errcheck
+        - goconst
+        - gosec
+
+    # checking for errors in defers seldom makes sense...
+    - source: "^\\s*defer\\s"
+      linters:
+        - errcheck
+        - staticcheck
diff --git a/cem/events.go b/cem/events.go
@@ -7,7 +7,6 @@ import (
 
 // handle SPINE events
 func (h *Cem) HandleEvent(payload spineapi.EventPayload) {
-
 	if util.IsDeviceConnected(payload) {
 		h.eventCB(payload.Ski, payload.Device, DeviceConnected)
 		return
diff --git a/uccevc/events.go b/uccevc/events.go
@@ -156,7 +156,6 @@ func (e *UCCEVC) evIncentiveTableDescriptionDataUpdate(payload spineapi.EventPay
 	if e.evCheckIncentiveTableDescriptionUpdateRequired(payload.Entity) {
 		e.eventCB(payload.Ski, payload.Device, payload.Entity, DataRequestedIncentiveTableDescription)
 	}
-
 }
 
 // the incentive table constraint data of an EV was updated
diff --git a/uccevc/events_test.go b/uccevc/events_test.go
@@ -158,5 +158,4 @@ func (s *UCCEVCSuite) Test_evTimeSeriesDescriptionDataUpdate() {
 	assert.Nil(s.T(), fErr)
 
 	s.sut.evTimeSeriesDescriptionDataUpdate(payload)
-
 }
diff --git a/uccevc/public_scen1.go b/uccevc/public_scen1.go
@@ -63,7 +63,6 @@ func (e *UCCEVC) ChargeStrategy(entity spineapi.EntityRemoteInterface) api.EVCha
 
 			return api.EVChargeStrategyTypeNoDemand
 		}
-
 	}
 
 	return api.EVChargeStrategyTypeUnknown
diff --git a/uccevc/public_scen3_test.go b/uccevc/public_scen3_test.go
@@ -203,7 +203,6 @@ func (s *UCCEVCSuite) Test_WriteIncentives() {
 	for _, tc := range tests {
 		s.T().Run(tc.name, func(t *testing.T) {
 			for _, data := range tc.data {
-
 				constData = &model.IncentiveTableConstraintsDataType{
 					IncentiveTableConstraints: []model.IncentiveTableConstraintsType{
 						{
diff --git a/uccevc/public_scen4.go b/uccevc/public_scen4.go
@@ -92,7 +92,6 @@ func (e *UCCEVC) ChargePlan(entity spineapi.EntityRemoteInterface) (api.ChargePl
 	currentStart := time.Now()
 	currentEnd := currentStart
 	if data.TimePeriod != nil && data.TimePeriod.StartTime != nil {
-
 		if start, err := data.TimePeriod.StartTime.GetTimeDuration(); err == nil {
 			currentStart = currentStart.Add(start)
 			startAvailable = true
diff --git a/uccevc/public_scen4_test.go b/uccevc/public_scen4_test.go
@@ -78,7 +78,6 @@ func (s *UCCEVCSuite) Test_ChargePlanConstaints() {
 
 	_, err = s.sut.ChargePlanConstraints(s.evEntity)
 	assert.Nil(s.T(), err)
-
 }
 
 func (s *UCCEVCSuite) Test_ChargePlan() {
diff --git a/ucevcc/events.go b/ucevcc/events.go
@@ -187,7 +187,6 @@ func (e *UCEVCC) evManufacturerDataUpdate(payload spineapi.EventPayload) {
 	if _, err := evDeviceClassification.GetManufacturerDetails(); err == nil {
 		e.eventCB(payload.Ski, payload.Device, payload.Entity, DataUpdateManufacturerData)
 	}
-
 }
 
 // the electrical connection parameter description data of an EV was updated
diff --git a/ucevcc/public.go b/ucevcc/public.go
@@ -16,7 +16,7 @@ func (e *UCEVCC) ChargeState(entity spineapi.EntityRemoteInterface) (api.EVCharg
 
 	evDeviceDiagnosis, err := util.DeviceDiagnosis(e.service, entity)
 	if err != nil {
-		return api.EVChargeStateTypeUnplugged, nil
+		return api.EVChargeStateTypeUnplugged, err
 	}
 
 	diagnosisState, err := evDeviceDiagnosis.GetState()
@@ -201,7 +201,6 @@ func (e *UCEVCC) ManufacturerData(
 	api.ManufacturerData,
 	error,
 ) {
-
 	return util.ManufacturerData(e.service, entity, e.validEntityTypes)
 }
 
diff --git a/ucevcem/events.go b/ucevcem/events.go
@@ -52,7 +52,6 @@ func (e *UCEVCEM) evConnected(entity spineapi.EntityRemoteInterface) {
 		if _, err := evElectricalConnection.RequestParameterDescriptions(); err != nil {
 			logging.Log().Debug(err)
 		}
-
 	}
 
 	if evMeasurement, err := util.Measurement(e.service, entity); err == nil {
diff --git a/ucevsecc/ucevsecc.go b/ucevsecc/ucevsecc.go
@@ -98,7 +98,6 @@ func (e *UCEVSECC) IsUseCaseSupported(entity spineapi.EntityRemoteInterface) (bo
 		) {
 			return false, nil
 		}
-
 	}
 
 	return true, nil
diff --git a/ucmgcp/events.go b/ucmgcp/events.go
@@ -139,5 +139,4 @@ func (e *UCMGCP) gridMeasurementDataUpdate(payload spineapi.EventPayload) {
 	if _, err := util.MeasurementValueForScope(e.service, payload.Entity, model.ScopeTypeTypeACFrequency); err == nil {
 		e.eventCB(payload.Ski, payload.Device, payload.Entity, DataUpdateFrequency)
 	}
-
 }
diff --git a/ucmgcp/public_test.go b/ucmgcp/public_test.go
@@ -322,7 +322,6 @@ func (s *UCMGCPSuite) Test_CurrentPerPhase() {
 	data, err = s.sut.CurrentPerPhase(s.smgwEntity)
 	assert.Nil(s.T(), err)
 	assert.Equal(s.T(), []float64{10, 10, 10}, data)
-
 }
 
 func (s *UCMGCPSuite) Test_VoltagePerPhase() {
diff --git a/ucmpc/events.go b/ucmpc/events.go
@@ -110,5 +110,4 @@ func (e *UCMPC) deviceMeasurementDataUpdate(payload spineapi.EventPayload) {
 	if _, err := util.MeasurementValueForScope(e.service, payload.Entity, model.ScopeTypeTypeACFrequency); err == nil {
 		e.eventCB(payload.Ski, payload.Device, payload.Entity, DataUpdateFrequency)
 	}
-
 }
diff --git a/ucmpc/public_test.go b/ucmpc/public_test.go
@@ -382,7 +382,6 @@ func (s *UCMPCSuite) Test_CurrentPerPhase() {
 	data, err = s.sut.CurrentPerPhase(s.monitoredEntity)
 	assert.Nil(s.T(), err)
 	assert.Equal(s.T(), []float64{10, 10, 10}, data)
-
 }
 
 func (s *UCMPCSuite) Test_VoltagePerPhase() {
diff --git a/ucopev/events.go b/ucopev/events.go
@@ -94,7 +94,6 @@ func (e *UCOPEV) evLoadControlLimitDataUpdate(payload spineapi.EventPayload) {
 		e.eventCB(payload.Ski, payload.Device, payload.Entity, DataUpdateLimit)
 		return
 	}
-
 }
 
 // the electrical connection permitted value sets data of an EV was updated
diff --git a/ucvabd/ucvabd_test.go b/ucvabd/ucvabd_test.go
@@ -94,5 +94,4 @@ func (s *UCVABDSuite) Test_IsUseCaseSupported() {
 	data, err = s.sut.IsUseCaseSupported(s.batteryEntity)
 	assert.Nil(s.T(), err)
 	assert.Equal(s.T(), true, data)
-
 }
diff --git a/ucvapd/ucvapd_test.go b/ucvapd/ucvapd_test.go
@@ -111,5 +111,4 @@ func (s *UCVAPDSuite) Test_IsUseCaseSupported() {
 	data, err = s.sut.IsUseCaseSupported(s.pvEntity)
 	assert.Nil(s.T(), err)
 	assert.Equal(s.T(), true, data)
-
 }
diff --git a/util/loadcontrol.go b/util/loadcontrol.go
@@ -19,7 +19,6 @@ func LoadControlLimits(
 	entity spineapi.EntityRemoteInterface,
 	entityTypes []model.EntityTypeType,
 	category model.LoadControlCategoryType) (limits []api.LoadLimitsPhase, resultErr error) {
-
 	limits = nil
 	resultErr = api.ErrNoCompatibleEntity
 	if entity == nil || !IsCompatibleEntity(entity, entityTypes) {
diff --git a/util/loadcontrol_test.go b/util/loadcontrol_test.go
@@ -351,8 +351,8 @@ func (s *UtilSuite) Test_WriteLoadControlLimits() {
 						IsActive: true,
 						Value:    limit,
 					})
-
 				}
+
 				msgCounter, err = WriteLoadControlLimits(s.service, s.monitoredEntity, entityTypes, category, phaseLimitValues)
 				assert.Nil(t, err)
 				assert.NotNil(t, msgCounter)
diff --git a/util/measurement.go b/util/measurement.go
@@ -43,7 +43,6 @@ func MeasurementValuesForTypeCommodityScope(
 	energyDirection model.EnergyDirectionType,
 	validPhaseNameTypes []model.ElectricalConnectionPhaseNameType,
 ) ([]float64, error) {
-
 	measurement := measurementType
 	commodity := commodityType
 	scope := scopeType
@@ -99,7 +98,6 @@ func GetValuesForTypeCommodityScope(
 	measurement model.MeasurementTypeType,
 	commodity model.CommodityTypeType,
 	scope model.ScopeTypeType) ([]model.MeasurementDataType, error) {
-
 	measurementFeature, err := Measurement(service, entity)
 	if err != nil || measurementFeature == nil {
 		return nil, err
diff --git a/util/measurement_test.go b/util/measurement_test.go
@@ -197,5 +197,4 @@ func (s *UtilSuite) Test_MeasurementValuesForTypeCommodityScope() {
 	)
 	assert.Nil(s.T(), err)
 	assert.Equal(s.T(), []float64{10, 10, 10}, data)
-
 }

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,6 @@ func (e *UCCEVC) evIncentiveTableDescriptionDataUpdate(payload spineapi.EventPay`
`156`	`156`	`if e.evCheckIncentiveTableDescriptionUpdateRequired(payload.Entity) {`
`157`	`157`	`e.eventCB(payload.Ski, payload.Device, payload.Entity, DataRequestedIncentiveTableDescription)`
`158`	`158`	`}`
`159`		`-`
`160`	`159`	`}`
`161`	`160`
`162`	`161`	`// the incentive table constraint data of an EV was updated`
Original file line number	Diff line number	Diff line change
`@@ -158,5 +158,4 @@ func (s *UCCEVCSuite) Test_evTimeSeriesDescriptionDataUpdate() {`
`158`	`158`	`assert.Nil(s.T(), fErr)`
`159`	`159`
`160`	`160`	`s.sut.evTimeSeriesDescriptionDataUpdate(payload)`
`161`		`-`
`162`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ func (e *UCCEVC) ChargeStrategy(entity spineapi.EntityRemoteInterface) api.EVCha`
`63`	`63`
`64`	`64`	`return api.EVChargeStrategyTypeNoDemand`
`65`	`65`	`}`
`66`		`-`
`67`	`66`	`}`
`68`	`67`
`69`	`68`	`return api.EVChargeStrategyTypeUnknown`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,6 @@ func (s *UCCEVCSuite) Test_WriteIncentives() {`
`203`	`203`	`for _, tc := range tests {`
`204`	`204`	`s.T().Run(tc.name, func(t *testing.T) {`
`205`	`205`	`for _, data := range tc.data {`
`206`		`-`
`207`	`206`	`constData = &model.IncentiveTableConstraintsDataType{`
`208`	`207`	`IncentiveTableConstraints: []model.IncentiveTableConstraintsType{`
`209`	`208`	`{`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ func (s *UCCEVCSuite) Test_ChargePlanConstaints() {`
`78`	`78`
`79`	`79`	`_, err = s.sut.ChargePlanConstraints(s.evEntity)`
`80`	`80`	`assert.Nil(s.T(), err)`
`81`		`-`
`82`	`81`	`}`
`83`	`82`
`84`	`83`	`func (s *UCCEVCSuite) Test_ChargePlan() {`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,6 @@ func (e *UCEVCC) evManufacturerDataUpdate(payload spineapi.EventPayload) {`
`187`	`187`	`if _, err := evDeviceClassification.GetManufacturerDetails(); err == nil {`
`188`	`188`	`e.eventCB(payload.Ski, payload.Device, payload.Entity, DataUpdateManufacturerData)`
`189`	`189`	`}`
`190`		`-`
`191`	`190`	`}`
`192`	`191`
`193`	`192`	`// the electrical connection parameter description data of an EV was updated`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ func (e *UCEVCC) ChargeState(entity spineapi.EntityRemoteInterface) (api.EVCharg`
`16`	`16`
`17`	`17`	`evDeviceDiagnosis, err := util.DeviceDiagnosis(e.service, entity)`
`18`	`18`	`if err != nil {`
`19`		`- return api.EVChargeStateTypeUnplugged, nil`
	`19`	`+ return api.EVChargeStateTypeUnplugged, err`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`diagnosisState, err := evDeviceDiagnosis.GetState()`
`@@ -201,7 +201,6 @@ func (e *UCEVCC) ManufacturerData(`
`201`	`201`	`api.ManufacturerData,`
`202`	`202`	`error,`
`203`	`203`	`) {`
`204`		`-`
`205`	`204`	`return util.ManufacturerData(e.service, entity, e.validEntityTypes)`
`206`	`205`	`}`
`207`	`206`