@adobe/aio-cli-plugin-api-mesh 4.1.1-beta.1 → 5.0.0-alpha

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

@@ -16,7 +16,6 @@ const logger = require('../../classes/logger');
 const { initSdk, initRequestId } = require('../../helpers');
 const { ignoreCacheFlag, jsonFlag } = require('../../utils');
 const { getMeshId, getMesh } = require('../../lib/devConsole');
-const { buildMeshUrl } = require('../../urlBuilder');
 
 require('dotenv').config();
 class GetCommand extends Command {
@@ -38,7 +37,7 @@ class GetCommand extends Command {
 		const ignoreCache = await flags.ignoreCache;
 		const json = await flags.json;
 
-		const { imsOrgId, projectId, workspaceId, workspaceName } = await initSdk({
+		const { imsOrgCode, projectId, workspaceId, workspaceName } = await initSdk({
 			ignoreCache,
 			verbose: !json,
 		});
@@ -46,22 +45,20 @@ class GetCommand extends Command {
 		let meshId = null;
 
 		try {
-			meshId = await getMeshId(imsOrgId, projectId, workspaceId, workspaceName);
+			meshId = await getMeshId(imsOrgCode, projectId, workspaceId, workspaceName);
 		} catch (err) {
 			this.error(
-				`Unable to get mesh ID. Please check the details and try again. RequestId: ${global.requestId}`,
+				`Unable to get mesh ID. Check the details and try again. RequestId: ${global.requestId}`,
 			);
 		}
 
 		if (meshId) {
 			try {
-				const mesh = await getMesh(imsOrgId, projectId, workspaceId, workspaceName, meshId);
+				const mesh = await getMesh(imsOrgCode, projectId, workspaceId, workspaceName, meshId);
 
 				if (mesh) {
 					this.log('Successfully retrieved mesh %s', JSON.stringify(mesh, null, 2));
 
-					const meshUrl = buildMeshUrl(meshId, workspaceName);
-
 					if (args.file) {
 						try {
 							const { meshConfig } = mesh;
@@ -75,10 +72,10 @@ class GetCommand extends Command {
 						}
 					}
 
-					return { ...mesh, meshUrl, imsOrgId, projectId, workspaceId, workspaceName };
+					return mesh;
 				} else {
 					logger.error(
-						`Unable to get mesh with the ID ${meshId}. Please check the mesh ID and try again. RequestId: ${global.requestId}`,
+						`Unable to get mesh with the ID ${meshId}. Check the mesh ID and try again. RequestId: ${global.requestId}`,
 						{ exit: false },
 					);
 				}
@@ -86,12 +83,12 @@ class GetCommand extends Command {
 				this.log(error.message);
 
 				this.error(
-					`Unable to get mesh. Please check the details and try again. If the error persists please contact support. RequestId: ${global.requestId}`,
+					`Unable to get mesh. Check the details and try again. If the error persists please contact support. RequestId: ${global.requestId}`,
 				);
 			}
 		} else {
 			this.error(
-				`Unable to get mesh config. No mesh found for Org(${imsOrgId}) -> Project(${projectId}) -> Workspace(${workspaceId}). Please check the details and try again.`,
+				`Unable to get mesh config. No mesh found for Org(${imsOrgCode}) -> Project(${projectId}) -> Workspace(${workspaceId}). Please check the details and try again.`,
 				{ exit: false },
 			);
 		}

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

@@ -108,7 +108,6 @@ class InitCommand extends Command {
 		const readmePath = `${getAppRootDir()}/src/templates/readme.md`;
 		const sampleMeshConfigPath = `${getAppRootDir()}/src/templates/mesh.json`;
 		const newRelicConfigPath = `${getAppRootDir()}/src/templates/newrelic.cjs`;
-		const wranglerTomlTemplate = `${getAppRootDir()}/src/templates/wrangler.toml`;
 		const shouldCreateWorkspace = await promptConfirm(
 			`Do you want to create the workspace in ${absolutePath}`,
 		);
@@ -181,7 +180,6 @@ class InitCommand extends Command {
 			await this.cloneFile(readmePath, `${absolutePath}/README.md`);
 			await this.cloneFile(sampleMeshConfigPath, `${absolutePath}/mesh.json`);
 			await this.cloneFile(newRelicConfigPath, `${absolutePath}/newrelic.cjs`);
-			await this.cloneFile(wranglerTomlTemplate, `${absolutePath}/wrangler.toml`);
 
 			this.log(`Installing dependencies`);
 

package/src/commands/api-mesh/log-get-bulk.js

@@ -147,14 +147,14 @@ class GetBulkLogCommand extends Command {
 			return;
 		}
 		logger.info('Calling initSdk...');
-		const { imsOrgId, imsOrgCode, projectId, workspaceId, workspaceName } = await initSdk({
+		const { imsOrgCode, projectId, workspaceId, workspaceName } = await initSdk({
 			ignoreCache,
 		});
 
 		// Retrieve meshId
 		let meshId = null;
 		try {
-			meshId = await getMeshId(imsOrgId, projectId, workspaceId, workspaceName);
+			meshId = await getMeshId(imsOrgCode, projectId, workspaceId, workspaceName);
 		} catch (err) {
 			this.error(`Unable to get mesh ID: ${err.message}.`);
 		}

package/src/commands/api-mesh/log-get.js

@@ -31,13 +31,13 @@ class FetchLogsCommand extends Command {
 		const ignoreCache = flags.ignoreCache;
 		const rayId = args.rayId;
 
-		const { imsOrgId, imsOrgCode, projectId, workspaceId } = await initSdk({
+		const { imsOrgCode, projectId, workspaceId } = await initSdk({
 			ignoreCache,
 		});
 
 		let meshId = null;
 		try {
-			meshId = await getMeshId(imsOrgId, projectId, workspaceId, meshId);
+			meshId = await getMeshId(imsOrgCode, projectId, workspaceId, meshId);
 			if (!meshId) {
 				throw new Error('MeshIdNotFound');
 			}

package/src/commands/api-mesh/log-list.js

@@ -43,7 +43,7 @@ class ListLogsCommand extends Command {
 		let meshId = null;
 
 		try {
-			meshId = await getMeshId(imsOrgId, projectId, workspaceId, workspaceName);
+			meshId = await getMeshId(imsOrgCode, projectId, workspaceId, workspaceName);
 		} catch (err) {
 			this.error(
 				`Unable to get mesh ID. Check the details and try again. RequestId: ${global.requestId}`,

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

@@ -26,10 +26,12 @@ const {
 } = require('../../utils');
 const meshBuilder = require('@adobe-apimesh/mesh-builder');
 const fs = require('fs');
+const UUID = require('../../uuid');
 const path = require('path');
 const {
 	initSdk,
 	initRequestId,
+	startGraphqlServer,
 	importFiles,
 	setUpTenantFiles,
 	writeSecretsFile,
@@ -37,8 +39,6 @@ const {
 const logger = require('../../classes/logger');
 const { getMeshId, getMeshArtifact } = require('../../lib/devConsole');
 require('dotenv').config();
-const { runServer } = require('../../server');
-const { fixPlugins } = require('../../fixPlugins');
 
 const { validateMesh, buildMesh, compileMesh } = meshBuilder.default;
 
@@ -82,10 +82,10 @@ class RunCommand extends Command {
 			if (fs.existsSync(path.join(process.cwd(), 'package.json'))) {
 				//If select flag is present then getMeshId for the specified org
 				if (flags.select) {
-					const { imsOrgId, projectId, workspaceId, workspaceName } = await initSdk({});
+					const { imsOrgCode, projectId, workspaceId, workspaceName } = await initSdk({});
 
 					try {
-						meshId = await getMeshId(imsOrgId, projectId, workspaceId, workspaceName);
+						meshId = await getMeshId(imsOrgCode, projectId, workspaceId, workspaceName);
 					} catch (err) {
 						throw new Error(
 							`Unable to get mesh ID. Please check the details and try again. RequestId: ${global.requestId}`,
@@ -93,7 +93,7 @@ class RunCommand extends Command {
 					}
 
 					try {
-						await getMeshArtifact(imsOrgId, projectId, workspaceId, workspaceName, meshId);
+						await getMeshArtifact(imsOrgCode, projectId, workspaceId, workspaceName, meshId);
 					} catch (err) {
 						throw new Error(
 							`Unable to retrieve mesh. Please check the details and try again. RequestId: ${global.requestId}`,
@@ -163,12 +163,13 @@ class RunCommand extends Command {
 					}
 
 					//Generating unique mesh id
-					meshId = 'testMesh';
+					meshId = UUID.newUuid().toString();
 
 					await validateMesh(data.meshConfig);
 					await buildMesh(meshId, data.meshConfig);
 					await compileMesh(meshId);
 				}
+
 				let portNo;
 				//secrets management
 				if (secretsFilePath) {
@@ -182,8 +183,6 @@ class RunCommand extends Command {
 					}
 				}
 
-				await this.copyMeshContent(meshId);
-
 				//To set the port number using the environment file
 				if (process.env.PORT !== undefined) {
 					if (isNaN(process.env.PORT) || !Number.isInteger(parseInt(process.env.PORT))) {
@@ -202,9 +201,9 @@ class RunCommand extends Command {
 				if (!portNo) {
 					portNo = 5000;
 				}
+
 				this.log(`Starting server on port : ${portNo}`);
-				await runServer(portNo);
-				this.log(`Server is running on http://localhost:${portNo}/graphql`);
+				await startGraphqlServer(meshId, portNo, flags.debug);
 			} else {
 				throw new Error(
 					'`aio api-mesh run` cannot be executed because there is no package.json file in the current directory. Use `aio api-mesh init` to set up a package.',
@@ -214,31 +213,6 @@ class RunCommand extends Command {
 			this.error(error.message);
 		}
 	}
-
-	async copyMeshContent(meshId) {
-		// Remove mesh artifact directory if exists
-		if (fs.existsSync('.mesh')) {
-			fs.rmSync('.mesh', { recursive: true });
-		}
-		// Move built mesh artifact to expect directory
-		fs.renameSync(`mesh-artifact/${meshId}`, '.mesh');
-		// Remove tenant files directory if exists
-		if (fs.existsSync('tenantFiles')) {
-			fs.rmSync('tenantFiles', { recursive: true });
-		}
-		// Move built tenant files if exists
-		if (fs.existsSync('mesh-artifact/tenantFiles')) {
-			fs.cpSync('mesh-artifact/tenantFiles', '.mesh/tenantFiles', { recursive: true });
-			fs.renameSync('mesh-artifact/tenantFiles', 'tenantFiles');
-		}
-
-		await fixPlugins('.mesh/index.js');
-
-		if (fs.existsSync(`${__dirname}/../../../.mesh`)) {
-			fs.rmSync(`${__dirname}/../../../.mesh`, { recursive: true });
-		}
-		fs.cpSync('.mesh', `${__dirname}/../../../.mesh`, { recursive: true });
-	}
 }
 
 module.exports = RunCommand;

package/src/commands/api-mesh/source/install.js

@@ -38,6 +38,7 @@ class InstallCommand extends Command {
 		const ignoreCache = await flags.ignoreCache;
 		const {
 			imsOrgId,
+			imsOrgCode,
 			projectId,
 			workspaceId,
 			organizationName,
@@ -126,7 +127,7 @@ class InstallCommand extends Command {
 		}
 
 		try {
-			meshId = await getMeshId(imsOrgId, projectId, workspaceId, workspaceName);
+			meshId = await getMeshId(imsOrgCode, projectId, workspaceId, workspaceName);
 		} catch (err) {
 			this.error(
 				`Unable to get mesh ID. Please check the details and try again. RequestId: ${global.requestId}`,
@@ -140,7 +141,7 @@ class InstallCommand extends Command {
 		}
 
 		try {
-			const mesh = await getMesh(imsOrgId, projectId, workspaceId, meshId, workspaceName);
+			const mesh = await getMesh(imsOrgCode, projectId, workspaceId, meshId, workspaceName);
 
 			if (!mesh) {
 				this.error(

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

@@ -18,14 +18,14 @@ class StatusCommand extends Command {
 
 		const { flags } = await this.parse(StatusCommand);
 		const ignoreCache = await flags.ignoreCache;
-		const { imsOrgId, imsOrgCode, projectId, workspaceId, workspaceName } = await initSdk({
+		const { imsOrgCode, projectId, workspaceId, workspaceName } = await initSdk({
 			ignoreCache,
 		});
 
 		let meshId = null;
 
 		try {
-			meshId = await getMeshId(imsOrgId, projectId, workspaceId, workspaceName);
+			meshId = await getMeshId(imsOrgCode, projectId, workspaceId, workspaceName);
 		} catch (err) {
 			// API Request failed
 			this.log(err.message);
@@ -37,17 +37,15 @@ class StatusCommand extends Command {
 		// 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.`,
+				`Unable to get mesh status. No mesh found for Org(${imsOrgCode}) -> Project(${projectId}) -> Workspace(${workspaceId}). Check the details and try again.`,
 			);
 		}
 
 		try {
-			const mesh = await getMesh(imsOrgId, projectId, workspaceId, workspaceName, meshId);
+			const mesh = await getMesh(imsOrgCode, projectId, workspaceId, workspaceName, meshId);
 			this.log(''.padEnd(102, '*'));
 			await this.displayMeshStatus(mesh, imsOrgCode, projectId, workspaceId);
 			this.log(''.padEnd(102, '*'));
-
-			return mesh;
 		} catch (err) {
 			// Error occurred while fetching/displaying the mesh status
 			this.error(

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

@@ -73,10 +73,10 @@ class UpdateCommand extends Command {
 		let meshId = null;
 
 		try {
-			meshId = await getMeshId(imsOrgId, projectId, workspaceId);
+			meshId = await getMeshId(imsOrgCode, projectId, workspaceId);
 		} catch (err) {
 			this.error(
-				`Unable to get mesh ID. Please check the details and try again. RequestId: ${global.requestId}`,
+				`Unable to get mesh ID. Check the details and try again. RequestId: ${global.requestId}`,
 			);
 		}
 
@@ -90,7 +90,7 @@ class UpdateCommand extends Command {
 				data = JSON.parse(inputMeshData);
 			} catch (err) {
 				this.log(err.message);
-				this.error('Input mesh file is not a valid JSON. Please check the file provided.');
+				this.error('Input mesh file is not a valid JSON. Check the file provided.');
 			}
 		}
 
@@ -109,9 +109,7 @@ class UpdateCommand extends Command {
 				data = await importFiles(data, filesList, args.file, flags.autoConfirmAction);
 			} catch (err) {
 				this.log(err.message);
-				this.error(
-					'Unable to import the files in the mesh config. Please check the file and try again.',
-				);
+				this.error('Unable to import the files in the mesh config. Check the file and try again.');
 			}
 		}
 
@@ -125,7 +123,7 @@ class UpdateCommand extends Command {
 				data.secrets = encryptedSecrets;
 			} catch (err) {
 				this.log(err.message);
-				this.error('Unable to import secrets. Please check the file and try again.');
+				this.error('Unable to import secrets. Check the file and try again.');
 			}
 		}
 
@@ -141,7 +139,7 @@ class UpdateCommand extends Command {
 			if (shouldContinue) {
 				try {
 					const response = await updateMesh(
-						imsOrgId,
+						imsOrgCode,
 						projectId,
 						workspaceId,
 						workspaceName,
@@ -169,7 +167,7 @@ class UpdateCommand extends Command {
 					this.log(error.message);
 
 					this.error(
-						`Unable to update the mesh. Please check the mesh configuration file and try again. If the error persists please contact support. RequestId: ${global.requestId}`,
+						`Unable to update the mesh. Check the mesh configuration file and try again. If the error persists please contact support. RequestId: ${global.requestId}`,
 					);
 				}
 			} else {

package/src/constants.js

@@ -9,6 +9,7 @@ const StageConstants = {
 	AIO_CLI_API_KEY: 'aio-cli-console-auth-stage',
 	SMS_BASE_URL: 'https://graph-stage.adobe.io/api-admin',
 	MESH_BASE_URL: 'https://edge-stage-graph.adobe.io/api',
+	SMS_API_KEY: 'adobe-graph-stage-onboarding',
 };
 
 const ProdConstants = {
@@ -19,6 +20,7 @@ const ProdConstants = {
 	SMS_BASE_URL: 'https://graph.adobe.io/api-admin',
 	MESH_BASE_URL: 'https://edge-graph.adobe.io/api',
 	MESH_SANDBOX_BASE_URL: 'https://edge-sandbox-graph.adobe.io/api',
+	SMS_API_KEY: 'adobe-graph-prod',
 };
 
 const envConstants = clientEnv === 'stage' ? StageConstants : ProdConstants;

package/src/helpers.js

@@ -17,17 +17,15 @@ const { getToken, context } = require('@adobe/aio-lib-ims');
 const { CLI } = require('@adobe/aio-lib-ims/src/context');
 const libConsoleCLI = require('@adobe/aio-cli-lib-console');
 const { getCliEnv } = require('@adobe/aio-lib-env');
-const axios = require('axios');
+
+const logger = require('../src/classes/logger');
+const { UUID } = require('./classes/UUID');
+const CONSTANTS = require('./constants');
 const path = require('path');
 const { exec } = require('child_process');
 const { stdout, stderr } = require('process');
 const jsmin = require('jsmin').jsmin;
 const { resolve: resolveAbsolutePath } = require('path');
-const { compareVersions } = require('compare-versions');
-
-const logger = require('../src/classes/logger');
-const { UUID } = require('./classes/UUID');
-const CONSTANTS = require('./constants');
 
 const { DEV_CONSOLE_BASE_URL, DEV_CONSOLE_API_KEY, AIO_CLI_API_KEY } = CONSTANTS;
 
@@ -882,69 +880,6 @@ async function writeSecretsFile(secretsData, meshId) {
 	}
 }
 
-/**
- *
- * This function fetches current installed version the system and the latest version from npm
- *
- * @param {*} installedPlugins
- * @returns { currentVersion: string, latestVersion: string }
- */
-async function getPluginVersionDetails(installedPlugins) {
-	try {
-		const meshPlugin = installedPlugins.find(
-			({ name }) => name === '@adobe/aio-cli-plugin-api-mesh',
-		);
-		const currentVersion = meshPlugin.version;
-
-		let config = {
-			method: 'get',
-			url: 'https://registry.npmjs.org/@adobe/aio-cli-plugin-api-mesh/latest',
-		};
-
-		const response = await axios.request(config);
-		const latestVersion = response.data.version;
-
-		logger.debug(`Latest mesh plugin version: ${latestVersion}`);
-		logger.debug(`Installed mesh plugin version: ${currentVersion}`);
-
-		return {
-			currentVersion,
-			latestVersion,
-		};
-	} catch (err) {
-		logger.error('Unable to get package version to compare');
-		logger.error(err.message);
-
-		return {
-			currentVersion: null,
-			latestVersion: null,
-		};
-	}
-}
-
-/**
- *
- * This function compares current installed version against the latest version from npm and
- * returns true if current version is same as latest. Returns false if the current version
- * is behind the latest version.
- *
- * @param {string} currentVersion
- * @param {string} latestVersion
- * @returns
- */
-function isCurrentVersionLatest(currentVersion, latestVersion) {
-	try {
-		logger.debug(`Comparing versions Current: ${currentVersion} against Latest: ${latestVersion}`);
-
-		return compareVersions(currentVersion, latestVersion) >= 0;
-	} catch (err) {
-		logger.error('Unable to compare versions');
-		logger.error(err.message);
-
-		return true;
-	}
-}
-
 module.exports = {
 	objToString,
 	promptInput,
@@ -962,6 +897,4 @@ module.exports = {
 	startGraphqlServer,
 	setUpTenantFiles,
 	writeSecretsFile,
-	getPluginVersionDetails,
-	isCurrentVersionLatest,
 };