Skip to content
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

Bumped historian and gitrest r11 verisons #23413

Merged
merged 54 commits into from
Dec 31, 2024
Merged

Bumped historian and gitrest r11 verisons #23413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
bd5c693
Added support for hidden private keys in Riddler
dhr-verma Dec 17, 2024
76325b6
Added key ordering logic
dhr-verma Dec 17, 2024
518b48d
Added unit tests
dhr-verma Dec 17, 2024
abca9ee
Combined the getKey methods
dhr-verma Dec 18, 2024
b97ae1b
Fixed bug in sinon
dhr-verma Dec 18, 2024
39810d2
Merge branch 'main' of https://github.com/microsoft/FluidFramework in…
dhr-verma Dec 18, 2024
a4b24eb
Fixed unit test bug
dhr-verma Dec 18, 2024
ab12637
Added more unit tests
dhr-verma Dec 18, 2024
604d986
Added more unit tests for TenantManager
dhr-verma Dec 18, 2024
cf3bcd9
FIxed format
dhr-verma Dec 18, 2024
478b5fb
Fixed formatting
dhr-verma Dec 18, 2024
52cbe69
Added new prop to ITenantConfig
dhr-verma Dec 18, 2024
367c841
Lint fixes
dhr-verma Dec 18, 2024
053741c
Fixed bugs
dhr-verma Dec 19, 2024
d6b4c3c
Changed property name from isKeylessAccessEnabled to enableKeylessAccess
dhr-verma Dec 19, 2024
2332f10
Added documentation
dhr-verma Dec 19, 2024
3ae1ebd
Improved readability
dhr-verma Dec 19, 2024
e615875
Fixed format
dhr-verma Dec 19, 2024
70d1fec
Addressed usePrivateKey comment
dhr-verma Dec 19, 2024
cf51d29
Addressed comments about the keyless token claim
dhr-verma Dec 19, 2024
87e451b
Fixed lint errors
dhr-verma Dec 19, 2024
4d63e65
Merge branch 'main' of https://github.com/microsoft/FluidFramework in…
dhr-verma Dec 20, 2024
4108825
Addressed comments about combining the createTenantKeys methods
dhr-verma Dec 20, 2024
e7498a3
Modified keyless access policy API
dhr-verma Dec 20, 2024
3353fab
Fixed format
dhr-verma Dec 20, 2024
4097f71
Added a new tenant config prop enableKeyAccess and made enableKeyless…
dhr-verma Dec 20, 2024
9f58492
Changed logic of checking if key based access is enabled
dhr-verma Dec 20, 2024
89e839f
Changed variable name for readability
dhr-verma Dec 20, 2024
8b5a2b6
Addressed comments
dhr-verma Dec 26, 2024
5fcbd71
Added changesets
dhr-verma Dec 26, 2024
f736d30
Update server/routerlicious/.changeset/six-candles-sneeze.md
dhr-verma Dec 26, 2024
c329bac
Update server/routerlicious/.changeset/six-candles-sneeze.md
dhr-verma Dec 26, 2024
ded23b4
Update server/routerlicious/.changeset/weak-radios-camp.md
dhr-verma Dec 26, 2024
cd8fe82
Addressed comments
dhr-verma Dec 26, 2024
e1f7b20
Merge branch 'vermadhr/keylessAccessWork' of https://github.com/dhr-v…
dhr-verma Dec 26, 2024
015785b
Merge branch 'main' of https://github.com/microsoft/FluidFramework in…
dhr-verma Dec 26, 2024
c7efe65
Added support for making API keys optional
dhr-verma Dec 26, 2024
5218c20
Added more unit tests
dhr-verma Dec 27, 2024
19c0307
Added unit tests
dhr-verma Dec 27, 2024
2cc30b7
Added more unit tests
dhr-verma Dec 27, 2024
513c5f9
Removed getKey API call from internal services
dhr-verma Dec 27, 2024
a224f3a
Updated docs
dhr-verma Dec 27, 2024
66efcee
Added debug logs
dhr-verma Dec 27, 2024
3320a28
Added more debug logs
dhr-verma Dec 28, 2024
4f91beb
Fixed encryption bug
dhr-verma Dec 28, 2024
fe308d9
Removed debug logs
dhr-verma Dec 30, 2024
8f195d7
Update server/routerlicious/packages/services/src/tenant.ts
dhr-verma Dec 30, 2024
f94d7c2
Addressed comments
dhr-verma Dec 30, 2024
a79d8d6
Merge branch 'vermadhr/keylessAccessWork' of https://github.com/dhr-v…
dhr-verma Dec 30, 2024
2a0a016
Added changesets
dhr-verma Dec 30, 2024
36ae5d4
Update server/routerlicious/packages/routerlicious-base/src/riddler/a…
dhr-verma Dec 30, 2024
b73ae27
Changed API design for the case where shared keys are disabled
dhr-verma Dec 30, 2024
fb06ce9
Merge branch 'main' of https://github.com/microsoft/FluidFramework in…
dhr-verma Dec 30, 2024
b688b0a
Bumped r11 version consumed by Historian and Gitrest
dhr-verma Dec 30, 2024
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
14 changes: 7 additions & 7 deletions server/gitrest/packages/gitrest-base/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@
"dependencies": {
"@fluidframework/common-utils": "^1.1.1",
"@fluidframework/gitresources": "6.0.0-310414",
"@fluidframework/protocol-base": "6.0.0-310414",
"@fluidframework/protocol-base": "6.0.0-314215",
"@fluidframework/protocol-definitions": "^3.2.0",
"@fluidframework/server-services-client": "6.0.0-310414",
"@fluidframework/server-services-core": "6.0.0-310414",
"@fluidframework/server-services-shared": "6.0.0-310414",
"@fluidframework/server-services-telemetry": "6.0.0-310414",
"@fluidframework/server-services-utils": "6.0.0-310414",
"@fluidframework/server-test-utils": "6.0.0-310414",
"@fluidframework/server-services-client": "6.0.0-314215",
"@fluidframework/server-services-core": "6.0.0-314215",
"@fluidframework/server-services-shared": "6.0.0-314215",
"@fluidframework/server-services-telemetry": "6.0.0-314215",
"@fluidframework/server-services-utils": "6.0.0-314215",
"@fluidframework/server-test-utils": "6.0.0-314215",
"async-mutex": "^0.3.2",
"axios": "^1.7.7",
"body-parser": "^1.20.3",
Expand Down
100 changes: 52 additions & 48 deletions server/gitrest/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions server/historian/packages/historian-base/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@
"@fluidframework/common-utils": "^1.1.1",
"@fluidframework/gitresources": "6.0.0-310414",
"@fluidframework/protocol-definitions": "^3.2.0",
"@fluidframework/server-services": "6.0.0-310414",
"@fluidframework/server-services-client": "6.0.0-310414",
"@fluidframework/server-services-core": "6.0.0-310414",
"@fluidframework/server-services-shared": "6.0.0-310414",
"@fluidframework/server-services-telemetry": "6.0.0-310414",
"@fluidframework/server-services-utils": "6.0.0-310414",
"@fluidframework/server-services": "6.0.0-314215",
"@fluidframework/server-services-client": "6.0.0-314215",
"@fluidframework/server-services-core": "6.0.0-314215",
"@fluidframework/server-services-shared": "6.0.0-314215",
"@fluidframework/server-services-telemetry": "6.0.0-314215",
"@fluidframework/server-services-utils": "6.0.0-314215",
"@types/ioredis-mock": "^8.2.5",
"axios": "^1.7.7",
"body-parser": "^1.20.3",
Expand All @@ -79,7 +79,7 @@
"devDependencies": {
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/eslint-config-fluid": "^5.1.0",
"@fluidframework/server-test-utils": "6.0.0-310414",
"@fluidframework/server-test-utils": "6.0.0-314215",
"@types/compression": "0.0.36",
"@types/cors": "^2.8.4",
"@types/debug": "^4.1.5",
Expand Down
2 changes: 2 additions & 0 deletions server/historian/packages/historian-base/src/test/utils/testTenantService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ export class TestTenantService implements ITenantService {
storage: this.tenant.storage,
orderer: this.tenant.orderer,
customData: {},
enablePrivateKeyAccess: false,
enableSharedKeyAccess: true,
});
}

Expand Down
Loading
Loading