Skip to content

Commit

Permalink
helper/resource: Add missing equals for type aliases (#1177)
Browse files Browse the repository at this point in the history
Reference: #1176
  • Loading branch information
bflad committed Mar 21, 2023
1 parent 773d73e commit 3232543
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
5 changes: 5 additions & 0 deletions .changes/unreleased/BUG FIXES-20230321-085655.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
kind: BUG FIXES
body: 'helper/resource: Prevented build errors with type aliasing added in v2.26.0'
time: 2023-03-21T08:56:55.662651-04:00
custom:
Issue: "1176"
18 changes: 9 additions & 9 deletions helper/resource/aliases.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,19 @@ func PrefixedUniqueId(prefix string) string {

// Deprecated: Use helper/retry package instead. This is required for migrating acceptance
// testing to terraform-plugin-testing.
type NotFoundError retry.NotFoundError
type NotFoundError = retry.NotFoundError

// UnexpectedStateError is returned when Refresh returns a state that's neither in Target nor Pending
//
// Deprecated: Use helper/retry package instead. This is required for migrating acceptance
// testing to terraform-plugin-testing.
type UnexpectedStateError retry.UnexpectedStateError
type UnexpectedStateError = retry.UnexpectedStateError

// TimeoutError is returned when WaitForState times out
//
// Deprecated: Use helper/retry package instead. This is required for migrating acceptance
// testing to terraform-plugin-testing.
type TimeoutError retry.TimeoutError
type TimeoutError = retry.TimeoutError

// StateRefreshFunc is a function type used for StateChangeConf that is
// responsible for refreshing the item being watched for a state change.
Expand All @@ -69,19 +69,19 @@ type TimeoutError retry.TimeoutError
//
// Deprecated: Use helper/retry package instead. This is required for migrating acceptance
// testing to terraform-plugin-testing.
type StateRefreshFunc retry.StateRefreshFunc
type StateRefreshFunc = retry.StateRefreshFunc

// StateChangeConf is the configuration struct used for `WaitForState`.
//
// Deprecated: Use helper/retry package instead. This is required for migrating acceptance
// testing to terraform-plugin-testing.
type StateChangeConf retry.StateChangeConf
type StateChangeConf = retry.StateChangeConf

// RetryFunc is the function retried until it succeeds.
//
// Deprecated: Use helper/retry package instead. This is required for migrating acceptance
// testing to terraform-plugin-testing.
type RetryFunc retry.RetryFunc
type RetryFunc = retry.RetryFunc

// RetryContext is a basic wrapper around StateChangeConf that will just retry
// a function until it no longer returns an error.
Expand All @@ -92,7 +92,7 @@ type RetryFunc retry.RetryFunc
// Deprecated: Use helper/retry package instead. This is required for migrating acceptance
// testing to terraform-plugin-testing.
func RetryContext(ctx context.Context, timeout time.Duration, f RetryFunc) error {
return retry.RetryContext(ctx, timeout, retry.RetryFunc(f))
return retry.RetryContext(ctx, timeout, f)
}

// Retry is a basic wrapper around StateChangeConf that will just retry
Expand All @@ -101,15 +101,15 @@ func RetryContext(ctx context.Context, timeout time.Duration, f RetryFunc) error
// Deprecated: Use helper/retry package instead. This is required for migrating acceptance
// testing to terraform-plugin-testing.
func Retry(timeout time.Duration, f RetryFunc) error {
return retry.Retry(timeout, retry.RetryFunc(f))
return retry.Retry(timeout, f)
}

// RetryError is the required return type of RetryFunc. It forces client code
// to choose whether or not a given error is retryable.
//
// Deprecated: Use helper/retry package instead. This is required for migrating acceptance
// testing to terraform-plugin-testing.
type RetryError retry.RetryError
type RetryError = retry.RetryError

// RetryableError is a helper to create a RetryError that's retryable from a
// given error. To prevent logic errors, will return an error when passed a
Expand Down

0 comments on commit 3232543

Please sign in to comment.