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

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

@@ -53,7 +53,7 @@ const mockAutoApproveAction = Promise.resolve(false);
 describe('delete command tests', () => {
 	beforeEach(() => {
 		initSdk.mockResolvedValue({
-			imsOrgCode: selectedOrg.code,
+			imsOrgId: selectedOrg.id,
 			projectId: selectedProject.id,
 			workspaceId: selectedWorkspace.id,
 		});
@@ -117,13 +117,13 @@ describe('delete command tests', () => {
 
 		return runResult.catch(err => {
 			expect(err.message).toMatchInlineSnapshot(
-				`"Unable to delete mesh. No mesh found for Org(CODE1234@AdobeOrg) -> Project(5678) -> Workspace(123456789). Check the details and try again."`,
+				`"Unable to delete. No mesh found for Org(1234) -> Project(5678) -> Workspace(123456789). Please check the details and try again."`,
 			);
 			expect(logSpy.mock.calls).toMatchInlineSnapshot(`[]`);
 			expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
 			[
 			  [
-			    "Unable to delete mesh. No mesh found for Org(CODE1234@AdobeOrg) -> Project(5678) -> Workspace(123456789). Check the details and try again.",
+			    "Unable to delete. No mesh found for Org(1234) -> Project(5678) -> Workspace(123456789). Please check the details and try again.",
 			  ],
 			]
 		`);
@@ -181,7 +181,7 @@ describe('delete command tests', () => {
 
 		await expect(runResult).rejects.toEqual(
 			new Error(
-				'Unable to delete mesh. Check the details and try again. If the error persists please contact support. RequestId: dummy_request_id',
+				'Unable to delete mesh. Please check the details and try again. If the error persists please contact support. RequestId: dummy_request_id',
 			),
 		);
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
@@ -194,7 +194,7 @@ describe('delete command tests', () => {
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
 		[
 		  [
-		    "Unable to delete mesh. Check the details and try again. If the error persists please contact support. RequestId: dummy_request_id",
+		    "Unable to delete mesh. Please check the details and try again. If the error persists please contact support. RequestId: dummy_request_id",
 		  ],
 		]
 	`);
@@ -212,7 +212,7 @@ describe('delete command tests', () => {
 		expect(deleteMesh.mock.calls).toMatchInlineSnapshot(`
 		[
 		  [
-		    "CODE1234@AdobeOrg",
+		    "1234",
 		    "5678",
 		    "123456789",
 		    "mesh_id",

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

@@ -160,7 +160,12 @@ describe('describe command tests', () => {
 
 		expect(runResult).toMatchInlineSnapshot(`
 		{
+		  "imsOrgId": "1234",
 		  "meshId": "dummy_meshId",
+		  "meshUrl": "https://edge-sandbox-graph.adobe.io/api/dummy_meshId/graphql",
+		  "projectId": "5678",
+		  "workspaceId": "123456789",
+		  "workspaceName": "Workspace01",
 		}
 	`);
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
@@ -199,7 +204,7 @@ describe('describe command tests', () => {
 
 		expect(initRequestId).toHaveBeenCalled();
 		expect(describeMesh).toHaveBeenCalledWith(
-			selectedOrg.code,
+			selectedOrg.id,
 			selectedProject.id,
 			selectedWorkspace.id,
 			selectedWorkspace.title,
@@ -207,7 +212,12 @@ describe('describe command tests', () => {
 		expect(runResult).toMatchInlineSnapshot(`
 		{
 		  "apiKey": "dummy_apiKey",
+		  "imsOrgId": "1234",
 		  "meshId": "dummy_meshId",
+		  "meshUrl": "https://edge-sandbox-graph.adobe.io/api/dummy_meshId/graphql",
+		  "projectId": "5678",
+		  "workspaceId": "123456789",
+		  "workspaceName": "Workspace01",
 		}
 	`);
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
@@ -250,7 +260,7 @@ describe('describe command tests', () => {
 
 		expect(initRequestId).toHaveBeenCalled();
 		expect(describeMesh).toHaveBeenCalledWith(
-			selectedOrg.code,
+			selectedOrg.id,
 			selectedProject.id,
 			selectedWorkspace.id,
 			selectedWorkspace.title,
@@ -258,7 +268,12 @@ describe('describe command tests', () => {
 		expect(runResult).toMatchInlineSnapshot(`
 		{
 		  "apiKey": "dummy_apiKey",
+		  "imsOrgId": "1234",
 		  "meshId": "dummy_meshId",
+		  "meshUrl": "https://edge-sandbox-graph.adobe.io/api/dummy_meshId/graphql",
+		  "projectId": "5678",
+		  "workspaceId": "123456789",
+		  "workspaceName": "Workspace01",
 		}
 	`);
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`

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

@@ -115,13 +115,13 @@ describe('get command tests', () => {
 
 		return runResult.catch(err => {
 			expect(err.message).toMatchInlineSnapshot(
-				`"Unable to get mesh config. No mesh found for Org(1234) -> Project(5678) -> Workspace(123456789). Check the details and try again."`,
+				`"Unable to get mesh config. No mesh found for Org(1234) -> Project(5678) -> Workspace(123456789). Please check the details and try again."`,
 			);
 			expect(logSpy.mock.calls).toMatchInlineSnapshot(`[]`);
 			expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
 			[
 			  [
-			    "Unable to get mesh config. No mesh found for Org(1234) -> Project(5678) -> Workspace(123456789). Check the details and try again.",
+			    "Unable to get mesh config. No mesh found for Org(1234) -> Project(5678) -> Workspace(123456789). Please check the details and try again.",
 			  ],
 			]
 		`);
@@ -134,13 +134,13 @@ describe('get command tests', () => {
 
 		return runResult.catch(err => {
 			expect(err.message).toMatchInlineSnapshot(
-				`"Unable to get mesh ID. Check the details and try again. RequestId: dummy_request_id"`,
+				`"Unable to get mesh ID. Please check the details and try again. RequestId: dummy_request_id"`,
 			);
 			expect(logSpy.mock.calls).toMatchInlineSnapshot(`[]`);
 			expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
 			[
 			  [
-			    "Unable to get mesh ID. Check the details and try again. RequestId: dummy_request_id",
+			    "Unable to get mesh ID. Please check the details and try again. RequestId: dummy_request_id",
 			  ],
 			]
 		`);
@@ -164,7 +164,7 @@ describe('get command tests', () => {
 
 		await expect(runResult).rejects.toEqual(
 			new Error(
-				'Unable to get mesh. Check the details and try again. If the error persists please contact support. RequestId: dummy_request_id',
+				'Unable to get mesh. Please check the details and try again. If the error persists please contact support. RequestId: dummy_request_id',
 			),
 		);
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
@@ -177,7 +177,7 @@ describe('get command tests', () => {
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
 		[
 		  [
-		    "Unable to get mesh. Check the details and try again. If the error persists please contact support. RequestId: dummy_request_id",
+		    "Unable to get mesh. Please check the details and try again. If the error persists please contact support. RequestId: dummy_request_id",
 		  ],
 		]
 	`);
@@ -193,7 +193,30 @@ describe('get command tests', () => {
 			verbose: true,
 		});
 		expect(initRequestId).toHaveBeenCalled();
-		expect(runResult).toEqual({ meshId: 'dummy_meshId', mesh: mockGetMeshConfig });
+		expect(runResult).toMatchInlineSnapshot(`
+		{
+		  "imsOrgId": "1234",
+		  "mesh": {
+		    "meshConfig": {
+		      "sources": [
+		        {
+		          "handler": {
+		            "graphql": {
+		              "endpoint": "<gql_endpoint>",
+		            },
+		          },
+		          "name": "<api_name>",
+		        },
+		      ],
+		    },
+		  },
+		  "meshId": "dummy_meshId",
+		  "meshUrl": "https://edge-sandbox-graph.adobe.io/api/dummy_meshId/graphql",
+		  "projectId": "5678",
+		  "workspaceId": "123456789",
+		  "workspaceName": "Workspace01",
+		}
+	`);
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
 		[
 		  [
@@ -240,7 +263,30 @@ describe('get command tests', () => {
 
 		const runResult = await GetCommand.run();
 
-		expect(runResult).toEqual({ meshId: 'dummy_meshId', mesh: mockGetMeshConfig });
+		expect(runResult).toMatchInlineSnapshot(`
+		{
+		  "imsOrgId": "1234",
+		  "mesh": {
+		    "meshConfig": {
+		      "sources": [
+		        {
+		          "handler": {
+		            "graphql": {
+		              "endpoint": "<gql_endpoint>",
+		            },
+		          },
+		          "name": "<api_name>",
+		        },
+		      ],
+		    },
+		  },
+		  "meshId": "dummy_meshId",
+		  "meshUrl": "https://edge-sandbox-graph.adobe.io/api/dummy_meshId/graphql",
+		  "projectId": "5678",
+		  "workspaceId": "123456789",
+		  "workspaceName": "Workspace01",
+		}
+	`);
 		expect(writeFile.mock.calls).toMatchInlineSnapshot(`
 		[
 		  [
@@ -294,7 +340,30 @@ describe('get command tests', () => {
 		});
 		const runResult = await GetCommand.run();
 
-		expect(runResult).toEqual({ meshId: 'dummy_meshId', mesh: mockGetMeshConfig });
+		expect(runResult).toMatchInlineSnapshot(`
+		{
+		  "imsOrgId": "1234",
+		  "mesh": {
+		    "meshConfig": {
+		      "sources": [
+		        {
+		          "handler": {
+		            "graphql": {
+		              "endpoint": "<gql_endpoint>",
+		            },
+		          },
+		          "name": "<api_name>",
+		        },
+		      ],
+		    },
+		  },
+		  "meshId": "dummy_meshId",
+		  "meshUrl": "https://edge-sandbox-graph.adobe.io/api/dummy_meshId/graphql",
+		  "projectId": "5678",
+		  "workspaceId": "123456789",
+		  "workspaceName": "Workspace01",
+		}
+	`);
 		expect(writeFile.mock.calls).toMatchInlineSnapshot(`
 		[
 		  [

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

@@ -12,7 +12,6 @@ governing permissions and limitations under the License.
 
 const RunCommand = require('../run');
 const {
-	startGraphqlServer,
 	interpolateMesh,
 	importFiles,
 	promptConfirm,
@@ -20,18 +19,18 @@ const {
 	initSdk,
 	writeSecretsFile,
 } = require('../../../helpers');
+const { runServer } = require('../../../server');
 const { getMeshId, getMeshArtifact } = require('../../../lib/devConsole');
 require('@adobe-apimesh/mesh-builder');
 
 jest.mock('../../../helpers', () => ({
 	initSdk: jest.fn().mockResolvedValue({
-		imsOrgCode: 'mockOrgCode',
+		imsOrgId: 'mockOrgId',
 		projectId: 'mockProjectId',
 		workspaceId: 'mockWorkspaceId',
 		workspaceName: 'mockWorkspaceTitle',
 	}),
 	initRequestId: jest.fn().mockResolvedValue({}),
-	startGraphqlServer: jest.fn().mockResolvedValue({}),
 	interpolateMesh: jest.fn().mockResolvedValue({}),
 	importFiles: jest.fn().mockResolvedValue(),
 	promptConfirm: jest.fn().mockResolvedValue(true),
@@ -39,6 +38,10 @@ jest.mock('../../../helpers', () => ({
 	writeSecretsFile: jest.fn().mockResolvedValue(),
 }));
 
+jest.mock('../../../server', () => ({
+	runServer: jest.fn().mockResolvedValue(),
+}));
+
 jest.mock('../../../lib/devConsole', () => ({
 	getMeshId: jest.fn().mockResolvedValue('mockMeshId'),
 	getMeshArtifact: jest.fn().mockResolvedValue(),
@@ -91,6 +94,10 @@ describe('run command tests', () => {
 		platformSpy.mockRestore();
 	});
 
+	beforeAll(() => {
+		jest.spyOn(RunCommand.prototype, 'copyMeshContent').mockImplementation(() => {});
+	});
+
 	test('snapshot run command description', () => {
 		expect(RunCommand.description).toMatchInlineSnapshot(
 			`"Run a local development server that builds and compiles a mesh locally"`,
@@ -189,11 +196,7 @@ describe('run command tests', () => {
 		parseSpy.mockResolvedValue(parseOutput);
 
 		await RunCommand.run();
-		expect(startGraphqlServer).toHaveBeenCalledWith(
-			expect.anything(),
-			parseOutput.flags.port,
-			false,
-		);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), parseOutput.flags.port);
 	});
 
 	test('should use the port number provided in the .env file if there is no port', async () => {
@@ -210,7 +213,7 @@ describe('run command tests', () => {
 		parseSpy.mockResolvedValue(parseOutput);
 
 		await RunCommand.run();
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), process.env.PORT, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), process.env.PORT);
 	});
 
 	test('should use the default port if port number is not provided explicitly', async () => {
@@ -226,7 +229,7 @@ describe('run command tests', () => {
 		parseSpy.mockResolvedValue(parseOutput);
 
 		await RunCommand.run();
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	test('should return error for run command if the mesh has placeholders and env file provided using --env flag is not found', async () => {
@@ -393,7 +396,7 @@ describe('run command tests', () => {
 		});
 
 		await RunCommand.run();
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	// file import tests
@@ -439,7 +442,7 @@ describe('run command tests', () => {
 		});
 
 		await RunCommand.run();
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	test('should fail if the file name is more than 25 characters', async () => {
@@ -615,7 +618,7 @@ describe('run command tests', () => {
 		});
 
 		await RunCommand.run();
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	test('should override if prompt returns Yes, if there is files array', async () => {
@@ -662,7 +665,7 @@ describe('run command tests', () => {
 
 		await RunCommand.run();
 
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	test('should pass for a fully-qualified meshConfig even if the file does not exist in fileSystem', async () => {
@@ -709,7 +712,7 @@ describe('run command tests', () => {
 		});
 
 		await RunCommand.run();
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	test('should pass if the file is located in subdirectory of mesh directory', async () => {
@@ -755,7 +758,7 @@ describe('run command tests', () => {
 
 		await RunCommand.run();
 
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	test('should fail if the file is outside the workspace directory', async () => {
@@ -862,13 +865,13 @@ describe('run command tests', () => {
 
 		expect(initSdk).toHaveBeenCalled();
 		expect(getMeshId).toHaveBeenCalledWith(
-			'mockOrgCode',
+			'mockOrgId',
 			'mockProjectId',
 			'mockWorkspaceId',
 			'mockWorkspaceTitle',
 		);
 		expect(getMeshArtifact).toHaveBeenCalledWith(
-			'mockOrgCode',
+			'mockOrgId',
 			'mockProjectId',
 			'mockWorkspaceId',
 			'mockWorkspaceTitle',
@@ -926,7 +929,7 @@ describe('run command tests', () => {
 
 		await RunCommand.run();
 		expect(writeSecretsFile).toHaveBeenCalled();
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	test('should return error if ran with secrets against windows platform with batch variables', async () => {
@@ -964,7 +967,7 @@ describe('run command tests', () => {
 
 		await RunCommand.run();
 		expect(writeSecretsFile).toHaveBeenCalled();
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	test('should pass if ran with secrets against darwin(macOS) platform with batch variables', async () => {
@@ -979,7 +982,7 @@ describe('run command tests', () => {
 
 		await RunCommand.run();
 		expect(writeSecretsFile).toHaveBeenCalled();
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 
 	test('should escape variables that are preceded by backslash symbol', async () => {
@@ -996,6 +999,6 @@ describe('run command tests', () => {
 			'Home: rootPath\nHomeString: $HOME\nHomeWithSlash: \\rootPath\nHomeStringWithSlash: \\$HOME\n',
 			expect.anything(),
 		);
-		expect(startGraphqlServer).toHaveBeenCalledWith(expect.anything(), defaultPort, false);
+		expect(runServer).toHaveBeenCalledWith(expect.anything(), defaultPort);
 	});
 });

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

@@ -88,7 +88,7 @@ describe('status command tests', () => {
 	describe('unexpected error', () => {
 		test('should output mesh not found error when mesh does not exist', async () => {
 			getMeshId.mockResolvedValue(null);
-			const expectedMessage = `Unable to get mesh status. No mesh found for Org(${mockOrg.code}) -> Project(${mockProject.id}) -> Workspace(${mockWorkspace.id}). Check the details and try again.`;
+			const expectedMessage = `Unable to get mesh status. No mesh found for Org(${mockOrg.id}) -> Project(${mockProject.id}) -> Workspace(${mockWorkspace.id}). Please check the details and try again.`;
 			const runResult = StatusCommand.run();
 			await expect(runResult).rejects.toEqual(new Error(expectedMessage));
 			expect(errorLogSpy).toHaveBeenCalledWith(expectedMessage);

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

@@ -50,7 +50,6 @@ describe('update command tests', () => {
 	beforeEach(() => {
 		initSdk.mockResolvedValue({
 			imsOrgId: selectedOrg.id,
-			imsOrgCode: selectedOrg.code,
 			projectId: selectedProject.id,
 			workspaceId: selectedWorkspace.id,
 			workspaceName: selectedWorkspace.title,
@@ -326,13 +325,13 @@ describe('update command tests', () => {
 		const runResult = UpdateCommand.run();
 
 		await expect(runResult).rejects.toMatchInlineSnapshot(
-			`[Error: Unable to get mesh ID. Check the details and try again. RequestId: dummy_request_id]`,
+			`[Error: Unable to get mesh ID. Please check the details and try again. RequestId: dummy_request_id]`,
 		);
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`[]`);
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
 		[
 		  [
-		    "Unable to get mesh ID. Check the details and try again. RequestId: dummy_request_id",
+		    "Unable to get mesh ID. Please check the details and try again. RequestId: dummy_request_id",
 		  ],
 		]
 	`);
@@ -374,7 +373,7 @@ describe('update command tests', () => {
 		// );
 
 		await expect(runResult).rejects.toMatchInlineSnapshot(
-			`[Error: Unable to update the mesh. Check the mesh configuration file and try again. If the error persists please contact support. RequestId: dummy_request_id]`,
+			`[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(`
 		[
@@ -386,7 +385,7 @@ describe('update command tests', () => {
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
 		[
 		  [
-		    "Unable to update the mesh. Check the mesh configuration file and try again. If the error persists please contact support. RequestId: dummy_request_id",
+		    "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",
 		  ],
 		]
 	`);
@@ -555,7 +554,7 @@ describe('update command tests', () => {
 		expect(initRequestId).toHaveBeenCalled();
 		expect(updateMesh.mock.calls[0]).toMatchInlineSnapshot(`
 		[
-		  "CODE1234@AdobeOrg",
+		  "1234",
 		  "5678",
 		  "123456789",
 		  "Workspace01",
@@ -723,7 +722,9 @@ describe('update command tests', () => {
 
 		const output = UpdateCommand.run();
 		await expect(output).rejects.toEqual(
-			new Error('Unable to import the files in the mesh config. Check the file and try again.'),
+			new Error(
+				'Unable to import the files in the mesh config. Please check the file and try again.',
+			),
 		);
 
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
@@ -737,7 +738,7 @@ describe('update command tests', () => {
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
 		[
 		  [
-		    "Unable to import the files in the mesh config. Check the file and try again.",
+		    "Unable to import the files in the mesh config. Please check the file and try again.",
 		  ],
 		]
 	`);

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

@@ -59,6 +59,7 @@ class CreateCommand extends Command {
 		const envFilePath = await flags.env;
 		const secretsFilePath = await flags.secrets;
 		const {
+			imsOrgId,
 			imsOrgCode,
 			projectId,
 			workspaceId,
@@ -82,7 +83,7 @@ class CreateCommand extends Command {
 				data = JSON.parse(inputMeshData);
 			} catch (err) {
 				this.log(err.message);
-				this.error('Input mesh file is not a valid JSON. Check the file provided.');
+				this.error('Input mesh file is not a valid JSON. Please check the file provided.');
 			}
 		}
 
@@ -101,7 +102,9 @@ class CreateCommand 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. Check the file and try again.');
+				this.error(
+					'Unable to import the files in the mesh config. Please check the file and try again.',
+				);
 			}
 		}
 
@@ -115,7 +118,7 @@ class CreateCommand extends Command {
 				data.secrets = encryptedSecrets;
 			} catch (err) {
 				this.log(err.message);
-				this.error('Unable to import secrets. Check the file and try again.');
+				this.error('Unable to import secrets. Please check the file and try again.');
 			}
 		}
 
@@ -128,7 +131,7 @@ class CreateCommand extends Command {
 		if (shouldContinue) {
 			try {
 				const { mesh } = await createMesh(
-					imsOrgCode,
+					imsOrgId,
 					projectId,
 					workspaceId,
 					workspaceName,
@@ -156,7 +159,7 @@ class CreateCommand extends Command {
 
 					// When renaming the return values, make sure to make necessary changes to
 					// template adobe/generator-app-api-mesh since it relies on "mesh"
-					return { mesh };
+					return { ...mesh, meshUrl, imsOrgId, projectId, workspaceId, workspaceName };
 				} else {
 					this.error(`Unable to create a mesh. Please try again. RequestId: ${global.requestId}`, {
 						exit: false,
@@ -166,7 +169,7 @@ class CreateCommand extends Command {
 				this.log(error.message);
 
 				this.error(
-					`Unable to create a mesh. Check the mesh configuration file and try again. If the error persists please contact support. RequestId: ${global.requestId}`,
+					`Unable to create a mesh. Please check the mesh configuration file and try again. If the error persists please contact support. RequestId: ${global.requestId}`,
 				);
 			}
 		} else {

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

@@ -34,14 +34,14 @@ class DeleteCommand extends Command {
 		const ignoreCache = await flags.ignoreCache;
 		const autoConfirmAction = await flags.autoConfirmAction;
 
-		const { imsOrgCode, projectId, workspaceId } = await initSdk({
+		const { imsOrgId, projectId, workspaceId } = await initSdk({
 			ignoreCache,
 		});
 
 		let meshId = null;
 
 		try {
-			meshId = await getMeshId(imsOrgCode, projectId, workspaceId);
+			meshId = await getMeshId(imsOrgId, projectId, workspaceId);
 		} catch (err) {
 			this.error(
 				`Unable to get mesh ID. Please check the details and try again. RequestId: ${global.requestId}`,
@@ -59,7 +59,7 @@ class DeleteCommand extends Command {
 
 			if (shouldContinue) {
 				try {
-					const deleteMeshResponse = await deleteMesh(imsOrgCode, projectId, workspaceId, meshId);
+					const deleteMeshResponse = await deleteMesh(imsOrgId, projectId, workspaceId, meshId);
 
 					if (deleteMeshResponse) {
 						this.log('Successfully deleted mesh %s', meshId);
@@ -72,7 +72,7 @@ class DeleteCommand extends Command {
 					this.log(error.message);
 
 					this.error(
-						`Unable to delete mesh. Check the details and try again. If the error persists please contact support. RequestId: ${global.requestId}`,
+						`Unable to delete mesh. Please check the details and try again. If the error persists please contact support. RequestId: ${global.requestId}`,
 					);
 				}
 			} else {
@@ -82,7 +82,7 @@ class DeleteCommand extends Command {
 			}
 		} else {
 			this.error(
-				`Unable to delete mesh. No mesh found for Org(${imsOrgCode}) -> Project(${projectId}) -> Workspace(${workspaceId}). Check the details and try again.`,
+				`Unable to delete. No mesh found for Org(${imsOrgId}) -> Project(${projectId}) -> Workspace(${workspaceId}). Please check the details and try again.`,
 			);
 		}
 	}

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

@@ -30,12 +30,12 @@ class DescribeCommand extends Command {
 
 		const { flags } = await this.parse(DescribeCommand);
 		const ignoreCache = await flags.ignoreCache;
-		const { imsOrgCode, imsOrgId, projectId, workspaceId, workspaceName } = await initSdk({
+		const { imsOrgId, projectId, workspaceId, workspaceName } = await initSdk({
 			ignoreCache,
 		});
 
 		try {
-			const meshDetails = await describeMesh(imsOrgCode, projectId, workspaceId, workspaceName);
+			const meshDetails = await describeMesh(imsOrgId, projectId, workspaceId, workspaceName);
 
 			if (meshDetails) {
 				const { meshId } = meshDetails;
@@ -49,7 +49,7 @@ class DescribeCommand extends Command {
 					this.log('Mesh ID: %s', meshId);
 					this.log('Mesh Endpoint: %s', meshUrl);
 
-					return meshDetails;
+					return { ...meshDetails, meshUrl, imsOrgId, projectId, workspaceId, workspaceName };
 				} else {
 					logger.error(
 						`Unable to get mesh details. Please check the details and try again. RequestId: ${global.requestId}`,