@adobe/aio-cli-plugin-api-mesh 3.2.2 → 3.3.0-alpha

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"3.2.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: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}},"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"}},"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":"3.3.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"}},"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: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}},"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"}},"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": "3.2.2",
+	"version": "3.3.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.4.0",
+		"@adobe-apimesh/mesh-builder": "1.4.4",
 		"@adobe/aio-cli-lib-console": "^4.0.0",
 		"@adobe/aio-lib-core-config": "^3.0.0",
 		"@adobe/aio-lib-core-logging": "^2.0.0",

package/src/commands/__fixtures__/openapi-schema.json

@@ -1,4 +1,4 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema"
+    "$schema": "http://json-schema.org/draft-04/schema",
     "id": "2"
 }

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

@@ -12,6 +12,22 @@ governing permissions and limitations under the License.
 
 const mockConsoleCLIInstance = {};
 
+jest.mock('axios');
+jest.mock('@adobe/aio-lib-ims');
+jest.mock('@adobe/aio-lib-env');
+jest.mock('@adobe/aio-cli-lib-console', () => ({
+	init: jest.fn().mockResolvedValue(mockConsoleCLIInstance),
+	cleanStdOut: jest.fn(),
+}));
+jest.mock('../../../helpers', () => ({
+	initSdk: jest.fn().mockResolvedValue({}),
+	initRequestId: jest.fn().mockResolvedValue({}),
+	promptConfirm: jest.fn().mockResolvedValue(true),
+	interpolateMesh: jest.fn().mockResolvedValue({}),
+	importFiles: jest.fn().mockResolvedValue(),
+}));
+jest.mock('../../../lib/devConsole');
+
 const CreateCommand = require('../create');
 const sampleCreateMeshConfig = require('../../__fixtures__/sample_mesh.json');
 const meshConfigWithComposerFiles = require('../../__fixtures__/sample_mesh_with_composer_files.json');
@@ -27,35 +43,15 @@ const {
 	createMesh,
 	createAPIMeshCredentials,
 	subscribeCredentialToMeshService,
+	getTenantFeatures,
 } = require('../../../lib/devConsole');
 
 const selectedOrg = { id: '1234', code: 'CODE1234@AdobeOrg', name: 'ORG01', type: 'entp' };
-
 const selectedProject = { id: '5678', title: 'Project01' };
-
 const selectedWorkspace = { id: '123456789', title: 'Workspace01' };
 
-jest.mock('@adobe/aio-cli-lib-console', () => ({
-	init: jest.fn().mockResolvedValue(mockConsoleCLIInstance),
-	cleanStdOut: jest.fn(),
-}));
-
-jest.mock('axios');
-jest.mock('@adobe/aio-lib-ims');
-jest.mock('@adobe/aio-lib-env');
-jest.mock('@adobe/aio-cli-lib-console');
-jest.mock('../../../helpers', () => ({
-	initSdk: jest.fn().mockResolvedValue({}),
-	initRequestId: jest.fn().mockResolvedValue({}),
-	promptConfirm: jest.fn().mockResolvedValue(true),
-	interpolateMesh: jest.fn().mockResolvedValue({}),
-	importFiles: jest.fn().mockResolvedValue(),
-}));
-jest.mock('../../../lib/devConsole');
-
 let logSpy = null;
 let errorLogSpy = null;
-
 let parseSpy = null;
 
 const mockIgnoreCacheFlag = Promise.resolve(true);
@@ -65,16 +61,14 @@ describe('create command tests', () => {
 	beforeEach(() => {
 		initSdk.mockResolvedValue({
 			imsOrgId: selectedOrg.id,
+			imsOrgCode: selectedOrg.code,
 			projectId: selectedProject.id,
 			workspaceId: selectedWorkspace.id,
 			workspaceName: selectedWorkspace.title,
+			orgName: selectedOrg.name,
+			projectName: selectedProject.title,
 		});
 
-		global.requestId = 'dummy_request_id';
-
-		logSpy = jest.spyOn(CreateCommand.prototype, 'log');
-		errorLogSpy = jest.spyOn(CreateCommand.prototype, 'error');
-
 		createMesh.mockResolvedValue({
 			mesh: {
 				meshId: 'dummy_mesh_id',
@@ -88,14 +82,23 @@ describe('create command tests', () => {
 			apiKey: 'dummy_api_key',
 			id: 'dummy_id',
 		});
+
 		subscribeCredentialToMeshService.mockResolvedValue(['dummy_service']);
 
-		let fetchedMeshConfig = sampleCreateMeshConfig;
-		fetchedMeshConfig.meshId = 'dummy_id';
-		fetchedMeshConfig.meshURL = '';
+		getMesh.mockResolvedValue({
+			meshId: 'dummy_id',
+			meshURL: '',
+		});
 
-		getMesh.mockResolvedValue(fetchedMeshConfig);
+		getTenantFeatures.mockResolvedValue({
+			imsOrgId: selectedProject.code,
+			showCloudflareURL: false,
+		});
 
+		global.requestId = 'dummy_request_id';
+
+		logSpy = jest.spyOn(CreateCommand.prototype, 'log');
+		errorLogSpy = jest.spyOn(CreateCommand.prototype, 'error');
 		parseSpy = jest.spyOn(CreateCommand.prototype, 'parse');
 		parseSpy.mockResolvedValue({
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
@@ -280,6 +283,8 @@ describe('create command tests', () => {
 		  "5678",
 		  "123456789",
 		  "Workspace01",
+		  "ORG01",
+		  "Project01",
 		  {
 		    "meshConfig": {
 		      "sources": [
@@ -370,6 +375,8 @@ describe('create command tests', () => {
 		  "5678",
 		  "123456789",
 		  "Workspace01",
+		  "ORG01",
+		  "Project01",
 		  {
 		    "meshConfig": {
 		      "sources": [
@@ -929,6 +936,8 @@ describe('create command tests', () => {
 		  "5678",
 		  "123456789",
 		  "Workspace01",
+		  "ORG01",
+		  "Project01",
 		  {
 		    "meshConfig": {
 		      "files": [
@@ -1133,7 +1142,8 @@ describe('create command tests', () => {
 	`);
 	});
 
-	test('should not override if prompt returns No, if there is files array', async () => {
+	// Temporarily skipping since it is not actually testing the file import override prompt. The function which performs the prompt is mocked.
+	test.skip('should not override if prompt returns No, if there is files array', async () => {
 		let meshConfig = {
 			sources: [
 				{
@@ -1191,6 +1201,8 @@ describe('create command tests', () => {
 		  "5678",
 		  "123456789",
 		  "Workspace01",
+		  "ORG01",
+		  "Project01",
 		  {
 		    "files": [
 		      {
@@ -1260,7 +1272,8 @@ describe('create command tests', () => {
 	`);
 	});
 
-	test('should override if prompt returns Yes, if there is files array', async () => {
+	// Temporarily skipping since it is not actually testing the file import override prompt. The function which performs the prompt is mocked.
+	test.skip('should override if prompt returns Yes, if there is files array', async () => {
 		let meshConfig = {
 			sources: [
 				{
@@ -1320,6 +1333,8 @@ describe('create command tests', () => {
 		  "5678",
 		  "123456789",
 		  "Workspace01",
+		  "ORG01",
+		  "Project01",
 		  {
 		    "meshConfig": {
 		      "files": [
@@ -1452,6 +1467,8 @@ describe('create command tests', () => {
 		  "5678",
 		  "123456789",
 		  "Workspace01",
+		  "ORG01",
+		  "Project01",
 		  {
 		    "meshConfig": {
 		      "files": [
@@ -1581,6 +1598,8 @@ describe('create command tests', () => {
 		  "5678",
 		  "123456789",
 		  "Workspace01",
+		  "ORG01",
+		  "Project01",
 		  {
 		    "meshConfig": {
 		      "files": [
@@ -1742,4 +1761,74 @@ describe('create command tests', () => {
 		]
 	`);
 	});
+
+	test('should show prod edge mesh url on workspace named "Production" if feature is enabled', async () => {
+		// mock the edge mesh url feature to be enabled
+		getTenantFeatures.mockResolvedValue({
+			imsOrgId: selectedOrg.code,
+			showCloudflareURL: true,
+		});
+
+		// mock the workspace name to "Production"
+		initSdk.mockResolvedValue({
+			workspaceName: 'Production',
+		});
+
+		await CreateCommand.run();
+
+		expect(logSpy).toHaveBeenCalledWith(
+			expect.stringContaining('Legacy Mesh Endpoint:'),
+			'https://graph.adobe.io/api/dummy_mesh_id/graphql?api_key=dummy_api_key',
+		);
+
+		expect(logSpy).toHaveBeenCalledWith(
+			expect.stringContaining('Edge Mesh Endpoint:'),
+			'https://edge-graph.adobe.io/api/dummy_mesh_id/graphql',
+		);
+	});
+
+	test('should show sandbox edge mesh url on workspace NOT named "Production" if feature is enabled', async () => {
+		// mock the edge mesh url feature to be enabled
+		getTenantFeatures.mockResolvedValueOnce({
+			imsOrgId: selectedOrg.code,
+			showCloudflareURL: true,
+		});
+
+		// mock the workspace name to a value not equal to "Production"
+		initSdk.mockResolvedValueOnce({
+			workspaceName: 'AnythingButProduction',
+		});
+
+		await CreateCommand.run();
+
+		expect(logSpy).toHaveBeenCalledWith(
+			expect.stringContaining('Legacy Mesh Endpoint:'),
+			'https://graph.adobe.io/api/dummy_mesh_id/graphql?api_key=dummy_api_key',
+		);
+
+		expect(logSpy).toHaveBeenCalledWith(
+			expect.stringContaining('Edge Mesh Endpoint:'),
+			'https://edge-sandbox-graph.adobe.io/api/dummy_mesh_id/graphql',
+		);
+	});
+
+	test('should not show edge mesh url if feature is disabled', async () => {
+		// mock the edge mesh url feature to be disabled
+		getTenantFeatures.mockResolvedValueOnce({
+			imsOrgId: selectedOrg.code,
+			showCloudflareURL: false,
+		});
+
+		await CreateCommand.run();
+
+		expect(logSpy).not.toHaveBeenCalledWith(
+			expect.stringContaining('Edge Mesh Endpoint:'),
+			expect.any(String),
+		);
+
+		expect(logSpy).toHaveBeenCalledWith(
+			expect.stringContaining('Mesh Endpoint:'),
+			'https://graph.adobe.io/api/dummy_mesh_id/graphql?api_key=dummy_api_key',
+		);
+	});
 });

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

@@ -14,7 +14,6 @@ const mockConsoleCLIInstance = {};
 
 jest.mock('axios');
 jest.mock('@adobe/aio-lib-env');
-jest.mock('@adobe/aio-cli-lib-console');
 jest.mock('@adobe/aio-lib-ims');
 jest.mock('../../../helpers', () => ({
 	initSdk: jest.fn().mockResolvedValue({}),
@@ -28,7 +27,7 @@ jest.mock('../../../lib/devConsole');
 
 const DescribeCommand = require('../describe');
 const { initSdk, initRequestId } = require('../../../helpers');
-const { describeMesh, getMesh } = require('../../../lib/devConsole');
+const { describeMesh, getMesh, getTenantFeatures } = require('../../../lib/devConsole');
 const sampleCreateMeshConfig = require('../../__fixtures__/sample_mesh.json');
 
 const selectedOrg = { id: '1234', code: 'CODE1234@AdobeOrg', name: 'ORG01', type: 'entp' };
@@ -43,35 +42,39 @@ const mockIgnoreCacheFlag = jest.fn().mockResolvedValue(true);
 
 describe('describe command tests', () => {
 	beforeEach(() => {
-		describeMesh.mockResolvedValue({
-			meshId: 'dummy_meshId',
-			apiKey: 'dummy_apiKey',
-		});
-
 		initSdk.mockResolvedValue({
 			imsOrgId: selectedOrg.id,
+			imsOrgCode: selectedOrg.code,
 			projectId: selectedProject.id,
 			workspaceId: selectedWorkspace.id,
 			workspaceName: selectedWorkspace.title,
 		});
 
+		describeMesh.mockResolvedValue({
+			meshId: 'dummy_meshId',
+			apiKey: 'dummy_apiKey',
+		});
+
+		getMesh.mockResolvedValue({
+			meshId: 'dummy_id',
+			meshURL: '',
+		});
+
+		getTenantFeatures.mockResolvedValue({
+			imsOrgId: selectedOrg.code,
+			showCloudflareURL: false,
+		});
+
 		global.requestId = 'dummy_request_id';
 
 		logSpy = jest.spyOn(DescribeCommand.prototype, 'log');
 		errorLogSpy = jest.spyOn(DescribeCommand.prototype, 'error');
-
 		parseSpy = jest.spyOn(DescribeCommand.prototype, 'parse');
 		parseSpy.mockResolvedValue({
 			flags: {
 				ignoreCache: mockIgnoreCacheFlag,
 			},
 		});
-
-		let fetchedMeshConfig = sampleCreateMeshConfig;
-		fetchedMeshConfig.meshId = 'dummy_id';
-		fetchedMeshConfig.meshURL = '';
-
-		getMesh.mockResolvedValue(fetchedMeshConfig);
 	});
 
 	afterEach(() => {
@@ -284,4 +287,74 @@ describe('describe command tests', () => {
 	`);
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`[]`);
 	});
+
+	test('should show prod edge mesh url on workspace named "Production" if feature is enabled', async () => {
+		// mock the edge mesh url feature to be enabled
+		getTenantFeatures.mockResolvedValueOnce({
+			imsOrgId: selectedOrg.code,
+			showCloudflareURL: true,
+		});
+
+		// mock the workspace name to "Production"
+		initSdk.mockResolvedValueOnce({
+			workspaceName: 'Production',
+		});
+
+		await DescribeCommand.run();
+
+		expect(logSpy).toHaveBeenCalledWith(
+			expect.stringContaining('Legacy Mesh Endpoint:'),
+			'https://graph.adobe.io/api/dummy_meshId/graphql?api_key=dummy_apiKey',
+		);
+
+		expect(logSpy).toHaveBeenCalledWith(
+			expect.stringContaining('Edge Mesh Endpoint:'),
+			'https://edge-graph.adobe.io/api/dummy_meshId/graphql',
+		);
+	});
+
+	test('should show sandbox edge mesh url on workspace NOT named "Production" if feature is enabled', async () => {
+		// mock the edge mesh url feature to be enabled
+		getTenantFeatures.mockResolvedValueOnce({
+			imsOrgId: selectedOrg.code,
+			showCloudflareURL: true,
+		});
+
+		// mock the workspace name to a value not equal to "Production"
+		initSdk.mockResolvedValueOnce({
+			workspaceName: 'AnythingButProduction',
+		});
+
+		await DescribeCommand.run();
+
+		expect(logSpy).toHaveBeenCalledWith(
+			expect.stringContaining('Legacy Mesh Endpoint:'),
+			'https://graph.adobe.io/api/dummy_meshId/graphql?api_key=dummy_apiKey',
+		);
+
+		expect(logSpy).toHaveBeenCalledWith(
+			expect.stringContaining('Edge Mesh Endpoint:'),
+			'https://edge-sandbox-graph.adobe.io/api/dummy_meshId/graphql',
+		);
+	});
+
+	test('should not show edge mesh url if feature is disabled', async () => {
+		// mock the edge mesh url feature to be disabled
+		getTenantFeatures.mockResolvedValueOnce({
+			imsOrgId: selectedOrg.code,
+			showCloudflareURL: false,
+		});
+
+		await DescribeCommand.run();
+
+		expect(logSpy).not.toHaveBeenCalledWith(
+			expect.stringContaining('Edge Mesh Endpoint:'),
+			expect.any(String),
+		);
+
+		expect(logSpy).toHaveBeenCalledWith(
+			expect.stringContaining('Mesh Endpoint:'),
+			'https://graph.adobe.io/api/dummy_meshId/graphql?api_key=dummy_apiKey',
+		);
+	});
 });

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

@@ -10,9 +10,9 @@ governing permissions and limitations under the License.
 */
 
 const { Command } = require('@oclif/core');
+const chalk = require('chalk');
 const { initSdk, initRequestId, promptConfirm, importFiles } = require('../../helpers');
 const logger = require('../../classes/logger');
-const CONSTANTS = require('../../constants');
 const {
 	ignoreCacheFlag,
 	autoConfirmActionFlag,
@@ -23,9 +23,8 @@ const {
 	readFileContents,
 	validateAndInterpolateMesh,
 } = require('../../utils');
-const { getMesh, createMesh } = require('../../lib/devConsole');
-
-const { MULTITENANT_GRAPHQL_SERVER_BASE_URL } = CONSTANTS;
+const { createMesh, getTenantFeatures } = require('../../lib/devConsole');
+const { buildEdgeMeshUrl, buildMeshUrl } = require('../../urlBuilder');
 
 class CreateCommand extends Command {
 	static args = [{ name: 'file' }];
@@ -54,7 +53,15 @@ class CreateCommand extends Command {
 		const ignoreCache = await flags.ignoreCache;
 		const autoConfirmAction = await flags.autoConfirmAction;
 		const envFilePath = await flags.env;
-		const { imsOrgId, projectId, workspaceId, workspaceName } = await initSdk({
+		const {
+			imsOrgId,
+			imsOrgCode,
+			projectId,
+			workspaceId,
+			workspaceName,
+			orgName,
+			projectName,
+		} = await initSdk({
 			ignoreCache,
 		});
 
@@ -109,6 +116,8 @@ class CreateCommand extends Command {
 					projectId,
 					workspaceId,
 					workspaceName,
+					orgName,
+					projectName,
 					data,
 				);
 
@@ -132,25 +141,23 @@ class CreateCommand extends Command {
 						if (sdkList) {
 							this.log('Successfully subscribed API Key %s to API Mesh service', apiKey);
 
-							const { meshURL } = await getMesh(
+							const meshUrl = await buildMeshUrl(
 								imsOrgId,
 								projectId,
 								workspaceId,
 								workspaceName,
 								mesh.meshId,
+								apiKey,
 							);
-							const meshUrl =
-								meshURL === '' || meshURL === undefined
-									? MULTITENANT_GRAPHQL_SERVER_BASE_URL
-									: meshURL;
-
-							if (apiKey && MULTITENANT_GRAPHQL_SERVER_BASE_URL.includes(meshUrl)) {
-								this.log(
-									'Mesh Endpoint: %s\n',
-									`${meshUrl}/${mesh.meshId}/graphql?api_key=${apiKey}`,
-								);
+
+							const { showCloudflareURL: showEdgeMeshUrl } = await getTenantFeatures(imsOrgCode);
+
+							if (showEdgeMeshUrl) {
+								const edgeMeshUrl = buildEdgeMeshUrl(mesh.meshId, workspaceName);
+								this.log('Legacy Mesh Endpoint: %s', meshUrl);
+								this.log(chalk.bold('Edge Mesh Endpoint: %s\n'), edgeMeshUrl);
 							} else {
-								this.log('Mesh Endpoint: %s\n', `${meshUrl}/${mesh.meshId}/graphql`);
+								this.log('Mesh Endpoint: %s\n', meshUrl);
 							}
 						} else {
 							this.log('Unable to subscribe API Key %s to API Mesh service', apiKey);

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

@@ -10,17 +10,16 @@ governing permissions and limitations under the License.
 */
 
 const { Command } = require('@oclif/command');
+const chalk = require('chalk');
 
 const logger = require('../../classes/logger');
 const { initSdk, initRequestId } = require('../../helpers');
-const CONSTANTS = require('../../constants');
 const { ignoreCacheFlag } = require('../../utils');
-const { describeMesh, getMesh } = require('../../lib/devConsole');
+const { describeMesh, getTenantFeatures } = require('../../lib/devConsole');
+const { buildMeshUrl, buildEdgeMeshUrl } = require('../../urlBuilder');
 
 require('dotenv').config();
 
-const { MULTITENANT_GRAPHQL_SERVER_BASE_URL } = CONSTANTS;
-
 class DescribeCommand extends Command {
 	static flags = {
 		ignoreCache: ignoreCacheFlag,
@@ -32,10 +31,8 @@ class DescribeCommand extends Command {
 		logger.info(`RequestId: ${global.requestId}`);
 
 		const { flags } = await this.parse(DescribeCommand);
-
 		const ignoreCache = await flags.ignoreCache;
-
-		const { imsOrgId, projectId, workspaceId, workspaceName } = await initSdk({
+		const { imsOrgId, imsOrgCode, projectId, workspaceId, workspaceName } = await initSdk({
 			ignoreCache,
 		});
 
@@ -44,29 +41,32 @@ class DescribeCommand extends Command {
 
 			if (meshDetails) {
 				const { meshId, apiKey } = meshDetails;
+				const { showCloudflareURL: showEdgeMeshUrl } = await getTenantFeatures(imsOrgCode);
 
 				if (meshId) {
-					this.log('Successfully retrieved mesh details \n');
-					this.log('Org ID: %s', imsOrgId);
-					this.log('Project ID: %s', projectId);
-					this.log('Workspace ID: %s', workspaceId);
-					this.log('Mesh ID: %s', meshId);
-
-					const { meshURL } = await getMesh(
+					const meshUrl = await buildMeshUrl(
 						imsOrgId,
 						projectId,
 						workspaceId,
 						workspaceName,
 						meshId,
+						apiKey,
 					);
-					const meshUrl =
-						meshURL === '' || meshURL === undefined ? MULTITENANT_GRAPHQL_SERVER_BASE_URL : meshURL;
 
-					if (apiKey && MULTITENANT_GRAPHQL_SERVER_BASE_URL.includes(meshUrl)) {
-						this.log('Mesh Endpoint: %s\n', `${meshUrl}/${meshId}/graphql?api_key=${apiKey}`);
+					this.log('Successfully retrieved mesh details \n');
+					this.log('Org ID: %s', imsOrgId);
+					this.log('Project ID: %s', projectId);
+					this.log('Workspace ID: %s', workspaceId);
+					this.log('Mesh ID: %s', meshId);
+
+					if (showEdgeMeshUrl) {
+						const edgeMeshUrl = buildEdgeMeshUrl(meshId, workspaceName);
+						this.log('Legacy Mesh Endpoint: %s', meshUrl);
+						this.log(chalk.bold('Edge Mesh Endpoint: %s\n'), edgeMeshUrl);
 					} else {
-						this.log('Mesh Endpoint: %s\n', `${meshUrl}/${meshId}/graphql`);
+						this.log('Mesh Endpoint: %s\n', meshUrl);
 					}
+
 					return meshDetails;
 				} else {
 					logger.error(

package/src/constants.js

@@ -9,6 +9,7 @@ const StageConstants = {
 	DEV_CONSOLE_TRANSPORTER_API_KEY: 'UDPWeb1',
 	AIO_CLI_API_KEY: 'aio-cli-console-auth-stage',
 	SMS_BASE_URL: 'https://graph-stage.adobe.io/api-admin',
+	EDGE_MESH_BASE_URL: 'https://edge-stage-graph.adobe.io/api',
 };
 
 const ProdConstants = {
@@ -18,6 +19,8 @@ const ProdConstants = {
 	DEV_CONSOLE_TRANSPORTER_API_KEY: 'UDPWeb1',
 	AIO_CLI_API_KEY: 'aio-cli-console-auth',
 	SMS_BASE_URL: 'https://graph.adobe.io/api-admin',
+	EDGE_MESH_BASE_URL: 'https://edge-graph.adobe.io/api',
+	EDGE_MESH_SANDBOX_BASE_URL: 'https://edge-sandbox-graph.adobe.io/api',
 };
 
 const envConstants = clientEnv === 'stage' ? StageConstants : ProdConstants;

package/src/helpers.js

@@ -423,9 +423,12 @@ async function initSdk(options) {
 
 	return {
 		imsOrgId: org.id,
+		imsOrgCode: org.code,
 		projectId: project.id,
 		workspaceId: workspace.id,
 		workspaceName: workspace.title,
+		orgName: org.name,
+		projectName: project.title,
 	};
 }
 

package/src/lib/devConsole.js

@@ -11,7 +11,7 @@ const util = require('util');
 const exec = util.promisify(require('child_process').exec);
 const contentDisposition = require('content-disposition');
 
-const { DEV_CONSOLE_TRANSPORTER_API_KEY } = CONSTANTS;
+const { DEV_CONSOLE_TRANSPORTER_API_KEY, SMS_BASE_URL } = CONSTANTS;
 
 const { objToString, getDevConsoleConfig } = require('../helpers');
 
@@ -193,7 +193,15 @@ const getMesh = async (organizationId, projectId, workspaceId, workspaceName, me
 	}
 };
 
-const createMesh = async (organizationId, projectId, workspaceId, workspaceName, data) => {
+const createMesh = async (
+	organizationId,
+	projectId,
+	workspaceId,
+	workspaceName,
+	orgName,
+	projectName,
+	data,
+) => {
 	const { baseUrl: devConsoleUrl, accessToken, apiKey } = await getDevConsoleConfig();
 	const config = {
 		method: 'post',
@@ -202,6 +210,9 @@ const createMesh = async (organizationId, projectId, workspaceId, workspaceName,
 			'Authorization': `Bearer ${accessToken}`,
 			'Content-Type': 'application/json',
 			'x-request-id': global.requestId,
+			'workspaceName': workspaceName,
+			'orgName': orgName,
+			'projectName': projectName,
 		},
 		data: JSON.stringify(data),
 	};
@@ -821,6 +832,60 @@ const getMeshArtifact = async (organizationId, projectId, workspaceId, workspace
 	}
 };
 
+/**
+ * Gets the enabled features for the tenant.
+ *
+ * This request bypasses the Dev Console and is sent directly to the Schema Management Service.
+ * As a result, we provide the orgCode instead of orgId since Dev Console usually performs the translation.
+ * The near-term goal is to stop using Dev Console as a proxy for all routes.
+ * @param organizationCode
+ * @returns {Promise<Object>}
+ */
+const getTenantFeatures = async organizationCode => {
+	const { accessToken, apiKey } = await getDevConsoleConfig();
+	const config = {
+		method: 'get',
+		url: `${SMS_BASE_URL}/organizations/${organizationCode}/features?API_KEY=${apiKey}`,
+		headers: {
+			'Authorization': `Bearer ${accessToken}`,
+			'x-request-id': global.requestId,
+		},
+	};
+
+	logger.info(
+		'Initiating GET %s',
+		`${SMS_BASE_URL}/organizations/${organizationCode}/features?API_KEY=${apiKey}`,
+	);
+
+	try {
+		const response = await axios(config);
+
+		logger.info('Response from GET %s', response.status);
+
+		if (response?.status === 200) {
+			logger.info(`Tenant Features : ${objToString(response, ['data'])}`);
+
+			return response.data;
+		} else {
+			let errorMessage = `Something went wrong: ${objToString(
+				response,
+				['data'],
+				'Unable to get tenant features.',
+			)}`;
+			logger.error(`${errorMessage}. Received ${response.status} response instead of 200`);
+
+			throw new Error(errorMessage);
+		}
+	} catch (error) {
+		logger.error(`Error getting features for organization: ${organizationCode}`);
+
+		return {
+			imsOrgId: organizationCode,
+			showCloudflareURL: false,
+		};
+	}
+};
+
 module.exports = {
 	getApiKeyCredential,
 	describeMesh,
@@ -835,4 +900,5 @@ module.exports = {
 	subscribeCredentialToMeshService,
 	unsubscribeCredentialFromMeshService,
 	getMeshArtifact,
+	getTenantFeatures,
 };

package/src/urlBuilder.js

@@ -0,0 +1,58 @@
+const CONSTANTS = require('./constants');
+const { getMesh } = require('./lib/devConsole');
+
+const {
+	MULTITENANT_GRAPHQL_SERVER_BASE_URL,
+	EDGE_MESH_BASE_URL,
+	EDGE_MESH_SANDBOX_BASE_URL,
+} = CONSTANTS;
+
+/**
+ * Build the mesh url for the multitenant mesh.
+ *
+ * Gets the mesh details to checks for a custom domain in the case of a TI mesh.
+ * @param imsOrgId
+ * @param projectId
+ * @param workspaceId
+ * @param workspaceName
+ * @param meshId
+ * @param apiKey
+ * @returns {Promise<string>}
+ */
+async function buildMeshUrl(imsOrgId, projectId, workspaceId, workspaceName, meshId, apiKey) {
+	const { meshURL: customBaseUrl } = await getMesh(
+		imsOrgId,
+		projectId,
+		workspaceId,
+		workspaceName,
+		meshId,
+	);
+
+	return customBaseUrl
+		? `${customBaseUrl}/${meshId}/graphql`
+		: `${MULTITENANT_GRAPHQL_SERVER_BASE_URL}/${meshId}/graphql${
+				apiKey ? `?api_key=${apiKey}` : ''
+		  }`;
+}
+
+/**
+ * Builds the mesh url for the edge mesh.
+ *
+ * Uses the url for the appropriate Cloudflare namespace based on the console workspace name.
+ * @param meshId
+ * @param workspaceName
+ * @returns {string}
+ */
+function buildEdgeMeshUrl(meshId, workspaceName) {
+	let baseUrl;
+
+	if (EDGE_MESH_BASE_URL.includes('stage')) {
+		baseUrl = EDGE_MESH_BASE_URL;
+	} else {
+		baseUrl = workspaceName === 'Production' ? EDGE_MESH_BASE_URL : EDGE_MESH_SANDBOX_BASE_URL;
+	}
+
+	return `${baseUrl}/${meshId}/graphql`;
+}
+
+module.exports = { buildMeshUrl, buildEdgeMeshUrl };