@finos/legend-server-lakehouse 0.3.40 → 0.3.41

package/lib/helpers/V1_IngestHelpers.d.ts

@@ -29,4 +29,5 @@ export type IngestDeploymentServerConfigOption = {
 };
 export declare const buildIngestDeploymentServerConfigOption: (serverConf: IngestDeploymentServerConfig) => IngestDeploymentServerConfigOption;
 export declare const filterEnvironmentsByEntitlementsEnv: (entitlementsType: V1_EntitlementsLakehouseEnvironmentType, environments: IngestDeploymentServerConfig[]) => IngestDeploymentServerConfig[];
+export declare const decorateEnvWithRealm: (env: string, relam: LakehouseEnvironmentType) => string;
 //# sourceMappingURL=V1_IngestHelpers.d.ts.map

package/lib/helpers/V1_IngestHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"V1_IngestHelpers.d.ts","sourceRoot":"","sources":["../../src/helpers/V1_IngestHelpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,uCAAuC,EAGxC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AAE9F,eAAO,MAAM,mCAAmC,GAC9C,YAAY,4BAA4B,KACvC,MAAM,GAAG,SAKX,CAAC;AAEF,oBAAY,wBAAwB;IAClC,WAAW,QAAQ;IACnB,mBAAmB,OAAO;CAC3B;AAED,eAAO,MAAM,4DAA4D,GACvE,SAAS,MAAM,KACd,uCASF,CAAC;AAEF,eAAO,MAAM,kDAAkD,GAC7D,SAAS,MAAM,EACf,iBAAiB,MAAM,KACtB,MAUF,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,SAAS,MAAM,KAAG,OAQ5D,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,KAAK,EAAE,4BAA4B,CAAC;IACpC,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AACF,eAAO,MAAM,uCAAuC,GAClD,YAAY,4BAA4B,KACvC,kCAUF,CAAC;AAEF,eAAO,MAAM,mCAAmC,GAC9C,kBAAkB,uCAAuC,EACzD,cAAc,4BAA4B,EAAE,KAC3C,4BAA4B,EAO9B,CAAC"}
+{"version":3,"file":"V1_IngestHelpers.d.ts","sourceRoot":"","sources":["../../src/helpers/V1_IngestHelpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,uCAAuC,EAGxC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AAE9F,eAAO,MAAM,mCAAmC,GAC9C,YAAY,4BAA4B,KACvC,MAAM,GAAG,SAKX,CAAC;AAEF,oBAAY,wBAAwB;IAClC,WAAW,QAAQ;IACnB,mBAAmB,OAAO;CAC3B;AAED,eAAO,MAAM,4DAA4D,GACvE,SAAS,MAAM,KACd,uCASF,CAAC;AAEF,eAAO,MAAM,kDAAkD,GAC7D,SAAS,MAAM,EACf,iBAAiB,MAAM,KACtB,MAUF,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,SAAS,MAAM,KAAG,OAQ5D,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,KAAK,EAAE,4BAA4B,CAAC;IACpC,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AACF,eAAO,MAAM,uCAAuC,GAClD,YAAY,4BAA4B,KACvC,kCAUF,CAAC;AAEF,eAAO,MAAM,mCAAmC,GAC9C,kBAAkB,uCAAuC,EACzD,cAAc,4BAA4B,EAAE,KAC3C,4BAA4B,EAO9B,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,KAAK,MAAM,EACX,OAAO,wBAAwB,KAC9B,MAYF,CAAC"}

package/lib/helpers/V1_IngestHelpers.js

@@ -62,4 +62,18 @@ export const buildIngestDeploymentServerConfigOption = (serverConf) => {
 export const filterEnvironmentsByEntitlementsEnv = (entitlementsType, environments) => {
     return environments.filter((env) => V1_isIngestEnvsCompatibleWithEntitlements(env.environmentClassification, entitlementsType));
 };
+export const decorateEnvWithRealm = (env, relam) => {
+    if (relam === LakehouseEnvironmentType.DEVELOPMENT) {
+        if (env.startsWith(`${LakehouseEnvironmentType.DEVELOPMENT}-`)) {
+            return env;
+        }
+        return `${LakehouseEnvironmentType.DEVELOPMENT}-${env}`;
+    }
+    else {
+        if (env.endsWith(`-${LakehouseEnvironmentType.PRODUCTION_PARALLEL}`)) {
+            return env;
+        }
+        return `${env}-${LakehouseEnvironmentType.PRODUCTION_PARALLEL}`;
+    }
+};
 //# sourceMappingURL=V1_IngestHelpers.js.map

package/lib/helpers/V1_IngestHelpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"V1_IngestHelpers.js","sourceRoot":"","sources":["../../src/helpers/V1_IngestHelpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"V1_IngestHelpers.js","sourceRoot":"","sources":["../../src/helpers/V1_IngestHelpers.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-server-lakehouse",
-  "version": "0.3.40",
+  "version": "0.3.41",
   "description": "Legend Lakehouse Server Client",
   "keywords": [
     "legend",
@@ -39,7 +39,7 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-graph": "32.3.39",
+    "@finos/legend-graph": "32.4.0",
     "@finos/legend-shared": "11.0.23",
     "serializr": "3.0.3"
   },

package/src/helpers/V1_IngestHelpers.ts

@@ -102,3 +102,20 @@ export const filterEnvironmentsByEntitlementsEnv = (
     ),
   );
 };
+
+export const decorateEnvWithRealm = (
+  env: string,
+  relam: LakehouseEnvironmentType,
+): string => {
+  if (relam === LakehouseEnvironmentType.DEVELOPMENT) {
+    if (env.startsWith(`${LakehouseEnvironmentType.DEVELOPMENT}-`)) {
+      return env;
+    }
+    return `${LakehouseEnvironmentType.DEVELOPMENT}-${env}`;
+  } else {
+    if (env.endsWith(`-${LakehouseEnvironmentType.PRODUCTION_PARALLEL}`)) {
+      return env;
+    }
+    return `${env}-${LakehouseEnvironmentType.PRODUCTION_PARALLEL}`;
+  }
+};