@faable/faable 0.0.0-dev → 0.0.0-development

package/dist/api/FaableApi.js

@@ -34,10 +34,12 @@ const data = async (res) => {
 };
 class FaableApi {
     client;
+    strategy;
     constructor(config) {
         const { authStrategy, auth } = config;
         this.client = create_base_client();
-        const strategy = authStrategy && authStrategy(auth);
+        this.strategy = authStrategy && authStrategy(auth);
+        const strategy = this.strategy;
         this.client.interceptors.request.use(async function (config) {
             // Do something before request is sent
             const headers = strategy ? await strategy.headers() : {};
@@ -59,6 +61,9 @@ class FaableApi {
     async getBySlug(slug) {
         return data(this.client.get(`/app/slug/${slug}`));
     }
+    async getApp(app_id) {
+        return data(this.client.get(`/app/${app_id}`));
+    }
     async getRegistry(app_id) {
         return data(this.client.get(`/app/${app_id}/registry`));
     }
@@ -68,6 +73,9 @@ class FaableApi {
     async getAppSecrets(app_id) {
         return firstPage(data(this.client.get(`/secret/${app_id}`)));
     }
+    async updateApp(app_id, params) {
+        return data(this.client.patch(`/app/${app_id}`, params));
+    }
 }
 __decorate([
     handleError()
@@ -75,6 +83,9 @@ __decorate([
 __decorate([
     handleError()
 ], FaableApi.prototype, "getBySlug", null);
+__decorate([
+    handleError()
+], FaableApi.prototype, "getApp", null);
 __decorate([
     handleError()
 ], FaableApi.prototype, "getRegistry", null);
@@ -84,5 +95,8 @@ __decorate([
 __decorate([
     handleError()
 ], FaableApi.prototype, "getAppSecrets", null);
+__decorate([
+    handleError()
+], FaableApi.prototype, "updateApp", null);
 
 export { FaableApi };

package/dist/api/context.js

@@ -2,18 +2,18 @@ import { FaableApi } from './FaableApi.js';
 import { apikey_strategy } from './strategies/apikey.strategy.js';
 import { getIDToken } from '@actions/core';
 import { oidc_strategy } from './strategies/oidc.strategy.js';
+import { CredentialsStore } from '../lib/CredentialsStore.js';
 
 // import { CredentialsStore } from "../lib/CredentialsStore";
 const context = async () => {
     let api;
     if (process.env.FAABLE_APIKEY) {
+        // Apikey in environment
         const apikey = process.env.FAABLE_APIKEY;
         api = FaableApi.create({ authStrategy: apikey_strategy, auth: { apikey } });
     }
-    //const store = new CredentialsStore();
-    //(await store.loadCredentials())?.apikey
-    // Github actions environment
-    if (process.env.GITHUB_ACTIONS === 'true') {
+    else if (process.env.GITHUB_ACTIONS === 'true') {
+        // Github actions environment
         try {
             const idToken = process.env.FAABLE_ID_TOKEN || await getIDToken("https://faable.com");
             api = FaableApi.create({ authStrategy: oidc_strategy, auth: { idToken } });
@@ -22,8 +22,18 @@ const context = async () => {
             console.error("Error fetching token, configure 'permissions: id-token: write'");
         }
     }
+    else {
+        const store = new CredentialsStore();
+        const { apikey } = await store.loadCredentials();
+        if (!apikey) {
+            throw new Error("No apikey found, please run 'faable login' first");
+        }
+        api = FaableApi.create({ authStrategy: apikey_strategy, auth: { apikey } });
+    }
+    const appId = await api?.strategy?.app_id?.();
     return {
         api,
+        appId
     };
 };
 

package/dist/api/strategies/oidc.strategy.js

@@ -5,26 +5,32 @@ const exchangeGithubOidcToken = async (gh_token) => {
     const res = await client.post("/auth/github-oidc", {
         token: gh_token
     });
-    const { token } = res.data;
-    console.log("Obtained github token exchange");
-    console.log(token);
-    return token;
+    const { token, app_id } = res.data;
+    return { token, app_id };
 };
 const oidc_strategy = (config) => {
     const { idToken } = config;
     if (!idToken) {
         throw new Error("Missing idToken.");
     }
-    let token = "";
+    let token_ex;
     return {
         headers: async () => {
-            if (!token) {
-                token = await exchangeGithubOidcToken(idToken);
+            if (!token_ex) {
+                const ex = await exchangeGithubOidcToken(idToken);
+                token_ex = ex;
             }
             return {
-                Authorization: `Bearer ${token}`,
+                Authorization: `Bearer ${token_ex.token}`,
             };
         },
+        app_id: async () => {
+            if (!token_ex) {
+                const ex = await exchangeGithubOidcToken(idToken);
+                token_ex = ex;
+            }
+            return token_ex.app_id;
+        }
     };
 };
 

package/dist/commands/deploy/deploy_command.js

@@ -8,15 +8,25 @@ import { cmd } from '../../lib/cmd.js';
 
 const deploy_command = async (args) => {
     const workdir = args.workdir || process.cwd();
-    const { api } = await context();
+    const { api, appId } = await context();
     // Resolve runtime
     const { app_name, runtime } = await runtime_detection(workdir);
-    const name = args.app_slug || app_name;
-    if (!name) {
+    let app;
+    if (args.app_slug) {
+        app = await api.getBySlug(args.app_slug);
+    }
+    else {
+        const oidc_app_id = appId;
+        if (oidc_app_id) {
+            app = await api.getApp(oidc_app_id);
+        }
+        else if (app_name) {
+            app = await api.getBySlug(app_name);
+        }
+    }
+    if (!app) {
         throw new Error("Missing <app_name>");
     }
-    // Get app from Faable API
-    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}`);

package/dist/commands/init/index.js

@@ -1,7 +1,7 @@
 import { writeGithubAction } from './writeGithubAction.js';
 
 const init = {
-    command: ["initialize", "$0"],
+    command: ["init", "initialize"],
     describe: "Initialize Faable",
     builder: (yargs) => {
         return yargs

package/dist/commands/link/index.js

@@ -0,0 +1,67 @@
+import { context } from '../../api/context.js';
+import prompts from 'prompts';
+import { log } from '../../log.js';
+import { cmd } from '../../lib/cmd.js';
+import { Configuration } from '../../lib/Configuration.js';
+
+const getGitRemoteUrl = async (workdir) => {
+    try {
+        const { stdout } = await cmd("git remote get-url origin", { cwd: workdir });
+        return stdout?.toString().trim();
+    }
+    catch (error) {
+        log.warn("Could not detect git remote origin URL.");
+        return undefined;
+    }
+};
+const link = {
+    command: "link",
+    describe: "Link the local repository with a Faable app",
+    builder: (yargs) => {
+        return yargs
+            .option("workdir", {
+            alias: "w",
+            type: "string",
+            description: "Working directory",
+        })
+            .showHelpOnFail(false);
+    },
+    handler: async (args) => {
+        const workdir = args.workdir || process.cwd();
+        const { api } = await context();
+        log.info("Checking local git repository...");
+        const gitUrl = await getGitRemoteUrl(workdir);
+        const apps = await api.list();
+        if (apps.length === 0) {
+            log.error("No apps found in your account. Create one first at https://faable.cloud");
+            return;
+        }
+        const { selectedApp } = await prompts({
+            type: "select",
+            name: "selectedApp",
+            message: "Select the Faable app to link with this repository:",
+            choices: apps.map((app) => ({
+                title: `${app.name} (${app.url})`,
+                value: app,
+            })),
+        });
+        if (!selectedApp) {
+            log.info("Link cancelled.");
+            return;
+        }
+        log.info(`Linking to ${selectedApp.name}...`);
+        // Update the app in the API
+        if (gitUrl) {
+            await api.updateApp(selectedApp.id, { github_repo: gitUrl });
+            log.info(`Updated app ${selectedApp.name} with github_repo: ${gitUrl}`);
+        }
+        else {
+            log.warn("No git remote URL detected. Skipping API update for github_repo.");
+        }
+        // Save locally for CLI convenience
+        Configuration.instance().saveConfig({ app_slug: selectedApp.name });
+        log.info(`Successfully linked local repository to ${selectedApp.name}.`);
+    },
+};
+
+export { link };

package/dist/index.js

@@ -4,14 +4,15 @@ import { apps } from './commands/apps/index.js';
 import { configure } from './commands/configure/index.js';
 import { deploy } from './commands/deploy/index.js';
 import { log } from './log.js';
+import { link } from './commands/link/index.js';
 import { init } from './commands/init/index.js';
 import { version } from './config.js';
 import { Configuration } from './lib/Configuration.js';
 
 const yg = yargs();
 yg.scriptName("faable")
-    .middleware(function (argv) {
-    console.log(`Faable CLI ${version}`);
+    .middleware(function (_argv) {
+    log.info(`Faable CLI ${version}`);
 }, true)
     .option("c", {
     alias: "config",
@@ -32,6 +33,7 @@ yg.scriptName("faable")
     .command(apps)
     .command(configure)
     .command(init)
+    .command(link)
     .demandCommand(1)
     .help()
     .fail(function (msg, err) {

package/dist/lib/Configuration.js

@@ -5,14 +5,16 @@ import { log } from '../log.js';
 class Configuration {
     static _instance;
     config = {};
+    config_file = "faable.json";
     constructor() {
         // Try to read default config file
         this.setConfigFile("faable.json", { ignoreWarnings: true });
     }
     setConfigFile(file, options) {
-        const config_file = path__default.join(process.cwd(), file);
-        if (fs.existsSync(config_file)) {
-            this.config = fs.readJSONSync(config_file);
+        this.config_file = file;
+        const config_path = path__default.join(process.cwd(), file);
+        if (fs.existsSync(config_path)) {
+            this.config = fs.readJSONSync(config_path);
             log.info(`Loaded configuration from: ${file}`);
         }
         else {
@@ -21,6 +23,12 @@ class Configuration {
             }
         }
     }
+    saveConfig(updates) {
+        this.config = { ...this.config, ...updates };
+        const config_path = path__default.join(process.cwd(), this.config_file);
+        fs.writeJSONSync(config_path, this.config, { spaces: 2 });
+        log.info(`Configuration saved to: ${this.config_file}`);
+    }
     static instance() {
         if (!Configuration._instance) {
             Configuration._instance = new Configuration();
@@ -33,6 +41,9 @@ class Configuration {
     get buildCommand() {
         return this.config.buildCommand;
     }
+    get app_slug() {
+        return this.config.app_slug;
+    }
 }
 
 export { Configuration };

package/package.json

@@ -15,7 +15,7 @@
     "yaml": "^2.8.2",
     "yargs": "^18.0.0"
   },
-  "version": "0.0.0-dev",
+  "version": "0.0.0-development",
   "bin": {
     "faable": "bin/faable.js"
   },
@@ -32,7 +32,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/faablecloud/faable.git"
+    "url": "git+https://github.com/faablecloud/faable.git"
   },
   "homepage": "https://github.com/faablecloud/faable#readme"
 }