update for backoff v5

Author: sazap10

go.mod

@@ -4,7 +4,6 @@ go 1.23
 
 require (
 	github.com/bugsnag/bugsnag-go/v2 v2.5.1
-	github.com/cenkalti/backoff/v4 v4.3.0
 	github.com/cenkalti/backoff/v5 v5.0.1
 	github.com/joho/godotenv v1.5.1
 	github.com/pkg/errors v0.9.1

go.sum

@@ -4,8 +4,7 @@ github.com/bugsnag/bugsnag-go/v2 v2.5.1 h1:cGsEJHcis1zfQ4KoFaBPIT4N1TYqVNRALKr2w
 github.com/bugsnag/bugsnag-go/v2 v2.5.1/go.mod h1:S9njhE7l6XCiKycOZ2zp0x1zoEE5nL3HjROCSsKc/3c=
 github.com/bugsnag/panicwrap v1.3.4 h1:A6sXFtDGsgU/4BLf5JT0o5uYg3EeKgGx3Sfs+/uk3pU=
 github.com/bugsnag/panicwrap v1.3.4/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
-github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
-github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/cenkalti/backoff/v5 v5.0.1 h1:kGZdCHH1+eW+Yd0wftimjMuhg9zidDvNF5aGdnkkb+U=
 github.com/cenkalti/backoff/v5 v5.0.1/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

main.go

@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/bugsnag/bugsnag-go/v2"
-	"github.com/cenkalti/backoff/v4"
+	"github.com/cenkalti/backoff/v5"
 	"github.com/joho/godotenv"
 	"github.com/pkg/errors"
 )
@@ -92,14 +92,17 @@ func main() {
 }
 
 func getIPAddressWithRetry(ctx context.Context, client *http.Client) (string, error) {
-	ip, err := backoff.RetryNotifyWithData(
-		func() (string, error) {
-			return getIPAddress(ctx, client)
-		},
-		backoff.NewExponentialBackOff(),
-		func(err error, d time.Duration) {
-			log.Printf("Problem getting IP address: %s, retrying in %s\n", err, d)
-		},
+	operation := 	func() (string, error) {
+		return getIPAddress(ctx, client)
+	}
+	notify := func(err error, d time.Duration) {
+		log.Printf("Problem getting IP address: %s, retrying in %s\n", err, d)
+	}
+	ip, err := backoff.Retry(
+		ctx,
+		operation,
+		backoff.WithBackOff(backoff.NewExponentialBackOff()),
+		backoff.WithNotify(notify),
 	)
 	if err != nil {
 		return "", errors.Wrapf(err, "Unable to get IP address, retries exhausted")
@@ -130,45 +133,49 @@ func getIPAddress(ctx context.Context, client *http.Client) (string, error) {
 }
 
 func setDyndnsIPAddressWithRetry(ctx context.Context, client *http.Client, r DynDNSRequest) error {
-	err := backoff.RetryNotify(
-		func() error {
-			return setDyndnsIPAddress(ctx, client, r)
-		},
-		backoff.NewExponentialBackOff(),
-		func(err error, d time.Duration) {
-			log.Printf("Unable to set dyndns ip for domain %s: %s, retrying in %s\n", r.DomainName, err, d)
-		},
+	operation := 	func() (string, error) {
+		return setDyndnsIPAddress(ctx, client, r)
+	}
+	notify := func(err error, d time.Duration) {
+		log.Printf("Unable to set dyndns ip for domain %s: %s, retrying in %s\n", r.DomainName, err, d)
+	}
+
+	result, err := backoff.Retry(
+		ctx,
+		operation,
+		backoff.WithBackOff(backoff.NewExponentialBackOff()),
+		backoff.WithNotify(notify),
 	)
 	if err != nil {
 		return errors.Wrapf(err, "Unable to set dyndns ip for domain %s, retries exhausted", r.DomainName)
 	}
+	log.Printf("Set dyndns ip for domain %s: %s\n", r.DomainName, result)
 	return nil
 }
 
-func setDyndnsIPAddress(ctx context.Context, client *http.Client, r DynDNSRequest) error {
+func setDyndnsIPAddress(ctx context.Context, client *http.Client, r DynDNSRequest) (string, error) {
 	url := fmt.Sprintf("https://www.ovh.com/nic/update?system=dyndns&hostname=%s&myip=%s", r.DomainName, r.IPAddress)
 	req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
 	if err != nil {
-		return errors.Wrapf(err, "Unable to create request to set IP Address for domain: %s", r.DomainName)
+		return "", errors.Wrapf(err, "Unable to create request to set IP Address for domain: %s", r.DomainName)
 	}
 	req.SetBasicAuth(r.Username, r.Password)
 
 	resp, err := client.Do(req)
 	if err != nil {
-		return errors.Wrapf(err, "Unable to set IP Address for domain: %s", r.DomainName)
+		return "", errors.Wrapf(err, "Unable to set IP Address for domain: %s", r.DomainName)
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode != 200 {
-		return fmt.Errorf("Unable to set IP Address for domain, got code: %d", resp.StatusCode)
+		return "", fmt.Errorf("Unable to set IP Address for domain, got code: %d", resp.StatusCode)
 	}
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return errors.Wrapf(err, "Unable to read response body for domain: %s", r.DomainName)
+		return "", errors.Wrapf(err, "Unable to read response body for domain: %s", r.DomainName)
 	}
-	log.Println(string(body))
-	return nil
+	return string(body), nil
 }
 
 func getDomains() ([]string, bool) {