@webiny/cli 5.32.0 → 5.33.0-beta.0

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.33.0-beta.0](https://github.com/webiny/webiny-js/compare/v5.32.0...v5.33.0-beta.0) (2022-10-11)
+
+
+### Bug Fixes
+
+* do not continue if there's no WCP project ID present ([faf54da](https://github.com/webiny/webiny-js/commit/faf54da5d8028c1658ba15429e2c366482727c3a))
+* replace verb "activated" with "linked" ([a4634eb](https://github.com/webiny/webiny-js/commit/a4634eb6b0cf5d05edf9b0ca45e742731af21924))
+* skip PAT auth if the environment is being retrieved via API key ([99214e3](https://github.com/webiny/webiny-js/commit/99214e3b124884eafdc94ba8df03bc9345837b92))
+
+
+
+
+
 # [5.32.0](https://github.com/webiny/webiny-js/compare/v5.32.0-beta.0...v5.32.0) (2022-09-07)
 
 **Note:** Version bump only for package @webiny/cli

package/commands/wcp/hooks.js

@@ -22,6 +22,12 @@ const { getUser, getProjectEnvironment, updateUserLastActiveOn } = require("./ut
 let projectEnvironment;
 
 const getEnvironmentHookHandler = async (args, context) => {
+    // If the project isn't linked with WCP, do nothing.
+    const wcpProjectId = context.project.config.id || process.env.WCP_PROJECT_ID;
+    if (!wcpProjectId) {
+        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.
@@ -30,12 +36,6 @@ const getEnvironmentHookHandler = async (args, context) => {
         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 [orgId, projectId] = wcpProjectId.split("/");
 

package/commands/wcp/utils/getProjectEnvironment.js

@@ -69,6 +69,16 @@ module.exports.getProjectEnvironment = async ({
     environmentId,
     apiKey
 }) => {
+    if (apiKey) {
+        return request(getWcpGqlApiUrl(), GET_ENVIRONMENT, { apiKey })
+            .then(response => response.projects.getEnvironment)
+            .catch(() => {
+                throw new Error(
+                    `It seems the API key you provided is incorrect or disabled. Please double check the API key and try again.`
+                );
+            });
+    }
+
     const pat = localStorage().get("wcpPat");
     if (!pat) {
         throw new Error(

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/cli",
-	"version": "5.32.0",
+	"version": "5.33.0-beta.0",
 	"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.32.0",
-		"@webiny/wcp": "5.32.0",
+		"@webiny/telemetry": "5.33.0-beta.0",
+		"@webiny/wcp": "5.33.0-beta.0",
 		"boolean": "3.1.4",
 		"camelcase": "5.3.1",
 		"chalk": "4.1.2",
@@ -64,5 +64,5 @@
 			]
 		}
 	},
-	"gitHead": "1227aa53c68afa4ccd518c8a4344195a2b8e354b"
+	"gitHead": "8809a70796e5117e92416d6859c1f5dcae2a8c98"
 }