@webiny/cli 5.29.0-beta.2 → 5.30.0-beta.1

package/CHANGELOG.md

@@ -3,6 +3,35 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.30.0-beta.1](https://github.com/webiny/webiny-js/compare/v5.30.0-beta.0...v5.30.0-beta.1) (2022-07-26)
+
+**Note:** Version bump only for package @webiny/cli
+
+
+
+
+
+# [5.30.0-beta.0](https://github.com/webiny/webiny-js/compare/v5.29.0...v5.30.0-beta.0) (2022-07-25)
+
+
+### Features
+
+* assign WCP project ID via WCP_PROJECT_ID ([ef55575](https://github.com/webiny/webiny-js/commit/ef55575323737151a0f6675471e6964703ac7513))
+* reorganize code and add support for WCP_PROJECT_ID env var ([6e77c52](https://github.com/webiny/webiny-js/commit/6e77c520068d66547f4dd0bbf9b4d3b11a470179))
+* typescript to 4.7.4 ([#2527](https://github.com/webiny/webiny-js/issues/2527)) ([ee24a3a](https://github.com/webiny/webiny-js/commit/ee24a3a995942ee2588e615e42f604ed7418390a))
+
+
+
+
+
+# [5.29.0](https://github.com/webiny/webiny-js/compare/v5.29.0-beta.2...v5.29.0) (2022-06-28)
+
+**Note:** Version bump only for package @webiny/cli
+
+
+
+
+
 # [5.29.0-beta.2](https://github.com/webiny/webiny-js/compare/v5.29.0-beta.1...v5.29.0-beta.2) (2022-06-27)
 
 **Note:** Version bump only for package @webiny/cli

package/commands/wcp/hooks.js

@@ -7,6 +7,18 @@ const { getUser, getProjectEnvironment, updateUserLastActiveOn } = require("./ut
  * - WCP_PROJECT_ENVIRONMENT_API_KEY - for easier access, we also set the API key
  */
 
+/**
+ * There are multiple ways the hooks below prepare the WCP-enabled project for deployment.
+ * 1. If `WCP_PROJECT_ENVIRONMENT` metadata env var is defined, we decrypt it, retrieve the
+ *    API key from it, and assign it as the `WCP_PROJECT_ENVIRONMENT_API_KEY` env var.
+ * 2. If `WCP_PROJECT_ENVIRONMENT_API_KEY` env var is defined, then we use that as the
+ *    project environment API key. We use that to load the project environment data
+ *    and to also assign the `WCP_PROJECT_ENVIRONMENT` metadata env var.
+ * 3. If none of the above is defined, we retrieve (or create) the project environment,
+ *    retrieve its API key and again assign it as `WCP_PROJECT_ENVIRONMENT_API_KEY` env var.
+ *    As in 2), we also assign the `WCP_PROJECT_ENVIRONMENT` metadata env var.
+ */
+
 let projectEnvironment;
 
 module.exports = () => [
@@ -14,39 +26,36 @@ module.exports = () => [
         type: "hook-before-deploy",
         name: "hook-before-deploy-environment-get-environment",
         async hook(args, context) {
-            // If the project isn't activated, do nothing.
-            if (!context.project.config.id) {
-                return;
-            }
-
+            // For development purposes, we allow setting the WCP_PROJECT_ENVIRONMENT env var directly.
             if (process.env.WCP_PROJECT_ENVIRONMENT) {
                 // If we have WCP_PROJECT_ENVIRONMENT env var, we set the WCP_PROJECT_ENVIRONMENT_API_KEY too.
-                if (!process.env.WCP_PROJECT_ENVIRONMENT_API_KEY) {
-                    const decryptedProjectEnvironment = decrypt(
-                        process.env.WCP_PROJECT_ENVIRONMENT
-                    );
-                    process.env.WCP_PROJECT_ENVIRONMENT_API_KEY =
-                        decryptedProjectEnvironment.apiKey;
-                }
+                const decryptedProjectEnvironment = decrypt(process.env.WCP_PROJECT_ENVIRONMENT);
+                process.env.WCP_PROJECT_ENVIRONMENT_API_KEY = decryptedProjectEnvironment.apiKey;
+                return;
+            }
 
+            // If the project isn't activated, do nothing.
+            const wcpProjectId = context.project.config.id || process.env.WCP_PROJECT_ID;
+            if (!wcpProjectId) {
                 return;
             }
 
             // The `id` has the orgId/projectId structure, for example `my-org-x/my-project-y`.
-            const orgProject = context.project.config.id;
-            const [orgId, projectId] = orgProject.split("/");
-
-            const isValidId = orgId && projectId;
-            if (!isValidId) {
-                throw new Error(
-                    `It seems the project ID, specified in "webiny.project.ts" file, is invalid.`
-                );
-            }
+            const [orgId, projectId] = wcpProjectId.split("/");
 
             const apiKey = process.env.WCP_PROJECT_ENVIRONMENT_API_KEY;
+
+            let projectEnvironment;
             if (apiKey) {
                 projectEnvironment = await getProjectEnvironment({ apiKey });
             } else {
+                const isValidId = orgId && projectId;
+                if (!isValidId) {
+                    throw new Error(
+                        `It seems the project ID, specified in "webiny.project.ts" file, is invalid.`
+                    );
+                }
+
                 // If there is no API key, that means we need to retrieve the currently logged-in user.
                 const user = await getUser();
                 const project = user.projects.find(item => item.id === projectId);
@@ -64,24 +73,25 @@ module.exports = () => [
                 });
             }
 
+            if (projectEnvironment.org.id !== orgId) {
+                throw new Error(
+                    `Cannot proceed with the deployment because the "${projectEnvironment.name}" project environment doesn't belong to the "${orgId}" organization. Please check your WCP project ID (currently set to "${wcpProjectId}").`
+                );
+            }
+
+            if (projectEnvironment.project.id !== projectId) {
+                throw new Error(
+                    `Cannot proceed with the deployment because the "${projectEnvironment.name}" project environment doesn't belong to the "${wcpProjectId}" project. Please check your WCP project ID (currently set to "${wcpProjectId}").`
+                );
+            }
+
             if (projectEnvironment && projectEnvironment.status !== "enabled") {
                 throw new Error(
                     `Cannot proceed with the deployment because the "${projectEnvironment.name}" project environment has been disabled.`
                 );
             }
-        }
-    },
-    // Within this hook, we're setting the `WCP_PROJECT_ENVIRONMENT` env variable, which can then be used in
-    // build / deploy steps. For example, we pass it to GraphQL and Headless CMS Lambda functions.
-    {
-        type: "hook-before-deploy",
-        name: "hook-before-deploy-project-environment",
-        async hook() {
-            if (!projectEnvironment) {
-                return;
-            }
 
-            // Ensure the correct API key is set into environment variable.
+            // Assign `WCP_PROJECT_ENVIRONMENT` and `WCP_PROJECT_ENVIRONMENT_API_KEY`
             const wcpProjectEnvironment = {
                 id: projectEnvironment.id,
                 apiKey: projectEnvironment.apiKey,
@@ -93,7 +103,6 @@ module.exports = () => [
             process.env.WCP_PROJECT_ENVIRONMENT_API_KEY = projectEnvironment.apiKey;
         }
     },
-    // Within this hook, we're updating user's "last active" field.
     {
         type: "hook-before-deploy",
         name: "hook-before-deploy-update-last-active-on",

package/commands/wcp/login.js

@@ -179,7 +179,9 @@ module.exports.command = () => ({
                     `${chalk.green("✔")} You've successfully logged in to Webiny Control Panel.`
                 );
 
-                let projectInitialized = Boolean(context.project.config.id);
+                let projectInitialized = Boolean(
+                    context.project.config.id || process.env.WCP_PROJECT_ID
+                );
 
                 // If we have `orgId` and `projectId` in PAT's meta data, let's immediately activate the project.
                 if (pat.meta && pat.meta.orgId && pat.meta.projectId) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/cli",
-	"version": "5.29.0-beta.2",
+	"version": "5.30.0-beta.1",
 	"main": "index.js",
 	"bin": {
 		"webiny": "./bin.js"
@@ -13,8 +13,8 @@
 	"author": "Pavel Denisjuk <pavel@webiny.com>",
 	"description": "A tool to bootstrap a Webiny project.",
 	"dependencies": {
-		"@webiny/telemetry": "5.29.0-beta.2",
-		"@webiny/wcp": "5.29.0-beta.2",
+		"@webiny/telemetry": "5.30.0-beta.1",
+		"@webiny/wcp": "5.30.0-beta.1",
 		"boolean": "3.1.4",
 		"camelcase": "5.3.1",
 		"chalk": "4.1.2",
@@ -30,7 +30,7 @@
 		"pirates": "4.0.5",
 		"semver": "7.3.7",
 		"ts-morph": "11.0.3",
-		"typescript": "4.5.5",
+		"typescript": "4.7.4",
 		"uniqid": "5.4.0",
 		"yargs": "17.5.1"
 	},
@@ -66,5 +66,5 @@
 			]
 		}
 	},
-	"gitHead": "3a8c701139cca39dc1316d2452c6a3afdd7c1867"
+	"gitHead": "d3b1e74ec1077a608fe40dfd3aba237b1b29a458"
 }