@adobe/aio-cli-plugin-api-mesh 1.5.0 → 2.1.0

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

@@ -73,8 +73,126 @@ describe('update command tests', () => {
 		});
 	});
 
-	afterEach(() => {
-		jest.restoreAllMocks();
+	test('should pass with valid args', async () => {
+		const runResult = await UpdateCommand.run();
+
+		expect(runResult).toMatchInlineSnapshot(`
+		{
+		  "status": "success",
+		}
+	`);
+		expect(initRequestId).toHaveBeenCalled();
+		expect(initSdk).toHaveBeenCalledWith({
+			ignoreCache: true,
+		});
+		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
+		[
+		  [
+		    "******************************************************************************************************",
+		  ],
+		  [
+		    "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(`[]`);
+	});
+
+	test('should pass with valid args and ignoreCache flag', async () => {
+		parseSpy.mockResolvedValueOnce({
+			args: { file: 'valid_file_name' },
+			flags: {
+				ignoreCache: Promise.resolve(true),
+				autoConfirmAction: mockAutoApproveAction,
+			},
+		});
+
+		const runResult = await UpdateCommand.run();
+
+		expect(runResult).toMatchInlineSnapshot(`
+		{
+		  "status": "success",
+		}
+	`);
+		expect(initRequestId).toHaveBeenCalled();
+		expect(initSdk).toHaveBeenCalledWith({
+			ignoreCache: true,
+		});
+		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
+		[
+		  [
+		    "******************************************************************************************************",
+		  ],
+		  [
+		    "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(`[]`);
+	});
+
+	test('should pass with valid args if autoConfirmAction flag is set', async () => {
+		parseSpy.mockResolvedValueOnce({
+			args: { file: 'valid_file_name' },
+			flags: {
+				ignoreCache: mockIgnoreCacheFlag,
+				autoConfirmAction: Promise.resolve(true),
+			},
+		});
+
+		const runResult = await UpdateCommand.run();
+
+		expect(runResult).toMatchInlineSnapshot(`
+		{
+		  "status": "success",
+		}
+	`);
+		expect(initRequestId).toHaveBeenCalled();
+		expect(promptConfirm).not.toHaveBeenCalled();
+		expect(initSdk).toHaveBeenCalledWith({
+			ignoreCache: true,
+		});
+		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
+		[
+		  [
+		    "******************************************************************************************************",
+		  ],
+		  [
+		    "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(`[]`);
 	});
 
 	test('should fail if mesh id is missing', async () => {
@@ -84,10 +202,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,16 +219,46 @@ 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",
 		  ],
 		]
 	`);
 	});
 
+	test('should fail if updateMesh method failed', async () => {
+		updateMesh.mockRejectedValueOnce(new Error('dummy_error'));
+
+		const runResult = UpdateCommand.run();
+
+		// await expect(runResult).rejects.toEqual(
+		// 	new Error(
+		// 		'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',
+		// 	),
+		// );
+
+		await expect(runResult).rejects.toMatchInlineSnapshot(
+			`[Error: 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]`,
+		);
+		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
+		[
+		  [
+		    "dummy_error",
+		  ],
+		]
+	`);
+		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
+		[
+		  [
+		    "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",
+		  ],
+		]
+	`);
+	});
+
 	test('should fail if update file path is missing', async () => {
 		parseSpy.mockResolvedValueOnce({
 			args: { file: null },
@@ -124,10 +272,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 +292,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,124 +314,12 @@ describe('update command tests', () => {
 
 		expect(runResult).toMatchInlineSnapshot(`"Update cancelled"`);
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
-		Array [
-		  Array [
+		[
+		  [
 		    "Update cancelled",
 		  ],
 		]
 	`);
-		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`Array []`);
-	});
-
-	test('should fail if updateMesh method failed', async () => {
-		updateMesh.mockRejectedValueOnce(new Error('dummy_error'));
-
-		const runResult = UpdateCommand.run();
-
-		await expect(runResult).rejects.toEqual(
-			new Error(
-				'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',
-			),
-		);
-		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",
-		  ],
-		]
-	`);
-	});
-
-	test('should pass with valid args', async () => {
-		const runResult = await UpdateCommand.run();
-
-		expect(runResult).toMatchInlineSnapshot(`
-		Object {
-		  "status": "success",
-		}
-	`);
-		expect(initRequestId).toHaveBeenCalled();
-		expect(initSdk).toHaveBeenCalledWith({
-			ignoreCache: true,
-		});
-		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
-		Array [
-		  Array [
-		    "Successfully updated the mesh with the id: %s",
-		    "mesh_id",
-		  ],
-		]
-	`);
-		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`Array []`);
-	});
-
-	test('should pass with valid args and ignoreCache flag', async () => {
-		parseSpy.mockResolvedValueOnce({
-			args: { file: 'valid_file_name' },
-			flags: {
-				ignoreCache: Promise.resolve(true),
-				autoConfirmAction: mockAutoApproveAction,
-			},
-		});
-
-		const runResult = await UpdateCommand.run();
-
-		expect(runResult).toMatchInlineSnapshot(`
-		Object {
-		  "status": "success",
-		}
-	`);
-		expect(initRequestId).toHaveBeenCalled();
-		expect(initSdk).toHaveBeenCalledWith({
-			ignoreCache: true,
-		});
-		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
-		Array [
-		  Array [
-		    "Successfully updated the mesh with the id: %s",
-		    "mesh_id",
-		  ],
-		]
-	`);
-		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`Array []`);
-	});
-
-	test('should pass with valid args if autoConfirmAction flag is set', async () => {
-		parseSpy.mockResolvedValueOnce({
-			args: { file: 'valid_file_name' },
-			flags: {
-				ignoreCache: mockIgnoreCacheFlag,
-				autoConfirmAction: Promise.resolve(true),
-			},
-		});
-
-		const runResult = await UpdateCommand.run();
-
-		expect(runResult).toMatchInlineSnapshot(`
-		Object {
-		  "status": "success",
-		}
-	`);
-		expect(initRequestId).toHaveBeenCalled();
-		expect(promptConfirm).not.toHaveBeenCalled();
-		expect(initSdk).toHaveBeenCalledWith({
-			ignoreCache: true,
-		});
-		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
-		Array [
-		  Array [
-		    "Successfully updated the mesh with the id: %s",
-		    "mesh_id",
-		  ],
-		]
-	`);
-		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`Array []`);
+		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`[]`);
 	});
 });

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

@@ -31,10 +31,10 @@ class CreateCommand extends Command {
 	static flags = {
 		ignoreCache: ignoreCacheFlag,
 		autoConfirmAction: autoConfirmActionFlag,
-		json: jsonFlag
+		json: jsonFlag,
 	};
 
-	static enableJsonFlag = true
+	static enableJsonFlag = true;
 
 	async run() {
 		await initRequestId();
@@ -81,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,
@@ -119,12 +130,12 @@ class CreateCommand extends Command {
 					} else {
 						this.log('Unable to create API Key');
 					}
-                    // Do not remove or rename return values.
+					// Do not remove or rename return values.
 					// Template adobe/generator-app-api-mesh relies on "mesh" & "adobeIdIntegrationsForWorkspace" obj structure
 					return {
 						adobeIdIntegrationsForWorkspace,
 						sdkList,
-						mesh
+						mesh,
 					};
 				} else {
 					this.error(`Unable to create a mesh. Please try again. RequestId: ${global.requestId}`, {

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

@@ -37,7 +37,7 @@ 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([]);
@@ -46,7 +46,7 @@ describe('source:discover command tests', () => {
 	test('Check that "source:install" command is called', async () => {
 		InstallCommand.run = jest.fn().mockImplementation(() => 'source:install');
 		promptConfirm.mockResolvedValue(true);
-		promptMultiselect.mockResolvedValue([mockMetadataFixture['test-01']])
+		promptMultiselect.mockResolvedValue([mockMetadataFixture['test-01']]);
 		await DiscoverCommand.run([]);
 		expect(InstallCommand.run).toHaveBeenCalledTimes(1);
 	});

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

@@ -31,8 +31,11 @@ const expectedResultForSuccessScenarios = JSON.stringify(
 	4,
 );
 const normalizeAssertString = str => {
-	return str.replace(/[\r\t]/gm, '').replace(/[\r\n]/gm, '').replace(/  +/g, ' ')
-}
+	return str
+		.replace(/[\r\t]/gm, '')
+		.replace(/[\r\n]/gm, '')
+		.replace(/  +/g, ' ');
+};
 mockAdapter.mockImplementation(() => ({
 	get: jest
 		.fn()
@@ -56,8 +59,8 @@ describe('source:get command tests', () => {
 			`"Command returns the content of a specific source."`,
 		);
 		expect(GetCommand.flags).toMatchInlineSnapshot(`
-		Object {
-		  "confirm": Object {
+		{
+		  "confirm": {
 		    "allowNo": false,
 		    "char": "c",
 		    "default": false,
@@ -65,37 +68,39 @@ describe('source:get command tests', () => {
 		    "parse": [Function],
 		    "type": "boolean",
 		  },
-		  "multiple": Object {
+		  "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(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.`)
+				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 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);
@@ -109,9 +114,7 @@ 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).toContain(
-				chalk.red(`The source with the name "test-99" doesn't exist.`),
-			);
+			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 () => {

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,8 @@ describe('source:install command tests', () => {
 			`"Command to install the source to your API mesh."`,
 		);
 		expect(InstallCommand.flags).toMatchInlineSnapshot(`
-		Object {
-		  "confirm": Object {
+		{
+		  "confirm": {
 		    "allowNo": false,
 		    "char": "c",
 		    "default": false,
@@ -59,7 +58,7 @@ describe('source:install command tests', () => {
 		    "parse": [Function],
 		    "type": "boolean",
 		  },
-		  "ignoreCache": Object {
+		  "ignoreCache": {
 		    "allowNo": false,
 		    "char": "i",
 		    "default": false,
@@ -67,33 +66,33 @@ describe('source:install command tests', () => {
 		    "parse": [Function],
 		    "type": "boolean",
 		  },
-		  "source": Object {
+		  "source": {
 		    "char": "s",
 		    "description": "Source name",
-		    "input": Array [],
+		    "input": [],
 		    "multiple": true,
 		    "parse": [Function],
 		    "type": "option",
 		  },
-		  "variable": Object {
+		  "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 => {
@@ -112,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`,