@catladder/pipeline 0.0.2 → 0.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catladder/pipeline",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "scripts": {
     "prepack": "yarn tsc"
   },

package/scripts/createSamplePipeline.ts

@@ -0,0 +1,10 @@
+#!/usr/bin/env ts-node
+import { writeFileSync } from "fs";
+import { createPipeline } from "./magic/createPipeline";
+import sampleConfig from "./magic/sample-config";
+
+createPipeline("taggedRelease", sampleConfig).then((mainPipeline) => {
+  writeFileSync(`__pipeline.yml`, JSON.stringify(mainPipeline, null, 2), {
+    encoding: "utf-8",
+  });
+});

package/scripts/kubernetesCreateSecret

@@ -1,8 +1,9 @@
 #!/bin/bash
-kubectl create secret -n "$NAMESPACE" \
+echo "KUBE_NAMESPACE: '$KUBE_NAMESPACE', IMAGE_PULL_SECRET: '$IMAGE_PULL_SECRET'"
+kubectl create secret -n "$KUBE_NAMESPACE" \
     docker-registry $IMAGE_PULL_SECRET \
     --docker-server="$CI_REGISTRY" \
     --docker-username="${CI_DEPLOY_USER:-$CI_REGISTRY_USER}" \
     --docker-password="${CI_DEPLOY_PASSWORD:-$CI_REGISTRY_PASSWORD}" \
     --docker-email="$GITLAB_USER_EMAIL" \
-    -o yaml --dry-run | kubectl replace -n "$NAMESPACE" --force -f -
+    -o yaml --dry-run | kubectl replace -n "$KUBE_NAMESPACE" --force -f -

package/scripts/kubernetesDelete

@@ -1,4 +1,4 @@
 #!/bin/bash
 RELEASE_NAME=${CUSTOMER_NAME}-${APP_NAME}-${CI_ENVIRONMENT_SLUG}
 echo "Delete $RELEASE_NAME"
-helm3 uninstall "$RELEASE_NAME" --namespace "$NAMESPACE"
+helm3 uninstall "$RELEASE_NAME" --namespace "$KUBE_NAMESPACE"

package/scripts/kubernetesDeploy

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 echo "Deploy to kubernetes"
-RELEASE_NAME=${CUSTOMER_NAME}-${APP_NAME}-${CI_ENVIRONMENT_SLUG}
 echo "Release: $RELEASE_NAME"
 echo "URL (canonical): $HOST_CANONICAL"
 #helm3 init --client-only --stable-repo-url=https://charts.helm.sh/stable
@@ -16,10 +15,9 @@ readarray -t helmArgsArray <<<"$helmArgsEvaluated"
 #Log the time until selfdestruct in case of review environment
 if [[ ${ENV_SHORT} == "review" ]]; then echo "NOTE - This deployment will stop itself after 2 weeks"; fi
 
-echo "reading values files from $VALUES_PATH for $ENV_SHORT"
-
-printAllValues.ts -d $VALUES_PATH -e $ENV_SHORT
-printAllValues.ts -d $VALUES_PATH -e $ENV_SHORT >__all_values.yml
+echo "all values"
+echo "$KUBE_VALUES"
+echo $KUBE_VALUES >__all_values.yml
 
 echo "doing helm upgrade"
 helm3 upgrade --install "$RELEASE_NAME" /tmp/$HELM_GITLAB_CHART_NAME \
@@ -50,8 +48,8 @@ helm3 upgrade --install "$RELEASE_NAME" /tmp/$HELM_GITLAB_CHART_NAME \
     --set gitlab.mergeRequestId="$CI_MERGE_REQUEST_IID" \
     --set gitlab.projectId="$CI_PROJECT_ID" \
     --set gitlab.env="$CI_ENVIRONMENT_SLUG" \
-    --set namespace="$NAMESPACE" \
-    --namespace="$NAMESPACE" \
+    --set namespace="$KUBE_NAMESPACE" \
+    --namespace="$KUBE_NAMESPACE" \
     ${helmArgsArray[@]} \
-    --valeues __all_values.yml
+    --values __all_values.yml
 echo "Deployment successful 😻"

package/scripts/kubernetesEnsureNamespace

@@ -1,3 +1,3 @@
 #!/bin/bash
-echo "Ensure Namespace $NAMESPACE"
-kubectl describe namespace "$NAMESPACE" || kubectl create namespace "$NAMESPACE"
+echo "Ensure Namespace $KUBE_NAMESPACE"
+kubectl describe namespace "$KUBE_NAMESPACE" || kubectl create namespace "$KUBE_NAMESPACE"

package/scripts/magic/{types/build → build}/docker.ts

@@ -1,8 +1,9 @@
-import { GitlabJobDef } from "../gitlab-types";
+import { GitlabJobDef, Context } from "../types";
 
-export const createDockerBuildJob = ({
-  script,
-}: Pick<GitlabJobDef, "script">): GitlabJobDef => {
+export const createDockerBuildJob = (
+  context: Context,
+  { script }: Pick<GitlabJobDef, "script">
+): GitlabJobDef => {
   const base: Omit<GitlabJobDef, "script"> = {
     stage: "build",
     image:
@@ -15,9 +16,15 @@ export const createDockerBuildJob = ({
       },
     ],
     variables: {
+      APP_DIR: context.componentConfig.dir,
+      DOCKER_HOST: "tcp://0.0.0.0:2375",
+      DOCKER_TLS_CERTDIR: "",
+      DOCKER_DIR: ".",
+      IMAGE_TAG: "$CI_COMMIT_SHA",
       DOCKER_DRIVER: "overlay2",
-      IMAGE_NAME: "$CI_REGISTRY_IMAGE/$COMPONENT_NAME",
-      CACHE_IMAGE: "$CI_REGISTRY_IMAGE/$COMPONENT_NAME/cache:cache",
+      IMAGE_NAME: "$CI_REGISTRY_IMAGE/" + context.componentName,
+      CACHE_IMAGE:
+        "$CI_REGISTRY_IMAGE/" + context.componentName + "/cache:cache",
     },
   };
 

package/scripts/magic/build/index.ts

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

package/scripts/magic/{types/build → build}/node.ts

@@ -3,21 +3,21 @@ import {
   GitlabJobCache,
   GitlabJobs,
   Retry,
-} from "../gitlab-types";
-import { Context } from "../context";
+} from "../types/gitlab-types";
+import { Context } from "../types/context";
 import { createDockerBuildJob } from "./docker";
-
-const yarnInstall = [
-  "cd $APP_PATH",
-  "if [ -f ./.nvmrc ]; then source /root/.nvm/nvm.sh && nvm install <<< .nvmrc; fi",
-  "yarn install --frozen-lockfile",
-];
+import { BuildConfigNode, isOfType } from "./types";
 
 const baseRetry: Retry = {
   max: 2,
   when: ["runner_system_failure", "stuck_or_timeout_failure"],
 };
 
+const getYarnInstall = (context: Context) => [
+  `cd ${context.componentConfig.dir}`,
+  "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[] = [
     {
@@ -26,6 +26,7 @@ const createNodeTestJobs = (context: Context): GitlabJobs => {
       paths: ["node_modules", "**/node_modules/"],
     },
   ];
+
   const base: Omit<GitlabJobDef, "script"> = {
     variables: {
       APP_PATH: context.componentConfig.dir,
@@ -36,50 +37,60 @@ const createNodeTestJobs = (context: Context): GitlabJobs => {
     needs: [],
     retry: baseRetry,
   };
+  const yarnInstall = getYarnInstall(context);
   return [
     {
-      name: "test",
-      env: false,
-      job: () => ({
+      name: "audit",
+      perEnv: false,
+      job: {
         ...base,
-        script: [...yarnInstall, "yarn test"],
-      }),
+        script: [...yarnInstall, "yarn audit"],
+        allow_failure: true,
+      },
     },
     {
       name: "lint",
-      env: false,
-      job: () => ({
+      perEnv: false,
+      job: {
         ...base,
         script: [...yarnInstall, "yarn lint"],
-      }),
+      },
     },
     {
-      name: "audit",
-      env: false,
-      job: () => ({
+      name: "test",
+      perEnv: false,
+      job: {
         ...base,
-        script: [...yarnInstall, "yarn audit"],
-      }),
+        script: [...yarnInstall, "yarn test"],
+      },
     },
   ];
 };
 
 const createNodeBuildJobs = (context: Context): GitlabJobs => {
+  const buildConfig = context.componentConfig.build;
+  if (!isOfType(buildConfig, "node")) {
+    // should not happen
+    throw new Error("deploy config is not kubernetes");
+  }
+
   const buildInfo = [
     ". getCommitInfo", // TODO: inline
-    `echo '{"id":"'$BUILD_ID'","commit":"'$BUILD_COMMIT'","tag":"'$BUILD_TAG'","time":"'$BUILD_TIME'"}' > $APP_DIR/__build_info.json`,
+    `echo '{"id":"'$BUILD_ID'","commit":"'$BUILD_COMMIT'","tag":"'$BUILD_TAG'","time":"'$BUILD_TIME'"}' > ${context.componentConfig.dir}/__build_info.json`,
   ];
 
+  const yarnInstall = getYarnInstall(context);
+
   return [
     {
       name: "app-build",
-      env: true,
-      job: (environment) => ({
-        variables: environment.variables,
+      job: {
+        needs: [],
+        variables: context.environment.variables,
         retry: baseRetry,
         interruptible: true,
         stage: "build",
-        script: [...buildInfo, ...yarnInstall, "yarn build"],
+        script: [...buildInfo, ...yarnInstall, buildConfig.buildCommand!],
         artifacts: {
           paths: [
             context.componentConfig.dir + "/__build_info.json",
@@ -87,21 +98,33 @@ const createNodeBuildJobs = (context: Context): GitlabJobs => {
             context.componentConfig.dir + "/.next",
           ],
         },
-      }),
+      },
     },
     {
       name: "docker-build",
-      env: true,
-      job: () => ({
-        ...createDockerBuildJob({
-          script: ["ensureNodeDockerfile"], // TOOD: inline
+
+      job: {
+        ...createDockerBuildJob(context, {
+          script: [
+            buildConfig.runtime === "static"
+              ? "ensureNginxDockerfile"
+              : "ensureNodeDockerfile",
+          ], // TOOD: inline
         }),
         needs: ["app-build"],
-      }),
+      },
     },
   ];
 };
 
 export const createNodeJobs = (context: Context): GitlabJobs => {
-  return [...createNodeBuildJobs(context), ...createNodeTestJobs(context)];
+  return [...createNodeTestJobs(context), ...createNodeBuildJobs(context)];
+};
+
+export const getNodeDefaults = (): Partial<BuildConfigNode> => {
+  return {
+    startCommand: "yarn start",
+    runtime: "dynamic",
+    buildCommand: "yarn build",
+  };
 };

package/scripts/magic/build/types.ts

@@ -0,0 +1,17 @@
+export type BuildConfigBase = {
+  startCommand?: string;
+};
+export type BuildConfigNode = {
+  type: "node";
+  runtime?: "dynamic" | "static"; // defaults to dynamic
+  buildCommand?: string;
+} & BuildConfigBase;
+
+export type BuildConfig = BuildConfigNode;
+
+export const isOfType = <T extends BuildConfig["type"]>(
+  t: BuildConfig,
+  type: T
+): t is Extract<BuildConfig, { type: T }> => {
+  return t.type === type;
+};

package/scripts/magic/createChildPipeline/index.ts

@@ -1,10 +1,13 @@
 import { merge } from "lodash";
 import slugify from "slugify";
 import { GitlabJobDef, GitlabJobs } from "../types/gitlab-types";
-import { buildJobCreators } from "../types/build";
-import { Config } from "../types/config";
-import { Context, Environment } from "../types/context";
-import { deployJobCreators } from "../types/deploy";
+
+import { Config, DefaultEnvConfig } 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";
 
 const createRawJobs = (context: Context): GitlabJobs => {
   const buildJobs =
@@ -18,7 +21,8 @@ const createRawJobs = (context: Context): GitlabJobs => {
 const getEnvironment = (
   config: Config,
   componentName: string,
-  env: string
+  env: string,
+  commitInfo: CommitInfo
 ): Environment => {
   const componentConfig = config.components[componentName];
   if (!componentConfig) {
@@ -38,7 +42,7 @@ const getEnvironment = (
   const referenced = Object.entries(referencedRaw).reduce(
     (acc, [otherApp, mapping]) => {
       // TODO: prevent infinit looop
-      const { variables } = getEnvironment(config, otherApp, env);
+      const { variables } = getEnvironment(config, otherApp, env, commitInfo);
 
       return Object.fromEntries(
         Object.entries(mapping).map(([ourKey, otherKey]) => [
@@ -53,27 +57,29 @@ const getEnvironment = (
   const envType = componentConfig.env?.[env]?.type ?? env;
   const environmentName =
     envType === "review"
-      ? `${env}-${componentName}/$CI_COMMIT_REF_NAME`
+      ? `${env}-${componentName}/${commitInfo.refName}`
       : `${env}-${componentName}`;
 
   const KUBE_APP_NAME =
     envType === "review"
-      ? `${componentName}-$CI_COMMIT_REF_SLUG`
+      ? `${componentName}-${commitInfo.refSlug}`
       : componentName;
 
   const KUBE_NAMESPACE = `${config.customerName}-${config.appName}-${env}`;
 
   const APP_SLUG = slugify(KUBE_APP_NAME);
 
-  const CANONICAL_HOST = `${config.appName}-${APP_SLUG}.${config.customerName}.panter.cloud`;
+  const HOST_CANONICAL = `${config.appName}-${APP_SLUG}.${config.customerName}.panter.cloud`;
 
-  const hostname = mergedConfig.hostname ?? CANONICAL_HOST;
+  const hostname = mergedConfig.hostname ?? HOST_CANONICAL;
   const url = `https://${hostname}`;
 
   const predefinedVariables = {
-    CANONICAL_URL: url,
+    HOST_CANONICAL,
     ROOT_URL: url,
     KUBE_NAMESPACE,
+    KUBE_APP_NAME,
+    ENV_SHORT: env,
   };
   const variables = {
     ...predefinedVariables,
@@ -83,6 +89,7 @@ const getEnvironment = (
   };
 
   return {
+    hostname,
     fullName: environmentName,
     shortName: env,
     url: url,
@@ -92,16 +99,35 @@ const getEnvironment = (
 
 export const createContext = (
   componentName: string,
-  config: Config
+  config: Config,
+  env: string
 ): Context => {
-  const componentConfig = config.components[componentName];
-  if (!componentConfig) {
+  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,
   };
 };
 
@@ -131,31 +157,18 @@ export const createJobs = (
   config: Config,
   componentName: string
 ): Record<string, GitlabJobDef> => {
-  const context = createContext(componentName, config);
-  const jobs = createRawJobs(context);
-  const environments = envs.map((e) =>
-    getEnvironment(config, componentName, e)
-  );
-  return jobs.reduce((acc, job) => {
-    if (!job.env) {
-      const def = job.job();
-
-      return {
-        ...acc,
-        [getFullJobName(job.name, componentName)]: replaceReferences(
-          def,
-          componentName
-        ),
-      };
-    }
+  return envs.reduce((acc, env) => {
+    const context = createContext(componentName, config, env);
+    const jobs = createRawJobs(context);
     return {
       ...acc,
-      ...environments.reduce((envacc, environment) => {
-        const def = job.job(environment);
+      ...jobs.reduce((acc, { name, job, perEnv = true }) => {
+        const def = job;
+
         return {
           ...acc,
-          [getFullJobName(job.name, componentName, environment.shortName)]:
-            replaceReferences(def, componentName, environment.shortName),
+          [getFullJobName(name, componentName, perEnv ? env : undefined)]:
+            replaceReferences(def, componentName, perEnv ? env : undefined),
         };
       }, {}),
     };

package/scripts/magic/createPipeline.ts

@@ -1,5 +1,6 @@
 import { createJobs } from "./createChildPipeline";
 import { Config, ENV_TYPES, PipelineTrigger } from "./types/config";
+import { GitlabJobDef } from "./types/gitlab-types";
 
 export const createPipeline = async (
   trigger: PipelineTrigger,
@@ -12,12 +13,15 @@ export const createPipeline = async (
 
   // 2. write the triggering pipeline
 
-  const jobs = components.reduce((acc, componentName) => {
-    return {
-      ...acc,
-      ...createJobs(envs, config, componentName),
-    };
-  }, {});
+  const jobs = components.reduce<Record<string, GitlabJobDef>>(
+    (acc, componentName) => {
+      return {
+        ...acc,
+        ...createJobs(envs, config, componentName),
+      };
+    },
+    {}
+  );
 
   const rules = [
     // same as rules "always", but with `changes` to only trigger changed branches

package/scripts/magic/deploy/index.ts

@@ -0,0 +1,19 @@
+import { GitlabJobs } from "../types/gitlab-types";
+import { ComponentConfig } from "../types/config";
+import { Context } from "../types/context";
+import { createKubernetesDeployJobs, getKubernetesDefault } from "./kubernetes";
+import { DeployConfig } from "./types";
+
+export const deployJobCreators: {
+  [type in DeployConfig["type"]]: (context: Context) => GitlabJobs;
+} = {
+  kubernetes: createKubernetesDeployJobs,
+  serverless: () => [],
+};
+
+export const getDeployDefaults: {
+  [type in DeployConfig["type"]]: () => Partial<DeployConfig>;
+} = {
+  kubernetes: getKubernetesDefault,
+  serverless: () => ({}),
+};

package/scripts/magic/deploy/kubernetes.ts

@@ -0,0 +1,65 @@
+import { GitlabJobs } from "../types/gitlab-types";
+import { Context } from "../types/context";
+import { DeployConfigKubernetes, isOfType } from "./types";
+
+export const createKubernetesDeployJobs = (context: Context): GitlabJobs => {
+  const deployConfig = context.componentConfig.deploy;
+  if (!isOfType(deployConfig, "kubernetes")) {
+    // should not happen
+    throw new Error("deploy config is not kubernetes");
+  }
+
+  const defaltKubeValues = {
+    application: {
+      hostname: context.environment.hostname,
+      command: context.componentConfig.build.startCommand,
+    },
+  };
+  const kubeValues = {
+    ...defaltKubeValues,
+    ...deployConfig.values,
+  }; // TODO: merge with some defaults
+  return [
+    {
+      name: "deploy-to-kubernetes",
+
+      job: {
+        variables: {
+          ...context.environment.variables,
+
+          // TODO: refactor and unify with other stages
+          HELM_EXPERIMENTAL_OCI: "1",
+          IMAGE_PULL_SECRET: `gitlab-registry-${context.componentName}`,
+          KUBE_VALUES: JSON.stringify(kubeValues),
+          HELM_GITLAB_CHART_PATH: "catladder/helm-charts",
+          HELM_GITLAB_CHART_NAME: "the-panter-chart",
+          COMPONENT_NAME: context.componentName,
+          // TODO: unify with docker build stage
+          IMAGE_TAG: "$CI_COMMIT_SHA",
+          HELM_GITLAB_CHART_VERSION: "3.2.0", // TODO, we could actually just ship the chart directly here
+          RELEASE_NAME: `${context.fullConfig.customerName}-${context.fullConfig.appName}-$CI_ENVIRONMENT_SLUG`,
+        },
+        stage: "deploy",
+        dependencies: [],
+        script: [
+          "kubernetesEnsureNamespace",
+          "kubernetesCreateSecret",
+          "kubernetesDeploy",
+        ],
+        environment: {
+          name: context.environment.fullName,
+          url: context.environment.url,
+          kubernetes: {
+            namespace: context.environment.variables.KUBE_NAMESPACE,
+          },
+        },
+      },
+    },
+  ];
+};
+
+export const getKubernetesDefault = (): Partial<DeployConfigKubernetes> => {
+  return {
+    values: {},
+  };
+};

package/scripts/magic/sample-config.ts

@@ -7,7 +7,7 @@ const sampleConfig: Config = {
     web: {
       dir: "web",
       build: {
-        type: "node-static",
+        type: "node",
       },
       deploy: {
         type: "kubernetes",

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

@@ -0,0 +1,41 @@
+import { Config } from "../types";
+import { createPipeline } from "../createPipeline";
+
+describe("createPipeline", () => {
+  describe("node-app to kuberntes", () => {
+    const config: Config = {
+      appName: "test",
+      customerName: "pan",
+      components: {
+        myApp: {
+          dir: "myapp",
+          build: {
+            type: "node",
+          },
+          deploy: {
+            type: "kubernetes",
+          },
+        },
+      },
+    };
+
+    it("creates a pipeline for a single app on the main branch", async () => {
+      const { image, stages, workflow, ...jobs } = await createPipeline(
+        "mainBranch",
+        config
+      );
+      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",
+      ]);
+    });
+  });
+});

package/scripts/magic/types/config.ts

@@ -1,5 +1,5 @@
-import { BuildConfig } from "./build/types";
-import { DeployConfig } from "./deploy/types";
+import { BuildConfig } from "../build/types";
+import { DeployConfig } from "../deploy/types";
 
 export type PipelineTrigger = "mainBranch" | "mr" | "taggedRelease";
 
@@ -19,7 +19,7 @@ export const ENV_TYPES = {
 } as const;
 type EnvType = keyof typeof ENV_TYPES;
 
-type DefaultEnvConfig = {
+export type DefaultEnvConfig = {
   deploy: DeployConfig;
   build: BuildConfig;
   vars?: {

package/scripts/magic/types/context.ts

@@ -1,13 +1,21 @@
-import { ComponentConfig, Config, PipelineTrigger } from "./config";
+import { ComponentConfig, Config } from "./config";
 
 export type Environment = {
+  hostname: string;
   fullName: string;
   shortName: string;
   url: string;
   variables: Record<string, string>;
 };
+
+export type CommitInfo = {
+  refName: string;
+  refSlug: string;
+};
 export type Context = {
   componentConfig: ComponentConfig;
   componentName: string;
   fullConfig: Config;
+  environment: Environment;
+  commit: CommitInfo;
 };

package/scripts/magic/types/gitlab-types.ts

@@ -1,5 +1,3 @@
-import { Environment } from "./context";
-
 export type GitlabStage =
   | "setup"
   | "test"
@@ -52,22 +50,16 @@ export type GitlabJobDef = {
   variables?: GitlabVariables;
   dependencies?: string[];
   environment?: GitlabEnvironment;
+  allow_failure?: boolean;
 };
 
 export type GitlabVariables = Record<string, string | undefined>;
 
-export type JobEnvDependent = {
-  name: string;
-  env: true;
-  job: (environment: Environment) => GitlabJobDef;
-};
-
-export type JobNonEnv = {
+export type GitlabJob = {
   name: string;
-  env: false;
-  job: () => GitlabJobDef;
+  perEnv?: boolean;
+  job: GitlabJobDef;
 };
-export type GitlabJob = JobEnvDependent | JobNonEnv;
 export type GitlabJobs = GitlabJob[];
 
 export type GitlabPipeline = {

package/scripts/magic.ts

@@ -17,16 +17,16 @@ const isHotfixBranch = false; // TODO:  $CI_COMMIT_BRANCH =~ /^[0-9]+\.([0-9]+|x
 const isMergeRequest = Boolean(CI_MERGE_REQUEST_ID);
 const isTaggedRelease = Boolean(CI_COMMIT_TAG);
 
-const fullName = (ext: string) => "catladder." + ext;
+const fullPath = (ext: string) => process.cwd() + "/catladder." + ext;
 const readConfig = () => {
   const found = ["ts", "js", "yml", "yaml"].find((extension) =>
-    existsSync(fullName(extension))
+    existsSync(fullPath(extension))
   );
   if (found) {
     if (found === "ts" || found === "js") {
-      return require(fullName(found));
+      return require(fullPath(found)).default;
     } else {
-      return parse(fullName(found));
+      return parse(fullPath(found));
     }
   }
 };

package/scripts/utils/extractBuildEnv.ts

@@ -1,6 +1,8 @@
 import { extractAllValues } from "./extractAllValues";
 import slugify from "slugify";
 
+// deprecated
+
 type EnvVars = Record<string, string>;
 export const extractBuildEnv = async (
   componentName: string,

package/scripts/magic/types/build/index.ts

@@ -1,11 +0,0 @@
-import { GitlabJobs } from "../gitlab-types";
-import { Context } from "../context";
-import { createNodeJobs } from "./node";
-import { BuildConfig } from "./types";
-
-export const buildJobCreators: {
-  [type in BuildConfig["type"]]: (context: Context) => GitlabJobs;
-} = {
-  node: createNodeJobs,
-  "node-static": createNodeJobs, // TODO
-};

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

@@ -1,9 +0,0 @@
-export type BuildConfigNode = {
-  type: "node";
-};
-
-export type BuildConfigNodeStatic = {
-  type: "node-static";
-};
-
-export type BuildConfig = BuildConfigNode | BuildConfigNodeStatic;

package/scripts/magic/types/deploy/index.ts

@@ -1,11 +0,0 @@
-import { GitlabJobs } from "../gitlab-types";
-import { ComponentConfig } from "../config";
-import { Context } from "../context";
-import { createKubernetesDeployJobs } from "./kubernetes";
-
-export const deployJobCreators: {
-  [type in ComponentConfig["deploy"]["type"]]: (context: Context) => GitlabJobs;
-} = {
-  kubernetes: createKubernetesDeployJobs,
-  serverless: () => [],
-};

package/scripts/magic/types/deploy/kubernetes.ts

@@ -1,38 +0,0 @@
-import { GitlabJobs } from "../gitlab-types";
-import { Context } from "../context";
-import { isOfType } from "./types";
-
-export const createKubernetesDeployJobs = (context: Context): GitlabJobs => {
-  const deployConfig = context.componentConfig.deploy;
-  if (!isOfType(deployConfig, "kubernetes")) {
-    // should not happen
-    throw new Error("deploy config is not kubernetes");
-  }
-
-  return [
-    {
-      name: "deploy-to-kubernetes",
-      env: true,
-      job: (environment) => ({
-        variables: {
-          ...environment.variables,
-          RELEASE_NAME: "${CUSTOMER_NAME}-${APP_NAME}-${CI_ENVIRONMENT_SLUG}",
-        },
-        stage: "deploy",
-        dependencies: [],
-        script: [
-          "kubernetesEnsureNamespace",
-          "kubernetesCreateSecret",
-          "kubernetesDeploy",
-        ],
-        environment: {
-          name: environment.fullName,
-          url: environment.url,
-          kubernetes: {
-            namespace: environment.variables.KUBE_NAMESPACE,
-          },
-        },
-      }),
-    },
-  ];
-};