@catladder/pipeline 0.0.6 → 0.0.7

package/dist/scripts/magic/build/docker.js

@@ -59,7 +59,7 @@ var createDockerBuildJob = function (context, _a) {
     return __assign(__assign({}, base), { script: __spreadArray(__spreadArray([], __read(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/dist/scripts/magic/build/index.js

@@ -3,8 +3,10 @@ exports.__esModule = true;
 exports.getBuildDefaults = exports.buildJobCreators = void 0;
 var node_1 = require("./node");
 exports.buildJobCreators = {
-    node: node_1.createNodeJobs
+    node: node_1.createNodeJobs,
+    "node-static": node_1.createNodeJobs
 };
 exports.getBuildDefaults = {
-    node: node_1.getNodeDefaults
+    node: node_1.getNodeDefaults,
+    "node-static": node_1.getNodeStaticDefaults
 };

package/dist/scripts/magic/build/node.d.ts

@@ -1,5 +1,6 @@
 import { GitlabJobs } from "../types/gitlab-types";
 import { Context } from "../types/context";
-import { BuildConfigNode } from "./types";
+import { BuildConfigNode, BuildConfigNodeStatic } from "./types";
 export declare const createNodeJobs: (context: Context) => GitlabJobs;
 export declare const getNodeDefaults: () => Partial<BuildConfigNode>;
+export declare const getNodeStaticDefaults: () => Partial<BuildConfigNodeStatic>;

package/dist/scripts/magic/build/node.js

@@ -32,7 +32,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
     return to;
 };
 exports.__esModule = true;
-exports.getNodeDefaults = exports.createNodeJobs = void 0;
+exports.getNodeStaticDefaults = exports.getNodeDefaults = exports.createNodeJobs = void 0;
 var docker_1 = require("./docker");
 var types_1 = require("./types");
 var baseRetry = {
@@ -44,19 +44,26 @@ var getYarnInstall = function (context) { return [
     "if [ -f ./.nvmrc ]; then source /root/.nvm/nvm.sh && nvm install <<< .nvmrc; fi",
     "yarn install --frozen-lockfile",
 ]; };
+var getNodeCache = function (context) { return [
+    {
+        key: "node-modules",
+        policy: "pull-push",
+        paths: ["node_modules", "**/node_modules/"]
+    },
+]; };
+var getNextCache = function (context) { return [
+    {
+        key: "next-cache",
+        policy: "pull-push",
+        paths: [context.componentConfig.dir + "/.next/cache/"]
+    },
+]; };
 var createNodeTestJobs = function (context) {
-    var cache = [
-        {
-            key: "node-modules",
-            policy: "pull-push",
-            paths: ["node_modules", "**/node_modules/"]
-        },
-    ];
     var base = {
         variables: {
             APP_PATH: context.componentConfig.dir
         },
-        cache: cache,
+        cache: getNodeCache(context),
         stage: "test",
         interruptible: true,
         needs: [],
@@ -83,7 +90,7 @@ var createNodeTestJobs = function (context) {
 };
 var createNodeBuildJobs = function (context) {
     var buildConfig = context.componentConfig.build;
-    if (!types_1.isOfType(buildConfig, "node")) {
+    if (!types_1.isOfType(buildConfig, "node") && !types_1.isOfType(buildConfig, "node-static")) {
         // should not happen
         throw new Error("deploy config is not kubernetes");
     }
@@ -97,6 +104,7 @@ var createNodeBuildJobs = function (context) {
             name: "app-build",
             job: {
                 needs: [],
+                cache: __spreadArray(__spreadArray([], __read(getNodeCache(context))), __read(getNextCache(context))),
                 variables: context.environment.variables,
                 retry: baseRetry,
                 interruptible: true,
@@ -115,7 +123,7 @@ var createNodeBuildJobs = function (context) {
             name: "docker-build",
             job: __assign(__assign({}, docker_1.createDockerBuildJob(context, {
                 script: [
-                    buildConfig.runtime === "static"
+                    buildConfig.type === "node-static"
                         ? "ensureNginxDockerfile"
                         : "ensureNodeDockerfile",
                 ]
@@ -130,8 +138,13 @@ exports.createNodeJobs = createNodeJobs;
 var getNodeDefaults = function () {
     return {
         startCommand: "yarn start",
-        runtime: "dynamic",
         buildCommand: "yarn build"
     };
 };
 exports.getNodeDefaults = getNodeDefaults;
+var getNodeStaticDefaults = function () {
+    return {
+        buildCommand: "yarn build"
+    };
+};
+exports.getNodeStaticDefaults = getNodeStaticDefaults;

package/dist/scripts/magic/build/types.d.ts

@@ -3,10 +3,16 @@ export declare type BuildConfigBase = {
 };
 export declare type BuildConfigNode = {
     type: "node";
-    runtime?: "dynamic" | "static";
     buildCommand?: string;
 } & BuildConfigBase;
-export declare type BuildConfig = BuildConfigNode;
-export declare const isOfType: <T extends "node">(t: BuildConfig, type: T) => t is Extract<BuildConfigNode, {
+export declare type BuildConfigNodeStatic = {
+    type: "node-static";
+    buildCommand?: string;
+    startCommand: never;
+};
+export declare type BuildConfig = BuildConfigNode | BuildConfigNodeStatic;
+export declare const isOfType: <T extends "node" | "node-static">(t: BuildConfig, type: T) => t is Extract<BuildConfigNode, {
+    type: T;
+}> | Extract<BuildConfigNodeStatic, {
     type: T;
 }>;

package/dist/scripts/magic/context/index.d.ts

@@ -0,0 +1,3 @@
+import { Config } from "../types/config";
+import { Context } from "../types/context";
+export declare const createContext: (componentName: string, config: Config, env: string) => Context;

package/dist/scripts/magic/context/index.js

@@ -0,0 +1,122 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+exports.__esModule = true;
+exports.createContext = void 0;
+var lodash_1 = require("lodash");
+var slugify_1 = __importDefault(require("slugify"));
+var build_1 = require("../build");
+var deploy_1 = require("../deploy");
+var getEnvironment = function (config, componentName, env, commitInfo) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var componentConfig = config.components[componentName];
+    if (!componentConfig) {
+        throw new Error("unknown component " + componentName);
+    }
+    var defaultConfig = componentConfig;
+    var envConfig = (_b = (_a = componentConfig.env) === null || _a === void 0 ? void 0 : _a[env]) !== null && _b !== void 0 ? _b : {};
+    var mergedConfig = lodash_1.merge({}, defaultConfig, envConfig);
+    var publicEnvVars = (_d = (_c = mergedConfig.vars) === null || _c === void 0 ? void 0 : _c.public) !== null && _d !== void 0 ? _d : {};
+    var secretEnvVarsRaw = (_f = (_e = mergedConfig.vars) === null || _e === void 0 ? void 0 : _e.secret) !== null && _f !== void 0 ? _f : {}; // TODO, map to gl secrets?
+    var secretEnvVars = {}; // TODO
+    var referencedRaw = (_h = (_g = mergedConfig.vars) === null || _g === void 0 ? void 0 : _g.fromComponents) !== null && _h !== void 0 ? _h : {};
+    var referenced = Object.entries(referencedRaw).reduce(function (acc, _a) {
+        var _b = __read(_a, 2), otherApp = _b[0], mapping = _b[1];
+        // TODO: prevent infinit looop
+        var variables = getEnvironment(config, otherApp, env, commitInfo).variables;
+        return Object.fromEntries(Object.entries(mapping).map(function (_a) {
+            var _b = __read(_a, 2), ourKey = _b[0], otherKey = _b[1];
+            return [
+                ourKey,
+                variables[otherKey],
+            ];
+        }));
+    }, {});
+    var envType = (_l = (_k = (_j = componentConfig.env) === null || _j === void 0 ? void 0 : _j[env]) === null || _k === void 0 ? void 0 : _k.type) !== null && _l !== void 0 ? _l : env;
+    var environmentName = envType === "review"
+        ? env + "/" + componentName + "/" + commitInfo.refName
+        : env + "/" + componentName;
+    var KUBE_APP_NAME = envType === "review"
+        ? componentName + "-" + commitInfo.refSlug
+        : componentName;
+    var KUBE_NAMESPACE = config.customerName + "-" + config.appName + "-" + env;
+    var APP_SLUG = slugify_1["default"](KUBE_APP_NAME);
+    var HOST_CANONICAL = config.appName + "-" + APP_SLUG + "." + config.customerName + ".panter.cloud";
+    var hostname = (_m = mergedConfig.hostname) !== null && _m !== void 0 ? _m : HOST_CANONICAL;
+    var url = "https://" + hostname;
+    var predefinedVariables = {
+        HOST_CANONICAL: HOST_CANONICAL,
+        ROOT_URL: url,
+        KUBE_NAMESPACE: KUBE_NAMESPACE,
+        KUBE_APP_NAME: KUBE_APP_NAME,
+        ENV_SHORT: env,
+        APP_DIR: componentConfig.dir
+    };
+    var variables = __assign(__assign(__assign(__assign({}, predefinedVariables), publicEnvVars), secretEnvVars), referenced);
+    return {
+        hostname: hostname,
+        fullName: environmentName,
+        shortName: env,
+        url: url,
+        variables: variables
+    };
+};
+var createContext = function (componentName, config, env) {
+    var _a, _b, _c, _d;
+    if (!/^[a-z0-9-]+$/.test(componentName)) {
+        throw new Error("componentName may only contain lower case letters, numbers and -");
+    }
+    var rawConfig = config.components[componentName];
+    if (!rawConfig) {
+        throw new Error("unknown component " + componentName);
+    }
+    // envs can override the config
+    var envConfig = (_b = (_a = rawConfig.env) === null || _a === void 0 ? void 0 : _a[env]) !== null && _b !== void 0 ? _b : {};
+    var componentConfigWithoutDefaults = lodash_1.merge({}, rawConfig, envConfig);
+    // fill in defaults of build and deploy
+    var defaults = {
+        build: build_1.getBuildDefaults[componentConfigWithoutDefaults.build.type](),
+        deploy: deploy_1.getDeployDefaults[componentConfigWithoutDefaults.deploy.type]()
+    };
+    var componentConfig = lodash_1.merge({}, defaults, componentConfigWithoutDefaults);
+    var commit = {
+        refName: (_c = process.env.CI_COMMIT_REF_NAME) !== null && _c !== void 0 ? _c : "unknown",
+        refSlug: (_d = process.env.CI_COMMIT_REF_SLUG) !== null && _d !== void 0 ? _d : "unknown"
+    };
+    return {
+        fullConfig: config,
+        componentConfig: componentConfig,
+        componentName: componentName,
+        environment: getEnvironment(config, componentName, env, commit),
+        commit: commit
+    };
+};
+exports.createContext = createContext;

package/dist/scripts/magic/createChildPipeline/index.d.ts

@@ -1,5 +1,3 @@
-import { GitlabJobDef } from "../types/gitlab-types";
 import { Config } from "../types/config";
-import { Context } from "../types/context";
-export declare const createContext: (componentName: string, config: Config, env: string) => Context;
+import { GitlabJobDef } from "../types/gitlab-types";
 export declare const createJobs: (envs: string[], config: Config, componentName: string) => Record<string, GitlabJobDef>;

package/dist/scripts/magic/createChildPipeline/index.js

@@ -31,101 +31,16 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
         to[j] = from[i];
     return to;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 exports.__esModule = true;
-exports.createJobs = exports.createContext = void 0;
-var lodash_1 = require("lodash");
-var slugify_1 = __importDefault(require("slugify"));
-var deploy_1 = require("../deploy");
+exports.createJobs = void 0;
 var build_1 = require("../build");
+var context_1 = require("../context");
+var deploy_1 = require("../deploy");
 var createRawJobs = function (context) {
     var buildJobs = build_1.buildJobCreators[context.componentConfig.build.type](context);
     var deployJobs = deploy_1.deployJobCreators[context.componentConfig.deploy.type](context);
     return __spreadArray(__spreadArray([], __read(buildJobs)), __read(deployJobs));
 };
-var getEnvironment = function (config, componentName, env, commitInfo) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-    var componentConfig = config.components[componentName];
-    if (!componentConfig) {
-        throw new Error("unknown component " + componentName);
-    }
-    var defaultConfig = componentConfig;
-    var envConfig = (_b = (_a = componentConfig.env) === null || _a === void 0 ? void 0 : _a[env]) !== null && _b !== void 0 ? _b : {};
-    var mergedConfig = lodash_1.merge({}, defaultConfig, envConfig);
-    var publicEnvVars = (_d = (_c = mergedConfig.vars) === null || _c === void 0 ? void 0 : _c.public) !== null && _d !== void 0 ? _d : {};
-    var secretEnvVarsRaw = (_f = (_e = mergedConfig.vars) === null || _e === void 0 ? void 0 : _e.secret) !== null && _f !== void 0 ? _f : {}; // TODO, map to gl secrets?
-    var secretEnvVars = {}; // TODO
-    var referencedRaw = (_h = (_g = mergedConfig.vars) === null || _g === void 0 ? void 0 : _g.fromComponents) !== null && _h !== void 0 ? _h : {};
-    var referenced = Object.entries(referencedRaw).reduce(function (acc, _a) {
-        var _b = __read(_a, 2), otherApp = _b[0], mapping = _b[1];
-        // TODO: prevent infinit looop
-        var variables = getEnvironment(config, otherApp, env, commitInfo).variables;
-        return Object.fromEntries(Object.entries(mapping).map(function (_a) {
-            var _b = __read(_a, 2), ourKey = _b[0], otherKey = _b[1];
-            return [
-                ourKey,
-                variables[otherKey],
-            ];
-        }));
-    }, {});
-    var envType = (_l = (_k = (_j = componentConfig.env) === null || _j === void 0 ? void 0 : _j[env]) === null || _k === void 0 ? void 0 : _k.type) !== null && _l !== void 0 ? _l : env;
-    var environmentName = envType === "review"
-        ? env + "-" + componentName + "/" + commitInfo.refName
-        : env + "-" + componentName;
-    var KUBE_APP_NAME = envType === "review"
-        ? componentName + "-" + commitInfo.refSlug
-        : componentName;
-    var KUBE_NAMESPACE = config.customerName + "-" + config.appName + "-" + env;
-    var APP_SLUG = slugify_1["default"](KUBE_APP_NAME);
-    var HOST_CANONICAL = config.appName + "-" + APP_SLUG + "." + config.customerName + ".panter.cloud";
-    var hostname = (_m = mergedConfig.hostname) !== null && _m !== void 0 ? _m : HOST_CANONICAL;
-    var url = "https://" + hostname;
-    var predefinedVariables = {
-        HOST_CANONICAL: HOST_CANONICAL,
-        ROOT_URL: url,
-        KUBE_NAMESPACE: KUBE_NAMESPACE,
-        KUBE_APP_NAME: KUBE_APP_NAME,
-        ENV_SHORT: env
-    };
-    var variables = __assign(__assign(__assign(__assign({}, predefinedVariables), publicEnvVars), secretEnvVars), referenced);
-    return {
-        hostname: hostname,
-        fullName: environmentName,
-        shortName: env,
-        url: url,
-        variables: variables
-    };
-};
-var createContext = function (componentName, config, env) {
-    var _a, _b, _c, _d;
-    var rawConfig = config.components[componentName];
-    if (!rawConfig) {
-        throw new Error("unknown component " + componentName);
-    }
-    // envs can override the config
-    var envConfig = (_b = (_a = rawConfig.env) === null || _a === void 0 ? void 0 : _a[env]) !== null && _b !== void 0 ? _b : {};
-    var componentConfigWithoutDefaults = lodash_1.merge({}, rawConfig, envConfig);
-    // fill in defaults of build and deploy
-    var defaults = {
-        build: build_1.getBuildDefaults[componentConfigWithoutDefaults.build.type](),
-        deploy: deploy_1.getDeployDefaults[componentConfigWithoutDefaults.deploy.type]()
-    };
-    var componentConfig = lodash_1.merge({}, componentConfigWithoutDefaults, defaults);
-    var commit = {
-        refName: (_c = process.env.CI_COMMIT_REF_NAME) !== null && _c !== void 0 ? _c : "unknown",
-        refSlug: (_d = process.env.CI_COMMIT_REF_SLUG) !== null && _d !== void 0 ? _d : "unknown"
-    };
-    return {
-        fullConfig: config,
-        componentConfig: componentConfig,
-        componentName: componentName,
-        environment: getEnvironment(config, componentName, env, commit),
-        commit: commit
-    };
-};
-exports.createContext = createContext;
 var getFullJobName = function (name, componentName, env) {
     if (env) {
         return env + " " + componentName + " " + name;
@@ -140,7 +55,7 @@ var replaceReferences = function (def, componentName, env) {
 };
 var createJobs = function (envs, config, componentName) {
     return envs.reduce(function (acc, env) {
-        var context = exports.createContext(componentName, config, env);
+        var context = context_1.createContext(componentName, config, env);
         var jobs = createRawJobs(context);
         return __assign(__assign({}, acc), jobs.reduce(function (acc, _a) {
             var _b;

package/dist/scripts/magic/tests/createPipeline.test.js

@@ -54,7 +54,7 @@ describe("createPipeline", function () {
             appName: "test",
             customerName: "pan",
             components: {
-                myApp: {
+                "my-app": {
                     dir: "myapp",
                     build: {
                         type: "node"
@@ -74,12 +74,12 @@ describe("createPipeline", function () {
                         _a = _b.sent(), image = _a.image, stages = _a.stages, workflow = _a.workflow, jobs = __rest(_a, ["image", "stages", "workflow"]);
                         expect(image).toEqual("git.panter.ch:5001/catladder/gitlab-ci/pipeline:$PIPELINE_IMAGE_TAG");
                         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",
                         ]);
                         return [2 /*return*/];
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catladder/pipeline",
-  "version": "0.0.6",
+  "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",
       ]);
     });
   });