@faable/faable 1.5.4 → 1.5.6

package/dist/api/FaableApi.js

@@ -24,7 +24,7 @@ function handleError(message) {
         };
     };
 }
-const paginate = async (res) => {
+const firstPage = async (res) => {
     const items = (await res).results;
     return items;
 };
@@ -41,7 +41,7 @@ class FaableApi {
         return new FaableApi(config);
     }
     async list() {
-        return paginate(data(this.client.get(`/app`)));
+        return firstPage(data(this.client.get(`/app`)));
     }
     async getBySlug(slug) {
         return data(this.client.get(`/app/slug/${slug}`));
@@ -52,6 +52,9 @@ class FaableApi {
     async createDeployment(params) {
         return data(this.client.post(`/deployment`, params));
     }
+    async getAppSecrets(app_id) {
+        return firstPage(data(this.client.get(`/secret/${app_id}`)));
+    }
 }
 __decorate([
     handleError()
@@ -65,5 +68,8 @@ __decorate([
 __decorate([
     handleError()
 ], FaableApi.prototype, "createDeployment", null);
+__decorate([
+    handleError()
+], FaableApi.prototype, "getAppSecrets", null);
 
 export { FaableApi };

package/dist/commands/deploy/deploy_command.js

@@ -19,12 +19,15 @@ const deploy_command = async (args) => {
     const app = await api.getBySlug(name);
     // Check if we can build docker images
     await check_environment();
-    log.info(`🚀 Deploying ${app.name} (${app.id}) runtime=${runtime.name}-${runtime.version} `);
+    log.info(`🚀 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;
     }

package/dist/commands/deploy/node-pipeline/{bundle_docker.js → build_docker.js}

@@ -24,7 +24,7 @@ Handlebars.registerHelper("escape", function (variable) {
 // Docker template file
 const docker_template = Handlebars.compile(dockerfile);
 const entrypoint_template = Handlebars.compile(entrypoint);
-const bundle_docker = async (props) => {
+const build_docker = async (props) => {
     const { app, workdir, template_context } = props;
     const entrypoint_custom = entrypoint_template(template_context);
     const start_command = Configuration.instance().startCommand;
@@ -45,4 +45,4 @@ const bundle_docker = async (props) => {
     await cmd(`docker build -t ${app.id} ${workdir} -f -<<EOF\n${dockerfile}\nEOF`, { timeout, enableOutput: true });
 };
 
-export { bundle_docker };
+export { build_docker };

package/dist/commands/deploy/node-pipeline/index.js

@@ -1,18 +1,24 @@
-import { bundle_docker } from './bundle_docker.js';
+import { build_docker } from './build_docker.js';
 import { analyze_package } from './analyze_package.js';
 import { build_project } from './build_project.js';
+import * as R from 'ramda';
+import { log } from '../../../log.js';
 
 const build_node = async (app, options) => {
     // 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({ 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({ build_script});
     // Bundle project inside a docker image
-    await bundle_docker({
+    await build_docker({
         app,
         workdir,
         template_context: {

package/dist/commands/deploy/runtime-detect/strategies/nodejs.js

@@ -22,7 +22,7 @@ const strategy_nodejs = async (workdir) => {
         try {
             const check_cmd = `npm view node@"${engines.node}" version | tail -n 1 | cut -d "'" -f2`;
             const out = await cmd(check_cmd);
-            runtime_version = out.stdout.toString();
+            runtime_version = out.stdout.toString().trim();
             log.info(`Using node@${runtime_version} from engines in package.json (${engines.node})`);
         }
         catch (e) {

package/dist/lib/cmd.js

@@ -10,6 +10,7 @@ const cmd = async (cmd, config) => {
         stdio: enableOutput ? "inherit" : "pipe",
         timeout,
         cwd,
+        env: config.env,
     });
     const out_data = [];
     child.stderr?.on("data", (data) => {

package/package.json

@@ -14,7 +14,7 @@
     "yaml": "^2.8.2",
     "yargs": "^18.0.0"
   },
-  "version": "1.5.4",
+  "version": "1.5.6",
   "bin": {
     "faable": "bin/faable.js"
   },