diff --git a/packages-answers/scripts/generateCsv.ts b/packages-answers/scripts/generateCsv.ts index bf929bfe05d..0190e3d89e6 100644 --- a/packages-answers/scripts/generateCsv.ts +++ b/packages-answers/scripts/generateCsv.ts @@ -4,13 +4,16 @@ import { parse } from 'csv-parse/sync' import { AppCsvParseRuns } from '../db/generated/prisma-client' import { prisma } from '../db/src/client' -const s3 = new S3({ - region: process.env.S3_STORAGE_REGION ?? 'us-east-1', - credentials: { - accessKeyId: process.env.S3_STORAGE_ACCESS_KEY_ID ?? '', - secretAccessKey: process.env.S3_STORAGE_SECRET_ACCESS_KEY ?? '' +const s3Config: any = { + region: process.env.S3_STORAGE_REGION ?? 'us-east-1' +} +if (process.env.S3_STORAGE_ACCESS_KEY_ID && process.env.S3_STORAGE_SECRET_ACCESS_KEY) { + s3Config.credentials = { + accessKeyId: process.env.S3_STORAGE_ACCESS_KEY_ID, + secretAccessKey: process.env.S3_STORAGE_SECRET_ACCESS_KEY } -}) +} +const s3 = new S3(s3Config) function collectAllColumnKeys(rows: Array>): string[] { const seen = new Set() diff --git a/packages-answers/scripts/initCsvRun.ts b/packages-answers/scripts/initCsvRun.ts index 60d39dbc25c..83f7fccf831 100644 --- a/packages-answers/scripts/initCsvRun.ts +++ b/packages-answers/scripts/initCsvRun.ts @@ -4,13 +4,16 @@ import { parse } from 'csv-parse/sync' import { AppCsvParseRuns } from '../db/generated/prisma-client' import { prisma } from '../db/src/client' -const s3 = new S3({ - region: process.env.S3_STORAGE_REGION ?? 'us-east-1', - credentials: { - accessKeyId: process.env.S3_STORAGE_ACCESS_KEY_ID ?? '', - secretAccessKey: process.env.S3_STORAGE_SECRET_ACCESS_KEY ?? '' +const s3Config: any = { + region: process.env.S3_STORAGE_REGION ?? 'us-east-1' +} +if (process.env.S3_STORAGE_ACCESS_KEY_ID && process.env.S3_STORAGE_SECRET_ACCESS_KEY) { + s3Config.credentials = { + accessKeyId: process.env.S3_STORAGE_ACCESS_KEY_ID, + secretAccessKey: process.env.S3_STORAGE_SECRET_ACCESS_KEY } -}) +} +const s3 = new S3(s3Config) const initCsvRun = async (csvParseRun: AppCsvParseRuns) => { try { diff --git a/packages-answers/utils/src/ingest/document.ts b/packages-answers/utils/src/ingest/document.ts index efe5df6df57..17e8fc31a3b 100644 --- a/packages-answers/utils/src/ingest/document.ts +++ b/packages-answers/utils/src/ingest/document.ts @@ -320,10 +320,10 @@ export const processDocument: EventVersionHandler<{ const s3Client = new S3Client({ region: AWS_S3_REGION, - credentials: { - accessKeyId: S3_STORAGE_ACCESS_KEY_ID, - secretAccessKey: S3_STORAGE_SECRET_ACCESS_KEY - } + credentials: + S3_STORAGE_ACCESS_KEY_ID && S3_STORAGE_SECRET_ACCESS_KEY + ? { accessKeyId: S3_STORAGE_ACCESS_KEY_ID, secretAccessKey: S3_STORAGE_SECRET_ACCESS_KEY } + : undefined }) const command = new GetObjectCommand({