Skip to content

Commit c4710d5

Browse files
Merge branch 'main' into feature/text-widget-nullable-empty-handling
2 parents 8de836a + 1dac917 commit c4710d5

4 files changed

Lines changed: 583 additions & 87 deletions

File tree

backend/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
},
2626
"dependencies": {
2727
"@amplitude/node": "1.10.2",
28-
"@aws-sdk/client-bedrock-runtime": "^3.1011.0",
29-
"@aws-sdk/client-s3": "^3.1011.0",
30-
"@aws-sdk/lib-dynamodb": "^3.1011.0",
31-
"@aws-sdk/s3-request-presigner": "^3.1011.0",
28+
"@aws-sdk/client-bedrock-runtime": "^3.1037.0",
29+
"@aws-sdk/client-s3": "^3.1037.0",
30+
"@aws-sdk/lib-dynamodb": "^3.1037.0",
31+
"@aws-sdk/s3-request-presigner": "^3.1037.0",
3232
"@cedar-policy/cedar-wasm": "^4.9.1",
3333
"@electric-sql/pglite": "^0.4.0",
3434
"@faker-js/faker": "^10.3.0",

backend/test/ava-tests/saas-tests/saas-postgres-proxy-e2e.test.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import http from 'http';
99
import net from 'net';
1010
import request from 'supertest';
1111
import { ApplicationModule } from '../../../src/app.module.js';
12+
import { WinstonLogger } from '../../../src/entities/logging/winston-logger.js';
1213
import { AllExceptionsFilter } from '../../../src/exceptions/all-exceptions.filter.js';
1314
import { ValidationException } from '../../../src/exceptions/custom-exceptions/validation-exception.js';
1415
import { Cacher } from '../../../src/helpers/cache/cacher.js';
1516
import { DatabaseModule } from '../../../src/shared/database/database.module.js';
1617
import { DatabaseService } from '../../../src/shared/database/database.service.js';
17-
import { WinstonLogger } from '../../../src/entities/logging/winston-logger.js';
1818
import { createTestTable } from '../../utils/create-test-table.js';
1919
import {
2020
createInitialTestUser,
@@ -46,7 +46,9 @@ const upstreamConnectionParams = {
4646
// Connection DTO that points to the proxy (used in rocketadmin API).
4747
// Each call returns a unique username so the mock-api derives a unique
4848
// companyId — this isolates each test's connection pool inside the proxy's
49-
// per-company concurrency limiter.
49+
// per-company concurrency limiter. The password must match the upstream
50+
// password the mock-api hands back to the proxy, since the proxy now
51+
// verifies client-supplied credentials before forwarding.
5052
function createProxyConnectionDto(): {
5153
title: string;
5254
type: string;
@@ -65,7 +67,7 @@ function createProxyConnectionDto(): {
6567
host: PROXY_HOST,
6668
port: PROXY_PORT,
6769
username,
68-
password: 'proxy_pass',
70+
password: upstreamConnectionParams.password,
6971
database: 'postgres',
7072
ssh: false,
7173
ssl: false,

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
"lodash@>=4.0.0 <=4.17.23": ">=4.18.0",
3030
"lodash@<=4.17.23": ">=4.18.0",
3131
"@nestjs/core@<=11.1.17": ">=11.1.18",
32-
"uuid@<14.0.0": ">=14.0.0",
33-
"fast-xml-parser@<5.7.0": ">=5.7.0"
32+
"uuid@<14.0.0": ">=14.0.0"
3433
},
3534
"packageExtensions": {
3635
"ibm_db": {

0 commit comments

Comments
 (0)