v2.26.0 changes cause build failures in some downstream providers

[ewbankkit]

SDK version

v2.26.0

Actual Behavior

Changes made in v2.26.0 cause build failures in some downstream providers:

go build -o terraform-plugin-dir/registry.terraform.io/hashicorp/aws/99.99.99/$(go env GOOS)_$(go env GOARCH)/terraform-provider-aws .
...
# github.com/hashicorp/terraform-provider-aws/internal/tfresource
Error: internal/tfresource/errors.go:22:20: impossible type assertion: err.(*resource.TimeoutError)
	*resource.TimeoutError does not implement error (missing Error method)
Error: internal/tfresource/errors.go:30:7: impossible type switch case: *resource.TimeoutError
	err (variable of type error) cannot have dynamic type *resource.TimeoutError (missing Error method)
Error: internal/tfresource/errors.go:35:7: impossible type switch case: *resource.UnexpectedStateError
	err (variable of type error) cannot have dynamic type *resource.UnexpectedStateError (missing Error method)
Error: internal/tfresource/retry.go:26:29: cannot use func() *resource.RetryError {…} (value of type func() *resource.RetryError) as type resource.RetryFunc in argument to Retry
Error: internal/tfresource/retry.go:237:18: c.WaitForStateContext undefined (type *resource.StateChangeConf has no field or method WaitForStateContext)
Error: internal/tfresource/wait.go:53:22: stateConf.WaitForStateContext undefined (type *resource.StateChangeConf has no field or method WaitForStateContext)
# github.com/hashicorp/terraform-provider-aws/internal/service/athena
Error: internal/service/athena/database.go:275:15: cannot use queryExecutionStateRefreshFunc(ctx, conn, qeid) (value of type "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource".StateRefreshFunc) as type retry.StateRefreshFunc in struct literal
Error: internal/service/athena/database.go:280:31: executionStateConf.WaitForStateContext undefined (type *"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource".StateChangeConf has no field or method WaitForStateContext)
# github.com/hashicorp/terraform-provider-aws/internal/service/glacier
Error: internal/service/glacier/vault_lock.go:209:12: cannot use vaultLockRefreshFunc(ctx, conn, vaultName) (value of type "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource".StateRefreshFunc) as type retry.StateRefreshFunc in struct literal
Error: internal/service/glacier/vault_lock.go:214:22: stateConf.WaitForStateContext undefined (type *"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource".StateChangeConf has no field or method WaitForStateContext)
...

[bflad]

Hey @ewbankkit 👋 Thank you for reporting this and sorry for the trouble here 😖 Can you see if #1177 helps resolve the build issues?

[ewbankkit]

🤞 hashicorp/terraform-provider-aws#30155.

go build has succeeded for this PR. Declaring success.
@bflad Thanks.

[github-actions]

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.