Skip to content

Commit bc4545e

Browse files
committed
chore: fix linter
1 parent 631706c commit bc4545e

File tree

9 files changed

+17
-14
lines changed

9 files changed

+17
-14
lines changed

charger/tapo/connection.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ type Connection struct {
5151
func NewConnection(uri, user, password string) *Connection {
5252
log := util.NewLogger("tapo")
5353

54-
//lint:ignore
54+
// nosemgrep:go.lang.security.audit.crypto.use_of_weak_crypto.use-of-sha1
5555
h := sha1.New()
5656
_, _ = h.Write([]byte(user))
5757
userhash := hex.EncodeToString(h.Sum(nil))
@@ -276,7 +276,7 @@ func (d *Connection) CheckErrorCode(errorCode int) error {
276276
}
277277

278278
if errorCode != 0 {
279-
return errors.New(fmt.Sprintf("Tapo error %d: %s", errorCode, errorDesc[errorCode]))
279+
return fmt.Errorf("tapo error %d: %s", errorCode, errorDesc[errorCode])
280280
}
281281

282282
return nil

cmd/charger.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ func init() {
2727
rootCmd.AddCommand(chargerCmd)
2828
chargerCmd.PersistentFlags().StringP(flagName, "n", "", fmt.Sprintf(flagNameDescription, "charger"))
2929
chargerCmd.PersistentFlags().IntP(flagCurrent, "I", noCurrent, flagCurrentDescription)
30+
//lint:ignore SA1019 as Title is safe on ascii
3031
chargerCmd.PersistentFlags().BoolP(flagEnable, "e", false, strings.Title(flagEnable))
32+
//lint:ignore SA1019 as Title is safe on ascii
3133
chargerCmd.PersistentFlags().BoolP(flagDisable, "d", false, strings.Title(flagDisable))
3234
chargerCmd.PersistentFlags().BoolP(flagWakeup, "w", false, flagWakeupDescription)
3335
chargerCmd.PersistentFlags().Bool(flagHeaders, false, flagHeadersDescription)

cmd/config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ func (cp *ConfigProvider) configureVehicles(conf config) error {
216216
}
217217

218218
if ccWithTitle.Title == "" {
219+
//lint:ignore SA1019 as Title is safe on ascii
219220
cc.Other["title"] = strings.Title(cc.Name)
220221
}
221222

cmd/configure/devicetest.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func (d *DeviceTest) testCharger(v interface{}) (DeviceTestResult, error) {
8484
return DeviceTestResultInvalid, err
8585
}
8686
} else {
87-
return DeviceTestResultInvalid, errors.New("selected device is not a wallbox!")
87+
return DeviceTestResultInvalid, errors.New("selected device is not a wallbox")
8888
}
8989

9090
if v, ok := v.(api.Meter); ok {
@@ -125,11 +125,11 @@ func (d *DeviceTest) testMeter(deviceCategory DeviceCategory, v interface{}) (De
125125
return DeviceTestResultInvalid, err
126126
}
127127
} else {
128-
return DeviceTestResultInvalid, errors.New("selected device is not a battery meter!")
128+
return DeviceTestResultInvalid, errors.New("selected device is not a battery meter")
129129
}
130130
}
131131
} else {
132-
return DeviceTestResultInvalid, errors.New("selected device is not a meter!")
132+
return DeviceTestResultInvalid, errors.New("selected device is not a meter")
133133
}
134134

135135
return DeviceTestResultValid, nil
@@ -144,7 +144,7 @@ func (d *DeviceTest) testVehicle(v interface{}) (DeviceTestResult, error) {
144144
}
145145
}
146146
} else {
147-
return DeviceTestResultInvalid, errors.New("selected device is not a vehicle!")
147+
return DeviceTestResultInvalid, errors.New("selected device is not a vehicle")
148148
}
149149

150150
return DeviceTestResultValid, nil

meter/tq-em.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ type tqemData struct {
5353

5454
type TqEm struct {
5555
dataG func() (tqemData, error)
56-
scale float64
5756
}
5857

5958
//go:generate go run ../cmd/tools/decorate.go -f decorateTqEm -b api.Meter -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)"

provider/cache.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ func Cached[T any](g func() (T, error), cache time.Duration) func() (T, error) {
4040
return c.Get
4141
}
4242

43-
// Cachable is the interface for a resettable cache
44-
type Cachable[T any] interface {
43+
// Cacheable is the interface for a resettable cache
44+
type Cacheable[T any] interface {
4545
Get() (T, error)
4646
Reset()
4747
}
4848

49-
var _ Cachable[int64] = (*cached[int64])(nil)
49+
var _ Cacheable[int64] = (*cached[int64])(nil)
5050

51-
// ResettableCached wraps a getter with a cache. It returns a `Cachable`.
51+
// ResettableCached wraps a getter with a cache. It returns a `Cacheable`.
5252
// Instead of the cached getter, the `Get()` and `Reset()` methods are exposed.
5353
func ResettableCached[T any](g func() (T, error), cache time.Duration) *cached[T] {
5454
return &cached[T]{

server/http.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ type route struct {
2121
HandlerFunc http.HandlerFunc
2222
}
2323

24+
//lint:ignore U1000 if needed
2425
// routeLogger traces matched routes including their executing time
2526
func routeLogger(inner http.Handler) http.HandlerFunc {
2627
return func(w http.ResponseWriter, r *http.Request) {

util/templates/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func (c *ConfigDefaults) LoadDefaults() {
3131
}
3232

3333
if err := yaml.Unmarshal([]byte(definition.DefaultsContent), &c); err != nil {
34-
panic(fmt.Errorf("Error: failed to parse deviceGroupListDefinition: %v\n", err))
34+
panic(fmt.Errorf("failed to parse deviceGroupListDefinition: %v", err))
3535
}
3636

3737
// resolve modbus param references

util/templates/template.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func (t *Template) ResolvePresets() error {
134134
if p.Preset != "" {
135135
base, ok := t.ConfigDefaults.Presets[p.Preset]
136136
if !ok {
137-
return fmt.Errorf("Error: Could not find preset definition: %s\n", p.Preset)
137+
return fmt.Errorf("could not find preset definition: %s", p.Preset)
138138
}
139139

140140
t.Params = append(t.Params, base.Params...)
@@ -159,7 +159,7 @@ func (t *Template) ResolveGroup() error {
159159

160160
_, ok := t.ConfigDefaults.DeviceGroups[t.Group]
161161
if !ok {
162-
return fmt.Errorf("Error: Could not find devicegroup definition: %s\n", t.Group)
162+
return fmt.Errorf("could not find devicegroup definition: %s", t.Group)
163163
}
164164

165165
return nil

0 commit comments

Comments
 (0)