Add Storage Name into Tenants Custom Data

server/historian/packages/historian-base/src/routes/utils.ts

@@ -54,15 +54,17 @@ export async function createGitService(
     const token = parseToken(tenantId, authorization);
     const details = await tenantService.getTenant(tenantId, token, allowDisabledTenant);
     const customData: ITenantCustomDataExternal = details.customData;
-    const writeToExternalStorage = !!customData.externalStorageData;
+    const writeToExternalStorage = !!customData?.externalStorageData;
+    const storageName = customData?.storageName;
     const decoded = jwt.decode(token) as ITokenClaims;
      const service = new RestGitService(
          details.storage,
          writeToExternalStorage,
          tenantId,
          decoded.documentId,
          cache,
-         asyncLocalStorage);
+         asyncLocalStorage,
+         storageName);
 
     return service;
 }

server/historian/packages/historian-base/src/services/definitions.ts

@@ -76,6 +76,7 @@ export interface ITenant {
  */
 export interface ITenantCustomDataExternal extends ITenantCustomData {
     externalStorageData?: IExternalStorage;
+    storageName?: string;
 }
 
 export interface IExternalStorage {

server/historian/packages/historian-base/src/services/restGitService.ts

@@ -57,11 +57,21 @@ export class RestGitService {
         private readonly tenantId: string,
         private readonly documentId: string,
         private readonly cache?: ICache,
-        private readonly asyncLocalStorage?: AsyncLocalStorage<string>) {
-        const defaultHeaders: OutgoingHttpHeaders = {
-            "User-Agent": userAgent,
-            "Storage-Routing-Id": this.getStorageRoutingHeaderValue(),
-        };
+        private readonly asyncLocalStorage?: AsyncLocalStorage<string>,
+        private readonly storageName? : string) {
+        let defaultHeaders: OutgoingHttpHeaders;
+        if (storageName !== undefined) {
+            defaultHeaders = {
+                "User-Agent": userAgent,
+                "Storage-Routing-Id": this.getStorageRoutingHeaderValue(),
+                "Storage-Name": this.storageName,
+            };
+        } else {
+            defaultHeaders = {
+                "User-Agent": userAgent,
+                "Storage-Routing-Id": this.getStorageRoutingHeaderValue(),
+            };
+        }
         if (storage.credentials) {
             const token = Buffer.from(`${storage.credentials.user}:${storage.credentials.password}`);
             defaultHeaders.Authorization = `Basic ${token.toString("base64")}`;
@@ -75,12 +85,15 @@ export class RestGitService {
             `Created RestGitService: ${JSON.stringify({
                 "BaseUrl": storage.url,
                 "Storage-Routing-Id": this.getStorageRoutingHeaderValue(),
+                "Storage-Name": this.storageName,
             })}`,
         );
+
         Lumberjack.info(
             `Created RestGitService: ${JSON.stringify({
                 "BaseUrl": storage.url,
                 "Storage-Routing-Id": this.getStorageRoutingHeaderValue(),
+                "Storage-Name": this.storageName,
             })}`,
             this.lumberProperties,
         );