feat(smithy)!: remove error match on http status code (#4750)

* fix!: remove http status code exception mapping

* chore: update remaining test

Author: Jordan-Nelson

packages/smithy/smithy/lib/src/http/http_operation.dart

@@ -287,9 +287,6 @@ abstract class HttpOperation<InputPayload, Input, OutputPayload, Output>
         smithyError =
             errorTypes.firstWhereOrNull((t) => t.shapeId.shape == resolvedType);
       }
-      smithyError ??= errorTypes.singleWhereOrNull(
-        (t) => t.statusCode == response.statusCode,
-      );
       if (smithyError == null) {
         throw SmithyHttpException(
           statusCode: response.statusCode,

packages/smithy/smithy_aws/test/http/dummy_operation.dart

@@ -4,6 +4,7 @@
 // ignore_for_file: avoid_unused_constructor_parameters
 
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:aws_common/aws_common.dart';
 import 'package:built_value/serializer.dart';
@@ -43,7 +44,7 @@ class DummyHttpOperation extends HttpOperation<Unit, Unit, Unit, Unit> {
 
   @override
   Iterable<HttpProtocol<Unit, Unit, Unit, Unit>> get protocols => [
-        GenericJsonProtocol(
+        DummyProtocol(
           serializers: const [
             _DummySmithyExceptionSerializer(),
           ],
@@ -130,3 +131,19 @@ class _DummySmithyExceptionSerializer
   @override
   String get wireName => 'DummySmithyException';
 }
+
+class DummyProtocol<InputPayload, Input, OutputPayload, Output>
+    extends GenericJsonProtocol<InputPayload, Input, OutputPayload, Output> {
+  DummyProtocol({
+    required super.requestInterceptors,
+    required super.serializers,
+  });
+
+  @override
+  Future<String?> resolveErrorType(AWSBaseHttpResponse response) async {
+    final body = await response.bodyBytes;
+    final json = jsonDecode(String.fromCharCodes(body)) as Map<String, Object?>;
+    final error = json['error'] as String?;
+    return error;
+  }
+}

packages/smithy/smithy_aws/test/http/sdk_request_test.dart

@@ -24,7 +24,10 @@ void main() {
           return AWSHttpResponse(statusCode: 200, body: '{}'.codeUnits);
         }
         attempt++;
-        return AWSHttpResponse(statusCode: 500, body: '{}'.codeUnits);
+        return AWSHttpResponse(
+          statusCode: 500,
+          body: '{"error":"DummySmithyException"}'.codeUnits,
+        );
       });
       final retryer = AWSRetryer();
       final op = DummyHttpOperation(retryer);
@@ -57,7 +60,10 @@ void main() {
         return AWSHttpResponse(statusCode: 200, body: '{}'.codeUnits);
       }
       attempt++;
-      return AWSHttpResponse(statusCode: 500, body: '{}'.codeUnits);
+      return AWSHttpResponse(
+        statusCode: 500,
+        body: '{"error":"DummySmithyException"}'.codeUnits,
+      );
     });
     final retryer = AWSRetryer();
     final op = DummyHttpOperation(retryer);

packages/storage/amplify_storage_s3/example/integration_test/copy_test.dart

@@ -3,7 +3,6 @@
 
 import 'package:amplify_core/amplify_core.dart';
 import 'package:amplify_storage_s3/amplify_storage_s3.dart';
-import 'package:amplify_storage_s3_dart/src/sdk/src/s3/model/object_not_in_active_tier_error.dart';
 import 'package:amplify_storage_s3_example/amplifyconfiguration.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
@@ -92,8 +91,7 @@ void main() {
             source: const StoragePath.fromString('unauthorized/path'),
             destination: const StoragePath.fromString('public/foo'),
           ).result,
-          // TODO(Jordan-Nelson): update to StorageAccessDeniedException when SDK error mapping is fixed
-          throwsA(isA<ObjectNotInActiveTierError>()),
+          throwsA(isA<StorageAccessDeniedException>()),
         );
       });
 
@@ -103,8 +101,7 @@ void main() {
             source: srcStoragePath,
             destination: const StoragePath.fromString('unauthorized/path'),
           ).result,
-          // TODO(Jordan-Nelson): update to StorageAccessDeniedException when SDK error mapping is fixed
-          throwsA(isA<ObjectNotInActiveTierError>()),
+          throwsA(isA<StorageAccessDeniedException>()),
         );
       });
 

packages/storage/amplify_storage_s3/example/integration_test/download_data_test.dart

@@ -5,7 +5,6 @@ import 'dart:convert';
 
 import 'package:amplify_core/amplify_core.dart';
 import 'package:amplify_storage_s3/amplify_storage_s3.dart';
-import 'package:amplify_storage_s3_dart/src/sdk/src/s3/model/invalid_object_state.dart';
 import 'package:amplify_storage_s3_example/amplifyconfiguration.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
@@ -83,8 +82,7 @@ void main() {
             () => Amplify.Storage.downloadData(
               path: const StoragePath.fromString('unauthorized/path'),
             ).result,
-            // TODO(khatruong2009): update to access denied exception when S3 exception mapping is fixed
-            throwsA(isA<InvalidObjectState>()),
+            throwsA(isA<StorageAccessDeniedException>()),
           );
         });
       });

packages/storage/amplify_storage_s3/example/integration_test/download_file_test.dart

@@ -5,7 +5,6 @@ import 'dart:io';
 
 import 'package:amplify_core/amplify_core.dart';
 import 'package:amplify_storage_s3/amplify_storage_s3.dart';
-import 'package:amplify_storage_s3_dart/src/sdk/src/s3/model/invalid_object_state.dart';
 import 'package:amplify_storage_s3_example/amplifyconfiguration.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -157,13 +156,12 @@ void main() {
         testWidgets('unauthorized path', (_) async {
           final downloadFilePath = '${tempDir.path}/downloaded-file.txt';
 
-          // TODO(khatruong2009): update to access denied exception when bug is fixed
           await expectLater(
             () => Amplify.Storage.downloadFile(
               path: const StoragePath.fromString('unauthorized/path'),
               localFile: AWSFile.fromPath(downloadFilePath),
             ).result,
-            throwsA(isA<InvalidObjectState>()),
+            throwsA(isA<StorageAccessDeniedException>()),
           );
         });
       });