Skip to content

Commit

Permalink
[Data Virtualization Testing] Consume server packages in client that …
Browse files Browse the repository at this point in the history 
…round trip groupId (microsoft#19725)

[AB#7240](https://dev.azure.com/fluidframework/internal/_workitems/edit/7240)

Bump server packages to allow for `groupId` to be round tripped. We
chose a pre-release as there will be more changes made to the
local-server as we will want to also control whether or not parts of
snapshots are returned via groupId.
  • Loading branch information
@tyler-cai-microsoft
tyler-cai-microsoft committed Feb 21, 2024
1 parent d849063 commit c8e6011
Show file tree
Hide file tree
Showing 26 changed files with 247 additions and 246 deletions.
2 changes: 1 addition & 1 deletion azure/packages/azure-local-service/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"tsc": "tsc"
},
"dependencies": {
"tinylicious": "^3.1.0-237980"
"tinylicious": "^3.1.0-238497"
},
"devDependencies": {
"@arethetypeswrong/cli": "^0.13.3",
Expand Down
2 changes: 1 addition & 1 deletion azure/packages/test/end-to-end-tests/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"prettier": "~3.0.3",
"sinon": "^7.4.2",
"start-server-and-test": "^1.11.7",
"tinylicious": "^3.1.0-237980",
"tinylicious": "^3.1.0-238497",
"uuid": "^9.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion azure/packages/test/scenario-runner/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"mocha": "^10.2.0",
"sinon": "^7.4.2",
"start-server-and-test": "^1.11.7",
"tinylicious": "^3.1.0-237980",
"tinylicious": "^3.1.0-238497",
"uuid": "^9.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/benchmarks/tablebench/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"prettier": "~3.0.3",
"rimraf": "^4.4.0",
"start-server-and-test": "^1.11.7",
"tinylicious": "^3.1.0-237980",
"tinylicious": "^3.1.0-238497",
"ts-loader": "^9.3.0",
"typescript": "~5.1.6",
"webpack": "^5.82.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/client-logger/app-insights-logger/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"prettier": "~3.0.3",
"rimraf": "^4.4.0",
"start-server-and-test": "^1.11.7",
"tinylicious": "^3.1.0-237980",
"tinylicious": "^3.1.0-238497",
"ts-jest": "^29.1.1",
"ts-loader": "^9.3.0",
"tslib": "^1.10.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/external-data/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"start-server-and-test": "^1.11.7",
"stream-http": "^3.2.0",
"supertest": "^3.4.2",
"tinylicious": "^3.1.0-237980",
"tinylicious": "^3.1.0-238497",
"ts-jest": "^29.1.1",
"ts-loader": "^9.3.0",
"typescript": "~5.1.6",
Expand Down
4 changes: 2 additions & 2 deletions examples/service-clients/azure-client/external-controller/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@fluidframework/eslint-config-fluid": "^3.5.0",
"@fluidframework/fluid-static": "workspace:~",
"@fluidframework/local-driver": "workspace:~",
"@fluidframework/server-local-server": "^3.1.0-237980",
"@fluidframework/server-local-server": "^3.1.0-238497",
"@fluidframework/test-runtime-utils": "workspace:~",
"@fluidframework/test-tools": "^1.0.195075",
"@types/jest": "29.5.3",
Expand All @@ -78,7 +78,7 @@
"puppeteer": "^22.0.0",
"rimraf": "^4.4.0",
"start-server-and-test": "^1.11.7",
"tinylicious": "^3.1.0-237980",
"tinylicious": "^3.1.0-238497",
"ts-jest": "^29.1.1",
"ts-loader": "^9.3.0",
"typescript": "~5.1.6",
Expand Down
2 changes: 1 addition & 1 deletion examples/utils/example-utils/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@fluidframework/routerlicious-driver": "workspace:~",
"@fluidframework/runtime-definitions": "workspace:~",
"@fluidframework/runtime-utils": "workspace:~",
"@fluidframework/server-local-server": "^3.1.0-237980",
"@fluidframework/server-local-server": "^3.1.0-238497",
"@fluidframework/task-manager": "workspace:~",
"@fluidframework/tinylicious-driver": "workspace:~",
"react": "^17.0.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/utils/webpack-fluid-loader/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"@fluidframework/protocol-definitions": "^3.2.0-237840",
"@fluidframework/routerlicious-driver": "workspace:~",
"@fluidframework/runtime-utils": "workspace:~",
"@fluidframework/server-local-server": "^3.1.0-237980",
"@fluidframework/server-local-server": "^3.1.0-238497",
"@fluidframework/telemetry-utils": "workspace:~",
"@fluidframework/test-runtime-utils": "workspace:~",
"@fluidframework/tool-utils": "workspace:~",
Expand Down
2 changes: 1 addition & 1 deletion examples/version-migration/tree-shim/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"rimraf": "^4.4.0",
"start-server-and-test": "^1.11.7",
"style-loader": "^1.0.0",
"tinylicious": "^3.1.0-237980",
"tinylicious": "^3.1.0-238497",
"ts-jest": "^29.1.1",
"ts-loader": "^9.3.0",
"typescript": "~5.1.6",
Expand Down
2 changes: 1 addition & 1 deletion experimental/PropertyDDS/packages/property-dds/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"@fluidframework/local-driver": "workspace:~",
"@fluidframework/mocha-test-setup": "workspace:~",
"@fluidframework/sequence": "workspace:~",
"@fluidframework/server-local-server": "^3.1.0-237980",
"@fluidframework/server-local-server": "^3.1.0-238497",
"@fluidframework/test-runtime-utils": "workspace:~",
"@fluidframework/test-utils": "workspace:~",
"@microsoft/api-extractor": "^7.39.1",
Expand Down
2 changes: 1 addition & 1 deletion experimental/PropertyDDS/services/property-query-service/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"@fluidframework/local-driver": "workspace:~",
"@fluidframework/mocha-test-setup": "workspace:~",
"@fluidframework/runtime-utils": "workspace:~",
"@fluidframework/server-local-server": "^3.1.0-237980",
"@fluidframework/server-local-server": "^3.1.0-238497",
"@fluidframework/test-utils": "workspace:~",
"aws-sdk": "2.547.0",
"c8": "^8.0.1",
Expand Down
10 changes: 5 additions & 5 deletions packages/drivers/local-driver/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,13 @@
"@fluidframework/driver-base": "workspace:~",
"@fluidframework/driver-definitions": "workspace:~",
"@fluidframework/driver-utils": "workspace:~",
"@fluidframework/protocol-base": "^3.1.0-237980",
"@fluidframework/protocol-base": "^3.1.0-238497",
"@fluidframework/protocol-definitions": "^3.2.0-237840",
"@fluidframework/routerlicious-driver": "workspace:~",
"@fluidframework/server-local-server": "^3.1.0-237980",
"@fluidframework/server-services-client": "^3.1.0-237980",
"@fluidframework/server-services-core": "^3.1.0-237980",
"@fluidframework/server-test-utils": "^3.1.0-237980",
"@fluidframework/server-local-server": "^3.1.0-238497",
"@fluidframework/server-services-client": "^3.1.0-238497",
"@fluidframework/server-services-core": "^3.1.0-238497",
"@fluidframework/server-test-utils": "^3.1.0-238497",
"@fluidframework/telemetry-utils": "workspace:~",
"events": "^3.1.0",
"jsrsasign": "^11.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/drivers/odsp-driver/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"@fluidframework/driver-utils": "workspace:~",
"@fluidframework/odsp-doclib-utils": "workspace:~",
"@fluidframework/odsp-driver-definitions": "workspace:~",
"@fluidframework/protocol-base": "^3.1.0-237980",
"@fluidframework/protocol-base": "^3.1.0-238497",
"@fluidframework/protocol-definitions": "^3.2.0-237840",
"@fluidframework/telemetry-utils": "workspace:~",
"node-fetch": "^2.6.9",
Expand Down
6 changes: 3 additions & 3 deletions packages/drivers/routerlicious-driver/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@
"@fluidframework/driver-base": "workspace:~",
"@fluidframework/driver-definitions": "workspace:~",
"@fluidframework/driver-utils": "workspace:~",
"@fluidframework/gitresources": "^3.1.0-237980",
"@fluidframework/protocol-base": "^3.1.0-237980",
"@fluidframework/gitresources": "^3.1.0-238497",
"@fluidframework/protocol-base": "^3.1.0-238497",
"@fluidframework/protocol-definitions": "^3.2.0-237840",
"@fluidframework/server-services-client": "^3.1.0-237980",
"@fluidframework/server-services-client": "^3.1.0-238497",
"@fluidframework/telemetry-utils": "workspace:~",
"cross-fetch": "^3.1.5",
"json-stringify-safe": "5.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/loader/container-loader/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
"@fluidframework/core-utils": "workspace:~",
"@fluidframework/driver-definitions": "workspace:~",
"@fluidframework/driver-utils": "workspace:~",
"@fluidframework/protocol-base": "^3.1.0-237980",
"@fluidframework/protocol-base": "^3.1.0-238497",
"@fluidframework/protocol-definitions": "^3.2.0-237840",
"@fluidframework/telemetry-utils": "workspace:~",
"@ungap/structured-clone": "^1.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/loader/driver-utils/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
"@fluidframework/core-interfaces": "workspace:~",
"@fluidframework/core-utils": "workspace:~",
"@fluidframework/driver-definitions": "workspace:~",
"@fluidframework/gitresources": "^3.1.0-237980",
"@fluidframework/protocol-base": "^3.1.0-237980",
"@fluidframework/gitresources": "^3.1.0-238497",
"@fluidframework/protocol-base": "^3.1.0-238497",
"@fluidframework/protocol-definitions": "^3.2.0-237840",
"@fluidframework/telemetry-utils": "workspace:~",
"axios": "^1.6.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/service-clients/azure-client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"@fluidframework/protocol-definitions": "^3.2.0-237840",
"@fluidframework/routerlicious-driver": "workspace:~",
"@fluidframework/runtime-utils": "workspace:~",
"@fluidframework/server-services-client": "^3.1.0-237980",
"@fluidframework/server-services-client": "^3.1.0-238497",
"@fluidframework/telemetry-utils": "workspace:~",
"axios": "^1.6.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/service-clients/tinylicious-client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
"prettier": "~3.0.3",
"rimraf": "^4.4.0",
"start-server-and-test": "^1.11.7",
"tinylicious": "^3.1.0-237980",
"tinylicious": "^3.1.0-238497",
"tsc-multi": "^1.1.0",
"typescript": "~5.1.6"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/test/local-server-tests/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"@fluidframework/runtime-definitions": "workspace:~",
"@fluidframework/runtime-utils": "workspace:~",
"@fluidframework/sequence": "workspace:~",
"@fluidframework/server-local-server": "^3.1.0-237980",
"@fluidframework/server-local-server": "^3.1.0-238497",
"@fluidframework/shared-object-base": "workspace:~",
"@fluidframework/telemetry-utils": "workspace:~",
"@fluidframework/test-utils": "workspace:~",
Expand Down
2 changes: 1 addition & 1 deletion packages/test/snapshots/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"@fluidframework/register-collection": "workspace:~",
"@fluidframework/replay-driver": "workspace:~",
"@fluidframework/sequence": "workspace:~",
"@fluidframework/server-local-server": "^3.1.0-237980",
"@fluidframework/server-local-server": "^3.1.0-238497",
"@fluidframework/test-utils": "workspace:~",
"mocha": "^10.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/test/test-drivers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"@fluidframework/odsp-urlresolver": "workspace:~",
"@fluidframework/protocol-definitions": "^3.2.0-237840",
"@fluidframework/routerlicious-driver": "workspace:~",
"@fluidframework/server-local-server": "^3.1.0-237980",
"@fluidframework/server-local-server": "^3.1.0-238497",
"@fluidframework/test-driver-definitions": "workspace:~",
"@fluidframework/test-runtime-utils": "workspace:~",
"@fluidframework/tinylicious-driver": "workspace:~",
Expand Down
2 changes: 1 addition & 1 deletion packages/test/test-end-to-end-tests/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
"semver": "^7.5.3",
"sinon": "^7.4.2",
"start-server-and-test": "^1.11.7",
"tinylicious": "^3.1.0-237980",
"tinylicious": "^3.1.0-238497",
"url": "^0.11.0",
"uuid": "^9.0.0"
},
Expand Down
25 changes: 13 additions & 12 deletions packages/test/test-end-to-end-tests/src/test/data-virtualization/groupIdInSummary.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
type ITestObjectProvider,
} from "@fluidframework/test-utils";
import { SummaryType } from "@fluidframework/protocol-definitions";
import { LoaderHeader } from "@fluidframework/container-definitions";

// A Test Data Object that exposes some basic functionality.
class TestDataObject extends DataObject {
Expand Down Expand Up @@ -85,25 +86,25 @@ describeCompat("Create data store with group id", "NoCompat", (getTestObjectProv
container,
dataObjectFactory,
);
const { summaryTree } = await summarizeNow(summarizer);

const { summaryVersion, summaryTree } = await summarizeNow(summarizer);
const channelsTree = summaryTree.tree[".channels"];
assert(channelsTree.type === SummaryType.Tree, "channels should be a tree");
const dataObjectTree = channelsTree.tree[dataObject.id];
assert(dataObjectTree !== undefined, "dataObjectTree should exist");
assert(dataObjectTree.type === SummaryType.Tree, "dataObjectTree should be a tree");
assert(dataObjectTree.groupId === loadingGroupId, "GroupId should be on the summary tree");

// TODO: Enable this portion of the test once we have the ability to load the summary with the group id
// Likely requires local server to support summary trees.
// const container2 = await provider.loadContainer(runtimeFactory, undefined, {
// [LoaderHeader.version]: summaryVersion,
// });
// TODO: Enable this portion in tinylicious
if (provider.driver.type === "local") {
const container2 = await provider.loadContainer(runtimeFactory, undefined, {
[LoaderHeader.version]: summaryVersion,
});

// const mainObject2 = (await container2.getEntryPoint()) as TestDataObject;
// const handle2 = await mainObject2._root.get("dataObject");
// assert(handle2 !== undefined, "handle2 should not be undefined");
// const testObject2 = (await handle2.get()) as TestDataObject;
// assert.equal(testObject2.groupId, groupId, "groupId should be the same");
const mainObject2 = (await container2.getEntryPoint()) as TestDataObject;
const handle2 = await mainObject2._root.get("dataObject");
assert(handle2 !== undefined, "handle2 should not be undefined");
const testObject2 = (await handle2.get()) as TestDataObject;
assert.equal(testObject2.loadingGroupId, loadingGroupId, "groupId should be the same");
}
});
});
2 changes: 1 addition & 1 deletion packages/test/test-service-load/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"commander": "^5.1.0",
"ps-node": "^0.1.6",
"start-server-and-test": "^1.11.7",
"tinylicious": "^3.1.0-237980"
"tinylicious": "^3.1.0-238497"
},
"devDependencies": {
"@fluid-tools/build-cli": "^0.34.0",
Expand Down
Loading

0 comments on commit c8e6011

Please sign in to comment.