@adobe/aio-cli-plugin-api-mesh 2.3.0 → 2.3.2

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"2.3.0","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"}},"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: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"}},"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":"2.3.2","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"}},"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: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"}},"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": "2.3.0",
+	"version": "2.3.2",
 	"publishConfig": {
 		"access": "public"
 	},

package/src/commands/__fixtures__/sample_mesh_with_composer_files.json

@@ -0,0 +1,42 @@
+{
+	"meshConfig": {
+		"sources": [
+			{
+				"name": "<json_source_name>",
+				"handler": {
+					"JsonSchema": {
+						"baseUrl": "<json_source__baseurl>",
+						"operations": [
+							{
+								"type": "Query",
+								"field": "<query>",
+								"path": "<query_path>",
+								"method": "POST",
+								"requestSchema": "./requestParams.json"
+							}
+						]
+					}
+				}
+			}
+		],
+		"plugins": [
+			{
+				"hooks": {
+					"beforeAll": {
+						"composer": "./hooks.js#functionName"
+					}
+				}
+			}
+		],
+		"files": [
+			{
+				"path": "./requestParams.json",
+				"content": "{\"type\":\"dummyContent\"}"
+			},
+			{
+				"path": "./hooks.js",
+				"content": "module.exports.functionName = () => { console.log('beforeAll hook'); }"
+			}
+		]
+	}
+}

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

@@ -14,6 +14,7 @@ const mockConsoleCLIInstance = {};
 
 const CreateCommand = require('../create');
 const sampleCreateMeshConfig = require('../../__fixtures__/sample_mesh.json');
+const meshConfigWithComposerFiles = require('../../__fixtures__/sample_mesh_with_composer_files.json');
 const {
 	initSdk,
 	initRequestId,
@@ -22,6 +23,7 @@ const {
 	importFiles,
 } = require('../../../helpers');
 const {
+	getMesh,
 	createMesh,
 	createAPIMeshCredentials,
 	subscribeCredentialToMeshService,
@@ -82,6 +84,12 @@ describe('create command tests', () => {
 		});
 		subscribeCredentialToMeshService.mockResolvedValue(['dummy_service']);
 
+		let fetchedMeshConfig = sampleCreateMeshConfig;
+		fetchedMeshConfig.meshId = 'dummy_id';
+		fetchedMeshConfig.meshURL = '';
+
+		getMesh.mockResolvedValue(fetchedMeshConfig);
+
 		parseSpy = jest.spyOn(CreateCommand.prototype, 'parse');
 		parseSpy.mockResolvedValue({
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
@@ -158,6 +166,78 @@ describe('create command tests', () => {
 	`);
 		expect(CreateCommand.aliases).toMatchInlineSnapshot(`[]`);
 	});
+
+	test('should pass if a valid mesh config file with composer files are provided', async () => {
+		createMesh.mockResolvedValueOnce({
+			meshId: 'dummy_mesh_id',
+			meshConfig: meshConfigWithComposerFiles.meshConfig,
+		});
+
+		parseSpy.mockResolvedValueOnce({
+			args: { file: 'src/commands/__fixtures__/sample_mesh_with_composer_files.json' },
+			flags: {
+				autoConfirmAction: Promise.resolve(true),
+			},
+		});
+
+		const output = await CreateCommand.run();
+
+		expect(output).toMatchInlineSnapshot(`
+		{
+		  "adobeIdIntegrationsForWorkspace": {
+		    "apiKey": "dummy_api_key",
+		    "id": "dummy_id",
+		  },
+		  "mesh": {
+		    "meshConfig": {
+		      "files": [
+		        {
+		          "content": "{"type":"dummyContent"}",
+		          "path": "./requestParams.json",
+		        },
+		        {
+		          "content": "module.exports.functionName = () => { console.log('beforeAll hook'); }",
+		          "path": "./hooks.js",
+		        },
+		      ],
+		      "plugins": [
+		        {
+		          "hooks": {
+		            "beforeAll": {
+		              "composer": "./hooks.js#functionName",
+		            },
+		          },
+		        },
+		      ],
+		      "sources": [
+		        {
+		          "handler": {
+		            "JsonSchema": {
+		              "baseUrl": "<json_source__baseurl>",
+		              "operations": [
+		                {
+		                  "field": "<query>",
+		                  "method": "POST",
+		                  "path": "<query_path>",
+		                  "requestSchema": "./requestParams.json",
+		                  "type": "Query",
+		                },
+		              ],
+		            },
+		          },
+		          "name": "<json_source_name>",
+		        },
+		      ],
+		    },
+		    "meshId": "dummy_mesh_id",
+		  },
+		  "sdkList": [
+		    "dummy_service",
+		  ],
+		}
+	`);
+	});
+
 	test('should fail if create mesh api has failed', async () => {
 		createMesh.mockRejectedValueOnce(new Error('create mesh api failed'));
 
@@ -182,6 +262,7 @@ describe('create command tests', () => {
 		]
 	`);
 	});
+
 	test('should create if a valid mesh config file is provided', async () => {
 		const runResult = await CreateCommand.run();
 
@@ -284,6 +365,113 @@ describe('create command tests', () => {
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`[]`);
 	});
 
+	test('should create and return Ti mesh url if a valid mesh config file for TI client is provided', async () => {
+		let fetchedMeshConfig = sampleCreateMeshConfig;
+		fetchedMeshConfig.meshId = 'dummy_id';
+		fetchedMeshConfig.meshURL = 'https://tigraph.adobe.io';
+		getMesh.mockResolvedValueOnce(fetchedMeshConfig);
+
+		const runResult = await CreateCommand.run();
+
+		expect(initRequestId).toHaveBeenCalled();
+		expect(createMesh.mock.calls[0]).toMatchInlineSnapshot(`
+		[
+		  "1234",
+		  "5678",
+		  "123456789",
+		  {
+		    "meshConfig": {
+		      "sources": [
+		        {
+		          "handler": {
+		            "graphql": {
+		              "endpoint": "<gql_endpoint>",
+		            },
+		          },
+		          "name": "<api_name>",
+		        },
+		      ],
+		    },
+		  },
+		]
+	`);
+		expect(createAPIMeshCredentials.mock.calls[0]).toMatchInlineSnapshot(`
+		[
+		  "1234",
+		  "5678",
+		  "123456789",
+		]
+	`);
+		expect(subscribeCredentialToMeshService.mock.calls[0]).toMatchInlineSnapshot(`
+		[
+		  "1234",
+		  "5678",
+		  "123456789",
+		  "dummy_id",
+		]
+	`);
+		expect(runResult).toMatchInlineSnapshot(`
+		{
+		  "adobeIdIntegrationsForWorkspace": {
+		    "apiKey": "dummy_api_key",
+		    "id": "dummy_id",
+		  },
+		  "mesh": {
+		    "meshConfig": {
+		      "sources": [
+		        {
+		          "handler": {
+		            "graphql": {
+		              "endpoint": "<gql_endpoint>",
+		            },
+		          },
+		          "name": "<api_name>",
+		        },
+		      ],
+		    },
+		    "meshId": "dummy_mesh_id",
+		  },
+		  "sdkList": [
+		    "dummy_service",
+		  ],
+		}
+	`);
+		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
+		[
+		  [
+		    "******************************************************************************************************",
+		  ],
+		  [
+		    "Your mesh is being provisioned. Wait a few minutes before checking the status of your mesh %s",
+		    "dummy_mesh_id",
+		  ],
+		  [
+		    "To check the status of your mesh, run:",
+		  ],
+		  [
+		    "aio api-mesh:status",
+		  ],
+		  [
+		    "******************************************************************************************************",
+		  ],
+		  [
+		    "Successfully created API Key %s",
+		    "dummy_api_key",
+		  ],
+		  [
+		    "Successfully subscribed API Key %s to API Mesh service",
+		    "dummy_api_key",
+		  ],
+		  [
+		    "Mesh Endpoint: %s
+		",
+		    "https://tigraph.adobe.io/dummy_mesh_id/graphql?api_key=dummy_api_key",
+		  ],
+		]
+	`);
+		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`[]`);
+	});
+
 	test('should fail if mesh config file arg is missing', async () => {
 		parseSpy.mockResolvedValueOnce({
 			args: {},
@@ -639,7 +827,7 @@ describe('create command tests', () => {
 	});
 
 	test('should successfully create a mesh if provided env file is valid, mesh interpolation is successful and interpolated mesh is a valid JSON', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_with_placeholder' },
 			flags: {
 				ignoreCache: mockIgnoreCacheFlag,
@@ -690,7 +878,7 @@ describe('create command tests', () => {
 	});
 
 	test('should return error if inputMesh is not a valid JSON', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_invalid_mesh.txt' },
 			flags: {
 				ignoreCache: mockIgnoreCacheFlag,
@@ -741,12 +929,12 @@ describe('create command tests', () => {
 			],
 		};
 
-		createMesh.mockResolvedValue({
+		createMesh.mockResolvedValueOnce({
 			meshId: 'dummy_mesh_id',
 			meshConfig: meshConfig,
 		});
 
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_files.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(false),
@@ -856,7 +1044,7 @@ describe('create command tests', () => {
 	});
 
 	test('should fail if the file name is more than 25 characters', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_invalid_file_name.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(false),
@@ -884,36 +1072,8 @@ describe('create command tests', () => {
 	`);
 	});
 
-	test('should fail if the file paths in files array and filenames in sources, transforms, additionalResolvers do not match in mesh config', async () => {
-		parseSpy.mockResolvedValue({
-			args: { file: 'src/commands/__fixtures__/sample_mesh_mismatching_path.json' },
-			flags: {
-				autoConfirmAction: Promise.resolve(false),
-			},
-		});
-
-		const output = CreateCommand.run();
-
-		await expect(output).rejects.toEqual(new Error('Input mesh config is not valid.'));
-
-		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
-		[
-		  [
-		    "Please make sure the file names are matching in meshConfig.",
-		  ],
-		]
-	`);
-		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
-		[
-		  [
-		    "Input mesh config is not valid.",
-		  ],
-		]
-	`);
-	});
-
 	test('should fail if the file is of type other than js, json extension', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_invalid_type.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(false),
@@ -941,7 +1101,7 @@ describe('create command tests', () => {
 	});
 
 	test('should fail if the files do not exist in the mesh directory or subdirectory', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_invalid_paths.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(false),
@@ -979,7 +1139,7 @@ describe('create command tests', () => {
 	});
 
 	test('should fail if import files function fails', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_files.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(false),
@@ -1044,19 +1204,19 @@ describe('create command tests', () => {
 			],
 		};
 
-		promptConfirm.mockResolvedValue(false).mockResolvedValue(true);
+		promptConfirm.mockResolvedValueOnce(false).mockResolvedValueOnce(true);
 
-		importFiles.mockResolvedValue(meshConfig);
+		importFiles.mockResolvedValueOnce(meshConfig);
 
-		createMesh.mockResolvedValue({
+		createMesh.mockResolvedValueOnce({
 			meshId: 'dummy_mesh_id',
 			meshConfig: meshConfig,
 		});
 
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_with_files_array.json' },
 			flags: {
-				autoConfirmAction: Promise.resolve(false),
+				autoConfirmAction: Promise.resolve(true),
 			},
 		});
 
@@ -1184,12 +1344,12 @@ describe('create command tests', () => {
 			],
 		};
 
-		promptConfirm.mockResolvedValue(true).mockResolvedValue(true);
+		promptConfirm.mockResolvedValueOnce(true).mockResolvedValueOnce(true);
 
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_with_files_array.json' },
 			flags: {
-				autoConfirmAction: Promise.resolve(false),
+				autoConfirmAction: Promise.resolve(true),
 			},
 		});
 
@@ -1197,7 +1357,7 @@ describe('create command tests', () => {
 			meshConfig,
 		});
 
-		createMesh.mockResolvedValue({
+		createMesh.mockResolvedValueOnce({
 			meshId: 'dummy_mesh_id',
 			meshConfig: meshConfig,
 		});
@@ -1329,20 +1489,20 @@ describe('create command tests', () => {
 			],
 		};
 
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_fully_qualified_mesh.json' },
 			flags: {
-				autoConfirmAction: Promise.resolve(false),
+				autoConfirmAction: Promise.resolve(true),
 			},
 		});
 
-		promptConfirm.mockResolvedValue(true);
+		promptConfirm.mockResolvedValueOnce(true);
 
 		importFiles.mockResolvedValueOnce({
 			meshConfig,
 		});
 
-		createMesh.mockResolvedValue({
+		createMesh.mockResolvedValueOnce({
 			meshId: 'dummy_mesh_id',
 			meshConfig: meshConfig,
 		});
@@ -1473,15 +1633,15 @@ describe('create command tests', () => {
 			],
 		};
 
-		createMesh.mockResolvedValue({
+		createMesh.mockResolvedValueOnce({
 			meshId: 'dummy_mesh_id',
 			meshConfig: meshConfig,
 		});
 
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_subdirectory.json' },
 			flags: {
-				autoConfirmAction: Promise.resolve(false),
+				autoConfirmAction: Promise.resolve(true),
 			},
 		});
 
@@ -1588,7 +1748,7 @@ describe('create command tests', () => {
 	});
 
 	test('should fail if the file is outside the workspace directory', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_outside_workspace_dir.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(false),
@@ -1615,7 +1775,7 @@ describe('create command tests', () => {
 	});
 
 	test('should fail if the file has invalid JSON content', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_invalid_file_content.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(false),
@@ -1652,7 +1812,7 @@ describe('create command tests', () => {
 	});
 
 	test('should fail if the file path starts from home directory i.e., path starts with ~/', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_path_from_home.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(false),

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

@@ -28,7 +28,8 @@ jest.mock('../../../lib/devConsole');
 
 const DescribeCommand = require('../describe');
 const { initSdk, initRequestId } = require('../../../helpers');
-const { describeMesh } = require('../../../lib/devConsole');
+const { describeMesh, getMesh } = require('../../../lib/devConsole');
+const sampleCreateMeshConfig = require('../../__fixtures__/sample_mesh.json');
 
 const selectedOrg = { id: '1234', code: 'CODE1234@AdobeOrg', name: 'ORG01', type: 'entp' };
 const selectedProject = { id: '5678', title: 'Project01' };
@@ -64,6 +65,12 @@ describe('describe command tests', () => {
 				ignoreCache: mockIgnoreCacheFlag,
 			},
 		});
+
+		let fetchedMeshConfig = sampleCreateMeshConfig;
+		fetchedMeshConfig.meshId = 'dummy_id';
+		fetchedMeshConfig.meshURL = '';
+
+		getMesh.mockResolvedValue(fetchedMeshConfig);
 	});
 
 	afterEach(() => {
@@ -172,7 +179,7 @@ describe('describe command tests', () => {
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`[]`);
 	});
 
-	test('should succeed if valid details are provided', async () => {
+	test('should return Non TI url if request is Non Ti', async () => {
 		const runResult = await DescribeCommand.run();
 
 		expect(initRequestId).toHaveBeenCalled();
@@ -219,6 +226,61 @@ describe('describe command tests', () => {
 		    "https://graph.adobe.io/api/dummy_meshId/graphql?api_key=dummy_apiKey",
 		  ],
 		]
+	`);
+	});
+
+	test('should return Ti URL if api return TI url', async () => {
+		let fetchedMeshConfig = sampleCreateMeshConfig;
+		fetchedMeshConfig.meshId = 'dummy_id';
+		fetchedMeshConfig.meshURL = 'https://tigraph.adobe.io';
+
+		getMesh.mockResolvedValue(fetchedMeshConfig);
+		const runResult = await DescribeCommand.run();
+
+		expect(initRequestId).toHaveBeenCalled();
+		expect(describeMesh).toHaveBeenCalledWith(
+			selectedOrg.id,
+			selectedProject.id,
+			selectedWorkspace.id,
+		);
+		expect(runResult).toMatchInlineSnapshot(`
+		{
+		  "apiKey": "dummy_apiKey",
+		  "meshId": "dummy_meshId",
+		}
+	`);
+		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
+		[
+		  [
+		    "Successfully retrieved mesh details 
+		",
+		  ],
+		  [
+		    "Org ID: %s",
+		    "1234",
+		  ],
+		  [
+		    "Project ID: %s",
+		    "5678",
+		  ],
+		  [
+		    "Workspace ID: %s",
+		    "123456789",
+		  ],
+		  [
+		    "Mesh ID: %s",
+		    "dummy_meshId",
+		  ],
+		  [
+		    "API Key: %s",
+		    "dummy_apiKey",
+		  ],
+		  [
+		    "Mesh Endpoint: %s
+		",
+		    "https://tigraph.adobe.io/dummy_meshId/graphql?api_key=dummy_apiKey",
+		  ],
+		]
 	`);
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`[]`);
 	});

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

@@ -25,6 +25,7 @@ const {
 	validateAndInterpolateMesh,
 } = require('../../utils');
 const {
+	getMesh,
 	createMesh,
 	createAPIMeshCredentials,
 	subscribeCredentialToMeshService,
@@ -150,9 +151,15 @@ class CreateCommand extends Command {
 								adobeIdIntegrationsForWorkspace.apiKey,
 							);
 
+							const { meshURL } = await getMesh(imsOrgId, projectId, workspaceId, mesh.meshId);
+							const meshUrl =
+								meshURL === '' || meshURL === undefined
+									? MULTITENANT_GRAPHQL_SERVER_BASE_URL
+									: meshURL;
+
 							this.log(
 								'Mesh Endpoint: %s\n',
-								`${MULTITENANT_GRAPHQL_SERVER_BASE_URL}/${mesh.meshId}/graphql?api_key=${adobeIdIntegrationsForWorkspace.apiKey}`,
+								`${meshUrl}/${mesh.meshId}/graphql?api_key=${adobeIdIntegrationsForWorkspace.apiKey}`,
 							);
 						} else {
 							this.log(

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

@@ -15,7 +15,7 @@ const logger = require('../../classes/logger');
 const { initSdk, initRequestId } = require('../../helpers');
 const CONSTANTS = require('../../constants');
 const { ignoreCacheFlag } = require('../../utils');
-const { describeMesh } = require('../../lib/devConsole');
+const { describeMesh, getMesh } = require('../../lib/devConsole');
 
 require('dotenv').config();
 
@@ -52,12 +52,12 @@ class DescribeCommand extends Command {
 					this.log('Workspace ID: %s', workspaceId);
 					this.log('Mesh ID: %s', meshId);
 
+					const { meshURL } = await getMesh(imsOrgId, projectId, workspaceId, meshId);
+					const meshUrl = meshURL === '' ? MULTITENANT_GRAPHQL_SERVER_BASE_URL : meshURL;
+
 					if (apiKey) {
 						this.log('API Key: %s', apiKey);
-						this.log(
-							'Mesh Endpoint: %s\n',
-							`${MULTITENANT_GRAPHQL_SERVER_BASE_URL}/${meshId}/graphql?api_key=${apiKey}`,
-						);
+						this.log('Mesh Endpoint: %s\n', `${meshUrl}/${meshId}/graphql?api_key=${apiKey}`);
 					}
 
 					return meshDetails;

package/src/utils.js

@@ -88,7 +88,9 @@ function getFilesInMeshConfig(data, meshConfigName) {
 	data.meshConfig.sources.transforms?.forEach(transform => {
 		transform.replaceField?.replacements.forEach(replacement => {
 			if (replacement.composer && !fileURLRegex.test(replacement.composer)) {
-				filesList.push(replacement.composer);
+				const [filename] = replacement.composer.split('#');
+
+				filesList.push(filename);
 			}
 		});
 	});
@@ -97,16 +99,51 @@ function getFilesInMeshConfig(data, meshConfigName) {
 	data.meshConfig.transforms?.forEach(transform => {
 		transform.replaceField?.replacements.forEach(replacement => {
 			if (replacement.composer && !fileURLRegex.test(replacement.composer)) {
-				filesList.push(replacement.composer);
+				const [filename] = replacement.composer.split('#');
+
+				filesList.push(filename);
 			}
 		});
 	});
 
+	// Hooks Plugin - mesh level
+	data.meshConfig.plugins?.forEach(plugin => {
+		if (plugin.hooks) {
+			if (plugin.hooks.beforeAll) {
+				const composer = plugin.hooks.beforeAll.composer;
+
+				if (composer && !fileURLRegex.test(composer)) {
+					const [filename] = composer.split('#');
+
+					filesList.push(filename);
+				}
+			}
+		}
+	});
+
+	// OnFetch plugin - mesh level
+	data.meshConfig.plugins?.forEach(plugin => {
+		if (plugin.onFetch) {
+			plugin.onFetch.forEach(onFetchConfig => {
+				const handler = onFetchConfig.handler;
+
+				if (handler) {
+					filesList.push(handler);
+				}
+			});
+		}
+	});
+
+	// remove duplicate files
+	filesList = [...new Set(filesList)];
+
+	logger.info(`Files to be imported: ${filesList.join(', ')}`);
+
 	try {
 		if (filesList.length) {
 			checkFilesAreUnderMeshDirectory(filesList, meshConfigName);
 			validateFileType(filesList);
-			validateFileName(filesList, data);
+			validateFileName(filesList);
 		}
 	} catch (err) {
 		logger.error(err.message);
@@ -226,9 +263,8 @@ function validateFileType(filesList) {
  * Validate the filenames
  *
  * @param filesList Files in sources, tranforms or additionalResolvers in the meshConfig
- * @param data MeshConfig
  */
-function validateFileName(filesList, data) {
+function validateFileName(filesList) {
 	const filesWithInvalidNames = [];
 
 	// Check if the file names are less than 25 characters
@@ -244,17 +280,6 @@ function validateFileName(filesList, data) {
 			`Mesh file names must be less than 25 characters. The following file(s) are invalid: ${filesWithInvalidNames}.`,
 		);
 	}
-
-	// check if the the filePaths in the files array match
-	// the fileNames in sources, transforms or additionalResolvers
-
-	if (data.meshConfig.files) {
-		for (let i = 0; i < data.meshConfig.files.length; i++) {
-			if (filesList.indexOf(data.meshConfig.files[i].path) == -1) {
-				throw new Error(`Please make sure the file names are matching in meshConfig.`);
-			}
-		}
-	}
 }
 
 /**validates the environment file content