@webiny/cli 0.0.0-unstable.990c3ab1b6 → 0.0.0-unstable.99666aeb00

package/cli.js

@@ -1,32 +1,11 @@
 #!/usr/bin/env node
-const path = require("path");
 const yargs = require("yargs");
-const { log, getProject } = require("./utils");
-const { boolean } = require("boolean");
 
 // Disable help processing until after plugins are imported.
 yargs.help(false);
 
-// Immediately load .env.{PASSED_ENVIRONMENT} and .env files.
-// This way we ensure all of the environment variables are not loaded too late.
-const project = getProject();
-let paths = [path.join(project.root, ".env")];
-
-if (yargs.argv.env) {
-    paths.push(path.join(project.root, `.env.${yargs.argv.env}`));
-}
-
-for (let i = 0; i < paths.length; i++) {
-    const path = paths[i];
-    const { error } = require("dotenv").config({ path });
-    if (boolean(yargs.argv.debug)) {
-        if (error) {
-            log.debug(`No environment file found on ${log.debug.hl(path)}.`);
-        } else {
-            log.success(`Successfully loaded environment variables from ${log.success.hl(path)}.`);
-        }
-    }
-}
+// Loads environment variables from multiple sources.
+require("./utils/loadEnvVariables");
 
 const { blue, red } = require("chalk");
 const context = require("./context");

package/commands/about/getNpxVersion.js

@@ -0,0 +1,10 @@
+const execa = require("execa");
+
+module.exports.getNpxVersion = async () => {
+    try {
+        const { stdout } = await execa("npx", ["--version"]);
+        return stdout;
+    } catch (err) {
+        return "";
+    }
+};

package/commands/about/getPulumiVersions.js

@@ -0,0 +1,41 @@
+const execa = require("execa");
+
+module.exports.getPulumiVersions = async () => {
+    let pulumi, pulumiAws;
+
+    try {
+        {
+            const { stdout } = await execa("yarn", [
+                "info",
+                "@pulumi/pulumi",
+                "-A",
+                "--name-only",
+                "--json"
+            ]);
+
+            const match = stdout.match(/npm:(.*?)"/);
+            if (match) {
+                pulumi = match[1];
+            }
+        }
+
+        {
+            const { stdout } = await execa("yarn", [
+                "info",
+                "@pulumi/aws",
+                "-A",
+                "--name-only",
+                "--json"
+            ]);
+
+            const match = stdout.match(/npm:(.*?)"/);
+            if (match) {
+                pulumiAws = match[1];
+            }
+        }
+    } catch (err) {
+        return "";
+    }
+
+    return [pulumi, pulumiAws];
+};

package/commands/about/getYarnVersion.js

@@ -0,0 +1,10 @@
+const execa = require("execa");
+
+module.exports.getYarnVersion = async () => {
+    try {
+        const { stdout } = await execa("yarn", ["--version"]);
+        return stdout;
+    } catch (err) {
+        return "";
+    }
+};

package/commands/about/index.js

@@ -0,0 +1,93 @@
+const NO_VALUE = "-";
+
+const getData = async context => {
+    const { getUser } = require("../wcp/utils");
+    const { getNpxVersion } = require("./getNpxVersion");
+    const { getPulumiVersions } = require("./getPulumiVersions");
+    const { getYarnVersion } = require("./getYarnVersion");
+
+    const [pulumiVersion, pulumiAwsVersion] = await getPulumiVersions();
+
+    return [
+        {
+            sectionName: "Webiny Project",
+            data: {
+                Name: context.project.name,
+                Version: context.version,
+                Template: context.project.config.template || NO_VALUE,
+                "Debug Enabled": process.env.DEBUG === "true" ? "Yes" : "No",
+                "Feature Flags": process.env.WEBINY_FEATURE_FLAGS || "N/A"
+            }
+        },
+        {
+            sectionName: "Webiny Control Panel (WCP)",
+            data: {
+                "Project ID": context.project.config.id || process.env.WCP_PROJECT_ID,
+                User: await getUser()
+                    .catch(() => "N/A")
+                    .then(res => res.email),
+                Authentication: process.env.WEBINY_PROJECT_ENVIRONMENT_API_KEY
+                    ? "Project Environment API Key"
+                    : "Personal Access Token"
+            }
+        },
+        {
+            sectionName: "Pulumi",
+            data: {
+                "@pulumi/pulumi": pulumiVersion,
+                "@pulumi/aws": pulumiAwsVersion,
+                "Used AWS Region": process.env.AWS_REGION,
+                "Secrets Provider": process.env.PULUMI_SECRETS_PROVIDER,
+                "Using Password": process.env.PULUMI_CONFIG_PASSPHRASE ? "Yes" : "No"
+            }
+        },
+        {
+            sectionName: "Host",
+            data: {
+                OS: `${process.platform} (${process.arch})`,
+                "Node.js": process.version,
+                NPX: await getNpxVersion(),
+                Yarn: await getYarnVersion()
+            }
+        }
+    ];
+};
+
+module.exports = {
+    type: "cli-command",
+    name: "cli-command-about",
+    create({ yargs, context }) {
+        yargs.command(
+            "about",
+            `Prints out information helpful for debugging purposes.`,
+            yargs => {
+                yargs.option("json", {
+                    describe: "Emit output as JSON.",
+                    type: "boolean",
+                    default: false
+                });
+            },
+            async yargs => {
+                const data = await getData(context);
+
+                if (yargs.json) {
+                    console.log(JSON.stringify(data, null, 2));
+                    return;
+                }
+
+                data.forEach(({ sectionName, data }, index) => {
+                    if (index > 0) {
+                        console.log();
+                    }
+
+                    const { bold } = require("chalk");
+                    console.log(bold(sectionName));
+
+                    Object.keys(data).forEach(key => {
+                        console.log(key.padEnd(30), data[key] || NO_VALUE);
+                    });
+                });
+            }
+        );
+    }
+};

package/commands/index.js

@@ -1,9 +1,10 @@
+const about = require("./about");
 const run = require("./run");
 const telemetry = require("./telemetry");
 const upgrade = require("./upgrade");
 
 module.exports.createCommands = async (yargs, context) => {
-    context.plugins.register(run, telemetry, upgrade);
+    context.plugins.register(about, run, telemetry, upgrade);
 
     try {
         const wcp = require("./wcp");

package/commands/wcp/utils/getWcpOrgProjectId.js

@@ -0,0 +1,9 @@
+const { getWcpProjectId } = require("./getWcpProjectId");
+
+module.exports.getWcpOrgProjectId = context => {
+    const id = getWcpProjectId(context);
+    if (typeof id === "string") {
+        return id.split("/");
+    }
+    return [];
+};

package/commands/wcp/utils/getWcpProjectId.js

@@ -0,0 +1,3 @@
+module.exports.getWcpProjectId = context => {
+    return context?.project?.config?.id || process.env.WCP_PROJECT_ID || "";
+};

package/commands/wcp/utils/index.js

@@ -4,6 +4,8 @@ const { updateUserLastActiveOn } = require("./updateUserLastActiveOn");
 const { setProjectId } = require("./setProjectId");
 const { setWcpPat } = require("./setWcpPat");
 const { getWcpPat } = require("./getWcpPat");
+const { getWcpProjectId } = require("./getWcpProjectId");
+const { getWcpOrgProjectId } = require("./getWcpOrgProjectId");
 const { sleep } = require("./sleep");
 
 module.exports = {
@@ -13,5 +15,7 @@ module.exports = {
     setProjectId,
     setWcpPat,
     getWcpPat,
+    getWcpProjectId,
+    getWcpOrgProjectId,
     sleep
 };

package/context.js

@@ -92,7 +92,7 @@ class Context {
     log = log.log;
     info = log.info;
     success = log.success;
-    debug = process.argv.includes("--debug") ? log.debug : noop;
+    debug = process.argv.some(v => v.match("--debug")) ? log.debug : noop;
     warning = log.warning;
     error = log.error;
 
@@ -116,7 +116,7 @@ class Context {
         }
 
         if (!fs.existsSync(filePath)) {
-            debug && this.debug(`No environment file found on ${this.debug.hl(filePath)}.`);
+            debug && this.debug(`No environment file found on %s.`, filePath);
             return;
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/cli",
-	"version": "0.0.0-unstable.990c3ab1b6",
+	"version": "0.0.0-unstable.99666aeb00",
 	"main": "index.js",
 	"bin": {
 		"webiny": "./bin.js"
@@ -13,14 +13,14 @@
 	"author": "Pavel Denisjuk <pavel@webiny.com>",
 	"description": "A tool to bootstrap a Webiny project.",
 	"dependencies": {
-		"@webiny/telemetry": "0.0.0-unstable.990c3ab1b6",
-		"@webiny/wcp": "0.0.0-unstable.990c3ab1b6",
-		"boolean": "3.1.4",
+		"@webiny/telemetry": "0.0.0-unstable.99666aeb00",
+		"@webiny/wcp": "0.0.0-unstable.99666aeb00",
+		"boolean": "3.2.0",
 		"camelcase": "5.3.1",
 		"chalk": "4.1.2",
-		"dotenv": "8.2.0",
+		"dotenv": "8.6.0",
 		"execa": "5.1.1",
-		"fast-glob": "3.2.7",
+		"fast-glob": "3.2.12",
 		"find-up": "5.0.0",
 		"fs-extra": "9.1.0",
 		"graphql-request": "3.7.0",
@@ -28,7 +28,7 @@
 		"ncp": "2.0.0",
 		"open": "8.4.0",
 		"pirates": "4.0.5",
-		"semver": "7.3.8",
+		"semver": "6.3.0",
 		"ts-morph": "11.0.3",
 		"typescript": "4.7.4",
 		"uniqid": "5.4.0",
@@ -64,5 +64,5 @@
 			]
 		}
 	},
-	"gitHead": "87e7b4d0a643f65b31d029d6bf2a81902fb940a8"
+	"gitHead": "99666aeb00056c56292eeb5dbb6aba7fda2439e2"
 }

package/utils/loadEnvVariables.js

@@ -0,0 +1,46 @@
+const path = require("path");
+const yargs = require("yargs");
+const log = require("./log");
+const getProject = require("./getProject");
+const { boolean } = require("boolean");
+
+// Load environment variables from following sources:
+// - `webiny.project.ts` file
+// - `.env` file
+// - `.env.{PASSED_ENVIRONMENT}` file
+
+const project = getProject();
+
+// `webiny.project.ts` file.
+// Environment variables defined via the `env` property.
+if (project.config.env) {
+    Object.assign(process.env, project.config.env);
+}
+
+// `.env.{PASSED_ENVIRONMENT}` and `.env` files.
+let paths = [path.join(project.root, ".env")];
+
+if (yargs.argv.env) {
+    paths.push(path.join(project.root, `.env.${yargs.argv.env}`));
+}
+
+// Let's load environment variables
+for (let i = 0; i < paths.length; i++) {
+    const path = paths[i];
+    const { error } = require("dotenv").config({ path });
+    if (boolean(yargs.argv.debug)) {
+        if (error) {
+            log.debug(`No environment file found on ${log.debug.hl(path)}.`);
+        } else {
+            log.success(`Successfully loaded environment variables from ${log.success.hl(path)}.`);
+        }
+    }
+}
+
+// Feature flags defined via the `featureFlags` property.
+// We set twice, to be available for both backend and frontend application code.
+// TODO: one day we might want to sync this up a bit.
+if (project.config.featureFlags) {
+    process.env.WEBINY_FEATURE_FLAGS = JSON.stringify(project.config.featureFlags);
+    process.env.REACT_APP_WEBINY_FEATURE_FLAGS = JSON.stringify(project.config.featureFlags);
+}