Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions packages-answers/scripts/generateCsv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<Record<string, unknown>>): string[] {
const seen = new Set<string>()
Expand Down
15 changes: 9 additions & 6 deletions packages-answers/scripts/initCsvRun.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions packages-answers/utils/src/ingest/document.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
Loading