Enable ifshort linter

sapcc · Sep 23, 2021 · 532836b · 532836b
1 parent d46e299
commit 532836b
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 27 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -35,7 +35,7 @@ linters:
   - tagliatelle
   - wastedassign
   - revive
-  # - ifshort
+  - ifshort
   disable-all: false
   fast: false
 issues:

diff --git a/controllers/config.go b/controllers/config.go
@@ -131,8 +131,7 @@ func loadPluginChains(config *ucfg.Config, registry *plugin.Registry) (state.Plu
 		Notify  string
 		Trigger string
 	}{}
-	err := config.Unpack(&texts)
-	if err != nil {
+	if err := config.Unpack(&texts); err != nil {
 		return chains, err
 	}
 	checkChain, err := registry.NewCheckChain(texts.Check)

diff --git a/plugin/impl/annotation.go b/plugin/impl/annotation.go
@@ -36,8 +36,7 @@ func (h *HasAnnotation) New(config *ucfg.Config) (plugin.Checker, error) {
 		Key   string `config:"key" validate:"required"`
 		Value string `config:"value"`
 	}{}
-	err := config.Unpack(&conf)
-	if err != nil {
+	if err := config.Unpack(&conf); err != nil {
 		return nil, err
 	}
 	return &HasAnnotation{Key: conf.Key, Value: conf.Value}, nil
@@ -74,8 +73,7 @@ func (a *AlterAnnotation) New(config *ucfg.Config) (plugin.Trigger, error) {
 		Value  string `config:"value"`
 		Remove bool   `config:"remove"`
 	}{}
-	err := config.Unpack(&conf)
-	if err != nil {
+	if err := config.Unpack(&conf); err != nil {
 		return nil, err
 	}
 	return &AlterAnnotation{Key: conf.Key, Remove: conf.Remove, Value: conf.Value}, nil

diff --git a/plugin/impl/condition.go b/plugin/impl/condition.go
@@ -38,8 +38,7 @@ func (c *Condition) New(config *ucfg.Config) (plugin.Checker, error) {
 		Type   string `config:"type" validate:"required"`
 		Status string `config:"status" validate:"required"`
 	}{}
-	err := config.Unpack(&conf)
-	if err != nil {
+	if err := config.Unpack(&conf); err != nil {
 		return nil, err
 	}
 	return &Condition{Type: conf.Type, Status: conf.Status}, nil

diff --git a/plugin/impl/label.go b/plugin/impl/label.go
@@ -36,8 +36,7 @@ func (h *HasLabel) New(config *ucfg.Config) (plugin.Checker, error) {
 		Key   string `config:"key" validate:"required"`
 		Value string `config:"value"`
 	}{}
-	err := config.Unpack(&conf)
-	if err != nil {
+	if err := config.Unpack(&conf); err != nil {
 		return nil, err
 	}
 	return &HasLabel{Key: conf.Key, Value: conf.Value}, nil
@@ -73,8 +72,7 @@ func (a *AlterLabel) New(config *ucfg.Config) (plugin.Trigger, error) {
 		Value  string `config:"value"`
 		Remove bool   `config:"remove"`
 	}{}
-	err := config.Unpack(&conf)
-	if err != nil {
+	if err := config.Unpack(&conf); err != nil {
 		return nil, err
 	}
 	return &AlterLabel{Key: conf.Key, Remove: conf.Remove, Value: conf.Value}, nil

diff --git a/plugin/impl/mail.go b/plugin/impl/mail.go
@@ -53,8 +53,7 @@ func (m *Mail) New(config *ucfg.Config) (plugin.Notifier, error) {
 		User     string   `config:"user"`
 		Password string   `config:"password"`
 	}{}
-	err := config.Unpack(&conf)
-	if err != nil {
+	if err := config.Unpack(&conf); err != nil {
 		return nil, err
 	}
 	return &Mail{

diff --git a/plugin/impl/maxmaintenance.go b/plugin/impl/maxmaintenance.go
@@ -38,8 +38,7 @@ func (m *MaxMaintenance) New(config *ucfg.Config) (plugin.Checker, error) {
 	conf := struct {
 		Max int `config:"max" validate:"required"`
 	}{}
-	err := config.Unpack(&conf)
-	if err != nil {
+	if err := config.Unpack(&conf); err != nil {
 		return nil, err
 	}
 	return &MaxMaintenance{MaxNodes: conf.Max}, nil

diff --git a/plugin/impl/slack.go b/plugin/impl/slack.go
@@ -53,8 +53,7 @@ func (sw *SlackWebhook) New(config *ucfg.Config) (plugin.Notifier, error) {
 		Channel string `config:"channel" validate:"required"`
 		Message string `config:"message" validate:"required"`
 	}{}
-	err := config.Unpack(&conf)
-	if err != nil {
+	if err := config.Unpack(&conf); err != nil {
 		return nil, err
 	}
 	return &SlackWebhook{Hook: conf.Hook, Channel: conf.Channel, Message: conf.Message}, nil
@@ -118,8 +117,7 @@ func (st *SlackThread) New(config *ucfg.Config) (plugin.Notifier, error) {
 		LeaseNamespace string        `config:"leaseNamespace" validate:"required"`
 		Period         time.Duration `config:"period" validate:"required"`
 	}{}
-	err := config.Unpack(&conf)
-	if err != nil {
+	if err := config.Unpack(&conf); err != nil {
 		return nil, err
 	}
 	return &SlackThread{

diff --git a/plugin/impl/stagger.go b/plugin/impl/stagger.go
@@ -45,8 +45,7 @@ func (s *Stagger) New(config *ucfg.Config) (plugin.Checker, error) {
 		LeaseName      string        `config:"leaseName" validate:"required"`
 		LeaseNamespace string        `config:"leaseNamespace" validate:"required"`
 	}{}
-	err := config.Unpack(&conf)
-	if err != nil {
+	if err := config.Unpack(&conf); err != nil {
 		return nil, err
 	}
 	return &Stagger{LeaseName: types.NamespacedName{

diff --git a/plugin/impl/wait.go b/plugin/impl/wait.go
@@ -34,8 +34,7 @@ func (w *Wait) New(config *ucfg.Config) (plugin.Checker, error) {
 	conf := struct {
 		Duration string `config:"duration" validate:"required"`
 	}{}
-	err := config.Unpack(&conf)
-	if err != nil {
+	if err := config.Unpack(&conf); err != nil {
 		return nil, err
 	}
 	duration, err := time.ParseDuration(conf.Duration)

diff --git a/state/state.go b/state/state.go
@@ -138,8 +138,7 @@ func notifyDefault(params plugin.Parameters, data *Data, interval time.Duration,
 	if label == data.LastNotificationState && time.Since(data.LastNotification) <= interval {
 		return nil
 	}
-	err := chain.Execute(params)
-	if err != nil {
+	if err := chain.Execute(params); err != nil {
 		return err
 	}
 	data.LastNotification = time.Now()