fix: ok

Author: boyander

src/api/FaableApi.ts

@@ -13,6 +13,13 @@ export interface FaableAppRegistry {
   password: string;
 }
 
+export interface Secret {
+  id: string;
+  related: string;
+  name: string;
+  value: string;
+}
+
 function handleError(message?: string) {
   return function (
     target: any,
@@ -43,7 +50,7 @@ function handleError(message?: string) {
 
 type Page<Q> = { results: Q[] };
 
-const paginate = async <T, Q extends Promise<Page<T>>>(
+const firstPage = async <T, Q extends Promise<Page<T>>>(
   res: Q
 ): Promise<Awaited<Q>["results"]> => {
   const items = (await res).results;
@@ -72,7 +79,7 @@ export class FaableApi<T = any> {
 
   @handleError()
   async list() {
-    return paginate(data(this.client.get<Page<FaableApp>>(`/app`)));
+    return firstPage(data(this.client.get<Page<FaableApp>>(`/app`)));
   }
 
   @handleError()
@@ -93,4 +100,8 @@ export class FaableApi<T = any> {
   }) {
     return data(this.client.post<{ id: string }>(`/deployment`, params));
   }
+  @handleError()
+  async getAppSecrets(app_id: string) {
+    return firstPage(data(this.client.get<Page<Secret>>(`/secret/${app_id}`)));
+  }
 }

src/commands/deploy/deploy_command.ts

@@ -32,15 +32,19 @@ export const deploy_command = async (args: DeployCommandArgs) => {
   await check_environment();
 
   log.info(
-    `🚀 Deploying ${app.name} (${app.id}) runtime=${runtime.name}-${runtime.version} `
+    `🚀 Deploying ${app.name} (${app.id}) runtime=${runtime.name}-${runtime.version}`
   );
 
+  // get environment variables
+  const env_vars = await api.getAppSecrets(app.id);
+
   let type;
 
   if (runtime.name == "node") {
     const node_result = await build_node(app, {
       workdir,
       runtime,
+      env_vars,
     });
     type = node_result.type;
   } else if (runtime.name == "docker") {

…ds/deploy/node-pipeline/bundle_docker.ts …nds/deploy/node-pipeline/build_docker.tssrc/commands/deploy/node-pipeline/bundle_docker.ts renamed to src/commands/deploy/node-pipeline/build_docker.ts src/commands/deploy/node-pipeline/bundle_docker.ts renamed to src/commands/deploy/node-pipeline/build_docker.ts

@@ -36,7 +36,7 @@ interface BuildConfig {
   };
 }
 
-export const bundle_docker = async (props: BuildConfig) => {
+export const build_docker = async (props: BuildConfig) => {
   const { app, workdir, template_context } = props;
 
   const entrypoint_custom = entrypoint_template(template_context);

src/commands/deploy/node-pipeline/build_project.ts

@@ -1,4 +1,4 @@
-import { FaableApp } from "../../../api/FaableApi";
+import { FaableApp, Secret } from "../../../api/FaableApi";
 import { log } from "../../../log";
 import { cmd } from "../../../lib/cmd";
 import { Configuration } from "../../../lib/Configuration";
@@ -9,6 +9,7 @@ interface BuildProjectArgs {
   /**build script*/
   build_script?: string;
   cwd?: string;
+  env?: Record<string, string>;
 }
 
 export const build_project = async (args: BuildProjectArgs) => {

src/commands/deploy/node-pipeline/index.ts

@@ -1,27 +1,37 @@
-import { FaableApp } from "../../../api/FaableApi";
-import { bundle_docker } from "./bundle_docker";
+import { FaableApp, Secret } from "../../../api/FaableApi";
+import { build_docker } from "./build_docker";
 import { analyze_package } from "./analyze_package";
 import { build_project } from "./build_project";
 import { Runtime } from "../runtime-detect/RuntimeStrategy";
+import * as R from "ramda";
+import { log } from "../../../log";
 
 interface BuildNodeOptions {
   workdir: string;
   runtime: Runtime;
+  env_vars?: Secret[];
 }
 
 export const build_node = async (app: FaableApp, options: BuildNodeOptions) => {
   // log.info(`🚀 Build Toolchain ${app.name} [${app.id}]`);
-  const { workdir, runtime } = options;
+  const { workdir, runtime, env_vars } = options;
 
   if (!runtime.version) {
     throw new Error("Runtime version not specified for node");
   }
   // Analyze package.json to check if build is needed
   const { build_script, type } = await analyze_package({ workdir });
-  await build_project({ app, build_script });
+
+  // Environment variables
+
+  const env = R.fromPairs(env_vars.map((e) => [e.name, e.value]));
+  log.info(`Building with env variables ${Object.keys(env).join(",")}`);
+
+  // Do build
+  await build_project({ app, build_script, env });
 
   // Bundle project inside a docker image
-  await bundle_docker({
+  await build_docker({
     app,
     workdir,
     template_context: {

src/lib/cmd.ts

@@ -7,6 +7,7 @@ interface CmdConfig {
   timeout: number;
   /** Sets workdir */
   cwd: string;
+  env?: Record<string, string>;
 }
 
 export const cmd = async (cmd: string, config?: Partial<CmdConfig>) => {
@@ -20,6 +21,7 @@ export const cmd = async (cmd: string, config?: Partial<CmdConfig>) => {
     stdio: enableOutput ? "inherit" : "pipe",
     timeout,
     cwd,
+    env: config.env,
   });
   const out_data: Buffer[] = [];
   child.stderr?.on("data", (data) => {