@adobe/aio-cli-plugin-api-mesh 3.9.4-beta → 4.0.0-beta

package/src/commands/api-mesh/status.js

@@ -1,5 +1,4 @@
 const { Command } = require('@oclif/core');
-const chalk = require('chalk');
 
 const logger = require('../../classes/logger');
 const { initRequestId, initSdk } = require('../../helpers');
@@ -28,123 +27,111 @@ class StatusCommand extends Command {
 		try {
 			meshId = await getMeshId(imsOrgId, projectId, workspaceId, workspaceName);
 		} catch (err) {
+			// API Request failed
 			this.log(err.message);
 			this.error(
 				`Unable to get mesh ID. Please check the details and try again. RequestId: ${global.requestId}`,
 			);
 		}
 
-		if (meshId) {
-			try {
-				const mesh = await getMesh(imsOrgId, projectId, workspaceId, workspaceName, meshId);
-				this.log(
-					chalk.bgYellow(
-						`\nAPI Mesh now runs at the edge and legacy mesh URLs will be deprecated.\nUse the following link to find more information on how to migrate your mesh:`,
-					),
-				);
-				this.log(
-					chalk.underline.blue(
-						'https://developer.adobe.com/graphql-mesh-gateway/mesh/release/migration\n',
-					),
-				);
-				const meshLabel = chalk.bold(`Legacy Mesh:`);
-
-				this.log(''.padEnd(102, '*'));
-				this.displayMeshStatus(mesh, meshLabel);
-				await this.displayEdgeMeshStatus(mesh, imsOrgCode, projectId, workspaceId);
-				this.log(''.padEnd(102, '*'));
-			} catch (err) {
-				this.log(err.message);
-				this.error(
-					`Unable to get the mesh status. If the error persists please contact support. RequestId: ${global.requestId}`,
-				);
-			}
-		} else {
+		// API Request succeeded, but mesh could not be found
+		if (!meshId) {
 			this.error(
 				`Unable to get mesh status. No mesh found for Org(${imsOrgId}) -> Project(${projectId}) -> Workspace(${workspaceId}). Please check the details and try again.`,
 			);
 		}
+
+		try {
+			const mesh = await getMesh(imsOrgId, projectId, workspaceId, workspaceName, meshId);
+			this.log(''.padEnd(102, '*'));
+			await this.displayMeshStatus(mesh, imsOrgCode, projectId, workspaceId);
+			this.log(''.padEnd(102, '*'));
+		} catch (err) {
+			// Error occurred while fetching/displaying the mesh status
+			this.error(
+				`Unable to get mesh status. If this error persists, contact support. RequestId: ${global.requestId}`,
+			);
+		}
 	}
 
 	/**
 	 * Display the status of the mesh.
 	 *
+	 * While the mesh is not successfully built, display a message based on the build status.
+	 * Once the build is successful, display a message based on the deployment status.
+	 * @param mesh
+	 * @param imsOrgCode
+	 * @param projectId
+	 * @param workspaceId
+	 * @returns {Promise<void>}
+	 */
+	async displayMeshStatus(mesh, imsOrgCode, projectId, workspaceId) {
+		if (mesh.meshStatus !== 'success') {
+			this.displayMeshBuildStatus(mesh);
+		} else {
+			await this.displayMeshDeploymentStatus(mesh, imsOrgCode, projectId, workspaceId);
+		}
+	}
+
+	/**
+	 * Display the status of the mesh build.
+	 *
 	 * @param mesh - Mesh data
-	 * @param meshLabel - Label to display for the mesh based on the mesh type
 	 */
-	displayMeshStatus(mesh, meshLabel = 'Your mesh') {
+	displayMeshBuildStatus(mesh) {
 		switch (mesh.meshStatus) {
-			case 'success':
-				this.log(`${meshLabel} has been successfully built.`);
-				break;
 			case 'pending':
-				this.log(`${meshLabel} is awaiting processing.`);
+				this.log('Mesh is awaiting processing.');
 				break;
 			case 'building':
-				this.log(
-					`${meshLabel} is currently being provisioned. Please wait a few minutes before checking again.`,
-				);
+				this.log('Mesh is currently building. Wait a few minutes before checking again.');
 				break;
 			case 'error':
-				this.log(
-					meshLabel === 'Your mesh'
-						? `${meshLabel} errored out with the following error.`
-						: `${meshLabel} build has errors.`,
-				);
+				this.log('Mesh build has errors.');
 				this.log(mesh.error);
 				break;
+			default:
+				this.log('Mesh status is not available. Wait a few minutes and try again.');
+				break;
 		}
 	}
 
 	/**
-	 * Display the status of the edge mesh.
+	 * Display the status of the mesh deployment.
 	 *
-	 * While the mesh is not successfully built, the edge mesh status will match the legacy mesh status.
-	 * Once the build is successful, the edge mesh status will reflect the deployment status
 	 * @param mesh
 	 * @param imsOrgCode
 	 * @param projectId
 	 * @param workspaceId
 	 * @returns {Promise<void>}
 	 */
-	async displayEdgeMeshStatus(mesh, imsOrgCode, projectId, workspaceId) {
-		const edgeMeshLabel = chalk.bold(`Edge Mesh:`);
-		const buildStatus = mesh.meshStatus;
-
-		if (buildStatus !== 'success') {
-			this.displayMeshStatus(mesh, edgeMeshLabel);
-		} else {
-			const meshDeployments = await getMeshDeployments(
-				imsOrgCode,
-				projectId,
-				workspaceId,
-				mesh.meshId,
-			);
-
-			const edgeDeploymentStatus = String(meshDeployments.status).toLowerCase();
-
-			switch (edgeDeploymentStatus) {
-				case 'success':
-					this.log(`${edgeMeshLabel} has been successfully built.`);
-					break;
-				case 'provisioning':
-					this.log(
-						`${edgeMeshLabel} is currently being provisioned. Please wait a few minutes before checking again.`,
-					);
-					break;
-				case 'de-provisioning':
-					this.log(
-						`${edgeMeshLabel} is currently being de-provisioned. Please wait a few minutes before checking again.`,
-					);
-					break;
-				case 'error':
-					this.log(`${edgeMeshLabel} ${meshDeployments.error}`);
-					break;
-				default:
-					this.log(
-						`${edgeMeshLabel} status is not available. Please wait for a while and try again.`,
-					);
-			}
+	async displayMeshDeploymentStatus(mesh, imsOrgCode, projectId, workspaceId) {
+		const meshDeployments = await getMeshDeployments(
+			imsOrgCode,
+			projectId,
+			workspaceId,
+			mesh.meshId,
+		);
+
+		const meshDeploymentStatus = String(meshDeployments.status).toLowerCase();
+
+		switch (meshDeploymentStatus) {
+			case 'provisioning':
+				this.log('Currently provisioning your mesh. Wait a few minutes and try again.');
+				break;
+			case 'de-provisioning':
+				this.log('Currently de-provisioning your mesh. Wait a few minutes and try again.');
+				break;
+			case 'success':
+				this.log('Mesh was built successfully.');
+				break;
+			case 'error':
+				this.log('Mesh build has errors.');
+				this.log(meshDeployments.error);
+				break;
+			default:
+				this.log('Mesh status is not available. Wait a few minutes and try again.');
+				break;
 		}
 	}
 }

package/src/constants.js

@@ -3,24 +3,22 @@ const { getCliEnv } = require('@adobe/aio-lib-env');
 const clientEnv = getCliEnv();
 
 const StageConstants = {
-	MULTITENANT_GRAPHQL_SERVER_BASE_URL: 'https://graph-stage.adobe.io/api',
 	DEV_CONSOLE_BASE_URL: 'https://developers-stage.adobe.io/console',
 	DEV_CONSOLE_API_KEY: 'adobe-api-manager-sms-stage',
 	DEV_CONSOLE_TRANSPORTER_API_KEY: 'UDPWeb1',
 	AIO_CLI_API_KEY: 'aio-cli-console-auth-stage',
 	SMS_BASE_URL: 'https://graph-stage.adobe.io/api-admin',
-	EDGE_MESH_BASE_URL: 'https://edge-stage-graph.adobe.io/api',
+	MESH_BASE_URL: 'https://edge-stage-graph.adobe.io/api',
 };
 
 const ProdConstants = {
-	MULTITENANT_GRAPHQL_SERVER_BASE_URL: 'https://graph.adobe.io/api',
 	DEV_CONSOLE_BASE_URL: 'https://developers.adobe.io/console',
 	DEV_CONSOLE_API_KEY: 'adobe-graph-prod',
 	DEV_CONSOLE_TRANSPORTER_API_KEY: 'UDPWeb1',
 	AIO_CLI_API_KEY: 'aio-cli-console-auth',
 	SMS_BASE_URL: 'https://graph.adobe.io/api-admin',
-	EDGE_MESH_BASE_URL: 'https://edge-graph.adobe.io/api',
-	EDGE_MESH_SANDBOX_BASE_URL: 'https://edge-sandbox-graph.adobe.io/api',
+	MESH_BASE_URL: 'https://edge-graph.adobe.io/api',
+	MESH_SANDBOX_BASE_URL: 'https://edge-sandbox-graph.adobe.io/api',
 };
 
 const envConstants = clientEnv === 'stage' ? StageConstants : ProdConstants;

package/src/lib/devConsole.js

@@ -90,21 +90,11 @@ const describeMesh = async (organizationId, projectId, workspaceId, workspaceNam
 
 		logger.info('Response from getMeshId %s', meshId);
 
-		if (meshId) {
-			const credential = await getApiKeyCredential(organizationId, projectId, workspaceId);
-
-			if (credential) {
-				return { meshId, apiKey: credential.client_id };
-			} else {
-				logger.error('API Key credential not found on workspace');
-
-				return { meshId, apiKey: null };
-			}
-		} else {
-			logger.error(`Unable to retrieve meshId.`);
-
+		if (!meshId) {
 			throw new Error(`Unable to retrieve meshId.`);
 		}
+
+		return { meshId };
 	} catch (error) {
 		logger.error(error);
 
@@ -270,42 +260,8 @@ const createMesh = async (
 		if (response && response.status === 201) {
 			logger.info(`Mesh Config : ${objToString(response, ['data'])}`);
 
-			let sdkList = [];
-			let credential;
-			let isApiKeyNew = false;
-
-			credential = await getApiKeyCredential(organizationId, projectId, workspaceId);
-			if (!credential) {
-				logger.info('API Key credential not found on workspace');
-
-				// try to create a new API key credential
-				credential = await createAPIMeshCredentials(organizationId, projectId, workspaceId);
-				isApiKeyNew = true;
-			}
-			// subscribe the credential to API mesh service
-			sdkList = await subscribeCredentialToMeshService(
-				organizationId,
-				projectId,
-				workspaceId,
-				isApiKeyNew ? credential.id : credential.id_integration,
-			);
-			const newlyCreatedOrExistingApiKey = isApiKeyNew ? credential.apiKey : credential.client_id;
-
-			if (sdkList) {
-				logger.info(
-					'Successfully subscribed API Key %s to API Mesh service',
-					isApiKeyNew ? credential.apiKey : credential.client_id,
-				);
-			} else {
-				logger.error(
-					'Unable to subscribe API Key %s to API Mesh service',
-					newlyCreatedOrExistingApiKey,
-				);
-			}
 			return {
 				mesh: response.data,
-				apiKey: newlyCreatedOrExistingApiKey,
-				sdkList,
 			};
 		} else {
 			// Non 201 response received
@@ -586,7 +542,7 @@ const getMeshId = async (organizationId, projectId, workspaceId, workspaceName)
 		logger.info('Response from GET %s', response.status);
 
 		if (response && response.status === 200) {
-			logger.info(`Mesh Config : ${objToString(response, ['data'])}`);
+			logger.debug(`Mesh response data : ${objToString(response, ['data'])}`);
 
 			return response.data.meshId;
 		} else {
@@ -1000,9 +956,9 @@ const getMeshDeployments = async (organizationCode, projectId, workspaceId, mesh
 		logger.error(`Error fetching deployments for mesh: ${meshId}`);
 
 		return {
-			status: 'ERROR',
+			status: null,
 			meshId: meshId,
-			error: 'Mesh status is not available.',
+			error: null,
 		};
 	}
 };

package/src/templates/package.json

@@ -26,8 +26,8 @@
 		"@graphql-mesh/soap": "0.14.25",
 		"@graphql-mesh/http": "^0.96.9",
 		"graphql": "^16.6.0",
-		"@adobe/plugin-hooks": "0.3.2-beta",
-		"@adobe/plugin-on-fetch": "0.1.1-alpha",
+		"@adobe/plugin-hooks": "0.3.2",
+		"@adobe/plugin-on-fetch": "0.1.1",
 		"eslint-plugin-no-loops": "^0.3.0",
 		"eslint-plugin-node": "^11.1.0",
 		"eslint-plugin-security": "^1.5.0",

package/src/urlBuilder.js

@@ -1,39 +1,6 @@
 const CONSTANTS = require('./constants');
-const { getMesh } = require('./lib/devConsole');
 
-const {
-	MULTITENANT_GRAPHQL_SERVER_BASE_URL,
-	EDGE_MESH_BASE_URL,
-	EDGE_MESH_SANDBOX_BASE_URL,
-} = CONSTANTS;
-
-/**
- * Build the mesh url for the multitenant mesh.
- *
- * Gets the mesh details to checks for a custom domain in the case of a TI mesh.
- * @param imsOrgId
- * @param projectId
- * @param workspaceId
- * @param workspaceName
- * @param meshId
- * @param apiKey
- * @returns {Promise<string>}
- */
-async function buildMeshUrl(imsOrgId, projectId, workspaceId, workspaceName, meshId, apiKey) {
-	const { meshURL: customBaseUrl } = await getMesh(
-		imsOrgId,
-		projectId,
-		workspaceId,
-		workspaceName,
-		meshId,
-	);
-
-	return customBaseUrl
-		? `${customBaseUrl}/${meshId}/graphql`
-		: `${MULTITENANT_GRAPHQL_SERVER_BASE_URL}/${meshId}/graphql${
-				apiKey ? `?api_key=${apiKey}` : ''
-		  }`;
-}
+const { MESH_BASE_URL, MESH_SANDBOX_BASE_URL } = CONSTANTS;
 
 /**
  * Builds the mesh url for the edge mesh.
@@ -43,16 +10,16 @@ async function buildMeshUrl(imsOrgId, projectId, workspaceId, workspaceName, mes
  * @param workspaceName
  * @returns {string}
  */
-function buildEdgeMeshUrl(meshId, workspaceName) {
+function buildMeshUrl(meshId, workspaceName) {
 	let baseUrl;
 
-	if (EDGE_MESH_BASE_URL.includes('stage')) {
-		baseUrl = EDGE_MESH_BASE_URL;
+	if (MESH_BASE_URL.includes('stage')) {
+		baseUrl = MESH_BASE_URL;
 	} else {
-		baseUrl = workspaceName === 'Production' ? EDGE_MESH_BASE_URL : EDGE_MESH_SANDBOX_BASE_URL;
+		baseUrl = workspaceName === 'Production' ? MESH_BASE_URL : MESH_SANDBOX_BASE_URL;
 	}
 
 	return `${baseUrl}/${meshId}/graphql`;
 }
 
-module.exports = { buildMeshUrl, buildEdgeMeshUrl };
+module.exports = { buildMeshUrl };