fix(deps): Update module github.com/avast/retry-go/v4 to v5 (#591)

#### Summary

Instead of #590 so I can get a proper review, as it required a few changes.

---

Author: erezrokah

go.mod

@@ -7,7 +7,7 @@ toolchain go1.24.6
 require (
 	github.com/Masterminds/semver v1.5.0
 	github.com/apache/arrow-go/v18 v18.5.0
-	github.com/avast/retry-go/v4 v4.7.0
+	github.com/avast/retry-go/v5 v5.0.0
 	github.com/cloudquery/cloudquery-api-go v1.14.7
 	github.com/distribution/reference v0.6.0
 	github.com/docker/docker v28.5.2+incompatible

go.sum

@@ -13,8 +13,8 @@ github.com/apache/thrift v0.22.0 h1:r7mTJdj51TMDe6RtcmNdQxgn9XcyfGDOzegMDRg47uc=
 github.com/apache/thrift v0.22.0/go.mod h1:1e7J/O1Ae6ZQMTYdy9xa3w9k+XHWPfRvdPyJeynQ+/g=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
-github.com/avast/retry-go/v4 v4.7.0 h1:yjDs35SlGvKwRNSykujfjdMxMhMQQM0TnIjJaHB+Zio=
-github.com/avast/retry-go/v4 v4.7.0/go.mod h1:ZMPDa3sY2bKgpLtap9JRUgk2yTAba7cgiFhqxY2Sg6Q=
+github.com/avast/retry-go/v5 v5.0.0 h1:kf1Qc2UsTZ4qq8elDymqfbISvkyMuhgRxuJqX2NHP7k=
+github.com/avast/retry-go/v5 v5.0.0/go.mod h1://d+usmKWio1agtZfS1H/ltTqwtIfBnRq9zEwjc3eH8=
 github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
 github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
 github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=

managedplugin/download.go

@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/avast/retry-go/v4"
+	"github.com/avast/retry-go/v5"
 	cloudquery_api "github.com/cloudquery/cloudquery-api-go"
 	"github.com/rs/zerolog"
 	"github.com/schollz/progressbar/v3"
@@ -74,8 +74,18 @@ func getURLLocation(ctx context.Context, org string, name string, version string
 		err429 = errors.New("429")
 	)
 
+	options := []retry.Option{
+		retry.RetryIf(func(err error) bool {
+			return err == err401 || err == err429
+		}),
+		retry.Context(ctx),
+		retry.Attempts(RetryAttempts),
+		retry.Delay(RetryWaitTime),
+		retry.LastErrorOnly(true),
+	}
+	retrier := retry.New(options...)
 	for _, downloadURL := range urls {
-		err := retry.Do(func() error {
+		err := retrier.Do(func() error {
 			req, err := http.NewRequestWithContext(ctx, http.MethodGet, downloadURL, nil)
 			if err != nil {
 				return fmt.Errorf("failed create request %s: %w", downloadURL, err)
@@ -101,14 +111,7 @@ func getURLLocation(ctx context.Context, org string, name string, version string
 				fmt.Printf("Failed downloading %s with status code %d\n", downloadURL, resp.StatusCode)
 				return fmt.Errorf("statusCode %d", resp.StatusCode)
 			}
-		}, retry.RetryIf(func(err error) bool {
-			return err == err401 || err == err429
-		}),
-			retry.Context(ctx),
-			retry.Attempts(RetryAttempts),
-			retry.Delay(RetryWaitTime),
-			retry.LastErrorOnly(true),
-		)
+		})
 		if err == err404 {
 			continue
 		}
@@ -338,7 +341,16 @@ func downloadFile(ctx context.Context, localPath string, downloadURL string, dop
 	defer out.Close()
 
 	checksum := ""
-	err = retry.Do(func() error {
+	options := []retry.Option{
+		retry.RetryIf(func(err error) bool {
+			return err.Error() == "statusCode != 200"
+		}),
+		retry.Context(ctx),
+		retry.Attempts(RetryAttempts),
+		retry.Delay(RetryWaitTime),
+	}
+	retrier := retry.New(options...)
+	err = retrier.Do(func() error {
 		checksum = ""
 		// Get the data
 		req, err := http.NewRequestWithContext(ctx, http.MethodGet, downloadURL, nil)
@@ -384,13 +396,7 @@ func downloadFile(ctx context.Context, localPath string, downloadURL string, dop
 		}
 		checksum = fmt.Sprintf("%x", s.Sum(nil))
 		return nil
-	}, retry.RetryIf(func(err error) bool {
-		return err.Error() == "statusCode != 200"
-	}),
-		retry.Context(ctx),
-		retry.Attempts(RetryAttempts),
-		retry.Delay(RetryWaitTime),
-	)
+	})
 	if err != nil {
 		for _, e := range err.(retry.Error) {
 			if e.Error() == "not found" {

managedplugin/plugin.go

@@ -16,7 +16,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/avast/retry-go/v4"
+	"github.com/avast/retry-go/v5"
 	"github.com/cloudquery/plugin-pb-go/internal/env"
 	pbBase "github.com/cloudquery/plugin-pb-go/pb/base/v0"
 	pbDiscovery "github.com/cloudquery/plugin-pb-go/pb/discovery/v0"
@@ -337,20 +337,23 @@ func (c *Client) startDockerPlugin(ctx context.Context, configPath string) error
 	}
 
 	var hostConnection string
-	err = retry.Do(func() error {
-		hostConnection, err = getHostConnection(ctx, cli, resp.ID, portMapping.Port)
-		return err
-	}, retry.RetryIf(func(err error) bool {
-		return err.Error() == "failed to get port mapping for container"
-	}),
+	options := []retry.Option{
+		retry.RetryIf(func(err error) bool {
+			return err.Error() == "failed to get port mapping for container"
+		}),
 		// this should generally succeed on first or second try, because we're only waiting for the container to start
 		// to get the port mapping, not the plugin to start. The plugin will be waited for when we establish the tcp
 		// connection.
 		retry.Attempts(containerPortMappingRetries),
 		retry.Delay(containerPortMappingInitialRetryDelay),
 		retry.DelayType(retry.BackOffDelay),
-		retry.MaxDelay(1*time.Second),
-	)
+		retry.MaxDelay(1 * time.Second),
+	}
+	retrier := retry.New(options...)
+	err = retrier.Do(func() error {
+		hostConnection, err = getHostConnection(ctx, cli, resp.ID, portMapping.Port)
+		return err
+	})
 	if err != nil {
 		return fmt.Errorf("failed to get host connection: %w", err)
 	}
@@ -390,7 +393,17 @@ func getHostConnection(ctx context.Context, cli *dockerClient.Client, containerI
 }
 
 func waitForContainerRunning(ctx context.Context, cli *dockerClient.Client, containerID string) error {
-	err := retry.Do(func() error {
+	options := []retry.Option{
+		retry.RetryIf(func(err error) bool {
+			return err != nil
+		}),
+		retry.Attempts(containerRunningRetries),
+		retry.Delay(containerRunningInitialRetryDelay),
+		retry.DelayType(retry.BackOffDelay),
+		retry.MaxDelay(1 * time.Second),
+	}
+	retrier := retry.New(options...)
+	err := retrier.Do(func() error {
 		containerJSON, err := cli.ContainerInspect(ctx, containerID)
 		if err != nil {
 			return fmt.Errorf("failed to inspect container: %w", err)
@@ -404,14 +417,7 @@ func waitForContainerRunning(ctx context.Context, cli *dockerClient.Client, cont
 			}
 		}
 		return errors.New("container not running")
-	}, retry.RetryIf(func(err error) bool {
-		return err != nil
-	}),
-		retry.Attempts(containerRunningRetries),
-		retry.Delay(containerRunningInitialRetryDelay),
-		retry.DelayType(retry.BackOffDelay),
-		retry.MaxDelay(1*time.Second),
-	)
+	})
 	return err
 }
 
@@ -432,7 +438,16 @@ func getFreeTCPAddr() (string, error) {
 
 func (c *Client) startLocal(ctx context.Context, path string) error {
 	attempt := 0
-	return retry.Do(
+	options := []retry.Option{
+		retry.Attempts(3),
+		retry.Delay(1 * time.Second),
+		retry.LastErrorOnly(true),
+		retry.OnRetry(func(n uint, err error) {
+			c.logger.Debug().Err(err).Int("attempt", int(n)).Msg("failed to start plugin, retrying")
+		}),
+	}
+	retrier := retry.New(options...)
+	return retrier.Do(
 		func() error {
 			attempt++
 			c.logger.Debug().Str("path", path).Int("attempt", attempt).Msg("starting plugin")
@@ -454,12 +469,6 @@ func (c *Client) startLocal(ctx context.Context, path string) error {
 			}
 			return err
 		},
-		retry.Attempts(3),
-		retry.Delay(1*time.Second),
-		retry.LastErrorOnly(true),
-		retry.OnRetry(func(n uint, err error) {
-			c.logger.Debug().Err(err).Int("attempt", int(n)).Msg("failed to start plugin, retrying")
-		}),
 	)
 }
 
@@ -601,7 +610,17 @@ func (c *Client) connectUsingTCP(ctx context.Context, path string) error {
 		return fmt.Errorf("failed to dial grpc %s plugin at %s: %w", c.typ.String(), path, err)
 	}
 
-	return retry.Do(
+	options := []retry.Option{
+		retry.RetryIf(func(err error) bool {
+			return err.Error() == "connection not ready"
+		}),
+		retry.Delay(containerServerHealthyInitialRetryDelay),
+		retry.Attempts(containerServerHealthyRetries),
+		retry.DelayType(retry.BackOffDelay),
+		retry.MaxDelay(1 * time.Second),
+	}
+	retrier := retry.New(options...)
+	return retrier.Do(
 		func() error {
 			state := c.Conn.GetState()
 			if state == connectivity.Idle || state == connectivity.Ready {
@@ -612,13 +631,6 @@ func (c *Client) connectUsingTCP(ctx context.Context, path string) error {
 			}
 			return errors.New("connection not ready")
 		},
-		retry.RetryIf(func(err error) bool {
-			return err.Error() == "connection not ready"
-		}),
-		retry.Delay(containerServerHealthyInitialRetryDelay),
-		retry.Attempts(containerServerHealthyRetries),
-		retry.DelayType(retry.BackOffDelay),
-		retry.MaxDelay(1*time.Second),
 	)
 }