@faable/faable 1.3.7 → 1.3.9

package/dist/api/context.js

@@ -1,10 +1,12 @@
+import { ConfigStore } from '../lib/ConfigStore.js';
 import { FaableApi } from './FaableApi.js';
-import { apikey } from './strategies/apikey.js';
+import { apikey_strategy } from './strategies/apikey.strategy.js';
 
 const context = async () => {
-    const { config } = await import('./userdir_config.js');
+    const store = new ConfigStore();
+    const apikey = process.env.FAABLE_APIKEY || (await store.loadCredentials())?.apikey;
     return {
-        api: FaableApi.create({ authStrategy: apikey, auth: config }),
+        api: FaableApi.create({ authStrategy: apikey_strategy, auth: { apikey } }),
     };
 };
 

package/dist/api/strategies/{apikey.js → apikey.strategy.js}

@@ -1,4 +1,4 @@
-const apikey = (config) => {
+const apikey_strategy = (config) => {
     const { apikey } = config;
     if (!apikey) {
         throw new Error("Missing apikey.");
@@ -12,4 +12,4 @@ const apikey = (config) => {
     };
 };
 
-export { apikey };
+export { apikey_strategy };

package/dist/commands/configure/index.js

@@ -1,7 +1,5 @@
-import prompts from 'prompts';
-import fs from 'fs-extra';
-import os from 'os';
-import path__default from 'path';
+import { ConfigStore } from '../../lib/ConfigStore.js';
+import { ConfigurationHelper } from '../init/ConfigurationHelper.js';
 
 const configure = {
     command: "configure",
@@ -18,22 +16,12 @@ const configure = {
     },
     handler: async (args) => {
         const { app_name, workdir, api, remove } = args;
-        const faable_home = path__default.join(os.homedir(), ".faable");
+        const store = new ConfigStore();
+        const helper = new ConfigurationHelper();
         if (remove) {
-            await fs.remove(faable_home);
-            console.log("Deleted faable config");
-            return;
+            await store.deleteCredentials();
         }
-        const response = await prompts([
-            {
-                type: "text",
-                name: "apikey",
-                message: "What is your Faable ApiKey?",
-            },
-        ]);
-        await fs.ensureDir(faable_home);
-        await fs.writeJSON(path__default.join(faable_home, "credentials"), response);
-        console.log("Stored credentials");
+        await helper.demandConfig();
     },
 };
 

package/dist/commands/init/ConfigurationHelper.js

@@ -0,0 +1,113 @@
+import path__default from 'path';
+import fs from 'fs-extra';
+import { log } from '../../log.js';
+import prompts from 'prompts';
+import { ConfigStore } from '../../lib/ConfigStore.js';
+import yaml from 'yaml';
+
+class ConfigurationHelper {
+    store;
+    constructor() {
+        this.store = new ConfigStore();
+    }
+    get workflows_dir() {
+        return path__default.join(process.cwd(), ".github", "workflows");
+    }
+    get default_action() {
+        return path__default.join(this.workflows_dir, "deploy.yml");
+    }
+    async demandConfig() {
+        const creds = await this.store.loadCredentials();
+        if (creds.apikey) {
+            return;
+        }
+        const apikey = await prompts([
+            {
+                type: "text",
+                name: "apikey",
+                message: "What is your Faable ApiKey?",
+            },
+        ]);
+        await this.store.saveApiKey({ apikey });
+    }
+    async tentativeName() {
+        try {
+            const pkg = path__default.join(process.cwd(), "package.json");
+            const { name } = await fs.readJSON(pkg);
+            return name;
+        }
+        catch (error) {
+            return;
+        }
+    }
+    async checkPackageManager() {
+        if (fs.existsSync(path__default.join(process.cwd(), "package-lock.json"))) {
+            return "npm";
+        }
+        if (fs.existsSync(path__default.join(process.cwd(), "yarn.lock"))) {
+            return "yarn";
+        }
+        throw new Error("No package-lock.json or yarn.lock file found");
+    }
+    async initializeGithubAction(force = false) {
+        await this.demandConfig();
+        // Already configured
+        if (!force && fs.pathExistsSync(this.default_action)) {
+            log.info(`Github action is already configured.`);
+            return;
+        }
+        const onCancel = (prompt) => {
+            log.info("Cancel");
+            process.exit(0);
+        };
+        const { app_name } = await prompts([
+            {
+                type: "text",
+                name: "app_name",
+                initial: await this.tentativeName(),
+                message: "Which app are you deploying",
+            },
+        ], { onCancel });
+        const manager = await this.checkPackageManager();
+        const action = {
+            name: "Deploy to Faable",
+            on: {
+                push: {
+                    branches: ["main"],
+                },
+            },
+            env: {
+                FAABLE_APIKEY: "${{ secrets.FAABLE_APIKEY }}",
+            },
+            jobs: {
+                deploy: {
+                    "runs-on": "ubuntu-latest",
+                    steps: [
+                        { uses: "actions/checkout@v2" },
+                        { name: "Prepare CLI", run: "npm i -g @faable/faable" },
+                        {
+                            uses: "actions/setup-node@v3",
+                            with: {
+                                "node-version": "16",
+                                cache: "yarn",
+                            },
+                        },
+                        ...(manager == "npm" && [{ run: "npm ci" }]),
+                        ...(manager == "yarn" && [
+                            { run: "yarn install --frozen-lockfile" },
+                        ]),
+                        {
+                            name: "Deploy to Faable",
+                            run: `faable deploy ${app_name}`,
+                        },
+                    ],
+                },
+            },
+        };
+        await fs.writeFile(this.default_action, yaml.stringify(action));
+        log.info(`Written ${this.default_action}`);
+        log.info(`Remember to create FAABLE_APIKEY on Github repo secrets`);
+    }
+}
+
+export { ConfigurationHelper };

package/dist/commands/init/index.js

@@ -0,0 +1,23 @@
+import { ConfigurationHelper } from './ConfigurationHelper.js';
+
+const init = {
+    command: ["initialize", "$0"],
+    describe: "Initialize Faable",
+    builder: (yargs) => {
+        return yargs
+            .option("force", {
+            alias: "f",
+            type: "boolean",
+            description: "Force initialization",
+            default: false,
+        })
+            .showHelpOnFail(false);
+    },
+    handler: async (args) => {
+        const { force } = args;
+        const helper = new ConfigurationHelper();
+        await helper.initializeGithubAction(force);
+    },
+};
+
+export { init };

package/dist/index.js

@@ -4,13 +4,16 @@ 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 { init } from './commands/init/index.js';
 
 const yg = yargs();
 yg.scriptName("faable")
     .command(deploy)
     .command(apps)
     .command(configure)
+    .command(init)
     .demandCommand(1)
+    .help()
     .fail(function (msg, err) {
     if (err) {
         log.error(`❌ ${err.message}`);

package/dist/lib/ConfigStore.js

@@ -0,0 +1,36 @@
+import path__default from 'path';
+import os from 'os';
+import fs from 'fs-extra';
+import { log } from '../log.js';
+
+class ConfigStore {
+    log;
+    faable_home;
+    constructor(log$1 = log) {
+        this.log = log$1;
+        this.faable_home = path__default.join(os.homedir(), ".faable");
+    }
+    async deleteCredentials() {
+        await fs.remove(this.faable_home);
+        this.log.info(`Deleted credentials`);
+    }
+    get credentials_path() {
+        return path__default.join(this.faable_home, "credentials");
+    }
+    async saveApiKey(config) {
+        await fs.ensureDir(this.faable_home);
+        await fs.writeJSON(this.credentials_path, config);
+        this.log.info(`Stored apikey`);
+    }
+    async loadCredentials() {
+        if (!fs.existsSync(this.credentials_path)) {
+            // No credentials found
+            return;
+        }
+        // Return credentials
+        const config = await fs.readJSON(this.credentials_path);
+        return config;
+    }
+}
+
+export { ConfigStore };

package/package.json

@@ -10,6 +10,7 @@
     "promisify-child-process": "^4.1.1",
     "prompts": "^2.4.2",
     "tslib": "^2.4.1",
+    "yaml": "^2.2.2",
     "yargs": "^17.6.2"
   },
   "bin": {
@@ -26,5 +27,5 @@
     "access": "public"
   },
   "homepage": "https://github.com/faablecloud/faable#readme",
-  "version": "1.3.7"
+  "version": "1.3.9"
 }

package/dist/api/userdir_config.js

@@ -1,20 +0,0 @@
-import fs from 'fs-extra';
-import path__default from 'path';
-import os from 'os';
-
-const faable_home = path__default.join(os.homedir(), ".faable");
-const config = {};
-const credentials_path = path__default.join(faable_home, "credentials");
-if (fs.existsSync(credentials_path)) {
-    // console.log("Loaded stored config");
-    const creds = fs.readJSONSync(credentials_path);
-    // console.log(creds);
-    config.clientId = creds.clientId;
-    config.clientSecret = creds.clientSecret;
-    config.apikey = creds.apikey;
-}
-config.clientId = process.env.FAABLE_CLIENT_ID || config.clientId;
-config.clientSecret = process.env.FAABLE_CLIENT_SECRET || config.clientSecret;
-config.apikey = process.env.FAABLE_APIKEY || config.apikey;
-
-export { config };