Improved logging for S3 errors

swisstopo · Jul 6, 2023 · e854df2 · e854df2
1 parent f2df81c
commit e854df2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/apps/server-asset-sg/src/app/app.controller.ts b/apps/server-asset-sg/src/app/app.controller.ts
@@ -98,6 +98,7 @@ export class AppController {
 
         const e = await this.appService.getFile(maybeFileId.right)();
         if (E.isLeft(e)) {
+            console.log(JSON.stringify(e.left));
             throw new HttpException(e.left.message, 500);
         }
         const result = e.right;

diff --git a/apps/server-asset-sg/src/app/file/get-file.ts b/apps/server-asset-sg/src/app/file/get-file.ts
@@ -4,7 +4,7 @@ import * as E from 'fp-ts/Either';
 import { pipe } from 'fp-ts/function';
 import * as TE from 'fp-ts/TaskEither';
 
-import { unknownToError } from '@asset-sg/core';
+import { TypedError, unknownErrorTag, unknownToError } from '@asset-sg/core';
 
 import { assetFolder, bucketName, createS3Client, destroyS3Client } from './common';
 
@@ -14,21 +14,16 @@ export const getFile = (prismaClient: PrismaClient, fileId: number) => {
         s3Client =>
             pipe(
                 TE.tryCatch(() => pipe(prismaClient.file.findFirstOrThrow({ where: { fileId } })), unknownToError),
-                TE.chain(({ fileName }) =>
-                    pipe(
+                TE.chainW(({ fileName }) => {
+                    const key = (assetFolder ? assetFolder + '/' : '') + fileName;
+                    return pipe(
                         TE.tryCatch(
-                            () =>
-                                s3Client.send(
-                                    new GetObjectCommand({
-                                        Key: (assetFolder ? assetFolder + '/' : '') + fileName,
-                                        Bucket: bucketName,
-                                    }),
-                                ),
-                            unknownToError,
+                            () => s3Client.send(new GetObjectCommand({ Key: key, Bucket: bucketName })),
+                            e => new TypedError(unknownErrorTag, e, 'Unable to get file from S3 with key ' + key),
                         ),
                         TE.map(a => ({ ...a, fileName })),
-                    ),
-                ),
+                    );
+                }),
                 TE.map(a => ({
                     fileName: a.fileName,
                     stream: a.Body as NodeJS.ReadableStream,