Add additional info to The specified bucket does not exist (#2338)

* adding S3 client error handling

* more error handling for S3 bucket

* specified errorName

* revert error catching changes

* attempting to catch error in new place

* adjust return

* change form generator error message to amplifyError

* updated model generator error message

* fix unintended change

* added changeset

* remove form generator handling, not necessary

* tsconfig fix

* removed all changes to form generator

* no longer user error

* adjust error message

* changed to AmplifyFault

* updates based on feedback

* adjusted error message

* another update to error message

---------

Co-authored-by: Vieltojarvi <[email protected]>

Author: ShadowCat567

.changeset/swift-mirrors-enjoy.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/model-generator': patch
+---
+
+Updated error handling with S3 Client

packages/model-generator/src/s3_string_object_fetcher.ts

@@ -1,4 +1,5 @@
-import { GetObjectCommand, S3Client } from '@aws-sdk/client-s3';
+import { AmplifyFault } from '@aws-amplify/platform-core';
+import { GetObjectCommand, NoSuchBucket, S3Client } from '@aws-sdk/client-s3';
 
 /**
  * Handles fetching an object from an s3 bucket and parsing the object contents to a string
@@ -14,15 +15,30 @@ export class S3StringObjectFetcher {
    */
   fetch = async (uri: string) => {
     const { bucket, key } = this.parseS3Uri(uri);
-    const getSchemaCommandResult = await this.s3Client.send(
-      new GetObjectCommand({ Bucket: bucket, Key: key })
-    );
-    const schema = await getSchemaCommandResult.Body?.transformToString();
-    if (!schema) {
-      // eslint-disable-next-line amplify-backend-rules/prefer-amplify-errors
-      throw new Error('Error on parsing output schema');
+    try {
+      const getSchemaCommandResult = await this.s3Client.send(
+        new GetObjectCommand({ Bucket: bucket, Key: key })
+      );
+      const schema = await getSchemaCommandResult.Body?.transformToString();
+      if (!schema) {
+        // eslint-disable-next-line amplify-backend-rules/prefer-amplify-errors
+        throw new Error('Error on parsing output schema');
+      }
+      return schema;
+    } catch (caught) {
+      if (caught instanceof NoSuchBucket) {
+        throw new AmplifyFault(
+          'NoSuchBucketFault',
+          {
+            message: `${bucket} does not exist. \n
+            Try redeploying your changes again, if the error persists, create a bug report here: https://github.com/aws-amplify/amplify-backend/issues/new/choose`,
+          },
+          caught
+        );
+      } else {
+        throw caught;
+      }
     }
-    return schema;
   };
 
   private parseS3Uri = (uri: string): { bucket: string; key: string } => {