Incorporate changes from #36932.

hashicorp · Apr 18, 2024 · be74dd6 · be74dd6
1 parent 4c530cd
commit be74dd6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/internal/conns/apiretry_test.go b/internal/conns/apiretry_test.go
@@ -68,13 +68,11 @@ func TestAddIsErrorRetryables(t *testing.T) {
 				},
 			},
 			f: func(err error) aws.Ternary {
-				if err != nil {
-					var oe *smithy.OperationError
-					if errors.As(err, &oe) {
-						if oe.OperationName == "StartDeployment" {
-							if errs.IsA[*appconfigtypes.ConflictException](err) {
-								return aws.TrueTernary
-							}
+				if err, ok := errs.As[*smithy.OperationError](err); ok {
+					switch err.OperationName {
+					case "StartDeployment":
+						if errs.IsA[*appconfigtypes.ConflictException](err) {
+							return aws.TrueTernary
 						}
 					}
 				}

diff --git a/internal/service/appconfig/service_package.go b/internal/service/appconfig/service_package.go
@@ -27,8 +27,8 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
 		// if ongoing deployments are in-progress, thus we handle them
 		// here for the service client.
 		o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws_sdkv2.RetryerV2), retry_sdkv2.IsErrorRetryableFunc(func(err error) aws_sdkv2.Ternary {
-			if v, ok := errs.As[*smithy.OperationError](err); ok {
-				switch v.OperationName {
+			if err, ok := errs.As[*smithy.OperationError](err); ok {
+				switch err.OperationName {
 				case "StartDeployment":
 					if errs.IsA[*awstypes.ConflictException](err) {
 						return aws_sdkv2.TrueTernary