@osaas/client-core 0.14.0 → 0.15.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/core.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { Context, Service } from './context';
2
2
  export declare function getService(context: Context, serviceId: string): Promise<Service>;
3
+ export declare const isValidInstanceName: (name: string) => boolean;
3
4
  export type Port = {
4
5
  externalIp: string;
5
6
  externalPort: number;
@@ -78,4 +79,5 @@ export declare function instanceValue(instance: {
78
79
  [key: string]: string;
79
80
  }, key: string): string;
80
81
  export declare function valueOrSecret(value: string): string;
82
+ export declare function waitForInstanceReady(serviceId: string, name: string, ctx: Context): Promise<void>;
81
83
  //# sourceMappingURL=core.d.ts.map
package/lib/core.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAK7C,wBAAsB,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAgBnE;AAED,MAAM,MAAM,IAAI,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF;;;;;;GAMG;AAEH;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,GAAG,GACR,OAAO,CAAC,GAAG,CAAC,CAad;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,iBAYd;AAED;;;;;;;;GAQG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,gBAuBd;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,gBAYd;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,EAAE,CAAC,CAYjB;AAED,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,MAAM,EAAE,CAAC,CAWnB;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,mBAad;AAED,wBAAgB,aAAa,CAC3B,QAAQ,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,GAAG,EAAE,MAAM,UAGZ;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,UAE1C"}
1
+ {"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAO7C,wBAAsB,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAgBnE;AAED,eAAO,MAAM,mBAAmB,SAAU,MAAM,YAE/C,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF;;;;;;GAMG;AAEH;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,GAAG,GACR,OAAO,CAAC,GAAG,CAAC,CAgBd;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,iBAYd;AAED;;;;;;;;GAQG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,gBAuBd;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,gBAYd;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,EAAE,CAAC,CAYjB;AAED,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,MAAM,EAAE,CAAC,CAWnB;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,mBAad;AAED,wBAAgB,aAAa,CAC3B,QAAQ,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,GAAG,EAAE,MAAM,UAGZ;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,UAE1C;AAED,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,OAAO,iBAgBb"}
package/lib/core.js CHANGED
@@ -1,9 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.valueOrSecret = exports.instanceValue = exports.getInstanceHealth = exports.getLogsForInstance = exports.getPortsForInstance = exports.listInstances = exports.getInstance = exports.removeInstance = exports.createInstance = exports.getService = void 0;
3
+ exports.waitForInstanceReady = exports.valueOrSecret = exports.instanceValue = exports.getInstanceHealth = exports.getLogsForInstance = exports.getPortsForInstance = exports.listInstances = exports.getInstance = exports.removeInstance = exports.createInstance = exports.isValidInstanceName = exports.getService = void 0;
4
4
  const errors_1 = require("./errors");
5
5
  const fetch_1 = require("./fetch");
6
6
  const log_1 = require("./log");
7
+ const delay = (ms) => new Promise((res) => setTimeout(res, ms));
7
8
  async function getService(context, serviceId) {
8
9
  const serviceUrl = new URL(`https://catalog.svc.${context.getEnvironment()}.osaas.io/mysubscriptions`);
9
10
  const services = await (0, fetch_1.createFetch)(serviceUrl, {
@@ -20,6 +21,10 @@ async function getService(context, serviceId) {
20
21
  return service;
21
22
  }
22
23
  exports.getService = getService;
24
+ const isValidInstanceName = (name) => {
25
+ return /^[a-z0-9]+$/.test(name);
26
+ };
27
+ exports.isValidInstanceName = isValidInstanceName;
23
28
  /**
24
29
  * @typedef ServiceInstance
25
30
  * @type object
@@ -44,6 +49,9 @@ exports.getService = getService;
44
49
  * console.log(instance.url);
45
50
  */
46
51
  async function createInstance(context, serviceId, token, body) {
52
+ if (!(0, exports.isValidInstanceName)(body.name)) {
53
+ throw new errors_1.InvalidName(body.name);
54
+ }
47
55
  const service = await getService(context, serviceId);
48
56
  const instanceUrl = new URL(service.apiUrl);
49
57
  const instance = await (0, fetch_1.createFetch)(instanceUrl, {
@@ -191,4 +199,16 @@ function valueOrSecret(value) {
191
199
  return value.match(/^{{secrets}}/) ? '***' : value;
192
200
  }
193
201
  exports.valueOrSecret = valueOrSecret;
202
+ async function waitForInstanceReady(serviceId, name, ctx) {
203
+ const serviceAccessToken = await ctx.getServiceAccessToken(serviceId);
204
+ let instanceOk = false;
205
+ while (!instanceOk) {
206
+ await delay(1000);
207
+ const status = await getInstanceHealth(ctx, serviceId, name, serviceAccessToken);
208
+ if (status && status === 'running') {
209
+ instanceOk = true;
210
+ }
211
+ }
212
+ }
213
+ exports.waitForInstanceReady = waitForInstanceReady;
194
214
  //# sourceMappingURL=core.js.map
package/lib/core.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"core.js","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"core.js","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"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"}
package/lib/errors.d.ts CHANGED
@@ -4,4 +4,7 @@ export declare class TokenExpiredError extends Error {
4
4
  export declare class UnauthorizedError extends Error {
5
5
  constructor();
6
6
  }
7
+ export declare class InvalidName extends Error {
8
+ constructor(name: string);
9
+ }
7
10
  //# sourceMappingURL=errors.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,qBAAa,iBAAkB,SAAQ,KAAK;;CAI3C;AAED,qBAAa,iBAAkB,SAAQ,KAAK;;CAI3C"}
1
+ {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,qBAAa,iBAAkB,SAAQ,KAAK;;CAI3C;AAED,qBAAa,iBAAkB,SAAQ,KAAK;;CAI3C;AAED,qBAAa,WAAY,SAAQ,KAAK;gBACxB,IAAI,EAAE,MAAM;CAGzB"}
package/lib/errors.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.UnauthorizedError = exports.TokenExpiredError = void 0;
3
+ exports.InvalidName = exports.UnauthorizedError = exports.TokenExpiredError = void 0;
4
4
  class TokenExpiredError extends Error {
5
5
  constructor() {
6
6
  super('Service Access Token expired');
@@ -13,4 +13,10 @@ class UnauthorizedError extends Error {
13
13
  }
14
14
  }
15
15
  exports.UnauthorizedError = UnauthorizedError;
16
+ class InvalidName extends Error {
17
+ constructor(name) {
18
+ super(`Invalid name: ${name}. Only alphanumeric characters are allowed.`);
19
+ }
20
+ }
21
+ exports.InvalidName = InvalidName;
16
22
  //# sourceMappingURL=errors.js.map
package/lib/errors.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":";;;AAAA,MAAa,iBAAkB,SAAQ,KAAK;IAC1C;QACE,KAAK,CAAC,8BAA8B,CAAC,CAAC;IACxC,CAAC;CACF;AAJD,8CAIC;AAED,MAAa,iBAAkB,SAAQ,KAAK;IAC1C;QACE,KAAK,CAAC,cAAc,CAAC,CAAC;IACxB,CAAC;CACF;AAJD,8CAIC"}
1
+ {"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":";;;AAAA,MAAa,iBAAkB,SAAQ,KAAK;IAC1C;QACE,KAAK,CAAC,8BAA8B,CAAC,CAAC;IACxC,CAAC;CACF;AAJD,8CAIC;AAED,MAAa,iBAAkB,SAAQ,KAAK;IAC1C;QACE,KAAK,CAAC,cAAc,CAAC,CAAC;IACxB,CAAC;CACF;AAJD,8CAIC;AAED,MAAa,WAAY,SAAQ,KAAK;IACpC,YAAY,IAAY;QACtB,KAAK,CAAC,iBAAiB,IAAI,6CAA6C,CAAC,CAAC;IAC5E,CAAC;CACF;AAJD,kCAIC"}
package/lib/index.d.ts CHANGED
@@ -3,7 +3,7 @@ export { Log } from './log';
3
3
  export { createFetch, FetchError } from './fetch';
4
4
  export { Context } from './context';
5
5
  export { Platform } from './platform';
6
- export { createInstance, removeInstance, getInstance, listInstances, getPortsForInstance, getLogsForInstance, getInstanceHealth, instanceValue, valueOrSecret } from './core';
6
+ export { createInstance, removeInstance, getInstance, listInstances, getPortsForInstance, getLogsForInstance, getInstanceHealth, instanceValue, valueOrSecret, isValidInstanceName, waitForInstanceReady } from './core';
7
7
  export { listSubscriptions, removeSubscription, Subscription } from './admin';
8
8
  export { createJob, removeJob, getJob, listJobs, waitForJobToComplete } from './job';
9
9
  export * from './platform/maker';
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EACL,cAAc,EACd,cAAc,EACd,WAAW,EACX,aAAa,EACb,mBAAmB,EACnB,kBAAkB,EAClB,iBAAiB,EACjB,aAAa,EACb,aAAa,EACd,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC9E,OAAO,EACL,SAAS,EACT,SAAS,EACT,MAAM,EACN,QAAQ,EACR,oBAAoB,EACrB,MAAM,OAAO,CAAC;AACf,cAAc,kBAAkB,CAAC;AACjC,cAAc,UAAU,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EACL,cAAc,EACd,cAAc,EACd,WAAW,EACX,aAAa,EACb,mBAAmB,EACnB,kBAAkB,EAClB,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC9E,OAAO,EACL,SAAS,EACT,SAAS,EACT,MAAM,EACN,QAAQ,EACR,oBAAoB,EACrB,MAAM,OAAO,CAAC;AACf,cAAc,kBAAkB,CAAC;AACjC,cAAc,UAAU,CAAC"}
package/lib/index.js CHANGED
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
14
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.waitForJobToComplete = exports.listJobs = exports.getJob = exports.removeJob = exports.createJob = exports.removeSubscription = exports.listSubscriptions = exports.valueOrSecret = exports.instanceValue = exports.getInstanceHealth = exports.getLogsForInstance = exports.getPortsForInstance = exports.listInstances = exports.getInstance = exports.removeInstance = exports.createInstance = exports.Platform = exports.Context = exports.FetchError = exports.createFetch = exports.Log = void 0;
17
+ exports.waitForJobToComplete = exports.listJobs = exports.getJob = exports.removeJob = exports.createJob = exports.removeSubscription = exports.listSubscriptions = exports.waitForInstanceReady = exports.isValidInstanceName = exports.valueOrSecret = exports.instanceValue = exports.getInstanceHealth = exports.getLogsForInstance = exports.getPortsForInstance = exports.listInstances = exports.getInstance = exports.removeInstance = exports.createInstance = exports.Platform = exports.Context = exports.FetchError = exports.createFetch = exports.Log = void 0;
18
18
  /** @module @osaas/client-core */
19
19
  var log_1 = require("./log");
20
20
  Object.defineProperty(exports, "Log", { enumerable: true, get: function () { return log_1.Log; } });
@@ -35,6 +35,8 @@ Object.defineProperty(exports, "getLogsForInstance", { enumerable: true, get: fu
35
35
  Object.defineProperty(exports, "getInstanceHealth", { enumerable: true, get: function () { return core_1.getInstanceHealth; } });
36
36
  Object.defineProperty(exports, "instanceValue", { enumerable: true, get: function () { return core_1.instanceValue; } });
37
37
  Object.defineProperty(exports, "valueOrSecret", { enumerable: true, get: function () { return core_1.valueOrSecret; } });
38
+ Object.defineProperty(exports, "isValidInstanceName", { enumerable: true, get: function () { return core_1.isValidInstanceName; } });
39
+ Object.defineProperty(exports, "waitForInstanceReady", { enumerable: true, get: function () { return core_1.waitForInstanceReady; } });
38
40
  var admin_1 = require("./admin");
39
41
  Object.defineProperty(exports, "listSubscriptions", { enumerable: true, get: function () { return admin_1.listSubscriptions; } });
40
42
  Object.defineProperty(exports, "removeSubscription", { enumerable: true, get: function () { return admin_1.removeSubscription; } });
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,6BAA4B;AAAnB,0FAAA,GAAG,OAAA;AACZ,iCAAkD;AAAzC,oGAAA,WAAW,OAAA;AAAE,mGAAA,UAAU,OAAA;AAChC,qCAAoC;AAA3B,kGAAA,OAAO,OAAA;AAChB,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,+BAUgB;AATd,sGAAA,cAAc,OAAA;AACd,sGAAA,cAAc,OAAA;AACd,mGAAA,WAAW,OAAA;AACX,qGAAA,aAAa,OAAA;AACb,2GAAA,mBAAmB,OAAA;AACnB,0GAAA,kBAAkB,OAAA;AAClB,yGAAA,iBAAiB,OAAA;AACjB,qGAAA,aAAa,OAAA;AACb,qGAAA,aAAa,OAAA;AAEf,iCAA8E;AAArE,0GAAA,iBAAiB,OAAA;AAAE,2GAAA,kBAAkB,OAAA;AAC9C,6BAMe;AALb,gGAAA,SAAS,OAAA;AACT,gGAAA,SAAS,OAAA;AACT,6FAAA,MAAM,OAAA;AACN,+FAAA,QAAQ,OAAA;AACR,2GAAA,oBAAoB,OAAA;AAEtB,mDAAiC;AACjC,2CAAyB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,6BAA4B;AAAnB,0FAAA,GAAG,OAAA;AACZ,iCAAkD;AAAzC,oGAAA,WAAW,OAAA;AAAE,mGAAA,UAAU,OAAA;AAChC,qCAAoC;AAA3B,kGAAA,OAAO,OAAA;AAChB,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,+BAYgB;AAXd,sGAAA,cAAc,OAAA;AACd,sGAAA,cAAc,OAAA;AACd,mGAAA,WAAW,OAAA;AACX,qGAAA,aAAa,OAAA;AACb,2GAAA,mBAAmB,OAAA;AACnB,0GAAA,kBAAkB,OAAA;AAClB,yGAAA,iBAAiB,OAAA;AACjB,qGAAA,aAAa,OAAA;AACb,qGAAA,aAAa,OAAA;AACb,2GAAA,mBAAmB,OAAA;AACnB,4GAAA,oBAAoB,OAAA;AAEtB,iCAA8E;AAArE,0GAAA,iBAAiB,OAAA;AAAE,2GAAA,kBAAkB,OAAA;AAC9C,6BAMe;AALb,gGAAA,SAAS,OAAA;AACT,gGAAA,SAAS,OAAA;AACT,6FAAA,MAAM,OAAA;AACN,+FAAA,QAAQ,OAAA;AACR,2GAAA,oBAAoB,OAAA;AAEtB,mDAAiC;AACjC,2CAAyB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@osaas/client-core",
3
- "version": "0.14.0",
3
+ "version": "0.15.0",
4
4
  "description": "Open Source Cloud Client SDK core library",
5
5
  "author": "Eyevinn Open Source Cloud <osc@eyevinn.se>",
6
6
  "homepage": "https://www.osaas.io",
@@ -31,5 +31,5 @@
31
31
  "publishConfig": {
32
32
  "access": "public"
33
33
  },
34
- "gitHead": "3fa2f5f0dce2421070870cb54d0ac5fc8f0db535"
34
+ "gitHead": "eb88400f144914fba52d8d37dfc9b26a7966a8bc"
35
35
  }