tfresource

Author: gdavison

internal/tfresource/errors_test.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
+	sdkretry "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 )
 
@@ -31,7 +31,7 @@ func TestNotFound(t *testing.T) {
 		},
 		{
 			Name:     "not found error",
-			Err:      &retry.NotFoundError{LastError: errors.New("test")},
+			Err:      &sdkretry.NotFoundError{LastError: errors.New("test")},
 			Expected: true,
 		},
 		{
@@ -40,7 +40,7 @@ func TestNotFound(t *testing.T) {
 		},
 		{
 			Name:     "wrapped not found error",
-			Err:      fmt.Errorf("test: %w", &retry.NotFoundError{LastError: errors.New("test")}),
+			Err:      fmt.Errorf("test: %w", &sdkretry.NotFoundError{LastError: errors.New("test")}),
 			Expected: true,
 		},
 	}
@@ -76,24 +76,24 @@ func TestTimedOut(t *testing.T) {
 		},
 		{
 			Name:     "timeout error",
-			Err:      &retry.TimeoutError{},
+			Err:      &sdkretry.TimeoutError{},
 			Expected: true,
 		},
 		{
 			Name: "timeout error non-nil last error",
-			Err:  &retry.TimeoutError{LastError: errors.New("test")},
+			Err:  &sdkretry.TimeoutError{LastError: errors.New("test")},
 		},
 		{
 			Name: "wrapped other error",
 			Err:  fmt.Errorf("test: %w", errors.New("test")),
 		},
 		{
 			Name: "wrapped timeout error",
-			Err:  fmt.Errorf("test: %w", &retry.TimeoutError{}),
+			Err:  fmt.Errorf("test: %w", &sdkretry.TimeoutError{}),
 		},
 		{
 			Name: "wrapped timeout error non-nil last error",
-			Err:  fmt.Errorf("test: %w", &retry.TimeoutError{LastError: errors.New("test")}),
+			Err:  fmt.Errorf("test: %w", &sdkretry.TimeoutError{LastError: errors.New("test")}),
 		},
 	}
 
@@ -129,40 +129,40 @@ func TestSetLastError(t *testing.T) {
 		},
 		{
 			Name: "timeout error lastErr is nil",
-			Err:  &retry.TimeoutError{},
+			Err:  &sdkretry.TimeoutError{},
 		},
 		{
 			Name:     "timeout error",
-			Err:      &retry.TimeoutError{},
+			Err:      &sdkretry.TimeoutError{},
 			LastErr:  errors.New("lasttest"),
 			Expected: true,
 		},
 		{
 			Name: "timeout error non-nil last error lastErr is nil",
-			Err:  &retry.TimeoutError{LastError: errors.New("test")},
+			Err:  &sdkretry.TimeoutError{LastError: errors.New("test")},
 		},
 		{
 			Name:    "timeout error non-nil last error no overwrite",
-			Err:     &retry.TimeoutError{LastError: errors.New("test")},
+			Err:     &sdkretry.TimeoutError{LastError: errors.New("test")},
 			LastErr: errors.New("lasttest"),
 		},
 		{
 			Name: "unexpected state error lastErr is nil",
-			Err:  &retry.UnexpectedStateError{},
+			Err:  &sdkretry.UnexpectedStateError{},
 		},
 		{
 			Name:     "unexpected state error",
-			Err:      &retry.UnexpectedStateError{},
+			Err:      &sdkretry.UnexpectedStateError{},
 			LastErr:  errors.New("lasttest"),
 			Expected: true,
 		},
 		{
 			Name: "unexpected state error non-nil last error lastErr is nil",
-			Err:  &retry.UnexpectedStateError{LastError: errors.New("test")},
+			Err:  &sdkretry.UnexpectedStateError{LastError: errors.New("test")},
 		},
 		{
 			Name:    "unexpected state error non-nil last error no overwrite",
-			Err:     &retry.UnexpectedStateError{LastError: errors.New("test")},
+			Err:     &sdkretry.UnexpectedStateError{LastError: errors.New("test")},
 			LastErr: errors.New("lasttest"),
 		},
 	}

internal/tfresource/not_found_error.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"iter"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
+	sdkretry "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices"
 	"github.com/hashicorp/terraform-provider-aws/internal/types/option"
 )
@@ -35,12 +35,12 @@ func (e *EmptyResultError) Is(err error) bool {
 }
 
 func (e *EmptyResultError) As(target any) bool {
-	t, ok := target.(**retry.NotFoundError)
+	t, ok := target.(**sdkretry.NotFoundError)
 	if !ok {
 		return false
 	}
 
-	*t = &retry.NotFoundError{
+	*t = &sdkretry.NotFoundError{
 		Message:     e.Error(),
 		LastRequest: e.LastRequest,
 	}
@@ -72,12 +72,12 @@ func (e *TooManyResultsError) Is(err error) bool {
 }
 
 func (e *TooManyResultsError) As(target any) bool {
-	t, ok := target.(**retry.NotFoundError)
+	t, ok := target.(**sdkretry.NotFoundError)
 	if !ok {
 		return false
 	}
 
-	*t = &retry.NotFoundError{
+	*t = &sdkretry.NotFoundError{
 		Message:     e.Error(),
 		LastRequest: e.LastRequest,
 	}

internal/tfresource/not_found_error_test.go

@@ -9,7 +9,7 @@ import (
 	"iter"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
+	sdkretry "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	tfiter "github.com/hashicorp/terraform-provider-aws/internal/iter"
 )
 
@@ -19,7 +19,7 @@ func TestEmptyResultErrorAsNotFoundError(t *testing.T) {
 	lastRequest := 123
 	err := NewEmptyResultError(lastRequest)
 
-	var nfe *retry.NotFoundError
+	var nfe *sdkretry.NotFoundError
 	ok := errors.As(err, &nfe)
 
 	if !ok {
@@ -99,7 +99,7 @@ func TestTooManyResultsErrorAsNotFoundError(t *testing.T) {
 	lastRequest := 123
 	err := NewTooManyResultsError(count, lastRequest)
 
-	var nfe *retry.NotFoundError
+	var nfe *sdkretry.NotFoundError
 	ok := errors.As(err, &nfe)
 
 	if !ok {