Skip to content

Commit 4bfb651

Browse files
zuharzzuharz
committed
Merge branch 'main' into pr-366 - resolve conflicts
2 parents 48dcf31 + ca9069e commit 4bfb651

File tree

53 files changed

+1523
-810
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1523
-810
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
### Changed
11+
- Updated NextJS to version 15. [#477](https://github.com/sourcebot-dev/sourcebot/pull/477)
12+
- Add `sessionToken` as optional Bedrock configuration parameter. [#478](https://github.com/sourcebot-dev/sourcebot/pull/478)
13+
1014
## [4.6.4] - 2025-08-11
1115

1216
### Added

‎docs/docs/configuration/language-model-providers.mdx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ For a detailed description of all the providers, please refer to the [schema](ht
6767
"accessKeySecret": {
6868
"env": "AWS_SECRET_ACCESS_KEY"
6969
},
70+
"sessionToken": {
71+
"env": "AWS_SESSION_TOKEN"
72+
},
7073
"region": "YOUR_REGION_HERE", // defaults to the AWS_REGION env var if not set
7174
"baseUrl": "OPTIONAL_BASE_URL"
7275
}

‎docs/snippets/schemas/v3/index.schema.mdx‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,6 +1355,37 @@
13551355
}
13561356
]
13571357
},
1358+
"sessionToken": {
1359+
"description": "Optional session token to use with the model. Defaults to the `AWS_SESSION_TOKEN` environment variable.",
1360+
"anyOf": [
1361+
{
1362+
"type": "object",
1363+
"properties": {
1364+
"secret": {
1365+
"type": "string",
1366+
"description": "The name of the secret that contains the token."
1367+
}
1368+
},
1369+
"required": [
1370+
"secret"
1371+
],
1372+
"additionalProperties": false
1373+
},
1374+
{
1375+
"type": "object",
1376+
"properties": {
1377+
"env": {
1378+
"type": "string",
1379+
"description": "The name of the environment variable that contains the token. Only supported in declarative connection configs."
1380+
}
1381+
},
1382+
"required": [
1383+
"env"
1384+
],
1385+
"additionalProperties": false
1386+
}
1387+
]
1388+
},
13581389
"region": {
13591390
"type": "string",
13601391
"description": "The AWS region. Defaults to the `AWS_REGION` environment variable.",
@@ -2749,6 +2780,37 @@
27492780
}
27502781
]
27512782
},
2783+
"sessionToken": {
2784+
"description": "Optional session token to use with the model. Defaults to the `AWS_SESSION_TOKEN` environment variable.",
2785+
"anyOf": [
2786+
{
2787+
"type": "object",
2788+
"properties": {
2789+
"secret": {
2790+
"type": "string",
2791+
"description": "The name of the secret that contains the token."
2792+
}
2793+
},
2794+
"required": [
2795+
"secret"
2796+
],
2797+
"additionalProperties": false
2798+
},
2799+
{
2800+
"type": "object",
2801+
"properties": {
2802+
"env": {
2803+
"type": "string",
2804+
"description": "The name of the environment variable that contains the token. Only supported in declarative connection configs."
2805+
}
2806+
},
2807+
"required": [
2808+
"env"
2809+
],
2810+
"additionalProperties": false
2811+
}
2812+
]
2813+
},
27522814
"region": {
27532815
"type": "string",
27542816
"description": "The AWS region. Defaults to the `AWS_REGION` environment variable.",

‎docs/snippets/schemas/v3/languageModel.schema.mdx‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,37 @@
8585
}
8686
]
8787
},
88+
"sessionToken": {
89+
"description": "Optional session token to use with the model. Defaults to the `AWS_SESSION_TOKEN` environment variable.",
90+
"anyOf": [
91+
{
92+
"type": "object",
93+
"properties": {
94+
"secret": {
95+
"type": "string",
96+
"description": "The name of the secret that contains the token."
97+
}
98+
},
99+
"required": [
100+
"secret"
101+
],
102+
"additionalProperties": false
103+
},
104+
{
105+
"type": "object",
106+
"properties": {
107+
"env": {
108+
"type": "string",
109+
"description": "The name of the environment variable that contains the token. Only supported in declarative connection configs."
110+
}
111+
},
112+
"required": [
113+
"env"
114+
],
115+
"additionalProperties": false
116+
}
117+
]
118+
},
88119
"region": {
89120
"type": "string",
90121
"description": "The AWS region. Defaults to the `AWS_REGION` environment variable.",
@@ -1479,6 +1510,37 @@
14791510
}
14801511
]
14811512
},
1513+
"sessionToken": {
1514+
"description": "Optional session token to use with the model. Defaults to the `AWS_SESSION_TOKEN` environment variable.",
1515+
"anyOf": [
1516+
{
1517+
"type": "object",
1518+
"properties": {
1519+
"secret": {
1520+
"type": "string",
1521+
"description": "The name of the secret that contains the token."
1522+
}
1523+
},
1524+
"required": [
1525+
"secret"
1526+
],
1527+
"additionalProperties": false
1528+
},
1529+
{
1530+
"type": "object",
1531+
"properties": {
1532+
"env": {
1533+
"type": "string",
1534+
"description": "The name of the environment variable that contains the token. Only supported in declarative connection configs."
1535+
}
1536+
},
1537+
"required": [
1538+
"env"
1539+
],
1540+
"additionalProperties": false
1541+
}
1542+
]
1543+
},
14821544
"region": {
14831545
"type": "string",
14841546
"description": "The AWS region. Defaults to the `AWS_REGION` environment variable.",

‎package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,8 @@
2424
"dotenv-cli": "^8.0.0",
2525
"npm-run-all": "^4.1.5"
2626
},
27-
"packageManager": "yarn@4.7.0"
27+
"packageManager": "yarn@4.7.0",
28+
"resolutions": {
29+
"prettier": "3.5.3"
30+
}
2831
}

‎packages/backend/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@types/micromatch": "^4.0.9",
1616
"@types/node": "^22.7.5",
1717
"cross-env": "^7.0.3",
18-
"json-schema-to-typescript": "^15.0.2",
18+
"json-schema-to-typescript": "^15.0.4",
1919
"tsc-watch": "^6.2.0",
2020
"tsx": "^4.19.1",
2121
"typescript": "^5.6.2",

‎packages/schemas/src/v3/index.schema.ts‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1354,6 +1354,37 @@ const schema = {
13541354
}
13551355
]
13561356
},
1357+
"sessionToken": {
1358+
"description": "Optional session token to use with the model. Defaults to the `AWS_SESSION_TOKEN` environment variable.",
1359+
"anyOf": [
1360+
{
1361+
"type": "object",
1362+
"properties": {
1363+
"secret": {
1364+
"type": "string",
1365+
"description": "The name of the secret that contains the token."
1366+
}
1367+
},
1368+
"required": [
1369+
"secret"
1370+
],
1371+
"additionalProperties": false
1372+
},
1373+
{
1374+
"type": "object",
1375+
"properties": {
1376+
"env": {
1377+
"type": "string",
1378+
"description": "The name of the environment variable that contains the token. Only supported in declarative connection configs."
1379+
}
1380+
},
1381+
"required": [
1382+
"env"
1383+
],
1384+
"additionalProperties": false
1385+
}
1386+
]
1387+
},
13571388
"region": {
13581389
"type": "string",
13591390
"description": "The AWS region. Defaults to the `AWS_REGION` environment variable.",
@@ -2748,6 +2779,37 @@ const schema = {
27482779
}
27492780
]
27502781
},
2782+
"sessionToken": {
2783+
"description": "Optional session token to use with the model. Defaults to the `AWS_SESSION_TOKEN` environment variable.",
2784+
"anyOf": [
2785+
{
2786+
"type": "object",
2787+
"properties": {
2788+
"secret": {
2789+
"type": "string",
2790+
"description": "The name of the secret that contains the token."
2791+
}
2792+
},
2793+
"required": [
2794+
"secret"
2795+
],
2796+
"additionalProperties": false
2797+
},
2798+
{
2799+
"type": "object",
2800+
"properties": {
2801+
"env": {
2802+
"type": "string",
2803+
"description": "The name of the environment variable that contains the token. Only supported in declarative connection configs."
2804+
}
2805+
},
2806+
"required": [
2807+
"env"
2808+
],
2809+
"additionalProperties": false
2810+
}
2811+
]
2812+
},
27512813
"region": {
27522814
"type": "string",
27532815
"description": "The AWS region. Defaults to the `AWS_REGION` environment variable.",

‎packages/schemas/src/v3/index.type.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,22 @@ export interface AmazonBedrockLanguageModel {
513513
*/
514514
env: string;
515515
};
516+
/**
517+
* Optional session token to use with the model. Defaults to the `AWS_SESSION_TOKEN` environment variable.
518+
*/
519+
sessionToken?:
520+
| {
521+
/**
522+
* The name of the secret that contains the token.
523+
*/
524+
secret: string;
525+
}
526+
| {
527+
/**
528+
* The name of the environment variable that contains the token. Only supported in declarative connection configs.
529+
*/
530+
env: string;
531+
};
516532
/**
517533
* The AWS region. Defaults to the `AWS_REGION` environment variable.
518534
*/

‎packages/schemas/src/v3/languageModel.schema.ts‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,37 @@ const schema = {
8484
}
8585
]
8686
},
87+
"sessionToken": {
88+
"description": "Optional session token to use with the model. Defaults to the `AWS_SESSION_TOKEN` environment variable.",
89+
"anyOf": [
90+
{
91+
"type": "object",
92+
"properties": {
93+
"secret": {
94+
"type": "string",
95+
"description": "The name of the secret that contains the token."
96+
}
97+
},
98+
"required": [
99+
"secret"
100+
],
101+
"additionalProperties": false
102+
},
103+
{
104+
"type": "object",
105+
"properties": {
106+
"env": {
107+
"type": "string",
108+
"description": "The name of the environment variable that contains the token. Only supported in declarative connection configs."
109+
}
110+
},
111+
"required": [
112+
"env"
113+
],
114+
"additionalProperties": false
115+
}
116+
]
117+
},
87118
"region": {
88119
"type": "string",
89120
"description": "The AWS region. Defaults to the `AWS_REGION` environment variable.",
@@ -1478,6 +1509,37 @@ const schema = {
14781509
}
14791510
]
14801511
},
1512+
"sessionToken": {
1513+
"description": "Optional session token to use with the model. Defaults to the `AWS_SESSION_TOKEN` environment variable.",
1514+
"anyOf": [
1515+
{
1516+
"type": "object",
1517+
"properties": {
1518+
"secret": {
1519+
"type": "string",
1520+
"description": "The name of the secret that contains the token."
1521+
}
1522+
},
1523+
"required": [
1524+
"secret"
1525+
],
1526+
"additionalProperties": false
1527+
},
1528+
{
1529+
"type": "object",
1530+
"properties": {
1531+
"env": {
1532+
"type": "string",
1533+
"description": "The name of the environment variable that contains the token. Only supported in declarative connection configs."
1534+
}
1535+
},
1536+
"required": [
1537+
"env"
1538+
],
1539+
"additionalProperties": false
1540+
}
1541+
]
1542+
},
14811543
"region": {
14821544
"type": "string",
14831545
"description": "The AWS region. Defaults to the `AWS_REGION` environment variable.",

‎packages/schemas/src/v3/languageModel.type.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,22 @@ export interface AmazonBedrockLanguageModel {
5959
*/
6060
env: string;
6161
};
62+
/**
63+
* Optional session token to use with the model. Defaults to the `AWS_SESSION_TOKEN` environment variable.
64+
*/
65+
sessionToken?:
66+
| {
67+
/**
68+
* The name of the secret that contains the token.
69+
*/
70+
secret: string;
71+
}
72+
| {
73+
/**
74+
* The name of the environment variable that contains the token. Only supported in declarative connection configs.
75+
*/
76+
env: string;
77+
};
6278
/**
6379
* The AWS region. Defaults to the `AWS_REGION` environment variable.
6480
*/

0 commit comments

Comments
 (0)