@adobe/aio-cli-plugin-api-mesh 1.3.0 → 2.0.0

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

@@ -12,7 +12,12 @@ governing permissions and limitations under the License.
 
 const { Command, Flags } = require('@oclif/core');
 const SourceRegistryStorage = require('source-registry-storage-adapter');
-const { promptMultiselect, promptSelect, promptConfirm, initRequestId } = require('../../../helpers');
+const {
+	promptMultiselect,
+	promptSelect,
+	promptConfirm,
+	initRequestId,
+} = require('../../../helpers');
 const ncp = require('node-clipboardy');
 const chalk = require('chalk');
 const config = require('@adobe/aio-lib-core-config');
@@ -31,18 +36,18 @@ class GetCommand extends Command {
 			await initRequestId();
 
 			logger.info(`RequestId: ${global.requestId}`);
-			let list
+			let list;
 			try {
 				list = await this.sourceRegistryStorage.getList();
 			} catch (err) {
-				this.log(err)
-				this.error(`Cannot get the list of sources: ${err}`)
+				this.log(err);
+				this.error(`Cannot get the list of sources: ${err}`);
 			}
 			const { flags } = await this.parse(GetCommand);
 			if (!flags.source && !flags.multiple) {
 				this.error(
-					`The "aio api-mesh:source:get" command requires additional parameters` +
-					`\nUse "aio api-mesh:source:get --help" to see parameters information.`,
+					`\nThe "aio api-mesh:source:get" command requires additional parameters` +
+						`\nUse "aio api-mesh:source:get --help" to see parameters information.`,
 				);
 			}
 			const sources = flags.multiple ? await this.handleMultiple(list) : flags.source;
@@ -54,7 +59,7 @@ class GetCommand extends Command {
 					this.error(
 						chalk.red(
 							`The source with the name "${name}" doesn't exist.` +
-							`\nUse "aio api-mesh:source:discover" command to see avaliable sources.`,
+								`\nUse "aio api-mesh:source:discover" command to see avaliable sources.`,
 						),
 					);
 				}
@@ -63,7 +68,7 @@ class GetCommand extends Command {
 					this.error(
 						chalk.red(
 							`The version "${version}" for source name "${name}" doesn't exist.` +
-							`\nUse "aio api-mesh:source:discover" command to see avaliable source versions.`,
+								`\nUse "aio api-mesh:source:discover" command to see avaliable source versions.`,
 						),
 					);
 				}
@@ -77,16 +82,19 @@ class GetCommand extends Command {
 					'The sources are copied to the clipboard, please paste them to your API Mesh configuration',
 				),
 			);
-			const print = await promptConfirm(`Do you want to print Source configurations in console?`);
-			if (print) {
+			if (!flags.confirm) {
+				const print = await promptConfirm(`Do you want to print Source configurations in console?`);
+				if (print) {
+					this.log(sourceConfigsString);
+				}
+			} else {
 				this.log(sourceConfigsString);
 			}
 		} catch (error) {
 			logger.error(error);
 			this.error(`
-				Something went wrong with "get" command. Please try again later. 
-				${error}
-			`);
+				\nSomething went wrong with "get" command. Please try again later.
+				\n${error}`);
 		}
 	}
 
@@ -116,6 +124,11 @@ class GetCommand extends Command {
 }
 
 GetCommand.flags = {
+	confirm: Flags.boolean({
+		char: 'c',
+		description: 'Auto confirm print action prompt. CLI will not check ask user to print source.',
+		default: false,
+	}),
 	source: Flags.string({
 		char: 's',
 		description: 'Source name',
@@ -130,8 +143,8 @@ GetCommand.flags = {
 
 GetCommand.description = 'Command returns the content of a specific source.';
 GetCommand.examples = [
-	'$ aio api-mesh:source:get <version>@<source_name>',
-	'$ aio api-mesh:source:get <source_name>',
+	'$ aio api-mesh:source:get -s=<version>@<source_name>',
+	'$ aio api-mesh:source:get -s<source_name>',
 	'$ aio api-mesh:source:get -m',
 ];
 

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

@@ -45,6 +45,7 @@ class InstallCommand extends Command {
 					return obj;
 			  }, {})
 			: {};
+
 		if (filepath) {
 			try {
 				variables = { ...variables, ...JSON.parse(await readFile(filepath, 'utf8')) };
@@ -67,7 +68,7 @@ class InstallCommand extends Command {
 			this.error(`Cannot get the list of sources: ${err}. RequestId: ${global.requestId}`);
 		}
 		const sources = flags.source ? flags.source : [args.source];
-		const sourceConfigs = {sources: [], files: {}};
+		const sourceConfigs = { sources: [], files: {} };
 		for (const source of sources) {
 			let [name, version] = source.split('@');
 			const normalizedName = this.normalizeName(name);
@@ -92,21 +93,27 @@ class InstallCommand extends Command {
 			const jsonInterpolate = new JsonInterpolate({ variablesSchema: sourceConfig.variables });
 			const sourceProviderString = JSON.stringify(sourceConfig.provider);
 			const sourceVariables = jsonInterpolate.getJsonVariables(sourceProviderString);
-			const missedVariables = jsonInterpolate.getMissedVariables(variables, sourceVariables);
-			for (const missedVariable of missedVariables) {
-				variables[missedVariable.name] = await promptInput(
-					`Enter the value for variable ${missedVariable.name}:`,
+			const passedSourceVariables = this.getPassedSourceVariables(sourceVariables || [], variables);
+			const missedVariables = jsonInterpolate.getMissedVariables(
+				passedSourceVariables,
+				sourceVariables,
+			);
+			for (const missedVariable of missedVariables
+				.map(item => item.name)
+				.filter((value, index, self) => self.indexOf(value) === index)) {
+				passedSourceVariables[missedVariable] = await promptInput(
+					`Enter the value for variable ${missedVariable}:`,
 				);
 			}
 
 			const { error, data } = jsonInterpolate.interpolate(
 				JSON.stringify(sourceConfig.provider),
-				variables,				
+				passedSourceVariables,
 			);
 			if (error) {
 				this.error(chalk.red(`${error.message}\n${error.list.map(err => err.message).join('\n')}`));
 			}
-			
+
 			sourceConfigs.sources.push(JSON.parse(data));
 			sourceConfigs.files[sourceConfig.provider.name] = sourceConfig.files;
 		}
@@ -137,56 +144,58 @@ class InstallCommand extends Command {
 			const verifiedSources = this.verifySourceAlreadyExists(
 				mesh.meshConfig.sources,
 				sourceConfigs.sources,
-			);			
+			);
 
 			let override = false;
 			if (verifiedSources.installed.length) {
-				override = await promptConfirm(
-					`The following sources are already installed: ${verifiedSources.installed
-						.map(source => source.name)
-						.join(', ')}.
+				override = flags.confirm
+					? true
+					: await promptConfirm(
+							`The following sources are already installed: ${verifiedSources.installed
+								.map(source => source.name)
+								.join(', ')}.
                     Do you want to override?`,
-				);
-			}			
-			
-			const uniqueFiles = this.getSourceFiles(verifiedSources.unique.map(source => source.name), sourceConfigs.files);
-			const installedFiles = this.getSourceFiles(verifiedSources.installed.map(source => source.name), sourceConfigs.files);
+					  );
+			}
+
+			const uniqueFiles = this.getSourceFiles(
+				verifiedSources.unique.map(source => source.name),
+				sourceConfigs.files,
+			);
+			const installedFiles = this.getSourceFiles(
+				verifiedSources.installed.map(source => source.name),
+				sourceConfigs.files,
+			);
 			let meshConfigFiles = mesh.meshConfig.files || [];
 
 			if (override) {
 				const installedMap = verifiedSources.installed.reduce((obj, source) => {
 					obj[source.name] = true;
-					return obj
+					return obj;
 				}, {});
-				
+
 				mesh.meshConfig.sources = [
 					...mesh.meshConfig.sources.filter(source => !installedMap[source.name]),
-					...verifiedSources.installed
+					...verifiedSources.installed,
 				];
 
 				const installedFilesMap = installedFiles.reduce((obj, file) => {
 					obj[file.path] = true;
-					return obj
+					return obj;
 				}, {});
 
 				meshConfigFiles = [
 					...meshConfigFiles.filter(file => !installedFilesMap[file.path]),
-					...installedFiles
+					...installedFiles,
 				];
 			}
 
-			mesh.meshConfig.sources = [
-				...mesh.meshConfig.sources,
-				...verifiedSources.unique
-			]
-			
-			meshConfigFiles = [
-				...meshConfigFiles,
-				...uniqueFiles
-			]					
-			
+			mesh.meshConfig.sources = [...mesh.meshConfig.sources, ...verifiedSources.unique];
+
+			meshConfigFiles = [...meshConfigFiles, ...uniqueFiles];
+
 			if (meshConfigFiles.length) {
-				mesh.meshConfig.files = meshConfigFiles
+				mesh.meshConfig.files = meshConfigFiles;
 			}
 
 			try {
@@ -222,12 +231,22 @@ class InstallCommand extends Command {
 		let result = [];
 		for (const source of sourcesList) {
 			if (Array.isArray(filesList[source])) {
-				result = [...result, ...filesList[source]]
+				result = [...result, ...filesList[source]];
 			}
 		}
 		return result;
 	}
 
+	getPassedSourceVariables(variablesInSource, passedVariables) {
+		const res = {};
+		variablesInSource.forEach(variable => {
+			if (passedVariables[variable.name]) {
+				res[variable.name] = passedVariables[variable.name];
+			}
+		});
+		return res;
+	}
+
 	verifySourceAlreadyExists(meshSources, installSources) {
 		const alreadyInstalledSources = [];
 		const uniqueSourcesToInstall = [];
@@ -247,6 +266,17 @@ class InstallCommand extends Command {
 }
 
 InstallCommand.flags = {
+	'source': Flags.string({
+		char: 's',
+		description: 'Source name',
+		multiple: true,
+	}),
+	'confirm': Flags.boolean({
+		char: 'c',
+		description:
+			'Auto confirm override action prompt. CLI will not check ask user to override source.',
+		default: false,
+	}),
 	'variable': Flags.string({
 		char: 'v',
 		description: 'Variables required for the source',

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

@@ -0,0 +1,96 @@
+const { Command } = require('@oclif/core');
+const logger = require('../../classes/logger');
+const { initRequestId, initSdk } = require('../../helpers');
+const { getMeshId, getMesh } = require('../../lib/devConsole');
+const { ignoreCacheFlag } = require('../../utils');
+
+require('dotenv').config();
+
+class StatusCommand extends Command {
+	static flags = {
+		ignoreCache: ignoreCacheFlag,
+	};
+
+	async run() {
+		await initRequestId();
+		logger.info(`RequestId: ${global.requestId}`);
+
+		const { flags } = await this.parse(StatusCommand);
+		const ignoreCache = await flags.ignoreCache;
+
+		const { imsOrgId, projectId, workspaceId } = await initSdk({
+			ignoreCache,
+		});
+
+		let meshId = null;
+
+		try {
+			meshId = await getMeshId(imsOrgId, projectId, workspaceId);
+		} catch (err) {
+			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, meshId);
+				switch (mesh.meshStatus) {
+					case 'success':
+						this.log(
+							'******************************************************************************************************',
+						);
+						this.log('Your mesh has been successfully built.');
+						this.log(
+							'******************************************************************************************************',
+						);
+						break;
+					case 'pending':
+						this.log(
+							'******************************************************************************************************',
+						);
+						this.log('Your mesh is awaiting processing.');
+						this.log(
+							'******************************************************************************************************',
+						);
+						break;
+					case 'building':
+						this.log(
+							'******************************************************************************************************',
+						);
+						this.log(
+							'Your mesh is currently being provisioned. Please wait a few minutes before checking again.',
+						);
+						this.log(
+							'******************************************************************************************************',
+						);
+						break;
+					case 'error':
+						this.log(
+							'******************************************************************************************************',
+						);
+						this.log('Your mesh errored out with the following error. ', mesh.error);
+						this.log(
+							'******************************************************************************************************',
+						);
+						break;
+				}
+			} 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 {
+			this.error(
+				`Unable to get mesh status. No mesh found for Org(${imsOrgId}) -> Project(${projectId}) -> Workspace(${workspaceId}). Please check the details and try again.`,
+			);
+		}
+	}
+}
+
+StatusCommand.description = 'Get a mesh status with a given meshid.';
+
+module.exports = StatusCommand;

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

@@ -82,7 +82,18 @@ class UpdateCommand extends Command {
 				try {
 					const response = await updateMesh(imsOrgId, projectId, workspaceId, meshId, data);
 
-					this.log('Successfully updated the mesh with the id: %s', meshId);
+					this.log(
+						'******************************************************************************************************',
+					);
+					this.log(
+						'Your mesh is being provisioned. Wait a few minutes before checking the status of your mesh %s',
+						meshId,
+					);
+					this.log('To check the status of your mesh, run:');
+					this.log('aio api-mesh:status');
+					this.log(
+						'******************************************************************************************************',
+					);
 
 					return response;
 				} catch (error) {

package/src/constants.js

@@ -8,6 +8,7 @@ const StageConstants = {
 	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',
 };
 
 const ProdConstants = {
@@ -16,6 +17,7 @@ const ProdConstants = {
 	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',
 };
 
 module.exports = clientEnv === 'stage' ? StageConstants : ProdConstants;

package/src/helpers.js

@@ -26,6 +26,9 @@ const { objToString } = require('./utils');
 
 const { DEV_CONSOLE_BASE_URL, DEV_CONSOLE_API_KEY, AIO_CLI_API_KEY } = CONSTANTS;
 
+/**
+ * @param configFilePath
+ */
 async function getDevConsoleConfigFromFile(configFilePath) {
 	try {
 		if (!fs.existsSync(configFilePath)) {
@@ -47,7 +50,7 @@ async function getDevConsoleConfigFromFile(configFilePath) {
 			: data.baseUrl;
 
 		const config = {
-			baseUrl: baseUrl,
+			baseUrl,
 			accessToken: (await getLibConsoleCLI()).accessToken,
 			apiKey: data.apiKey,
 		};
@@ -64,6 +67,9 @@ async function getDevConsoleConfigFromFile(configFilePath) {
 	}
 }
 
+/**
+ * @param configObject
+ */
 async function getDevConsoleConfigFromObject(configObject) {
 	const { baseUrl, apiKey } = configObject;
 	const config = {
@@ -325,15 +331,16 @@ async function getLibConsoleCLI() {
 	const accessToken = await getToken(CLI);
 
 	const consoleCLI = await libConsoleCLI.init({
-		accessToken: accessToken,
+		accessToken,
 		apiKey: AIO_CLI_API_KEY,
 		env: clientEnv,
 	});
 
-	return { consoleCLI: consoleCLI, accessToken: accessToken };
+	return { consoleCLI, accessToken };
 }
 
 /**
+ * @param options
  * @returns {any} Returns an object with properties ready for consumption
  */
 async function initSdk(options) {
@@ -377,7 +384,6 @@ async function initRequestId() {
  * Function to run the CLI Y/N prompt to confirm the user's action
  *
  * @param {string} message
- *
  * @returns boolean
  */
 async function promptConfirm(message) {
@@ -405,9 +411,9 @@ async function promptMultiselect(message, choices) {
 	const selected = await inquirer.prompt([
 		{
 			name: 'items',
-			message: message,
+			message,
 			type: 'checkbox',
-			choices: choices,
+			choices,
 		},
 	]);
 
@@ -425,9 +431,9 @@ async function promptSelect(message, choices) {
 	const selected = await inquirer.prompt([
 		{
 			name: 'item',
-			message: message,
+			message,
 			type: 'list',
-			choices: choices,
+			choices,
 		},
 	]);
 
@@ -441,11 +447,11 @@ async function promptSelect(message, choices) {
  * @param {object[]} choices - list of options
  * @returns {object[]} - selected options
  */
- async function promptInput(message) {
+async function promptInput(message) {
 	const selected = await inquirer.prompt([
 		{
 			name: 'item',
-			message: message,
+			message,
 			type: 'input',
 		},
 	]);

package/src/utils.js

@@ -3,9 +3,8 @@
  * If the path evaluates to false, the default string is returned.
  *
  * @param {object} obj
- * @param {array<string>} path
+ * @param {Array<string>} path
  * @param {string} defaultString
- *
  * @returns {string}
  */
 function objToString(obj, path = [], defaultString = '') {
@@ -49,8 +48,14 @@ const autoConfirmActionFlag = Flags.boolean({
 	default: false,
 });
 
+const jsonFlag = Flags.boolean({
+	description: 'Output JSON',
+	default: false,
+});
+
 module.exports = {
 	objToString,
 	ignoreCacheFlag,
 	autoConfirmActionFlag,
+	jsonFlag,
 };