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

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

@@ -84,10 +84,10 @@ describe('update command tests', () => {
 		await expect(runResult).rejects.toMatchInlineSnapshot(
 			`[Error: Unable to update. No mesh found for Org(1234) -> Project(5678) -> Workspace(123456789). Please check the details and try again.]`,
 		);
-		expect(logSpy.mock.calls).toMatchInlineSnapshot(`Array []`);
+		expect(logSpy.mock.calls).toMatchInlineSnapshot(`[]`);
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
-		Array [
-		  Array [
+		[
+		  [
 		    "Unable to update. No mesh found for Org(1234) -> Project(5678) -> Workspace(123456789). Please check the details and try again.",
 		  ],
 		]
@@ -101,10 +101,10 @@ describe('update command tests', () => {
 		await expect(runResult).rejects.toMatchInlineSnapshot(
 			`[Error: Unable to get mesh ID. Please check the details and try again. RequestId: dummy_request_id]`,
 		);
-		expect(logSpy.mock.calls).toMatchInlineSnapshot(`Array []`);
+		expect(logSpy.mock.calls).toMatchInlineSnapshot(`[]`);
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
-		Array [
-		  Array [
+		[
+		  [
 		    "Unable to get mesh ID. Please check the details and try again. RequestId: dummy_request_id",
 		  ],
 		]
@@ -124,10 +124,10 @@ describe('update command tests', () => {
 		await expect(runResult).rejects.toEqual(
 			new Error('Missing required args. Run aio api-mesh update --help for more info.'),
 		);
-		expect(logSpy.mock.calls).toMatchInlineSnapshot(`Array []`);
+		expect(logSpy.mock.calls).toMatchInlineSnapshot(`[]`);
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
-		Array [
-		  Array [
+		[
+		  [
 		    "Missing required args. Run aio api-mesh update --help for more info.",
 		  ],
 		]
@@ -144,15 +144,15 @@ describe('update command tests', () => {
 			),
 		);
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
-		Array [
-		  Array [
+		[
+		  [
 		    "File not found",
 		  ],
 		]
 	`);
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
-		Array [
-		  Array [
+		[
+		  [
 		    "Unable to read the mesh configuration file provided. Please check the file and try again.",
 		  ],
 		]
@@ -166,13 +166,13 @@ describe('update command tests', () => {
 
 		expect(runResult).toMatchInlineSnapshot(`"Update cancelled"`);
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
-		Array [
-		  Array [
+		[
+		  [
 		    "Update cancelled",
 		  ],
 		]
 	`);
-		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`Array []`);
+		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`[]`);
 	});
 
 	test('should fail if updateMesh method failed', async () => {
@@ -186,15 +186,15 @@ describe('update command tests', () => {
 			),
 		);
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
-		Array [
-		  Array [
+		[
+		  [
 		    "dummy_error",
 		  ],
 		]
 	`);
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
-		Array [
-		  Array [
+		[
+		  [
 		    "Unable to update the mesh. Please check the mesh configuration file and try again. If the error persists please contact support. RequestId: dummy_request_id",
 		  ],
 		]
@@ -205,7 +205,7 @@ describe('update command tests', () => {
 		const runResult = await UpdateCommand.run();
 
 		expect(runResult).toMatchInlineSnapshot(`
-		Object {
+		{
 		  "status": "success",
 		}
 	`);
@@ -214,14 +214,26 @@ describe('update command tests', () => {
 			ignoreCache: true,
 		});
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
-		Array [
-		  Array [
-		    "Successfully updated the mesh with the id: %s",
+		[
+		  [
+		    "******************************************************************************************************",
+		  ],
+		  [
+		    "Your mesh is being provisioned. Wait a few minutes before checking the status of your mesh %s",
 		    "mesh_id",
 		  ],
+		  [
+		    "To check the status of your mesh, run:",
+		  ],
+		  [
+		    "aio api-mesh:status",
+		  ],
+		  [
+		    "******************************************************************************************************",
+		  ],
 		]
 	`);
-		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`Array []`);
+		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`[]`);
 	});
 
 	test('should pass with valid args and ignoreCache flag', async () => {
@@ -236,7 +248,7 @@ describe('update command tests', () => {
 		const runResult = await UpdateCommand.run();
 
 		expect(runResult).toMatchInlineSnapshot(`
-		Object {
+		{
 		  "status": "success",
 		}
 	`);
@@ -245,14 +257,26 @@ describe('update command tests', () => {
 			ignoreCache: true,
 		});
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
-		Array [
-		  Array [
-		    "Successfully updated the mesh with the id: %s",
+		[
+		  [
+		    "******************************************************************************************************",
+		  ],
+		  [
+		    "Your mesh is being provisioned. Wait a few minutes before checking the status of your mesh %s",
 		    "mesh_id",
 		  ],
+		  [
+		    "To check the status of your mesh, run:",
+		  ],
+		  [
+		    "aio api-mesh:status",
+		  ],
+		  [
+		    "******************************************************************************************************",
+		  ],
 		]
 	`);
-		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`Array []`);
+		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`[]`);
 	});
 
 	test('should pass with valid args if autoConfirmAction flag is set', async () => {
@@ -267,7 +291,7 @@ describe('update command tests', () => {
 		const runResult = await UpdateCommand.run();
 
 		expect(runResult).toMatchInlineSnapshot(`
-		Object {
+		{
 		  "status": "success",
 		}
 	`);
@@ -277,13 +301,25 @@ describe('update command tests', () => {
 			ignoreCache: true,
 		});
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
-		Array [
-		  Array [
-		    "Successfully updated the mesh with the id: %s",
+		[
+		  [
+		    "******************************************************************************************************",
+		  ],
+		  [
+		    "Your mesh is being provisioned. Wait a few minutes before checking the status of your mesh %s",
 		    "mesh_id",
 		  ],
+		  [
+		    "To check the status of your mesh, run:",
+		  ],
+		  [
+		    "aio api-mesh:status",
+		  ],
+		  [
+		    "******************************************************************************************************",
+		  ],
 		]
 	`);
-		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`Array []`);
+		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`[]`);
 	});
 });

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

@@ -9,13 +9,13 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const { Command } = require('@oclif/command');
+const { Command } = require('@oclif/core');
 const { readFile } = require('fs/promises');
 
 const { initSdk, initRequestId, promptConfirm } = require('../../helpers');
 const logger = require('../../classes/logger');
 const CONSTANTS = require('../../constants');
-const { ignoreCacheFlag, autoConfirmActionFlag } = require('../../utils');
+const { ignoreCacheFlag, autoConfirmActionFlag, jsonFlag } = require('../../utils');
 const {
 	createMesh,
 	createAPIMeshCredentials,
@@ -31,8 +31,11 @@ class CreateCommand extends Command {
 	static flags = {
 		ignoreCache: ignoreCacheFlag,
 		autoConfirmAction: autoConfirmActionFlag,
+		json: jsonFlag,
 	};
 
+	static enableJsonFlag = true;
+
 	async run() {
 		await initRequestId();
 
@@ -78,8 +81,19 @@ class CreateCommand extends Command {
 				let sdkList = [];
 
 				if (mesh) {
-					this.log('Successfully created mesh %s', mesh.meshId);
-					this.log(JSON.stringify(mesh, null, 2));
+					this.log(
+						'******************************************************************************************************',
+					);
+					this.log(
+						'Your mesh is being provisioned. Wait a few minutes before checking the status of your mesh %s',
+						mesh.meshId,
+					);
+					this.log('To check the status of your mesh, run:');
+					this.log('aio api-mesh:status');
+					this.log(
+						'******************************************************************************************************',
+					);
+
 					// create API key credential
 					const adobeIdIntegrationsForWorkspace = await createAPIMeshCredentials(
 						imsOrgId,
@@ -116,7 +130,8 @@ class CreateCommand extends Command {
 					} else {
 						this.log('Unable to create API Key');
 					}
-
+					// Do not remove or rename return values.
+					// Template adobe/generator-app-api-mesh relies on "mesh" & "adobeIdIntegrationsForWorkspace" obj structure
 					return {
 						adobeIdIntegrationsForWorkspace,
 						sdkList,

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

@@ -62,7 +62,7 @@ class DescribeCommand extends Command {
 
 					return meshDetails;
 				} else {
-					this.error(
+					logger.error(
 						`Unable to get mesh details. Please check the details and try again. RequestId: ${global.requestId}`,
 						{ exit: false },
 					);

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

@@ -70,7 +70,7 @@ class GetCommand extends Command {
 
 					return mesh;
 				} else {
-					this.error(
+					logger.error(
 						`Unable to get mesh with the ID ${meshId}. Please check the mesh ID and try again. RequestId: ${global.requestId}`,
 						{ exit: false },
 					);

package/src/commands/api-mesh/source/__fixtures__/0.0.1-test-01.json

@@ -41,4 +41,4 @@
 			}
 		]
 	}
-}
+}

package/src/commands/api-mesh/source/__fixtures__/0.0.1-test-02.json

@@ -41,4 +41,4 @@
 			}
 		]
 	}
-}
+}

package/src/commands/api-mesh/source/__tests__/discover.test.js

@@ -12,10 +12,10 @@ governing permissions and limitations under the License.
 
 const mockMetadataFixture = require('../__fixtures__/connectors-metadata.json');
 const mockAdapter = require('source-registry-storage-adapter');
-const { promptConfirm } = require('../../../../helpers');
-const GetCommand = require('../get');
+const { promptConfirm, promptMultiselect } = require('../../../../helpers');
 const { CliUx } = require('@oclif/core');
 const DiscoverCommand = require('../discover');
+const InstallCommand = require('../install');
 jest.mock('source-registry-storage-adapter');
 jest.mock('../../../../helpers');
 jest.mock('../get');
@@ -37,22 +37,23 @@ describe('source:discover command tests', () => {
 		expect(DiscoverCommand.description).toMatchInlineSnapshot(
 			`"Return the list of avaliable sources"`,
 		);
-		expect(DiscoverCommand.aliases).toMatchInlineSnapshot(`Array []`);
+		expect(DiscoverCommand.aliases).toMatchInlineSnapshot(`[]`);
 	});
 	test('Check table render is executed', async () => {
 		await DiscoverCommand.run([]);
 		expect(CliUx.Table.table).toHaveBeenCalledTimes(1);
 	});
-	test('Check that "source:get -m" command is called', async () => {
-		GetCommand.run = jest.fn().mockImplementation(() => 'source:get -m');
+	test('Check that "source:install" command is called', async () => {
+		InstallCommand.run = jest.fn().mockImplementation(() => 'source:install');
 		promptConfirm.mockResolvedValue(true);
+		promptMultiselect.mockResolvedValue([mockMetadataFixture['test-01']]);
 		await DiscoverCommand.run([]);
-		expect(GetCommand.run).toHaveBeenCalledTimes(1);
+		expect(InstallCommand.run).toHaveBeenCalledTimes(1);
 	});
-	test('Check that "source:get -m" command is not called', async () => {
-		GetCommand.run = jest.fn().mockImplementation(() => 'source:get -m');
+	test('Check that "source:install" command is not called', async () => {
+		InstallCommand.run = jest.fn().mockImplementation(() => 'source:install');
 		promptConfirm.mockResolvedValue(false);
 		await DiscoverCommand.run([]);
-		expect(GetCommand.run).toHaveBeenCalledTimes(0);
+		expect(InstallCommand.run).toHaveBeenCalledTimes(0);
 	});
 });

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

@@ -30,6 +30,12 @@ const expectedResultForSuccessScenarios = JSON.stringify(
 	null,
 	4,
 );
+const normalizeAssertString = str => {
+	return str
+		.replace(/[\r\t]/gm, '')
+		.replace(/[\r\n]/gm, '')
+		.replace(/  +/g, ' ');
+};
 mockAdapter.mockImplementation(() => ({
 	get: jest
 		.fn()
@@ -53,40 +59,48 @@ describe('source:get command tests', () => {
 			`"Command returns the content of a specific source."`,
 		);
 		expect(GetCommand.flags).toMatchInlineSnapshot(`
-		Object {
-		  "multiple": Object {
+		{
+		  "confirm": {
+		    "allowNo": false,
+		    "char": "c",
+		    "default": false,
+		    "description": "Auto confirm print action prompt. CLI will not check ask user to print source.",
+		    "parse": [Function],
+		    "type": "boolean",
+		  },
+		  "multiple": {
 		    "allowNo": false,
 		    "char": "m",
 		    "description": "Select multiple sources",
-		    "exclusive": Array [
+		    "exclusive": [
 		      "name",
 		    ],
 		    "parse": [Function],
 		    "type": "boolean",
 		  },
-		  "source": Object {
+		  "source": {
 		    "char": "s",
 		    "description": "Source name",
-		    "input": Array [],
+		    "input": [],
 		    "multiple": true,
 		    "parse": [Function],
 		    "type": "option",
 		  },
 		}
 	`);
-		expect(GetCommand.aliases).toMatchInlineSnapshot(`Array []`);
+		expect(GetCommand.aliases).toMatchInlineSnapshot(`[]`);
 	});
 	test('Check executing without parameters', async () => {
 		await GetCommand.run([]).catch(err => {
-			expect(err.message).toEqual(`The "aio api-mesh:source:get" command requires additional parameters` +
-				`\nUse "aio api-mesh:source:get --help" to see parameters information.`)
+			expect(normalizeAssertString(err.message)).toEqual(
+				normalizeAssertString(
+					`Something went wrong with "get" command. Please try again later.` +
+						`Error: \nThe "aio api-mesh:source:get" command requires additional parameters` +
+						`Use "aio api-mesh:source:get --help" to see parameters information.`,
+				),
+			);
 		});
 	});
-	test('Check executing success with multiple, copied to clipboard and logged to console', async () => {
-		await GetCommand.run(['-m']);
-		expect(ncp.readSync()).toEqual(expectedResultForSuccessScenarios);
-		expect(logSpy.mock.calls.pop()[0]).toEqual(expectedResultForSuccessScenarios);
-	});
 	test('Check executing success with provided name and version, copied to clipboard and logged to console', async () => {
 		await GetCommand.run(['-s=test-01@0.0.1', '-s=test-02@0.0.1']);
 		expect(ncp.readSync()).toEqual(expectedResultForSuccessScenarios);
@@ -100,23 +114,15 @@ describe('source:get command tests', () => {
 	test('Check executing failed due to requested source does not exist', async () => {
 		const name = 'test-99';
 		await GetCommand.run([`-s=${name}`]).catch(err => {
-			expect(err.message).toEqual(
-				chalk.red(
-					`The source with the name "${name}" doesn't exist.` +
-					`\nUse "aio api-mesh:source:discover" command to see avaliable sources.`,
-				),
-			);
+			expect(err.message).toContain(chalk.red(`The source with the name "test-99" doesn't exist.`));
 		});
 	});
 	test('Check executing failed due to requested version does not exist', async () => {
 		const name = 'test-01';
 		const version = '1.1.1';
 		await GetCommand.run([`-s=${name}@${version}`]).catch(err => {
-			expect(err.message).toEqual(
-				chalk.red(
-					`The version "${version}" for source name "${name}" doesn't exist.` +
-					`\nUse "aio api-mesh:source:discover" command to see avaliable source versions.`,
-				),
+			expect(err.message).toContain(
+				chalk.red(`The version \"1.1.1\" for source name \"test-01\" doesn't exist.`),
 			);
 		});
 	});

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

@@ -11,11 +11,10 @@ governing permissions and limitations under the License.
 */
 
 const mockMetadataFixture = require('../__fixtures__/connectors-metadata.json');
-const mockSourceTest01v1Fixture = require('../__fixtures__/0.0.1-test-01.json');
-const mockSourceTest02v1Fixture = require('../__fixtures__/0.0.1-test-02.json');
 const mockSourceTest03v1Fixture = require('../__fixtures__/0.0.1-test-03.json');
 const mockAdapter = require('source-registry-storage-adapter');
 const chalk = require('chalk');
+const path = require('path');
 const { initSdk, initRequestId, promptInput } = require('../../../../helpers');
 const mockSources = { '0.0.1-test-03': mockSourceTest03v1Fixture };
 jest.mock('source-registry-storage-adapter');
@@ -50,8 +49,16 @@ describe('source:install command tests', () => {
 			`"Command to install the source to your API mesh."`,
 		);
 		expect(InstallCommand.flags).toMatchInlineSnapshot(`
-		Object {
-		  "ignoreCache": Object {
+		{
+		  "confirm": {
+		    "allowNo": false,
+		    "char": "c",
+		    "default": false,
+		    "description": "Auto confirm override action prompt. CLI will not check ask user to override source.",
+		    "parse": [Function],
+		    "type": "boolean",
+		  },
+		  "ignoreCache": {
 		    "allowNo": false,
 		    "char": "i",
 		    "default": false,
@@ -59,25 +66,33 @@ describe('source:install command tests', () => {
 		    "parse": [Function],
 		    "type": "boolean",
 		  },
-		  "variable": Object {
+		  "source": {
+		    "char": "s",
+		    "description": "Source name",
+		    "input": [],
+		    "multiple": true,
+		    "parse": [Function],
+		    "type": "option",
+		  },
+		  "variable": {
 		    "char": "v",
 		    "description": "Variables required for the source",
-		    "input": Array [],
+		    "input": [],
 		    "multiple": true,
 		    "parse": [Function],
 		    "type": "option",
 		  },
-		  "variable-file": Object {
+		  "variable-file": {
 		    "char": "f",
 		    "description": "Variables file path",
-		    "input": Array [],
+		    "input": [],
 		    "multiple": false,
 		    "parse": [Function],
 		    "type": "option",
 		  },
 		}
 	`);
-		expect(InstallCommand.aliases).toMatchInlineSnapshot(`Array []`);
+		expect(InstallCommand.aliases).toMatchInlineSnapshot(`[]`);
 	});
 	test('Check executing without parameters', async () => {
 		await InstallCommand.run([]).catch(err => {
@@ -96,8 +111,9 @@ describe('source:install command tests', () => {
 		});
 	});
 	test('Check executing with invalid variable type', async () => {
-		const path = `-f=${__dirname}/../__fixtures__/variables-file-invalid.json`;
-		await InstallCommand.run(['test-03', path]).catch(err => {
+		const newPath = path.join(__dirname, '/../__fixtures__/variables-file-invalid.json');
+		const runPath = `-f=${newPath}`;
+		await InstallCommand.run(['test-03', runPath]).catch(err => {
 			expect(err.message).toEqual(
 				chalk.red(
 					`The next variables has invalid type.\nVariable: ENDPOINT_URL\nRequested type: string`,

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

@@ -9,13 +9,17 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const { Command, CliUx } = require('@oclif/core');
-const { promptConfirm, initRequestId } = require('../../../helpers');
-const GetCommand = require('./get');
+const { Command, CliUx, Flags } = require('@oclif/core');
+const {
+	promptConfirm,
+	initRequestId,
+	promptMultiselect,
+	promptSelect,
+} = require('../../../helpers');
 const SourceRegistryStorage = require('source-registry-storage-adapter');
 const config = require('@adobe/aio-lib-core-config');
 const logger = require('../../../classes/logger');
-
+const InstallCommand = require('./install');
 
 class DiscoverCommand extends Command {
 	async run() {
@@ -23,6 +27,7 @@ class DiscoverCommand extends Command {
 			await initRequestId();
 
 			logger.info(`RequestId: ${global.requestId}`);
+			const { flags } = await this.parse(DiscoverCommand);
 			const srs = new SourceRegistryStorage(config.get('api-mesh.sourceRegistry.path'));
 			let list;
 			try {
@@ -33,9 +38,22 @@ class DiscoverCommand extends Command {
 			}
 
 			this.generateSourcesTable(list);
-			const needInstall = await promptConfirm(`Are you want to install sources?`);
+			let needInstall = false;
+
+			if (flags.confirm) {
+				needInstall = true;
+			} else {
+				needInstall = await promptConfirm(`Do you want to install sources?`);
+			}
+
 			if (needInstall) {
-				GetCommand.run(['-m']);
+				const toInstall = await this.handleMultiple(list);
+				const params = [];
+				toInstall.forEach(source => {
+					params.push('-s');
+					params.push(source);
+				});
+				InstallCommand.run(params);
 			}
 		} catch (error) {
 			logger.error(error);
@@ -46,6 +64,38 @@ class DiscoverCommand extends Command {
 		}
 	}
 
+	async handleMultiple(data) {
+		const result = [];
+		let selectedList =
+			(await promptMultiselect(
+				'Select sources to install',
+				Object.values(data).map(elem => ({ name: elem.name, value: elem })),
+			)) || [];
+
+		if (!selectedList.length) {
+			while (!selectedList.length) {
+				selectedList =
+					(await promptMultiselect(
+						'Please choose at least one source',
+						Object.values(data).map(elem => ({ name: elem.name, value: elem })),
+					)) || [];
+			}
+		}
+
+		for (const selected of selectedList) {
+			if (selected.versions.length > 1) {
+				const version = await promptSelect(
+					`Please choose the version of "${selected.name}" source`,
+					selected.versions.map(v => ({ name: `v${v}`, value: `${selected.name}@${v}` })),
+				);
+				result.push(version);
+			} else {
+				result.push(`${selected.name}@${selected.latest}`);
+			}
+		}
+		return result;
+	}
+
 	async generateSourcesTable(data) {
 		const columns = {
 			name: {
@@ -65,6 +115,15 @@ class DiscoverCommand extends Command {
 	}
 }
 
+DiscoverCommand.flags = {
+	confirm: Flags.boolean({
+		char: 'c',
+		description:
+			'Auto confirm install action prompt. CLI will not check ask user to install source.',
+		default: false,
+	}),
+};
+
 DiscoverCommand.description = 'Return the list of avaliable sources';
 
 module.exports = DiscoverCommand;