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

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"4.0.0-beta","commands":{"PLUGINNAME":{"id":"PLUGINNAME","description":"Your description here","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio PLUGINNAME:some_command"],"flags":{"someflag":{"name":"someflag","type":"option","char":"f","description":"this is some flag"}},"args":[]},"api-mesh:create":{"id":"api-mesh:create","description":"Create a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file"}]},"api-mesh:delete":{"id":"api-mesh:delete","description":"Delete the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false}},"args":[]},"api-mesh:describe":{"id":"api-mesh:describe","description":"Get details of a mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:get":{"id":"api-mesh:get","description":"Get the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false}},"args":[{"name":"file"}]},"api-mesh:init":{"id":"api-mesh:init","description":"This command will create a workspace where you can organise your API mesh configuration and other files","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":[{"description":"API mesh workspace init","command":"aio api-mesh init commerce-mesh"},{"description":"API mesh workspace init with flags","command":"aio api-mesh init commerce-mesh --path ./mesh_projects/test_mesh --git y --packageManager yarn"}],"flags":{"path":{"name":"path","type":"option","char":"p","default":"."},"packageManager":{"name":"packageManager","type":"option","char":"m","options":["npm","yarn"]},"git":{"name":"git","type":"option","char":"g","options":["y","n"]}},"args":[{"name":"projectName","description":"Project name","required":true}]},"api-mesh:log-get-bulk":{"id":"api-mesh:log-get-bulk","description":"Download all mesh logs for a selected time period.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"startTime":{"name":"startTime","type":"option","description":"Start time for the logs in UTC","required":true},"endTime":{"name":"endTime","type":"option","description":"End time for the logs in UTC","required":true},"filename":{"name":"filename","type":"option","description":"Path to the output file for logs","required":true}},"args":[]},"api-mesh:log-get":{"id":"api-mesh:log-get","description":"Get the Log of a given mesh by RayId","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[{"name":"rayId","description":"Fetch a single log by rayID","required":true}]},"api-mesh:log-list":{"id":"api-mesh:log-list","description":"Get recent logs of requests made to the API Mesh.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"filename":{"name":"filename","type":"option","description":"Name of CSV file to export the recent logs to"}},"args":[]},"api-mesh:run":{"id":"api-mesh:run","description":"Run a local development server that builds and compiles a mesh locally","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":[],"flags":{"port":{"name":"port","type":"option","char":"p","description":"Port number for the local dev server"},"debug":{"name":"debug","type":"boolean","description":"Enable debugging mode","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"select":{"name":"select","type":"boolean","description":"Retrieve existing artifacts from the mesh","allowNo":false},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file","description":"Mesh File"}]},"api-mesh:status":{"id":"api-mesh:status","description":"Get a mesh status with a given meshid.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:update":{"id":"api-mesh:update","description":"Update a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file"}]},"api-mesh:source:discover":{"id":"api-mesh:source:discover","description":"Return the list of avaliable sources","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm install action prompt. CLI will not check ask user to install source.","allowNo":false}},"args":[]},"api-mesh:source:get":{"id":"api-mesh:source:get","description":"Command returns the content of a specific source.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:get -s=<version>@<source_name>","$ aio api-mesh:source:get -s<source_name>","$ aio api-mesh:source:get -m"],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm print action prompt. CLI will not check ask user to print source.","allowNo":false},"source":{"name":"source","type":"option","char":"s","description":"Source name"},"multiple":{"name":"multiple","type":"boolean","char":"m","description":"Select multiple sources","allowNo":false}},"args":[]},"api-mesh:source:install":{"id":"api-mesh:source:install","description":"Command to install the source to your API mesh.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:install <version>@<source_name>","$ aio api-mesh:source:install <source_name> -v <variable_name>=<variable_value>","$ aio api-mesh:source:install <source_name> -f <path_to_variables_file>"],"flags":{"source":{"name":"source","type":"option","char":"s","description":"Source name"},"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm override action prompt. CLI will not check ask user to override source.","allowNo":false},"variable":{"name":"variable","type":"option","char":"v","description":"Variables required for the source"},"variable-file":{"name":"variable-file","type":"option","char":"f","description":"Variables file path"},"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[{"name":"source"}]}}}
+{"version":"4.1.0-alpha","commands":{"PLUGINNAME":{"id":"PLUGINNAME","description":"Your description here","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio PLUGINNAME:some_command"],"flags":{"someflag":{"name":"someflag","type":"option","char":"f","description":"this is some flag"}},"args":[]},"api-mesh:create":{"id":"api-mesh:create","description":"Create a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file"}]},"api-mesh:delete":{"id":"api-mesh:delete","description":"Delete the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false}},"args":[]},"api-mesh:describe":{"id":"api-mesh:describe","description":"Get details of a mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:get":{"id":"api-mesh:get","description":"Get the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false}},"args":[{"name":"file"}]},"api-mesh:init":{"id":"api-mesh:init","description":"This command will create a workspace where you can organise your API mesh configuration and other files","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":[{"description":"API mesh workspace init","command":"aio api-mesh init commerce-mesh"},{"description":"API mesh workspace init with flags","command":"aio api-mesh init commerce-mesh --path ./mesh_projects/test_mesh --git y --packageManager yarn"}],"flags":{"path":{"name":"path","type":"option","char":"p","default":"."},"packageManager":{"name":"packageManager","type":"option","char":"m","options":["npm","yarn"]},"git":{"name":"git","type":"option","char":"g","options":["y","n"]}},"args":[{"name":"projectName","description":"Project name","required":true}]},"api-mesh:log-get-bulk":{"id":"api-mesh:log-get-bulk","description":"Download all mesh logs for a selected time period.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"startTime":{"name":"startTime","type":"option","description":"Start time for the logs in UTC","required":true},"endTime":{"name":"endTime","type":"option","description":"End time for the logs in UTC","required":true},"filename":{"name":"filename","type":"option","description":"Path to the output file for logs","required":true}},"args":[]},"api-mesh:log-get":{"id":"api-mesh:log-get","description":"Get the Log of a given mesh by RayId","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[{"name":"rayId","description":"Fetch a single log by rayID","required":true}]},"api-mesh:log-list":{"id":"api-mesh:log-list","description":"Get recent logs of requests made to the API Mesh.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"filename":{"name":"filename","type":"option","description":"Name of CSV file to export the recent logs to"}},"args":[]},"api-mesh:run":{"id":"api-mesh:run","description":"Run a local development server that builds and compiles a mesh locally","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":[],"flags":{"port":{"name":"port","type":"option","char":"p","description":"Port number for the local dev server"},"debug":{"name":"debug","type":"boolean","description":"Enable debugging mode","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"select":{"name":"select","type":"boolean","description":"Retrieve existing artifacts from the mesh","allowNo":false},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file","description":"Mesh File"}]},"api-mesh:status":{"id":"api-mesh:status","description":"Get a mesh status with a given meshid.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:update":{"id":"api-mesh:update","description":"Update a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file"}]},"api-mesh:source:discover":{"id":"api-mesh:source:discover","description":"Return the list of avaliable sources","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm install action prompt. CLI will not check ask user to install source.","allowNo":false}},"args":[]},"api-mesh:source:get":{"id":"api-mesh:source:get","description":"Command returns the content of a specific source.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:get -s=<version>@<source_name>","$ aio api-mesh:source:get -s<source_name>","$ aio api-mesh:source:get -m"],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm print action prompt. CLI will not check ask user to print source.","allowNo":false},"source":{"name":"source","type":"option","char":"s","description":"Source name"},"multiple":{"name":"multiple","type":"boolean","char":"m","description":"Select multiple sources","allowNo":false}},"args":[]},"api-mesh:source:install":{"id":"api-mesh:source:install","description":"Command to install the source to your API mesh.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:install <version>@<source_name>","$ aio api-mesh:source:install <source_name> -v <variable_name>=<variable_value>","$ aio api-mesh:source:install <source_name> -f <path_to_variables_file>"],"flags":{"source":{"name":"source","type":"option","char":"s","description":"Source name"},"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm override action prompt. CLI will not check ask user to override source.","allowNo":false},"variable":{"name":"variable","type":"option","char":"v","description":"Variables required for the source"},"variable-file":{"name":"variable-file","type":"option","char":"f","description":"Variables file path"},"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[{"name":"source"}]}}}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@adobe/aio-cli-plugin-api-mesh",
-	"version": "4.0.0-beta",
+	"version": "4.1.0-alpha",
 	"description": "Adobe I/O CLI plugin to develop and manage API mesh sources",
 	"keywords": [
 		"oclif-plugin"
@@ -37,7 +37,7 @@
 		"version": "oclif-dev readme && git add README.md"
 	},
 	"dependencies": {
-		"@adobe-apimesh/mesh-builder": "1.7.1",
+		"@adobe-apimesh/mesh-builder": "2.0.0",
 		"@adobe/aio-cli-lib-console": "^5.0.0",
 		"@adobe/aio-lib-core-config": "^5.0.0",
 		"@adobe/aio-lib-core-logging": "^3.0.0",

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

@@ -295,7 +295,7 @@ describe('create command tests', () => {
 		const runResult = CreateCommand.run();
 		await expect(runResult).rejects.toEqual(
 			new Error(
-				'Unable to create a mesh. Please check the mesh configuration file and try again. If the error persists please contact support. RequestId: dummy_request_id',
+				'Unable to create a mesh. Check the mesh configuration file and try again. If the error persists please contact support. RequestId: dummy_request_id',
 			),
 		);
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
@@ -308,7 +308,7 @@ describe('create command tests', () => {
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
 		[
 		  [
-		    "Unable to create a mesh. Please check the mesh configuration file and try again. If the error persists please contact support. RequestId: dummy_request_id",
+		    "Unable to create a mesh. Check the mesh configuration file and try again. If the error persists please contact support. RequestId: dummy_request_id",
 		  ],
 		]
 	`);
@@ -320,7 +320,7 @@ describe('create command tests', () => {
 		expect(initRequestId).toHaveBeenCalled();
 		expect(createMesh.mock.calls[0]).toMatchInlineSnapshot(`
 		[
-		  "1234",
+		  "CODE1234@AdobeOrg",
 		  "5678",
 		  "123456789",
 		  "Workspace01",
@@ -399,7 +399,7 @@ describe('create command tests', () => {
 		expect(initRequestId).toHaveBeenCalled();
 		expect(createMesh.mock.calls[0]).toMatchInlineSnapshot(`
 		[
-		  "1234",
+		  "CODE1234@AdobeOrg",
 		  "5678",
 		  "123456789",
 		  "Workspace01",
@@ -787,13 +787,13 @@ describe('create command tests', () => {
 
 		const runResult = CreateCommand.run();
 		await expect(runResult).rejects.toEqual(
-			new Error('Input mesh file is not a valid JSON. Please check the file provided.'),
+			new Error('Input mesh file is not a valid JSON. Check the file provided.'),
 		);
 
 		await expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
 		[
 		  [
-		    "Input mesh file is not a valid JSON. Please check the file provided.",
+		    "Input mesh file is not a valid JSON. Check the file provided.",
 		  ],
 		]
 	`);
@@ -851,7 +851,7 @@ describe('create command tests', () => {
 		expect(initRequestId).toHaveBeenCalled();
 		expect(createMesh.mock.calls[0]).toMatchInlineSnapshot(`
 		[
-		  "1234",
+		  "CODE1234@AdobeOrg",
 		  "5678",
 		  "123456789",
 		  "Workspace01",
@@ -998,9 +998,7 @@ describe('create command tests', () => {
 
 		const output = CreateCommand.run();
 		await expect(output).rejects.toEqual(
-			new Error(
-				'Unable to import the files in the mesh config. Please check the file and try again.',
-			),
+			new Error('Unable to import the files in the mesh config. Check the file and try again.'),
 		);
 
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
@@ -1014,7 +1012,7 @@ describe('create command tests', () => {
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
 		[
 		  [
-		    "Unable to import the files in the mesh config. Please check the file and try again.",
+		    "Unable to import the files in the mesh config. Check the file and try again.",
 		  ],
 		]
 	`);
@@ -1035,9 +1033,7 @@ describe('create command tests', () => {
 		const output = CreateCommand.run();
 
 		await expect(output).rejects.toEqual(
-			new Error(
-				'Unable to import the files in the mesh config. Please check the file and try again.',
-			),
+			new Error('Unable to import the files in the mesh config. Check the file and try again.'),
 		);
 
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
@@ -1051,7 +1047,7 @@ describe('create command tests', () => {
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
 		[
 		  [
-		    "Unable to import the files in the mesh config. Please check the file and try again.",
+		    "Unable to import the files in the mesh config. Check the file and try again.",
 		  ],
 		]
 	`);
@@ -1364,7 +1360,7 @@ describe('create command tests', () => {
 		expect(initRequestId).toHaveBeenCalled();
 		expect(createMesh.mock.calls[0]).toMatchInlineSnapshot(`
 		[
-		  "1234",
+		  "CODE1234@AdobeOrg",
 		  "5678",
 		  "123456789",
 		  "Workspace01",
@@ -1489,7 +1485,7 @@ describe('create command tests', () => {
 		expect(initRequestId).toHaveBeenCalled();
 		expect(createMesh.mock.calls[0]).toMatchInlineSnapshot(`
 		[
-		  "1234",
+		  "CODE1234@AdobeOrg",
 		  "5678",
 		  "123456789",
 		  "Workspace01",
@@ -1604,9 +1600,7 @@ describe('create command tests', () => {
 		const output = CreateCommand.run();
 
 		await expect(output).rejects.toEqual(
-			new Error(
-				'Unable to import the files in the mesh config. Please check the file and try again.',
-			),
+			new Error('Unable to import the files in the mesh config. Check the file and try again.'),
 		);
 
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
@@ -1620,7 +1614,7 @@ describe('create command tests', () => {
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
 		[
 		  [
-		    "Unable to import the files in the mesh config. Please check the file and try again.",
+		    "Unable to import the files in the mesh config. Check the file and try again.",
 		  ],
 		]
 	`);
@@ -1706,13 +1700,13 @@ describe('create command tests', () => {
 		const runResult = CreateCommand.run();
 
 		await expect(runResult).rejects.toEqual(
-			new Error('Unable to import secrets. Please check the file and try again.'),
+			new Error('Unable to import secrets. Check the file and try again.'),
 		);
 
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
 		[
 		  [
-		    "Unable to import secrets. Please check the file and try again.",
+		    "Unable to import secrets. Check the file and try again.",
 		  ],
 		]
 	`);
@@ -1731,7 +1725,7 @@ describe('create command tests', () => {
 		const runResult = CreateCommand.run();
 
 		await expect(runResult).rejects.toEqual(
-			new Error('Unable to import secrets. Please check the file and try again.'),
+			new Error('Unable to import secrets. Check the file and try again.'),
 		);
 
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
@@ -1745,7 +1739,7 @@ describe('create command tests', () => {
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
 		[
 		  [
-		    "Unable to import secrets. Please check the file and try again.",
+		    "Unable to import secrets. Check the file and try again.",
 		  ],
 		]
 	`);
@@ -1801,7 +1795,7 @@ describe('create command tests', () => {
 		const runResult = CreateCommand.run();
 
 		await expect(runResult).rejects.toEqual(
-			new Error('Unable to import secrets. Please check the file and try again.'),
+			new Error('Unable to import secrets. Check the file and try again.'),
 		);
 
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
@@ -1814,7 +1808,7 @@ describe('create command tests', () => {
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
 		[
 		  [
-		    "Unable to import secrets. Please check the file and try again.",
+		    "Unable to import secrets. Check the file and try again.",
 		  ],
 		]
 	`);
@@ -1910,7 +1904,7 @@ describe('create command tests', () => {
 
 		const runResult = CreateCommand.run();
 		await expect(runResult).rejects.toEqual(
-			new Error('Unable to import secrets. Please check the file and try again.'),
+			new Error('Unable to import secrets. Check the file and try again.'),
 		);
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
 		[

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({
-			imsOrgId: selectedOrg.id,
+			imsOrgCode: selectedOrg.code,
 			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. No mesh found for Org(1234) -> Project(5678) -> Workspace(123456789). Please check the details and try again."`,
+				`"Unable to delete mesh. No mesh found for Org(CODE1234@AdobeOrg) -> Project(5678) -> Workspace(123456789). Check the details and try again."`,
 			);
 			expect(logSpy.mock.calls).toMatchInlineSnapshot(`[]`);
 			expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
 			[
 			  [
-			    "Unable to delete. No mesh found for Org(1234) -> Project(5678) -> Workspace(123456789). Please check the details and try again.",
+			    "Unable to delete mesh. No mesh found for Org(CODE1234@AdobeOrg) -> Project(5678) -> Workspace(123456789). 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. Please check the details and try again. If the error persists please contact support. RequestId: dummy_request_id',
+				'Unable to delete mesh. 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. Please check the details and try again. If the error persists please contact support. RequestId: dummy_request_id",
+		    "Unable to delete mesh. 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(`
 		[
 		  [
-		    "1234",
+		    "CODE1234@AdobeOrg",
 		    "5678",
 		    "123456789",
 		    "mesh_id",

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

@@ -199,7 +199,7 @@ describe('describe command tests', () => {
 
 		expect(initRequestId).toHaveBeenCalled();
 		expect(describeMesh).toHaveBeenCalledWith(
-			selectedOrg.id,
+			selectedOrg.code,
 			selectedProject.id,
 			selectedWorkspace.id,
 			selectedWorkspace.title,
@@ -250,7 +250,7 @@ describe('describe command tests', () => {
 
 		expect(initRequestId).toHaveBeenCalled();
 		expect(describeMesh).toHaveBeenCalledWith(
-			selectedOrg.id,
+			selectedOrg.code,
 			selectedProject.id,
 			selectedWorkspace.id,
 			selectedWorkspace.title,

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). Please check the details and try again."`,
+				`"Unable to get mesh config. No mesh found for Org(1234) -> Project(5678) -> Workspace(123456789). 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). Please check the details and try again.",
+			    "Unable to get mesh config. No mesh found for Org(1234) -> Project(5678) -> Workspace(123456789). 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. Please check the details and try again. RequestId: dummy_request_id"`,
+				`"Unable to get mesh ID. 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. Please check the details and try again. RequestId: dummy_request_id",
+			    "Unable to get mesh ID. 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. Please check the details and try again. If the error persists please contact support. RequestId: dummy_request_id',
+				'Unable to get mesh. 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. Please check the details and try again. If the error persists please contact support. RequestId: dummy_request_id",
+		    "Unable to get mesh. Check the details and try again. If the error persists please contact support. RequestId: dummy_request_id",
 		  ],
 		]
 	`);

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

@@ -25,7 +25,7 @@ require('@adobe-apimesh/mesh-builder');
 
 jest.mock('../../../helpers', () => ({
 	initSdk: jest.fn().mockResolvedValue({
-		imsOrgId: 'mockOrgId',
+		imsOrgCode: 'mockOrgCode',
 		projectId: 'mockProjectId',
 		workspaceId: 'mockWorkspaceId',
 		workspaceName: 'mockWorkspaceTitle',
@@ -862,13 +862,13 @@ describe('run command tests', () => {
 
 		expect(initSdk).toHaveBeenCalled();
 		expect(getMeshId).toHaveBeenCalledWith(
-			'mockOrgId',
+			'mockOrgCode',
 			'mockProjectId',
 			'mockWorkspaceId',
 			'mockWorkspaceTitle',
 		);
 		expect(getMeshArtifact).toHaveBeenCalledWith(
-			'mockOrgId',
+			'mockOrgCode',
 			'mockProjectId',
 			'mockWorkspaceId',
 			'mockWorkspaceTitle',

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

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

@@ -59,7 +59,6 @@ class CreateCommand extends Command {
 		const envFilePath = await flags.env;
 		const secretsFilePath = await flags.secrets;
 		const {
-			imsOrgId,
 			imsOrgCode,
 			projectId,
 			workspaceId,
@@ -83,7 +82,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. Please check the file provided.');
+				this.error('Input mesh file is not a valid JSON. Check the file provided.');
 			}
 		}
 
@@ -102,9 +101,7 @@ 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. Please check the file and try again.',
-				);
+				this.error('Unable to import the files in the mesh config. Check the file and try again.');
 			}
 		}
 
@@ -118,7 +115,7 @@ class CreateCommand 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.');
 			}
 		}
 
@@ -131,7 +128,7 @@ class CreateCommand extends Command {
 		if (shouldContinue) {
 			try {
 				const { mesh } = await createMesh(
-					imsOrgId,
+					imsOrgCode,
 					projectId,
 					workspaceId,
 					workspaceName,
@@ -169,7 +166,7 @@ class CreateCommand extends Command {
 				this.log(error.message);
 
 				this.error(
-					`Unable to create a mesh. Please check the mesh configuration file and try again. If the error persists please contact support. RequestId: ${global.requestId}`,
+					`Unable to create a mesh. 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 { imsOrgId, projectId, workspaceId } = await initSdk({
+		const { imsOrgCode, projectId, workspaceId } = await initSdk({
 			ignoreCache,
 		});
 
 		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}`,
@@ -59,7 +59,7 @@ class DeleteCommand extends Command {
 
 			if (shouldContinue) {
 				try {
-					const deleteMeshResponse = await deleteMesh(imsOrgId, projectId, workspaceId, meshId);
+					const deleteMeshResponse = await deleteMesh(imsOrgCode, 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. Please check the details and try again. If the error persists please contact support. RequestId: ${global.requestId}`,
+						`Unable to delete mesh. 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. No mesh found for Org(${imsOrgId}) -> Project(${projectId}) -> Workspace(${workspaceId}). Please check the details and try again.`,
+				`Unable to delete mesh. No mesh found for Org(${imsOrgCode}) -> Project(${projectId}) -> Workspace(${workspaceId}). 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 { imsOrgId, projectId, workspaceId, workspaceName } = await initSdk({
+		const { imsOrgCode, imsOrgId, projectId, workspaceId, workspaceName } = await initSdk({
 			ignoreCache,
 		});
 
 		try {
-			const meshDetails = await describeMesh(imsOrgId, projectId, workspaceId, workspaceName);
+			const meshDetails = await describeMesh(imsOrgCode, projectId, workspaceId, workspaceName);
 
 			if (meshDetails) {
 				const { meshId } = meshDetails;

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

@@ -37,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,
 		});
@@ -45,16 +45,16 @@ 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));
@@ -75,7 +75,7 @@ class GetCommand extends Command {
 					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 },
 					);
 				}
@@ -83,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/run.js

@@ -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}`,

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,12 +37,12 @@ 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, '*'));

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/lib/devConsole.js

@@ -12,7 +12,7 @@ const exec = util.promisify(require('child_process').exec);
 const contentDisposition = require('content-disposition');
 const chalk = require('chalk');
 
-const { DEV_CONSOLE_TRANSPORTER_API_KEY, SMS_BASE_URL } = CONSTANTS;
+const { DEV_CONSOLE_TRANSPORTER_API_KEY, SMS_BASE_URL, SMS_API_KEY } = CONSTANTS;
 
 const { objToString, getDevConsoleConfig } = require('../helpers');
 
@@ -113,7 +113,7 @@ const describeMesh = async (organizationId, projectId, workspaceId, workspaceNam
  * @returns
  */
 const listLogs = async (organizationCode, projectId, workspaceId, meshId, fileName) => {
-	const { accessToken, apiKey } = await getDevConsoleConfig();
+	const { accessToken } = await getDevConsoleConfig();
 	const url = `${SMS_BASE_URL}/organizations/${organizationCode}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}/logs/list`;
 	const config = {
 		method: 'get',
@@ -121,7 +121,7 @@ const listLogs = async (organizationCode, projectId, workspaceId, meshId, fileNa
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
-			'X-Api-Key': apiKey,
+			'x-api-key': SMS_API_KEY,
 		},
 	};
 
@@ -142,20 +142,21 @@ const listLogs = async (organizationCode, projectId, workspaceId, meshId, fileNa
 };
 
 const getMesh = async (organizationId, projectId, workspaceId, workspaceName, meshId) => {
-	const { baseUrl: devConsoleUrl, accessToken, apiKey } = await getDevConsoleConfig();
+	const { accessToken } = await getDevConsoleConfig();
 	const config = {
 		method: 'get',
-		url: `${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}?API_KEY=${apiKey}`,
+		url: `${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
 			'workspaceName': workspaceName,
+			'x-api-key': SMS_API_KEY,
 		},
 	};
 
 	logger.info(
 		'Initiating GET %s',
-		`${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}?API_KEY=${apiKey}`,
+		`${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}`,
 	);
 
 	try {
@@ -232,10 +233,10 @@ const createMesh = async (
 	projectName,
 	data,
 ) => {
-	const { baseUrl: devConsoleUrl, accessToken, apiKey } = await getDevConsoleConfig();
+	const { accessToken } = await getDevConsoleConfig();
 	const config = {
 		method: 'post',
-		url: `${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes?API_KEY=${apiKey}`,
+		url: `${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'Content-Type': 'application/json',
@@ -243,13 +244,14 @@ const createMesh = async (
 			'workspaceName': workspaceName,
 			'orgName': orgName,
 			'projectName': projectName,
+			'x-api-key': SMS_API_KEY,
 		},
 		data: JSON.stringify(data),
 	};
 
 	logger.info(
 		'Initiating POST %s',
-		`${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes?API_KEY=${apiKey}`,
+		`${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes`,
 	);
 
 	try {
@@ -343,10 +345,10 @@ const updateMesh = async (
 	meshId,
 	data,
 ) => {
-	const { baseUrl: devConsoleUrl, accessToken, apiKey } = await getDevConsoleConfig();
+	const { accessToken } = await getDevConsoleConfig();
 	const config = {
 		method: 'put',
-		url: `${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}?API_KEY=${apiKey}`,
+		url: `${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'Content-Type': 'application/json',
@@ -354,13 +356,14 @@ const updateMesh = async (
 			'workspaceName': workspaceName,
 			'orgName': orgName,
 			'projectName': projectName,
+			'x-api-key': SMS_API_KEY,
 		},
 		data: JSON.stringify(data),
 	};
 
 	logger.info(
 		'Initiating PUT %s',
-		`${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}?API_KEY=${apiKey}`,
+		`${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}`,
 	);
 
 	try {
@@ -433,19 +436,20 @@ const updateMesh = async (
 };
 
 const deleteMesh = async (organizationId, projectId, workspaceId, meshId) => {
-	const { baseUrl: devConsoleUrl, accessToken, apiKey } = await getDevConsoleConfig();
+	const { accessToken } = await getDevConsoleConfig();
 	const config = {
 		method: 'delete',
-		url: `${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}?API_KEY=${apiKey}`,
+		url: `${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
+			'x-api-key': SMS_API_KEY,
 		},
 	};
 
 	logger.info(
 		'Initiating DELETE %s',
-		`${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}?API_KEY=${apiKey}`,
+		`${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}`,
 	);
 
 	try {
@@ -517,23 +521,24 @@ const deleteMesh = async (organizationId, projectId, workspaceId, meshId) => {
 	}
 };
 
-const getMeshId = async (organizationId, projectId, workspaceId, workspaceName) => {
-	const { baseUrl: devConsoleUrl, accessToken, apiKey } = await getDevConsoleConfig();
+const getMeshId = async (organizationCode, projectId, workspaceId, workspaceName) => {
+	const { accessToken } = await getDevConsoleConfig();
 	logger.info('Initiating Mesh ID request');
 
 	const config = {
 		method: 'get',
-		url: `${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/describe?API_KEY=${apiKey}`,
+		url: `${SMS_BASE_URL}/organizations/${organizationCode}/projects/${projectId}/workspaces/${workspaceId}/mesh`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
 			'workspaceName': workspaceName,
+			'x-api-key': SMS_API_KEY,
 		},
 	};
 
 	logger.info(
 		'Initiating GET %s',
-		`${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/describe?API_KEY=${apiKey}`,
+		`${SMS_BASE_URL}/organizations/${organizationCode}/projects/${projectId}/workspaces/${workspaceId}/mesh`,
 	);
 
 	try {
@@ -805,21 +810,22 @@ const unsubscribeCredentialFromMeshService = async (
 };
 
 const getMeshArtifact = async (organizationId, projectId, workspaceId, workspaceName, meshId) => {
-	const { baseUrl: devConsoleUrl, accessToken, apiKey } = await getDevConsoleConfig();
+	const { accessToken } = await getDevConsoleConfig();
 	const config = {
 		method: 'get',
-		url: `${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}/artifact?API_KEY=${apiKey}`,
+		url: `${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}/artifact`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
 			'workspaceName': workspaceName,
+			'x-api-key': SMS_API_KEY,
 		},
 		responseType: 'arraybuffer',
 	};
 
 	logger.info(
 		'Initiating GET %s',
-		`${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}/artifact?API_KEY=${apiKey}`,
+		`${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}/artifact`,
 	);
 
 	try {
@@ -862,14 +868,14 @@ const getMeshArtifact = async (organizationId, projectId, workspaceId, workspace
  * @returns {Promise<Object>}
  */
 const getTenantFeatures = async organizationCode => {
-	const { accessToken, apiKey } = await getDevConsoleConfig();
+	const { accessToken } = await getDevConsoleConfig();
 	const config = {
 		method: 'get',
 		url: `${SMS_BASE_URL}/organizations/${organizationCode}/features`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
-			'X-Api-Key': apiKey,
+			'x-api-key': SMS_API_KEY,
 		},
 	};
 
@@ -917,14 +923,14 @@ const getTenantFeatures = async organizationCode => {
  * @returns {Promise<Object>}
  */
 const getMeshDeployments = async (organizationCode, projectId, workspaceId, meshId) => {
-	const { accessToken, apiKey } = await getDevConsoleConfig();
+	const { accessToken } = await getDevConsoleConfig();
 	const config = {
 		method: 'get',
 		url: `${SMS_BASE_URL}/organizations/${organizationCode}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}/deployments/latest`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
-			'X-Api-Key': apiKey,
+			'x-api-key': SMS_API_KEY,
 		},
 	};
 
@@ -973,14 +979,14 @@ const getMeshDeployments = async (organizationCode, projectId, workspaceId, mesh
  * @returns string
  */
 const getPublicEncryptionKey = async organizationCode => {
-	const { accessToken, apiKey } = await getDevConsoleConfig();
+	const { accessToken } = await getDevConsoleConfig();
 	const config = {
 		method: 'get',
 		url: `${SMS_BASE_URL}/organizations/${organizationCode}/getPublicKey`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
-			'X-Api-Key': apiKey,
+			'x-api-key': SMS_API_KEY,
 		},
 	};
 	logger.info(
@@ -1018,14 +1024,14 @@ const getPresignedUrls = async (
 	startTime,
 	endTime,
 ) => {
-	const { accessToken, apiKey } = await getDevConsoleConfig();
+	const { accessToken } = await getDevConsoleConfig();
 	const config = {
 		method: 'get',
 		url: `${SMS_BASE_URL}/organizations/${organizationCode}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}/logs?startDateTime=${startTime}&endDateTime=${endTime}`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
-			'X-Api-Key': apiKey,
+			'x-api-key': SMS_API_KEY,
 		},
 	};
 
@@ -1057,14 +1063,14 @@ const getPresignedUrls = async (
 };
 
 const getLogsByRayId = async (organizationCode, projectId, workspaceId, meshId, rayId) => {
-	const { accessToken, apiKey } = await getDevConsoleConfig();
+	const { accessToken } = await getDevConsoleConfig();
 	const config = {
 		method: 'get',
 		url: `${SMS_BASE_URL}/organizations/${organizationCode}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}/logs/${rayId}`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
-			'X-Api-Key': apiKey,
+			'x-api-key': SMS_API_KEY,
 		},
 	};