Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions server/gitrest/packages/gitrest-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@
},
"dependencies": {
"@fluidframework/common-utils": "^1.1.1",
"@fluidframework/gitresources": "6.0.0-340759",
"@fluidframework/protocol-base": "6.0.0-340759",
"@fluidframework/gitresources": "8.0.0-347501",
"@fluidframework/protocol-base": "8.0.0-347501",
"@fluidframework/protocol-definitions": "^3.2.0",
"@fluidframework/server-services-client": "6.0.0-340759",
"@fluidframework/server-services-core": "6.0.0-340759",
"@fluidframework/server-services-shared": "6.0.0-340759",
"@fluidframework/server-services-telemetry": "6.0.0-340759",
"@fluidframework/server-services-utils": "6.0.0-340759",
"@fluidframework/server-test-utils": "6.0.0-340759",
"@fluidframework/server-services-client": "8.0.0-347501",
"@fluidframework/server-services-core": "8.0.0-347501",
"@fluidframework/server-services-shared": "8.0.0-347501",
"@fluidframework/server-services-telemetry": "8.0.0-347501",
"@fluidframework/server-services-utils": "8.0.0-347501",
"@fluidframework/server-test-utils": "8.0.0-347501",
"async-mutex": "^0.3.2",
"axios": "^1.8.4",
"body-parser": "^1.20.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ async function createNewSummaryVersion(
isNewDocument: boolean,
sequenceNumber: number,
options: IWholeSummaryOptions,
commitDateStr?: string,
): Promise<ISummaryVersion> {
const commitMessage = isNewDocument
? "New document"
Expand All @@ -203,7 +204,7 @@ async function createNewSummaryVersion(
`Summary @${sequenceNumber}`;
const commitParams: ICreateCommitParams = {
author: {
date: new Date().toISOString(),
date: commitDateStr ?? new Date().toISOString(),
email: "dummy@microsoft.com",
name: "GitRest Service",
},
Expand All @@ -215,6 +216,7 @@ async function createNewSummaryVersion(
GitRestLumberEventName.CreateSummaryVersion,
options.lumberjackProperties,
);

try {
const commit = await options.repoManager.createCommit(commitParams);
writeSummaryVersionMetric.success("Successfully created summary version as Git commit.");
Expand Down Expand Up @@ -316,6 +318,7 @@ export async function writeContainerSummary(
isNewDocument,
payload.sequenceNumber,
options,
payload.summaryTime,
);

// Create or update the document ref to reference the new commit.
Expand Down
4 changes: 2 additions & 2 deletions server/gitrest/packages/gitrest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
},
"dependencies": {
"@fluidframework/gitrest-base": "workspace:~",
"@fluidframework/server-services-shared": "6.0.0-340759",
"@fluidframework/server-services-utils": "6.0.0-340759",
"@fluidframework/server-services-shared": "8.0.0-347501",
"@fluidframework/server-services-utils": "8.0.0-347501",
"body-parser": "^1.20.3",
"compression": "^1.7.3",
"cors": "^2.8.5",
Expand Down
128 changes: 64 additions & 64 deletions server/gitrest/pnpm-lock.yaml

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

16 changes: 8 additions & 8 deletions server/historian/packages/historian-base/package.json
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-340759",
"@fluidframework/gitresources": "8.0.0-347501",
"@fluidframework/protocol-definitions": "^3.2.0",
"@fluidframework/server-services": "6.0.0-340759",
"@fluidframework/server-services-client": "6.0.0-340759",
"@fluidframework/server-services-core": "6.0.0-340759",
"@fluidframework/server-services-shared": "6.0.0-340759",
"@fluidframework/server-services-telemetry": "6.0.0-340759",
"@fluidframework/server-services-utils": "6.0.0-340759",
"@fluidframework/server-services": "8.0.0-347501",
"@fluidframework/server-services-client": "8.0.0-347501",
"@fluidframework/server-services-core": "8.0.0-347501",
"@fluidframework/server-services-shared": "8.0.0-347501",
"@fluidframework/server-services-telemetry": "8.0.0-347501",
"@fluidframework/server-services-utils": "8.0.0-347501",
"@types/ioredis-mock": "^8.2.6",
"axios": "^1.8.4",
"body-parser": "^1.20.3",
Expand All @@ -79,7 +79,7 @@
"devDependencies": {
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/eslint-config-fluid": "^6.1.0",
"@fluidframework/server-test-utils": "6.0.0-340759",
"@fluidframework/server-test-utils": "8.0.0-347501",
"@types/compression": "0.0.36",
"@types/cors": "^2.8.4",
"@types/debug": "^4.1.5",
Expand Down
9 changes: 8 additions & 1 deletion server/historian/packages/historian-base/src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,12 @@ import express from "express";
import type * as nconf from "nconf";

import * as routes from "./routes";
import type { ICache, ITenantService, ISimplifiedCustomDataRetriever } from "./services";
import type {
ICache,
ITenantService,
ISimplifiedCustomDataRetriever,
IPostEphemeralContainerChecker,
} from "./services";
import { Constants, getDocumentIdFromRequest, getTenantIdFromRequest } from "./utils";

export function create(
Expand All @@ -51,6 +56,7 @@ export function create(
ephemeralDocumentTTLSec?: number,
readinessCheck?: IReadinessCheck,
simplifiedCustomDataRetriever?: ISimplifiedCustomDataRetriever,
postEphemeralContainerChecker?: IPostEphemeralContainerChecker,
) {
// Express app configuration
const app: express.Express = express();
Expand Down Expand Up @@ -131,6 +137,7 @@ export function create(
denyList,
ephemeralDocumentTTLSec,
simplifiedCustomDataRetriever,
postEphemeralContainerChecker,
);
app.use(apiRoutes.git.blobs);
app.use(apiRoutes.git.refs);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import type {
} from "@fluidframework/server-services-core";
import type { IRedisClientConnectionManager } from "@fluidframework/server-services-utils";

import type { ISimplifiedCustomDataRetriever } from "./services";
import type { IPostEphemeralContainerChecker, ISimplifiedCustomDataRetriever } from "./services";

export interface IHistorianResourcesCustomizations {
storageNameRetriever?: IStorageNameRetriever;
Expand All @@ -20,4 +20,5 @@ export interface IHistorianResourcesCustomizations {
redisClientConnectionManagerForInvalidTokenCache?: IRedisClientConnectionManager;
readinessCheck?: IReadinessCheck;
simplifiedCustomDataRetriever?: ISimplifiedCustomDataRetriever;
postEphemeralContainerChecker?: IPostEphemeralContainerChecker;
}
2 changes: 2 additions & 0 deletions server/historian/packages/historian-base/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ export {
type ITenant,
type ITenantCustomDataExternal,
type ITenantService,
type IPostEphemeralContainerChecker,
type ICreateGitServiceArgs,
RedisCache,
RedisTenantCache,
RestGitService,
Expand Down
Loading