chore: revert false-positive lint fix

Author: joel-perry-form3

pacttesting/mock_service.go

@@ -12,7 +12,7 @@ import (
 	"syscall"
 	"time"
 
-	retrygo "github.com/avast/retry-go/v4"
+	"github.com/avast/retry-go/v4"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -120,14 +120,14 @@ func (m *MockServer) Stop() error {
 
 		// wait for process to exit after interrupt, if it fails to stop
 		// then kill it
-		if err := retrygo.Do(func() error {
+		if err := retry.Do(func() error {
 			// check if the process is still alive
 			err := p.Signal(syscall.Signal(0))
 			if err == nil {
 				return errors.New("server process is still alive")
 			}
 			return nil
-		}, retrygo.Attempts(stopRetryAttempts), retrygo.Delay(stopRetryDelay), retrygo.DelayType(retrygo.FixedDelay)); err != nil {
+		}, retry.Attempts(stopRetryAttempts), retry.Delay(stopRetryDelay), retry.DelayType(retry.FixedDelay)); err != nil {
 			err = p.Kill()
 			if err != nil {
 				return fmt.Errorf("failed to kill process: %w", err)

pacttesting/pact_testing_integration_stage_test.go

@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	retrygo "github.com/avast/retry-go/v4"
+	"github.com/avast/retry-go/v4"
 	"github.com/pact-foundation/pact-go/dsl"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
@@ -245,7 +245,7 @@ func (s *pactTestingStage) test_service_a_is_called() *pactTestingStage {
 }
 
 func (s *pactTestingStage) test_service_a_was_invoked() *pactTestingStage {
-	assert.NoError(s.t, VerifyInteractions("testservicea", "go-pact-testing", retrygo.Attempts(3)))
+	assert.NoError(s.t, VerifyInteractions("testservicea", "go-pact-testing", retry.Attempts(3)))
 	return s
 }
 

pacttesting/testing.go

@@ -14,7 +14,7 @@ import (
 	"testing"
 	"time"
 
-	retrygo "github.com/avast/retry-go/v4"
+	"github.com/avast/retry-go/v4"
 	"github.com/pact-foundation/pact-go/dsl"
 	"github.com/pact-foundation/pact-go/types"
 	"github.com/pact-foundation/pact-go/utils"
@@ -51,11 +51,11 @@ var (
 	pactServers = make(map[string]*MockServer)
 )
 
-func defaultRetryOptions() []retrygo.Option {
-	return []retrygo.Option{
-		retrygo.Attempts(defaultRetryAttempts),
-		retrygo.Delay(defaultRetryDelay),
-		retrygo.DelayType(retrygo.FixedDelay),
+func defaultRetryOptions() []retry.Option {
+	return []retry.Option{
+		retry.Attempts(defaultRetryAttempts),
+		retry.Delay(defaultRetryDelay),
+		retry.DelayType(retry.FixedDelay),
 	}
 }
 
@@ -289,7 +289,7 @@ func AddPactInteraction(provider, consumer string, interaction *dsl.Interaction)
 	return pactServers[key].AddInteraction(interaction)
 }
 
-func VerifyInteractions(provider, consumer string, retryOptions ...retrygo.Option) error {
+func VerifyInteractions(provider, consumer string, retryOptions ...retry.Option) error {
 	verify := func() error {
 		key := provider + consumer
 		err := pactServers[key].Verify()
@@ -307,7 +307,7 @@ func VerifyInteractions(provider, consumer string, retryOptions ...retrygo.Optio
 		retryOptions = defaultRetryOptions()
 	}
 	cwd, _ := os.Getwd()
-	if err := retrygo.Do(verify, retryOptions...); err != nil {
+	if err := retry.Do(verify, retryOptions...); err != nil {
 		return fmt.Errorf("pact interactions not matched - for details see %s/pact/logs/pact-%s.log", cwd, provider)
 	}
 	return nil
@@ -381,13 +381,13 @@ func EnsurePactRunning(provider, consumer string) string {
 			Consumer: consumer,
 			Provider: provider,
 		}
-		err = retrygo.Do(func() error {
+		err = retry.Do(func() error {
 			err := mockServer.call("GET", serverAddress, nil)
 			if err != nil && cmd.ProcessState != nil {
-				return fmt.Errorf("calling mock server: %w", retrygo.Unrecoverable(err))
+				return fmt.Errorf("calling mock server: %w", retry.Unrecoverable(err))
 			}
 			return err
-		}, retrygo.DelayType(retrygo.FixedDelay), retrygo.Delay(mockServerHealthDelay), retrygo.Attempts(mockServerHealthAttempts))
+		}, retry.DelayType(retry.FixedDelay), retry.Delay(mockServerHealthDelay), retry.Attempts(mockServerHealthAttempts))
 		if err != nil {
 			log.
 				WithError(err).
@@ -408,7 +408,7 @@ func EnsurePactRunning(provider, consumer string) string {
 
 // Runs mock services defined by the given pacts,
 // invokes testFunc then verifies that the pacts have been invoked successfully
-func RunIntegrationTest(t *testing.T, pactFilePaths []Pact, testFunc func(), retryOptions ...retrygo.Option) error {
+func RunIntegrationTest(t *testing.T, pactFilePaths []Pact, testFunc func(), retryOptions ...retry.Option) error {
 	t.Helper()
 	return TestWithStubServices(pactFilePaths, func() {
 		testFunc()
@@ -420,7 +420,7 @@ func RunIntegrationTest(t *testing.T, pactFilePaths []Pact, testFunc func(), ret
 			retryOptions = defaultRetryOptions()
 		}
 		verify := func() error { return checkVerificationStatus(pactFilePaths) }
-		if err := retrygo.Do(verify, retryOptions...); err != nil {
+		if err := retry.Do(verify, retryOptions...); err != nil {
 			log.Error("Pact verification failed!!" +
 				"For more info on the error check the logs/pact*.log files, they are quite detailed")
 			t.Error(err)
@@ -430,7 +430,7 @@ func RunIntegrationTest(t *testing.T, pactFilePaths []Pact, testFunc func(), ret
 
 // Runs mock services defined by the given pacts,
 // invokes testFunc then verifies that the pacts have been invoked successfully
-func IntegrationTest(pactFilePaths []Pact, testFunc func(), retryOptions ...retrygo.Option) error {
+func IntegrationTest(pactFilePaths []Pact, testFunc func(), retryOptions ...retry.Option) error {
 	return TestWithStubServices(pactFilePaths, func() {
 		testFunc()
 
@@ -441,7 +441,7 @@ func IntegrationTest(pactFilePaths []Pact, testFunc func(), retryOptions ...retr
 			retryOptions = defaultRetryOptions()
 		}
 		verify := func() error { return checkVerificationStatus(pactFilePaths) }
-		if err := retrygo.Do(verify, retryOptions...); err != nil {
+		if err := retry.Do(verify, retryOptions...); err != nil {
 			log.Fatalf("Pact verification failed!!" +
 				"For more info on the error check the logs/pact*.log files, they are quite detailed")
 		}