feat: Reduce external dependencies: external Retry library is retired

Author: achetronic

Makefile

@@ -47,7 +47,7 @@ run:
 ### BUILD COMMANDS
 ########################################################################################################################
 build: fmt vet ## Build manager binary.
-	cd cmd/autoheater && go mod tidy && go build -o ../bin/manager .
+	cd cmd/autoheater && go mod tidy && go build -o ../../bin/manager .
 
 # If you wish built the manager image targeting other platforms you can use the --platform flag.
 # (i.e. docker build --platform linux/arm64 ). However, you must enable docker buildKit for it.

go.mod

@@ -4,8 +4,6 @@ go 1.21
 
 require (
 	github.com/achetronic/tapogo v0.2.0
-	github.com/avast/retry-go v3.0.0+incompatible
-	github.com/caarlos0/env/v9 v9.0.0
 	github.com/richardjennings/tapo v0.0.1
 	github.com/spf13/cobra v1.7.0
 	go.uber.org/zap v1.25.0

go.sum

@@ -1,11 +1,7 @@
 github.com/achetronic/tapogo v0.2.0 h1:eMyEPdZsEzKwacj43FihDRLJxfNX4YpiWb/eEmMyVTQ=
 github.com/achetronic/tapogo v0.2.0/go.mod h1:DVflSfbePg4SAjRy0aeMYJ0vj4Pjesw5sw6y4yP0f8w=
-github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0=
-github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
 github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
-github.com/caarlos0/env/v9 v9.0.0 h1:SI6JNsOA+y5gj9njpgybykATIylrRMklbs5ch6wO6pc=
-github.com/caarlos0/env/v9 v9.0.0/go.mod h1:ye5mlCVMYh6tZ+vCgrs/B95sj88cg5Tlnc0XIzgZ020=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

internal/schedules/utils.go renamed to internal/globals/globals.go

@@ -1,10 +1,10 @@
-package schedules
+package globals
 
 import (
 	"time"
 )
 
-func retry(function func() error, attempts int, timeBetweenAttempts time.Duration) (err error) {
+func Retry(function func() error, attempts int, timeBetweenAttempts time.Duration) (err error) {
 
 	var functionError error
 

internal/integrations/taposmartplug/taposmartplug.go

@@ -3,12 +3,13 @@ package taposmartplug
 import (
 	"encoding/json"
 	"errors"
+	"time"
+
 	"github.com/achetronic/autoheater/api/v1alpha1"
+	"github.com/achetronic/autoheater/internal/globals"
 	tapogotypes "github.com/achetronic/tapogo/api/types"
 	"github.com/achetronic/tapogo/pkg/tapogo"
-	"github.com/avast/retry-go"
 	"github.com/richardjennings/tapo/pkg/tapo"
-	"time"
 )
 
 const (
@@ -69,7 +70,9 @@ func TurnOnDevice(ctx *v1alpha1.Context) (tapoResponse map[string]interface{}, e
 		// New KLAP protocol throws random errors when the requests are done at speed.
 		// Retrying with a new token mostly solve the issue (jaquecoso...)
 		tapoResponseNew := &tapogotypes.ResponseSpec{}
-		err = retry.Do(
+
+		//schedules.R
+		err = globals.Retry(
 			func() (err error) {
 				tapoClientNew, err := tapogo.NewTapo(tapoConfig.Address,
 					tapoConfig.Auth.Username,
@@ -86,8 +89,8 @@ func TurnOnDevice(ctx *v1alpha1.Context) (tapoResponse map[string]interface{}, e
 				}
 				return err
 			},
-			retry.Attempts(RequestRetryAttempts),
-			retry.Delay(RequestRetryDelayDuration))
+			RequestRetryAttempts,
+			RequestRetryDelayDuration)
 
 		if err != nil {
 			ctx.Logger.Errorf(TurningOnError, err)
@@ -137,7 +140,7 @@ func TurnOffDevice(ctx *v1alpha1.Context) (tapoResponse map[string]interface{},
 		// New KLAP protocol throws random errors when the requests are done at speed.
 		// Retrying with a new token mostly solve the issue (jaquecoso...)
 		tapoResponseNew := &tapogotypes.ResponseSpec{}
-		err = retry.Do(
+		err = globals.Retry(
 			func() (err error) {
 				tapoClientNew, err := tapogo.NewTapo(tapoConfig.Address,
 					tapoConfig.Auth.Username,
@@ -155,8 +158,8 @@ func TurnOffDevice(ctx *v1alpha1.Context) (tapoResponse map[string]interface{},
 				}
 				return err
 			},
-			retry.Attempts(RequestRetryAttempts),
-			retry.Delay(RequestRetryDelayDuration))
+			RequestRetryAttempts,
+			RequestRetryDelayDuration)
 
 		if err != nil {
 			ctx.Logger.Errorf(TurningOffError, err)

internal/schedules/schedules.go

@@ -10,6 +10,7 @@ import (
 	"github.com/achetronic/autoheater/internal/integrations/webhook"
 	"github.com/achetronic/autoheater/internal/price"
 	"github.com/achetronic/autoheater/internal/weather"
+	"github.com/achetronic/autoheater/internal/globals"
 )
 
 const (
@@ -52,7 +53,7 @@ func RunScheduler(ctx *v1alpha1.Context) {
 		// Disable the scheduler in (hot days for heaters) && (cold days for coolers)
 		if ctx.Config.Spec.Weather.Enabled {
 
-			retryFunctionErr = retry(func() error {
+			retryFunctionErr = globals.Retry(func() error {
 				isCold, err = weather.IsColdDay(ctx)
 				return err
 			}, RetryAttempts, RetryDelay)
@@ -72,7 +73,7 @@ func RunScheduler(ctx *v1alpha1.Context) {
 		}
 
 		// Get the sections with the best prices to satisfy the hours required by the user
-		retryFunctionErr = retry(func() error {
+		retryFunctionErr = globals.Retry(func() error {
 			schedules, err = price.GetBestSchedules(ctx)
 			return err
 		}, RetryAttempts, RetryDelay)