Skip to content

Bugfix/S3 Credentials #4166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 12, 2025
Merged

Bugfix/S3 Credentials #4166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions packages/components/src/storageUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,20 +384,21 @@ export const getS3Config = () => {
throw new Error('S3 storage configuration is missing')
}

let credentials: S3ClientConfig['credentials'] | undefined
const s3Config: S3ClientConfig = {
region: region,
endpoint: customURL,
forcePathStyle: forcePathStyle
}

if (accessKeyId && secretAccessKey) {
credentials = {
accessKeyId,
secretAccessKey
s3Config.credentials = {
accessKeyId: accessKeyId,
secretAccessKey: secretAccessKey
}
}

const s3Client = new S3Client({
credentials,
region,
endpoint: customURL,
forcePathStyle: forcePathStyle
})
const s3Client = new S3Client(s3Config)

return { s3Client, Bucket }
}

Expand Down
10 changes: 7 additions & 3 deletions packages/components/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,18 @@ if (USE_AWS_SECRETS_MANAGER) {
const accessKeyId = process.env.SECRETKEY_AWS_ACCESS_KEY
const secretAccessKey = process.env.SECRETKEY_AWS_SECRET_KEY

let credentials: SecretsManagerClientConfig['credentials'] | undefined
const secretManagerConfig: SecretsManagerClientConfig = {
region: region
}

if (accessKeyId && secretAccessKey) {
credentials = {
secretManagerConfig.credentials = {
accessKeyId,
secretAccessKey
}
}
secretsManagerClient = new SecretsManagerClient({ credentials, region })

secretsManagerClient = new SecretsManagerClient(secretManagerConfig)
}

/*
Expand Down
9 changes: 6 additions & 3 deletions packages/server/src/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,17 @@ if (USE_AWS_SECRETS_MANAGER) {
const accessKeyId = process.env.SECRETKEY_AWS_ACCESS_KEY
const secretAccessKey = process.env.SECRETKEY_AWS_SECRET_KEY

let credentials: SecretsManagerClientConfig['credentials'] | undefined
const secretManagerConfig: SecretsManagerClientConfig = {
region: region
}

if (accessKeyId && secretAccessKey) {
credentials = {
secretManagerConfig.credentials = {
accessKeyId,
secretAccessKey
}
}
secretsManagerClient = new SecretsManagerClient({ credentials, region })
secretsManagerClient = new SecretsManagerClient(secretManagerConfig)
}

export const databaseEntities: IDatabaseEntity = {
Expand Down
18 changes: 8 additions & 10 deletions packages/server/src/utils/logger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,17 @@ if (process.env.STORAGE_TYPE === 's3') {
throw new Error('S3 storage configuration is missing')
}

let credentials: S3ClientConfig['credentials'] | undefined
if (accessKeyId && secretAccessKey) {
credentials = {
accessKeyId,
secretAccessKey
}
}

const s3Config: S3ClientConfig = {
region: region,
endpoint: customURL,
forcePathStyle: forcePathStyle,
credentials: credentials
forcePathStyle: forcePathStyle
}

if (accessKeyId && secretAccessKey) {
s3Config.credentials = {
accessKeyId: accessKeyId,
secretAccessKey: secretAccessKey
}
}

s3ServerStream = new S3StreamLogger({
Expand Down