@catladder/pipeline 0.0.3 → 0.0.7

package/dist/scripts/utils/extractValuesFromMr.js

@@ -0,0 +1,86 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+exports.__esModule = true;
+exports.extractValuesFromMr = exports.extractValuesFromMRMessage = void 0;
+var node_1 = require("@gitbeaker/node"); // Just the Project Resource
+var yaml_1 = require("yaml");
+var lodash_1 = require("lodash");
+var _a = process.env, GL_TOKEN = _a.GL_TOKEN, CI_SERVER_URL = _a.CI_SERVER_URL;
+var gitlabApi = new node_1.Gitlab({
+    token: GL_TOKEN,
+    host: CI_SERVER_URL
+});
+var getMRInfo = function (projectId, mrId) { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, gitlabApi.MergeRequests.show(projectId, mrId)];
+            case 1: return [2 /*return*/, _a.sent()];
+        }
+    });
+}); };
+var extractValuesFromMRMessage = function (mrMessage) {
+    var codeBlocks = Array.from(mrMessage.matchAll(/```.*([^`]+)```/gm)).map(function (match) { return match[1]; });
+    return codeBlocks.reduce(function (values, block) {
+        if (values === void 0) { values = {}; }
+        if (block.includes("$env") || block.includes("$values"))
+            try {
+                var _a = yaml_1.parse(block), $values = _a.$values, $env = _a.$env;
+                if ($values)
+                    lodash_1.merge(values, $values);
+                if ($env)
+                    lodash_1.merge(values, { env: { public: $env } });
+                return values;
+            }
+            catch (e) {
+                console.warn(e);
+            }
+    }, {});
+};
+exports.extractValuesFromMRMessage = extractValuesFromMRMessage;
+var extractValuesFromMr = function (projectId, mergeRequestId) { return __awaiter(void 0, void 0, void 0, function () {
+    var mrInfo;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, getMRInfo(projectId, mergeRequestId)];
+            case 1:
+                mrInfo = _a.sent();
+                return [2 /*return*/, exports.extractValuesFromMRMessage(mrInfo.description)];
+        }
+    });
+}); };
+exports.extractValuesFromMr = extractValuesFromMr;

package/dist/tests/extractValuesFromMr.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tests/extractValuesFromMr.test.js

@@ -0,0 +1,68 @@
+"use strict";
+exports.__esModule = true;
+var extractValuesFromMr_1 = require("../scripts/utils/extractValuesFromMr");
+describe("extractValuesFromMr", function () {
+    describe("extractValuesFromMRMessage", function () {
+        it("can extract $values yaml", function () {
+            var result = extractValuesFromMr_1.extractValuesFromMRMessage("\n      \n      blabla\n\n      test\n\n      ```\n      $values:\n        application:\n          host: www.foo.com\n        env:\n          public:\n            API_KEY: fooooxxx\n            BLA: \"blubb\"\n       ```\n      ");
+            expect(result).toEqual({
+                application: {
+                    host: "www.foo.com"
+                },
+                env: {
+                    public: {
+                        API_KEY: "fooooxxx",
+                        BLA: "blubb"
+                    }
+                }
+            });
+        });
+        it("can handle $env as shortcut", function () {
+            var result = extractValuesFromMr_1.extractValuesFromMRMessage("\n      \n      blabla\n\n      test\n\n      ```\n      $env:\n        API_KEY: fooooxxx\n        BLA: \"blubb\"\n     \n       ```\n      ");
+            expect(result).toEqual({
+                env: {
+                    public: {
+                        API_KEY: "fooooxxx",
+                        BLA: "blubb"
+                    }
+                }
+            });
+        });
+        it("ignores language in backticks", function () {
+            var result = extractValuesFromMr_1.extractValuesFromMRMessage("\n      \n      blabla\n\n      test\n\n      ```yaml\n      $env:\n        API_KEY: fooooxxx\n        BLA: \"blubb\"\n     \n       ```\n      ");
+            expect(result).toEqual({
+                env: {
+                    public: {
+                        API_KEY: "fooooxxx",
+                        BLA: "blubb"
+                    }
+                }
+            });
+        });
+        it("can handle mixed blocks", function () {
+            var result = extractValuesFromMr_1.extractValuesFromMRMessage("\n      \n      blabla\n\n      test\n\n      ```\n      $values:\n        env:\n          public:\n            FOO: \"bar\"\n\n      $env:\n        API_KEY: fooooxxx\n        BLA: \"blubb\"\n     \n      ```\n      ");
+            expect(result).toEqual({
+                env: {
+                    public: {
+                        FOO: "bar",
+                        API_KEY: "fooooxxx",
+                        BLA: "blubb"
+                    }
+                }
+            });
+        });
+        it("can handle multiple blocks", function () {
+            var result = extractValuesFromMr_1.extractValuesFromMRMessage("\n      \n      blabla\n\n      test\n\n      ```\n      $values:\n        env:\n          public:\n            FOO: \"bar\"\n\n      $env:\n        API_KEY: fooooxxx\n        BLA: \"blubb\"\n     \n      ```\n\n\n      fooo\n\n      ```\n      $values:\n        env:\n          public:\n            FOO: \"blubb\"\n\n      $env:\n        TEST: test\n     \n      ```\n      ");
+            expect(result).toEqual({
+                env: {
+                    public: {
+                        FOO: "blubb",
+                        API_KEY: "fooooxxx",
+                        BLA: "blubb",
+                        TEST: "test"
+                    }
+                }
+            });
+        });
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catladder/pipeline",
-  "version": "0.0.3",
+  "version": "0.0.7",
   "scripts": {
     "prepack": "yarn tsc"
   },
@@ -9,7 +9,8 @@
   "devDependencies": {
     "@types/lodash": "^4.14.172",
     "@types/node": "^16.6.1",
-    "@types/yargs": "^17.0.5"
+    "@types/yargs": "^17.0.5",
+    "typescript": "^4.5.4"
   },
   "dependencies": {
     "@gitbeaker/node": "^32.1.2",

package/scripts/magic/build/docker.ts

@@ -19,7 +19,7 @@ export const createDockerBuildJob = (
       APP_DIR: context.componentConfig.dir,
       DOCKER_HOST: "tcp://0.0.0.0:2375",
       DOCKER_TLS_CERTDIR: "",
-      DOCKER_DIR: ".",
+      DOCKER_DIR: ".", // relative to componentdir
       IMAGE_TAG: "$CI_COMMIT_SHA",
       DOCKER_DRIVER: "overlay2",
       IMAGE_NAME: "$CI_REGISTRY_IMAGE/" + context.componentName,
@@ -34,7 +34,7 @@ export const createDockerBuildJob = (
       ...script,
       "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
       "docker pull $CACHE_IMAGE || true",
-      "docker build --network host --cache-from $CACHE_IMAGE --tag $IMAGE_NAME:$IMAGE_TAG $DOCKER_DIR",
+      "docker build --network host --cache-from $CACHE_IMAGE --tag $IMAGE_NAME:$IMAGE_TAG -f $APP_DIR/Dockerfile .",
       "docker push $IMAGE_NAME:$IMAGE_TAG",
       "docker tag $IMAGE_NAME:$IMAGE_TAG $CACHE_IMAGE",
       "docker push $CACHE_IMAGE",

package/scripts/magic/build/index.ts

@@ -1,16 +1,18 @@
 import { GitlabJobs } from "../types/gitlab-types";
 import { Context } from "../types/context";
-import { createNodeJobs, getNodeDefaults } from "./node";
+import { createNodeJobs, getNodeDefaults, getNodeStaticDefaults } from "./node";
 import { BuildConfig } from "./types";
 
 export const buildJobCreators: {
   [type in BuildConfig["type"]]: (context: Context) => GitlabJobs;
 } = {
   node: createNodeJobs,
+  "node-static": createNodeJobs,
 };
 
 export const getBuildDefaults: {
   [type in BuildConfig["type"]]: () => Partial<BuildConfig>;
 } = {
   node: getNodeDefaults,
+  "node-static": getNodeStaticDefaults,
 };

package/scripts/magic/build/node.ts

@@ -6,7 +6,7 @@ import {
 } from "../types/gitlab-types";
 import { Context } from "../types/context";
 import { createDockerBuildJob } from "./docker";
-import { BuildConfigNode, isOfType } from "./types";
+import { BuildConfigNode, BuildConfigNodeStatic, isOfType } from "./types";
 
 const baseRetry: Retry = {
   max: 2,
@@ -18,20 +18,27 @@ const getYarnInstall = (context: Context) => [
   "if [ -f ./.nvmrc ]; then source /root/.nvm/nvm.sh && nvm install <<< .nvmrc; fi",
   "yarn install --frozen-lockfile",
 ];
-const createNodeTestJobs = (context: Context): GitlabJobs => {
-  const cache: GitlabJobCache[] = [
-    {
-      key: "node-modules",
-      policy: "pull-push",
-      paths: ["node_modules", "**/node_modules/"],
-    },
-  ];
+const getNodeCache = (context: Context): GitlabJobCache[] => [
+  {
+    key: "node-modules",
+    policy: "pull-push",
+    paths: ["node_modules", "**/node_modules/"],
+  },
+];
 
+const getNextCache = (context: Context): GitlabJobCache[] => [
+  {
+    key: "next-cache",
+    policy: "pull-push",
+    paths: [context.componentConfig.dir + "/.next/cache/"],
+  },
+];
+const createNodeTestJobs = (context: Context): GitlabJobs => {
   const base: Omit<GitlabJobDef, "script"> = {
     variables: {
       APP_PATH: context.componentConfig.dir,
     },
-    cache,
+    cache: getNodeCache(context),
     stage: "test",
     interruptible: true,
     needs: [],
@@ -69,7 +76,7 @@ const createNodeTestJobs = (context: Context): GitlabJobs => {
 
 const createNodeBuildJobs = (context: Context): GitlabJobs => {
   const buildConfig = context.componentConfig.build;
-  if (!isOfType(buildConfig, "node")) {
+  if (!isOfType(buildConfig, "node") && !isOfType(buildConfig, "node-static")) {
     // should not happen
     throw new Error("deploy config is not kubernetes");
   }
@@ -86,6 +93,7 @@ const createNodeBuildJobs = (context: Context): GitlabJobs => {
       name: "app-build",
       job: {
         needs: [],
+        cache: [...getNodeCache(context), ...getNextCache(context)],
         variables: context.environment.variables,
         retry: baseRetry,
         interruptible: true,
@@ -106,7 +114,7 @@ const createNodeBuildJobs = (context: Context): GitlabJobs => {
       job: {
         ...createDockerBuildJob(context, {
           script: [
-            buildConfig.runtime === "static"
+            buildConfig.type === "node-static"
               ? "ensureNginxDockerfile"
               : "ensureNodeDockerfile",
           ], // TOOD: inline
@@ -124,7 +132,12 @@ export const createNodeJobs = (context: Context): GitlabJobs => {
 export const getNodeDefaults = (): Partial<BuildConfigNode> => {
   return {
     startCommand: "yarn start",
-    runtime: "dynamic",
+    buildCommand: "yarn build",
+  };
+};
+
+export const getNodeStaticDefaults = (): Partial<BuildConfigNodeStatic> => {
+  return {
     buildCommand: "yarn build",
   };
 };

package/scripts/magic/build/types.ts

@@ -3,11 +3,15 @@ export type BuildConfigBase = {
 };
 export type BuildConfigNode = {
   type: "node";
-  runtime?: "dynamic" | "static"; // defaults to dynamic
   buildCommand?: string;
 } & BuildConfigBase;
 
-export type BuildConfig = BuildConfigNode;
+export type BuildConfigNodeStatic = {
+  type: "node-static";
+  buildCommand?: string;
+  startCommand: never;
+};
+export type BuildConfig = BuildConfigNode | BuildConfigNodeStatic;
 
 export const isOfType = <T extends BuildConfig["type"]>(
   t: BuildConfig,

package/scripts/magic/context/index.ts

@@ -0,0 +1,127 @@
+import { merge } from "lodash";
+import slugify from "slugify";
+import { getBuildDefaults } from "../build";
+import { BuildConfig } from "../build/types";
+import { getDeployDefaults } from "../deploy";
+import { DeployConfig } from "../deploy/types";
+import { Config } from "../types/config";
+import { CommitInfo, Context, Environment } from "../types/context";
+
+const getEnvironment = (
+  config: Config,
+  componentName: string,
+  env: string,
+  commitInfo: CommitInfo
+): Environment => {
+  const componentConfig = config.components[componentName];
+  if (!componentConfig) {
+    throw new Error("unknown component " + componentName);
+  }
+
+  const defaultConfig = componentConfig;
+  const envConfig = componentConfig.env?.[env] ?? {};
+
+  const mergedConfig = merge({}, defaultConfig, envConfig);
+
+  const publicEnvVars = mergedConfig.vars?.public ?? {};
+  const secretEnvVarsRaw = mergedConfig.vars?.secret ?? {}; // TODO, map to gl secrets?
+  const secretEnvVars = {}; // TODO
+  const referencedRaw = mergedConfig.vars?.fromComponents ?? {};
+
+  const referenced = Object.entries(referencedRaw).reduce(
+    (acc, [otherApp, mapping]) => {
+      // TODO: prevent infinit looop
+      const { variables } = getEnvironment(config, otherApp, env, commitInfo);
+
+      return Object.fromEntries(
+        Object.entries(mapping).map(([ourKey, otherKey]) => [
+          ourKey,
+          variables[otherKey],
+        ])
+      );
+    },
+    {}
+  );
+
+  const envType = componentConfig.env?.[env]?.type ?? env;
+  const environmentName =
+    envType === "review"
+      ? `${env}/${componentName}/${commitInfo.refName}`
+      : `${env}/${componentName}`;
+
+  const KUBE_APP_NAME =
+    envType === "review"
+      ? `${componentName}-${commitInfo.refSlug}`
+      : componentName;
+
+  const KUBE_NAMESPACE = `${config.customerName}-${config.appName}-${env}`;
+
+  const APP_SLUG = slugify(KUBE_APP_NAME);
+
+  const HOST_CANONICAL = `${config.appName}-${APP_SLUG}.${config.customerName}.panter.cloud`;
+
+  const hostname = mergedConfig.hostname ?? HOST_CANONICAL;
+  const url = `https://${hostname}`;
+
+  const predefinedVariables = {
+    HOST_CANONICAL,
+    ROOT_URL: url,
+    KUBE_NAMESPACE,
+    KUBE_APP_NAME,
+    ENV_SHORT: env,
+    APP_DIR: componentConfig.dir,
+  };
+  const variables = {
+    ...predefinedVariables,
+    ...publicEnvVars,
+    ...secretEnvVars,
+    ...referenced,
+  };
+
+  return {
+    hostname,
+    fullName: environmentName,
+    shortName: env,
+    url: url,
+    variables,
+  };
+};
+
+export const createContext = (
+  componentName: string,
+  config: Config,
+  env: string
+): Context => {
+  if (!/^[a-z0-9-]+$/.test(componentName)) {
+    throw new Error(
+      "componentName may only contain lower case letters, numbers and -"
+    );
+  }
+  const rawConfig = config.components[componentName];
+  if (!rawConfig) {
+    throw new Error("unknown component " + componentName);
+  }
+  // envs can override the config
+  const envConfig = rawConfig.env?.[env] ?? {};
+  const componentConfigWithoutDefaults = merge({}, rawConfig, envConfig);
+  // fill in defaults of build and deploy
+  const defaults: {
+    build: Partial<BuildConfig>;
+    deploy: Partial<DeployConfig>;
+  } = {
+    build: getBuildDefaults[componentConfigWithoutDefaults.build.type](),
+    deploy: getDeployDefaults[componentConfigWithoutDefaults.deploy.type](),
+  };
+  const componentConfig = merge({}, defaults, componentConfigWithoutDefaults);
+  const commit = {
+    refName: process.env.CI_COMMIT_REF_NAME ?? "unknown",
+    refSlug: process.env.CI_COMMIT_REF_SLUG ?? "unknown",
+  };
+  return {
+    fullConfig: config,
+    componentConfig,
+    componentName,
+    environment: getEnvironment(config, componentName, env, commit),
+    commit: commit,
+  };
+};

package/scripts/magic/createChildPipeline/index.ts

@@ -1,13 +1,11 @@
 import { merge } from "lodash";
 import slugify from "slugify";
-import { GitlabJobDef, GitlabJobs } from "../types/gitlab-types";
-
-import { Config, DefaultEnvConfig } from "../types/config";
+import { buildJobCreators } from "../build";
+import { createContext } from "../context";
+import { deployJobCreators } from "../deploy";
+import { Config } from "../types/config";
 import { CommitInfo, Context, Environment } from "../types/context";
-import { deployJobCreators, getDeployDefaults } from "../deploy";
-import { buildJobCreators, getBuildDefaults } from "../build";
-import { BuildConfig } from "../build/types";
-import { DeployConfig } from "../deploy/types";
+import { GitlabJobDef, GitlabJobs } from "../types/gitlab-types";
 
 const createRawJobs = (context: Context): GitlabJobs => {
   const buildJobs =
@@ -17,120 +15,6 @@ const createRawJobs = (context: Context): GitlabJobs => {
 
   return [...buildJobs, ...deployJobs];
 };
-
-const getEnvironment = (
-  config: Config,
-  componentName: string,
-  env: string,
-  commitInfo: CommitInfo
-): Environment => {
-  const componentConfig = config.components[componentName];
-  if (!componentConfig) {
-    throw new Error("unknown component " + componentName);
-  }
-
-  const defaultConfig = componentConfig;
-  const envConfig = componentConfig.env?.[env] ?? {};
-
-  const mergedConfig = merge({}, defaultConfig, envConfig);
-
-  const publicEnvVars = mergedConfig.vars?.public ?? {};
-  const secretEnvVarsRaw = mergedConfig.vars?.secret ?? {}; // TODO, map to gl secrets?
-  const secretEnvVars = {}; // TODO
-  const referencedRaw = mergedConfig.vars?.fromComponents ?? {};
-
-  const referenced = Object.entries(referencedRaw).reduce(
-    (acc, [otherApp, mapping]) => {
-      // TODO: prevent infinit looop
-      const { variables } = getEnvironment(config, otherApp, env, commitInfo);
-
-      return Object.fromEntries(
-        Object.entries(mapping).map(([ourKey, otherKey]) => [
-          ourKey,
-          variables[otherKey],
-        ])
-      );
-    },
-    {}
-  );
-
-  const envType = componentConfig.env?.[env]?.type ?? env;
-  const environmentName =
-    envType === "review"
-      ? `${env}-${componentName}/${commitInfo.refName}`
-      : `${env}-${componentName}`;
-
-  const KUBE_APP_NAME =
-    envType === "review"
-      ? `${componentName}-${commitInfo.refSlug}`
-      : componentName;
-
-  const KUBE_NAMESPACE = `${config.customerName}-${config.appName}-${env}`;
-
-  const APP_SLUG = slugify(KUBE_APP_NAME);
-
-  const HOST_CANONICAL = `${config.appName}-${APP_SLUG}.${config.customerName}.panter.cloud`;
-
-  const hostname = mergedConfig.hostname ?? HOST_CANONICAL;
-  const url = `https://${hostname}`;
-
-  const predefinedVariables = {
-    HOST_CANONICAL,
-    ROOT_URL: url,
-    KUBE_NAMESPACE,
-    KUBE_APP_NAME,
-    ENV_SHORT: env,
-  };
-  const variables = {
-    ...predefinedVariables,
-    ...publicEnvVars,
-    ...secretEnvVars,
-    ...referenced,
-  };
-
-  return {
-    hostname,
-    fullName: environmentName,
-    shortName: env,
-    url: url,
-    variables,
-  };
-};
-
-export const createContext = (
-  componentName: string,
-  config: Config,
-  env: string
-): Context => {
-  const rawConfig = config.components[componentName];
-  if (!rawConfig) {
-    throw new Error("unknown component " + componentName);
-  }
-  // envs can override the config
-  const envConfig = rawConfig.env?.[env] ?? {};
-  const componentConfigWithoutDefaults = merge({}, rawConfig, envConfig);
-  // fill in defaults of build and deploy
-  const defaults: {
-    build: Partial<BuildConfig>;
-    deploy: Partial<DeployConfig>;
-  } = {
-    build: getBuildDefaults[componentConfigWithoutDefaults.build.type](),
-    deploy: getDeployDefaults[componentConfigWithoutDefaults.deploy.type](),
-  };
-  const componentConfig = merge({}, componentConfigWithoutDefaults, defaults);
-  const commit = {
-    refName: process.env.CI_COMMIT_REF_NAME ?? "unknown",
-    refSlug: process.env.CI_COMMIT_REF_SLUG ?? "unknown",
-  };
-  return {
-    fullConfig: config,
-    componentConfig,
-    componentName,
-    environment: getEnvironment(config, componentName, env, commit),
-    commit: commit,
-  };
-};
-
 const getFullJobName = (name: string, componentName: string, env?: string) => {
   if (env) {
     return `${env} ${componentName} ${name}`;

package/scripts/magic/tests/createPipeline.test.ts

@@ -7,7 +7,7 @@ describe("createPipeline", () => {
       appName: "test",
       customerName: "pan",
       components: {
-        myApp: {
+        "my-app": {
           dir: "myapp",
           build: {
             type: "node",
@@ -29,12 +29,12 @@ describe("createPipeline", () => {
       );
 
       expect(Object.keys(jobs)).toEqual([
-        "myApp audit",
-        "myApp lint",
-        "myApp test",
-        "dev myApp app-build",
-        "dev myApp docker-build",
-        "dev myApp deploy-to-kubernetes",
+        "my-app audit",
+        "my-app lint",
+        "my-app test",
+        "dev my-app app-build",
+        "dev my-app docker-build",
+        "dev my-app deploy-to-kubernetes",
       ]);
     });
   });